couchrest_model 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/couchrest_model.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber", "Sam Lown"]
-  s.date = %q{2011-04-29}
+  s.date = File.mtime('VERSION')
   s.description = %q{CouchRest Model provides aditional features to the standard CouchRest Document class such as properties, view designs, associations, callbacks, typecasting and validations.}
   s.email = %q{jchris@apache.org}
   s.extra_rdoc_files = [
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency(%q<couchrest>, "1.1.1")
+  s.add_dependency(%q<couchrest>, "~> 1.1.2")
   s.add_dependency(%q<mime-types>, "~> 1.15")
   s.add_dependency(%q<activemodel>, "~> 3.0")
   s.add_dependency(%q<tzinfo>, "~> 0.3.22")

data/history.md

@@ -1,5 +1,12 @@
 # CouchRest Model Change History
 
+## 1.1.2 - 2011-07-23
+
+* Minor fixes
+  * Upgrade to couchrest 1.1.2
+  * Override as_couch_json to ensure nil values not stored
+  * Removing restriction that prohibited objects that cast as an array to be loaded.
+
 ## 1.1.1 - 2011-07-04
 
 * Minor fix

data/lib/couchrest/model/properties.rb

@@ -12,8 +12,10 @@ module CouchRest
         raise "You can only mixin Properties in a class responding to [] and []=, if you tried to mixin CastedModel, make sure your class inherits from Hash or responds to the proper methods" unless (method_defined?(:[]) && method_defined?(:[]=))
       end
 
-      def as_json(options = nil)
-        Hash[self].reject{|k,v| v.nil?}.as_json(options)
+      # Provide an attribute hash ready to be sent to CouchDB but with
+      # all the nil attributes removed.
+      def as_couch_json
+        super.delete_if{|k,v| v.nil?}
       end
 
       # Returns the Class properties with their values

data/lib/couchrest/model/property.rb

@@ -43,9 +43,8 @@ module CouchRest::Model
       end
     end
 
-    # Cast an individual value, not an array
+    # Cast an individual value
     def cast_value(parent, value)
-      raise "An array inside an array cannot be casted, use Embeddable module" if value.is_a?(Array)
       value = typecast_value(value, self)
       associate_casted_value_to_parent(parent, value)
     end

data/spec/unit/property_spec.rb

@@ -62,15 +62,23 @@ describe CouchRest::Model::Property do
     @card.updated_at.should_not be_nil
   end
 
-  describe "#as_json" do
+  describe "#as_couch_json" do
 
     it "should provide a simple hash from model" do
-      @card.as_json.class.should eql(Hash)
+      @card.as_couch_json.class.should eql(Hash)
     end
 
     it "should remove properties from Hash if value is nil" do
       @card.last_name = nil
-      @card.as_json.keys.include?('last_name').should be_false
+      @card.as_couch_json.keys.include?('last_name').should be_false
+    end
+
+  end
+
+  describe "#as_json" do
+
+    it "should provide a simple hash from model" do
+      @card.as_json.class.should eql(Hash)
     end
 
     it "should pass options to Active Support's as_json" do
@@ -442,15 +450,18 @@ describe "Property Class" do
       ary.last.should eql(Date.new(2011, 05, 22))
     end
 
-    it "should raise and error if value is array when type is not" do
-      property = CouchRest::Model::Property.new(:test, Date)
+    it "should cast an object that provides an array" do
+      prop = Class.new do
+        attr_accessor :ary
+        def initialize(val); self.ary = val; end
+        def as_json; ary; end
+      end
+      property = CouchRest::Model::Property.new(:test, prop)
       parent = mock("FooClass")
-      lambda {
-        cast = property.cast(parent, [Date.new(2010, 6, 1)])
-      }.should raise_error
+      cast = property.cast(parent, [1, 2])
+      cast.ary.should eql([1, 2])
     end
 
-
     it "should set parent as casted_by object in CastedArray" do
       property = CouchRest::Model::Property.new(:test, [Object])
       parent = mock("FooObject")

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest_model
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 1.1.1
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -14,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,9 +28,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -36,6 +46,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 15
         version: "1.15"
   type: :runtime
   version_requirements: *id002
@@ -47,6 +61,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id003
@@ -58,6 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 3
+        - 22
         version: 0.3.22
   type: :runtime
   version_requirements: *id004
@@ -69,6 +92,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id005
@@ -80,6 +108,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
   type: :development
   version_requirements: *id006
@@ -91,6 +124,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 5
+        - 7
         version: 0.5.7
   type: :development
   version_requirements: *id007
@@ -225,17 +263,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Extends the CouchRest Document for advanced modelling.