mirror of
https://github.com/awesome-print/awesome_print
synced 2023-03-27 23:22:34 -04:00
Fix mongoid concerns
This commit is contained in:
parent
52933a1c74
commit
1ff12067cb
5 changed files with 32 additions and 25 deletions
|
@ -11,7 +11,9 @@ module AwesomePrint
|
|||
end
|
||||
|
||||
def self.formattable?(object)
|
||||
defined?(::ActiveRecord) && object.is_a?(ActiveRecord::AttributeSet)
|
||||
defined?(::ActiveRecord) &&
|
||||
defined?(::ActiveRecord::AttributeSet) &&
|
||||
object.is_a?(ActiveRecord::AttributeSet)
|
||||
end
|
||||
|
||||
def format(object)
|
||||
|
|
|
@ -8,7 +8,8 @@ module AwesomePrint
|
|||
|
||||
def self.formattable?(object)
|
||||
defined?(::Mongoid::Document) &&
|
||||
object.class.ancestors.include?(::Mongoid::Document)
|
||||
(object.class.ancestors.include?(::Mongoid::Document) ||
|
||||
(object.respond_to?(:ancestors) && object.ancestors.include?(::Mongoid::Document)))
|
||||
end
|
||||
|
||||
def format(object)
|
||||
|
@ -16,16 +17,16 @@ module AwesomePrint
|
|||
return Formatters::SimpleFormatter.new(@inspector).format(object.inspect)
|
||||
end
|
||||
|
||||
if object.respond_to?(:fields)
|
||||
if object.is_a?(Class)
|
||||
puts "[MGD] formatting #{object} as class..." if AwesomePrint.debug
|
||||
# mongoid class
|
||||
format_as_class(object)
|
||||
else
|
||||
puts "[MGD] formatting #{object} as instance..." if AwesomePrint.debug
|
||||
format_as_instance(object)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def format_as_class(object)
|
||||
|
@ -51,6 +52,8 @@ module AwesomePrint
|
|||
|
||||
"#{object} #{Formatters::HashFormatter.new(@inspector).format(data)}"
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -127,6 +127,8 @@ module AwesomePrint
|
|||
# awesome_print-rails binding lib or something.
|
||||
if defined?(::ActiveRecord) && object.respond_to?(:ancestors) && object.ancestors.to_a.include?(::ActiveRecord::Base)
|
||||
:activerecord_base_class
|
||||
elsif defined?(::Mongoid) && object.respond_to?(:ancestors) && object.ancestors.to_a.include?(::Mongoid::Document)
|
||||
:mongoid_document
|
||||
else
|
||||
object.class.to_s.gsub(/:+/, '_').downcase.to_sym
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
module AwesomePrint
|
||||
|
||||
def self.debug
|
||||
false
|
||||
false #true
|
||||
end
|
||||
|
||||
def self.version
|
||||
|
|
|
@ -40,7 +40,7 @@ RSpec.describe 'AwesomePrint/Mongoid', skip: -> { !ExtVerifier.has_mongoid? }.ca
|
|||
it 'should print the class' do
|
||||
class_spec = <<-EOS.strip
|
||||
class MongoUser < Object {
|
||||
:_id => :"bson/object_id",
|
||||
:_id => :bson/object_id,
|
||||
:first_name => :string,
|
||||
:last_name => :string
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ class MongoUser < Object {
|
|||
|
||||
class_spec = <<-EOS.strip
|
||||
class Chamelion < Object {
|
||||
:_id => :"bson/object_id",
|
||||
:_id => :bson/object_id,
|
||||
:last_attribute => :object
|
||||
}
|
||||
EOS
|
||||
|
|
Loading…
Reference in a new issue