mongomodel 0.1.3 → 0.1.4

data/lib/mongomodel.rb

@@ -20,6 +20,7 @@ module MongoModel
   autoload :Translation,      'mongomodel/concerns/translation'
   autoload :Validations,      'mongomodel/concerns/validations'
   autoload :Callbacks,        'mongomodel/concerns/callbacks'
+  autoload :Serialization,    'mongomodel/concerns/serialization'
   autoload :Logging,          'mongomodel/concerns/logging'
   autoload :Timestamps,       'mongomodel/concerns/timestamps'
   autoload :PrettyInspect,    'mongomodel/concerns/pretty_inspect'

data/lib/mongomodel/concerns/properties.rb

@@ -20,6 +20,10 @@ module MongoModel
       def model_properties
         properties.reject { |k, p| p.internal? }
       end
+      
+      def internal_properties
+        properties.select { |k, p| p.internal? }.map { |k, p| p }
+      end
     end
   
     class Property

data/lib/mongomodel/concerns/serialization.rb

@@ -0,0 +1,33 @@
+module MongoModel
+  module Serialization
+    extend ActiveSupport::Concern
+    
+    include ActiveModel::Serializers::JSON
+    
+    def serializable_hash(options = nil)
+      options ||= {}
+
+      options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
+      options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
+
+      attribute_names = attributes.keys.map { |k| k.to_s }.sort
+      attribute_names -= self.class.internal_properties.map { |p| p.name.to_s }
+      
+      if options[:only].any?
+        attribute_names &= options[:only]
+      elsif options[:except].any?
+        attribute_names -= options[:except]
+      end
+
+      method_names = Array.wrap(options[:methods]).inject([]) do |methods, name|
+        methods << name if respond_to?(name.to_s)
+        methods
+      end
+
+      (attribute_names + method_names).inject({}) { |hash, name|
+        hash[name] = send(name) if respond_to?(name)
+        hash
+      }
+    end
+  end
+end

data/lib/mongomodel/embedded_document.rb

@@ -29,6 +29,7 @@ module MongoModel
     include Logging
     include RecordStatus
     include ActiveModelCompatibility
+    include Serialization
     include Timestamps
     include PrettyInspect
     include AbstractClass

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/mongomodel/concerns/activemodel_spec.rb

@@ -54,7 +54,7 @@ module MongoModel
     
     describe "#model_name" do
       it "should return an ActiveModel::Name object" do
-        TestModel.model_name.should == ActiveModel::Name.new('TestModel')
+        TestModel.model_name.should == ActiveModel::Name.new(mock('TestModel class', :name => 'TestModel'))
       end
     end
   end

data/spec/mongomodel/concerns/properties_spec.rb

@@ -25,5 +25,10 @@ module MongoModel
         :skill => Properties::Property.new(:skill, String)
       })
     end
+    
+    it "should have a set of internal property names" do
+      Person.internal_properties.should include(Person.properties[:type])
+      Person.internal_properties.should include(Person.properties[:id]) if described_class == Document
+    end
   end
 end

data/spec/mongomodel/concerns/serialization/json_serialization_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module MongoModel
+  specs_for(Document, EmbeddedDocument) do
+    define_class(:TestModel, described_class) do
+      property :name, String
+      property :age, Integer
+      property :paid, Boolean
+      property :prefs, Hash
+      property :internal, String, :internal => true
+      
+      def hello
+        "Hi friend!"
+      end
+    end
+    
+    let(:instance) do
+      TestModel.new(:name => 'Hello World', :age => 25, :paid => true, :prefs => { :foo => 'bar' }, :internal => 'hideme')
+    end
+    
+    it "should include root in json" do
+      begin
+        TestModel.include_root_in_json = true
+        
+        json = instance.to_json
+        json.should match(/^\{"test_model":\{/)
+      ensure
+        TestModel.include_root_in_json = false
+      end
+    end
+    
+    it "should encode all public attributes" do
+      json = instance.to_json
+      json.should match(/"name":"Hello World"/)
+      json.should match(/"age":25/)
+      json.should match(/"paid":true/)
+      json.should match(/"prefs":\{"foo":"bar"\}/)
+    end
+    
+    it "should not encode internal attributes" do
+      json = instance.to_json
+      json.should_not match(/"internal":"hideme"/)
+    end
+    
+    it "should allow attribute filtering with only" do
+      json = instance.to_json(:only => [:name, :age])
+      json.should match(/"name":"Hello World"/)
+      json.should match(/"age":25/)
+      json.should_not match(/"paid":true/)
+      json.should_not match(/"prefs":\{"foo":"bar"\}/)
+    end
+    
+    it "should allow attribute filtering with except" do
+      json = instance.to_json(:except => [:name, :age])
+      json.should_not match(/"name":"Hello World"/)
+      json.should_not match(/"age":25/)
+      json.should match(/"paid":true/)
+      json.should match(/"prefs":\{"foo":"bar"\}/)
+    end
+    
+    it "should allow methods to be included" do
+      json = instance.to_json(:methods => [:hello, :type])
+      json.should match(/"hello":"Hi friend!"/)
+      json.should match(/"type":"TestModel"/)
+    end
+  end
+end

data/spec/mongomodel/concerns/timestamps_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support/time'
 
 module MongoModel
   specs_for(Document, EmbeddedDocument) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +10:30
+date: 2010-02-16 00:00:00 +10:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - lib/mongomodel/concerns/pretty_inspect.rb
 - lib/mongomodel/concerns/properties.rb
 - lib/mongomodel/concerns/record_status.rb
+- lib/mongomodel/concerns/serialization.rb
 - lib/mongomodel/concerns/timestamps.rb
 - lib/mongomodel/concerns/translation.rb
 - lib/mongomodel/concerns/validations.rb
@@ -132,6 +133,7 @@ files:
 - spec/mongomodel/concerns/logging_spec.rb
 - spec/mongomodel/concerns/pretty_inspect_spec.rb
 - spec/mongomodel/concerns/properties_spec.rb
+- spec/mongomodel/concerns/serialization/json_serialization_spec.rb
 - spec/mongomodel/concerns/timestamps_spec.rb
 - spec/mongomodel/concerns/validations_spec.rb
 - spec/mongomodel/document/callbacks_spec.rb
@@ -205,6 +207,7 @@ test_files:
 - spec/mongomodel/concerns/logging_spec.rb
 - spec/mongomodel/concerns/pretty_inspect_spec.rb
 - spec/mongomodel/concerns/properties_spec.rb
+- spec/mongomodel/concerns/serialization/json_serialization_spec.rb
 - spec/mongomodel/concerns/timestamps_spec.rb
 - spec/mongomodel/concerns/validations_spec.rb
 - spec/mongomodel/document/callbacks_spec.rb