couchrest_model 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e473840521261d3dfe005eea56cd1585b4b245f4
+  data.tar.gz: 1df0369dc5e7a80c4d681eb9efdbb939f0df77f5
+SHA512:
+  metadata.gz: b8d8ded40ab8343e7f2e13969af3e319d1989724024b50ec00b3736d0b88eb0b118f807cf6e92a74d508b19581ff14a5e33b05a5d80cb14285c00e25794948e3
+  data.tar.gz: 31b1ecc35ec710094bec15bfa04fb2fa0eb3c208b966d787988fbfdd0bcd3c643684242f4508f98f6111d8f4075081e540b9969ab65050129054c4e85859721d

data/README.md

@@ -1,25 +1,21 @@
-# CouchRest Model: CouchDB, close to shiny metal with rounded edges [![Build Status](https://travis-ci.org/couchrest/couchrest_model.png)](https://travis-ci.org/couchrest/couchrest_model)
+# CouchRest Model
 
-CouchRest Models adds additional functionality to the standard CouchRest Document class such as
-setting properties, callbacks, typecasting, and validations.
+[![Build Status](https://travis-ci.org/couchrest/couchrest_model.png)](https://travis-ci.org/couchrest/couchrest_model)
 
-## Documentation
-
-Please visit the documentation project at [http://www.couchrest.info](http://www.couchrest.info). You're [contributions](https://github.com/couchrest/couchrest.github.com) to the documentation would be greatly appreciated!
+CouchRest Model helps you define models that are stored as documents in your CouchDB database.
 
-General API: [http://rdoc.info/projects/couchrest/couchrest_model](http://rdoc.info/projects/couchrest/couchrest_model)
+It supports useful features such as setting properties with typecasting, callbacks, validations, associations, and helps
+with creating CouchDB views to access your data.
 
-See the [update history](https://github.com/couchrest/couchrest_model/blob/master/history.md) for an up to date list of all the changes we've been working on recently.
+CouchRest Model uses ActiveModel for a lot of the magic, so if you're using Rails, you'll need at least version 3.0. The latest release (since 2.0.0) is Rails 4.0 compatible, and we recommend Ruby 2.0+.
 
-## Notes
+## Documentation
 
-Originally called ExtendedDocument, the new Model structure uses ActiveModel, part of Rails 3, 
-for validations and callbacks.
+Please visit the documentation project at [http://www.couchrest.info](http://www.couchrest.info). Your [contributions](https://github.com/couchrest/couchrest.github.com) would be greatly appreciated!
 
-If your project is still running Rails 2.3, you'll have to continue using ExtendedDocument as 
-it is not possible to load ActiveModel into programs that do not use ActiveSupport 3.0.
+General API: [http://rdoc.info/projects/couchrest/couchrest_model](http://rdoc.info/projects/couchrest/couchrest_model)
 
-CouchRest Model is only properly tested on CouchDB version 1.0 or newer.
+See the [update history](https://github.com/couchrest/couchrest_model/blob/master/history.md) for an up to date list of all the changes we've been working on recently.
 
 ### Upgrading from an earlier version?
 
@@ -27,23 +23,27 @@ CouchRest Model is only properly tested on CouchDB version 1.0 or newer.
 
 *Pre 1.1:* As of April 2011 and the release of version 1.1.0, the default model type key is 'type' instead of 'couchrest-type'. Simply updating your project will not work unless you migrate your data or set the configuration option in your initializers:
 
-    CouchRest::Model::Base.configure do |config|
-      config.model_type_key = 'couchrest-type'
-    end
-
-This is because CouchRest Model's are not couchrest specific and may be used in any other systems such as Javascript, the model type should reflect this. Also, we're all used to `type` being a reserved word in ActiveRecord.
+```ruby
+CouchRest::Model::Base.configure do |config|
+  config.model_type_key = 'couchrest-type'
+end
+```
 
 ## Install
 
 ### Gem
 
-    $ sudo gem install couchrest_model
+```bash
+$ sudo gem install couchrest_model
+```
 
 ### Bundler
 
 If you're using bundler, define a line similar to the following in your project's Gemfile:
 
-    gem 'couchrest_model'
+```ruby
+gem 'couchrest_model'
+```
 
 ### Configuration
 
@@ -64,56 +64,77 @@ Note that the name of the database is either just the prefix and suffix combined
 
 The example config above for example would use a database called "project_test". Heres an example using the `use_database` call:
 
-    class Project < CouchRest::Model::Base
-      use_database 'sample'
-    end
+```ruby
+class Project < CouchRest::Model::Base
+  use_database 'sample'
+end
+
+# The database object would be provided as:
+Project.database     #=> "https://test:user@sample.cloudant.com:443/project_sample_test"
+```
+
+### Using instead of ActiveRecord in Rails
+
+A common use case for a new project is to replace ActiveRecord with CouchRest Model, although they should work perfectly well together. If you no longer want to depend on ActiveRecord or any of its sub-dependencies such as sqlite, update your `config/application.rb` so the top looks something like:
 
-    # The database object would be provided as:
-    Project.database     #=> "https://test:user@sample.cloudant.com:443/project_sample_test"
+```ruby
+# We don't need active record, so load everything but:
+# require 'rails/all'
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
+```
 
+You'll then need to make sure any references to `config.active_record` are removed from your environment files.
 
 ## Generators
 
 ### Configuration
 
-    $ rails generate couchrest_model:config
+```bash
+$ rails generate couchrest_model:config
+```
 
 ### Model
 
-    $ rails generate model person --orm=couchrest_model
+```bash
+$ rails generate model person --orm=couchrest_model
+```
 
 ## General Usage 
 
-    require 'couchrest_model'
+```ruby
+require 'couchrest_model'
 
-    class Cat < CouchRest::Model::Base
+class Cat < CouchRest::Model::Base
 
-      property :name,      String
-      property :lives,     Integer, :default => 9
+  property :name,      String
+  property :lives,     Integer, :default => 9
 
-      property :nicknames, [String]
+  property :nicknames, [String]
 
-      timestamps!
+  timestamps!
 
-      design do
-        view :by_name
-      end
+  design do
+    view :by_name
+  end
 
-    end
+end
 
-    @cat = Cat.new(:name => 'Felix', :nicknames => ['so cute', 'sweet kitty'])
+@cat = Cat.new(:name => 'Felix', :nicknames => ['so cute', 'sweet kitty'])
 
-    @cat.new?   # true
-    @cat.save
+@cat.new?   # true
+@cat.save
 
-    @cat['name']   # "Felix"
+@cat['name']   # "Felix"
 
-    @cat.nicknames << 'getoffdamntable'
+@cat.nicknames << 'getoffdamntable'
 
-    @cat = Cat.new
-    @cat.update_attributes(:name => 'Felix', :random_text => 'feline')
-    @cat.new? # false
-    @cat.random_text  # Raises error!
+@cat = Cat.new
+@cat.update_attributes(:name => 'Felix', :random_text => 'feline')
+@cat.new? # false
+@cat.random_text  # Raises error!
+```
 
 ## Development
 
@@ -121,7 +142,9 @@ The example config above for example would use a database called "project_test".
 
 CouchRest Model now comes with a Gemfile to help with development. If you want to make changes to the code, download a copy then run:
 
-    bundle install
+```bash
+bundle install
+```
 
 That should set everything up for `rake spec` to be run correctly. Update the couchrest_model.gemspec if your alterations
 use different gems.
@@ -138,6 +161,6 @@ Please post bugs, suggestions and patches to the bug tracker at [http://github.c
 
 Follow us on Twitter: [http://twitter.com/couchrest](http://twitter.com/couchrest)
 
-Also, check [http://twitter.com/#search?q=%23couchrest](http://twitter.com/#search?q=%23couchrest)
+Also, check [https://twitter.com/search?q=couchrest](https://twitter.com/search?q=couchrest)
 
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/couchrest_model.gemspec

@@ -3,6 +3,7 @@
 Gem::Specification.new do |s|
   s.name = %q{couchrest_model}
   s.version = `cat VERSION`.strip
+  s.license = "Apache License 2.0"
 
   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"]

data/history.md

@@ -1,5 +1,11 @@
 # CouchRest Model Change History
 
+## 2.0.1 - 2013-12-03
+
+  * nil keys in view requests are now sent to server, avoiding returning first document issue. (Thanks to @svoboda-jan for pointer.)
+  * lazy create database if using `use_database`
+  * added .model_type_value to persistence layer, so that model name can be overwrriten if required (issue #163)
+
 ## 2.0.0 - 2013-10-04
 
   * Added design doc migration support, including for proxied models

data/lib/couchrest/model/base.rb

@@ -56,7 +56,7 @@ module CouchRest
         # set the instance's database, if provided
         self.database = options[:database] unless options[:database].nil?
         unless self['_id'] && self['_rev']
-          self[self.model_type_key] = self.class.to_s
+          self[self.model_type_key] = self.class.model_type_value
         end
 
         yield self if block_given?

data/lib/couchrest/model/connection.rb

@@ -11,14 +11,19 @@ module CouchRest
 
         # Overwrite the normal use_database method so that a database
         # name can be provided instead of a full connection.
+        # The actual database will be validated when it is requested for use.
+        # Note that this should not be used with proxied models!
         def use_database(db)
-          @database = prepare_database(db)
+          @_use_database = db
         end
 
         # Overwrite the default database method so that it always
-        # provides something from the configuration
+        # provides something from the configuration.
+        # It will try to inherit the database from an ancester
+        # unless the use_database method has been used, in which
+        # case a new connection will be started.
         def database
-          super || (@database ||= prepare_database)
+          @database ||= prepare_database(super)
         end
 
         def server
@@ -26,7 +31,8 @@ module CouchRest
         end
 
         def prepare_database(db = nil)
-          unless db.is_a?(CouchRest::Database)
+          db = @_use_database unless @_use_database.nil?
+          if db.nil? || db.is_a?(String) || db.is_a?(Symbol)
             conf = connection_configuration
             db = [conf[:prefix], db.to_s, conf[:suffix]].reject{|s| s.to_s.empty?}.join(conf[:join])
             self.server.database!(db)

data/lib/couchrest/model/designs/view.rb

@@ -20,7 +20,11 @@ module CouchRest
         # outside CouchRest Model.
         def initialize(design_doc, parent, new_query = {}, name = nil)
           self.design_doc = design_doc
-          proxy = new_query.delete(:proxy)
+
+          # Extrace important non-regular query values
+          proxy  = new_query.delete(:proxy)
+          delete = new_query.delete(:delete)
+
           if parent.is_a?(Class) && parent < CouchRest::Model::Base
             raise "Name must be provided for view to be initialized" if name.nil?
             self.model    = (proxy || parent)
@@ -36,7 +40,11 @@ module CouchRest
           else
             raise "View cannot be initialized without a parent Model or View"
           end
+
+          # Update the local query hash
           query.update(new_query)
+          delete.each{|k| query.delete(k)} if delete
+
           super()
         end
 
@@ -276,7 +284,7 @@ module CouchRest
         # will fail.
         def reduce
           raise "Cannot reduce a view without a reduce method" unless can_reduce?
-          update_query(:reduce => true, :include_docs => nil)
+          update_query(:reduce => true, :delete => [:include_docs])
         end
 
         # Control whether the reduce function reduces to a set of distinct keys
@@ -414,7 +422,7 @@ module CouchRest
 
           design_doc.sync(use_database)
 
-          self.result = design_doc.view_on(use_database, name, query.reject{|k,v| v.nil?})
+          self.result = design_doc.view_on(use_database, name, query)
         end
 
         # Class Methods
@@ -460,7 +468,7 @@ module CouchRest
             if name.to_s == 'all'
               opts[:map] = <<-EOF
                 function(doc) {
-                  if (doc['#{model.model_type_key}'] == '#{model.to_s}') {
+                  if (doc['#{model.model_type_key}'] == '#{model.model_type_value}') {
                     emit(doc._id, null);
                   }
                 }
@@ -473,7 +481,7 @@ module CouchRest
 
               opts[:allow_blank] = opts[:allow_blank].nil? ? true : opts[:allow_blank]
               opts[:guards] ||= []
-              opts[:guards].push "(doc['#{model.model_type_key}'] == '#{model.to_s}')"
+              opts[:guards].push "(doc['#{model.model_type_key}'] == '#{model.model_type_value}')"
 
               keys = opts[:by].map{|o| "doc['#{o}']"}
               emit = keys.length == 1 ? keys.first : "[#{keys.join(', ')}]"

data/lib/couchrest/model/persistence.rb

@@ -166,6 +166,13 @@ module CouchRest
           end
         end
 
+        # The value to use for this model's model_type_key.
+        # By default, this shouls always be the string representation of the class,
+        # but if you need anything special, overwrite this method.
+        def model_type_value
+          to_s
+        end
+
         # Raise an error if validation failed.
         def fail_validate!(document)
           raise Errors::Validations.new(document)

data/spec/unit/base_spec.rb

@@ -81,53 +81,6 @@ describe "Model Base" do
       @doc.name.should eql("foobar")
     end
   end
-  describe "multipart attributes" do
-    context "with valid params" do        
-      it "should parse a legal date" do
-        valid_date_params = { "exec_date(1i)"=>"2011", 
-                              "exec_date(2i)"=>"10", 
-                              "exec_date(3i)"=>"18"}
-        @obj = WithDateAndTime.new valid_date_params
-        @obj.exec_date.should_not be_nil
-        @obj.exec_date.should be_kind_of(Date)
-        @obj.exec_date.should == Date.new(2011, 10 ,18)
-      end
-    
-      it "should parse a legal time" do
-        valid_time_params = { "exec_time(1i)"=>"2011", 
-                              "exec_time(2i)"=>"10", 
-                              "exec_time(3i)"=>"18",
-                              "exec_time(4i)"=>"15",
-                              "exec_time(5i)"=>"15",
-                              "exec_time(6i)"=>"15",}
-        @obj = WithDateAndTime.new valid_time_params
-        @obj.exec_time.should_not be_nil
-        @obj.exec_time.should be_kind_of(Time)
-        @obj.exec_time.should == Time.utc(2011, 10 ,18, 15, 15, 15)
-      end
-    end
-    
-    context "with invalid params" do
-      before(:each) do
-        @invalid_date_params = { "exec_date(1i)"=>"2011", 
-                                 "exec_date(2i)"=>"foo", 
-                                 "exec_date(3i)"=>"18"}
-      end
-      it "should still create a model if there are invalid attributes" do
-        @obj = WithDateAndTime.new @invalid_date_params
-        @obj.should_not be_nil
-        @obj.should be_kind_of(WithDateAndTime)
-      end
-      it "should not crash because of an empty value" do
-        @invalid_date_params["exec_date(2i)"] = ""
-        @obj = WithDateAndTime.new @invalid_date_params
-        @obj.should_not be_nil
-        @obj.exec_date.should_not be_kind_of(Date)
-        @obj.should be_kind_of(WithDateAndTime)
-      end
-    end
-  end
-  
 
   describe "ActiveModel compatability Basic" do
 

data/spec/unit/connection_spec.rb

@@ -53,6 +53,21 @@ describe CouchRest::Model::Connection do
       it "should respond to" do
         @class.should respond_to(:use_database)
       end
+      it "should set the database if object provided" do
+        db = @class.server.database('test')
+        @class.use_database(db)
+        @class.database.should eql(db)
+      end
+      it "should never prepare the database before it is needed" do
+        db = @class.server.database('test')
+        @class.should_not_receive(:prepare_database)
+        @class.use_database('test')
+        @class.use_database(db)
+      end
+      it "should use the database specified" do
+        @class.use_database(:test)
+        @class.database.name.should eql('couchrest_test')
+      end
     end
 
     describe ".database" do
@@ -63,9 +78,8 @@ describe CouchRest::Model::Connection do
         @class.database.should be_a(CouchRest::Database)
       end
       it "should provide a database with default name" do
-
+        @class.database.name.should eql('couchrest')
       end
-
     end
 
     describe ".server" do
@@ -94,7 +108,6 @@ describe CouchRest::Model::Connection do
     end
 
     describe ".prepare_database" do
-
       it "should respond to" do
         @class.should respond_to(:prepare_database)
       end
@@ -110,6 +123,12 @@ describe CouchRest::Model::Connection do
         db = @class.prepare_database('test')
         db.name.should eql('couchrest_test')
       end
+
+      it "should use the .use_database value" do
+        @class.use_database('testing')
+        db = @class.prepare_database
+        db.name.should eql('couchrest_testing')
+      end
     end
 
     describe "protected methods" do

data/spec/unit/designs/view_spec.rb

@@ -57,6 +57,11 @@ describe "Design View" do
           @obj.query.should eql({:foo => :bar})
         end
 
+        it "should delete query keys if :delete defined" do
+          @obj2 = @klass.new(@mod.design_doc, @obj, {:delete => [:foo]})
+          @obj2.query.should_not include(:foo)
+        end
+
       end
 
       describe "with proxy in query for first initialization" do
@@ -517,7 +522,7 @@ describe "Design View" do
       describe "#reduce" do
         it "should update query" do
           @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.should_receive(:update_query).with({:reduce => true, :include_docs => nil})
+          @obj.should_receive(:update_query).with({:reduce => true, :delete => [:include_docs]})
           @obj.reduce
         end
         it "should raise error if query cannot be reduced" do
@@ -690,11 +695,11 @@ describe "Design View" do
           @obj.result.should eql('foos')
         end
 
-        it "should remove nil values from query" do
+        it "should not remove nil values from query" do
           @obj.should_receive(:can_reduce?).and_return(true)
           @obj.stub!(:use_database).and_return(@mod.database)
           @obj.query = {:reduce => true, :limit => nil, :skip => nil}
-          @design_doc.should_receive(:view_on).with(@mod.database, 'test_view', {:reduce => true})
+          @design_doc.should_receive(:view_on).with(@mod.database, 'test_view', {:reduce => true, :limit => nil, :skip => nil})
           @obj.send(:execute)
         end
 
@@ -871,6 +876,10 @@ describe "Design View" do
         view.last.name.should eql("Peter")
         view.all.length.should eql(3)
       end
+
+      it "should not return document if nil key provided" do
+        DesignViewModel.by_name.key(nil).first.should be_nil
+      end
     end
 
     describe "index information" do

data/spec/unit/persistence_spec.rb

@@ -478,4 +478,10 @@ describe CouchRest::Model::Persistence do
     end
   end
 
+  describe ".model_type_value" do
+    it "should always return string value of class" do
+      Article.model_type_value.should eql('Article')
+    end
+  end
+
 end

data/spec/unit/properties_spec.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe CouchRest::Model::Properties do
+
+  before(:each) do
+    @obj = WithDefaultValues.new
+  end
+ 
+  describe "multipart attributes" do
+    context "with valid params" do        
+      it "should parse a legal date" do
+        valid_date_params = { "exec_date(1i)"=>"2011", 
+                              "exec_date(2i)"=>"10", 
+                              "exec_date(3i)"=>"18"}
+        @obj = WithDateAndTime.new valid_date_params
+        @obj.exec_date.should_not be_nil
+        @obj.exec_date.should be_kind_of(Date)
+        @obj.exec_date.should == Date.new(2011, 10 ,18)
+      end
+    
+      it "should parse a legal time" do
+        valid_time_params = { "exec_time(1i)"=>"2011", 
+                              "exec_time(2i)"=>"10", 
+                              "exec_time(3i)"=>"18",
+                              "exec_time(4i)"=>"15",
+                              "exec_time(5i)"=>"15",
+                              "exec_time(6i)"=>"15",}
+        @obj = WithDateAndTime.new valid_time_params
+        @obj.exec_time.should_not be_nil
+        @obj.exec_time.should be_kind_of(Time)
+        @obj.exec_time.should == Time.utc(2011, 10 ,18, 15, 15, 15)
+      end
+    end
+    
+    context "with invalid params" do
+      before(:each) do
+        @invalid_date_params = { "exec_date(1i)"=>"2011", 
+                                 "exec_date(2i)"=>"foo", 
+                                 "exec_date(3i)"=>"18"}
+      end
+      it "should still create a model if there are invalid attributes" do
+        @obj = WithDateAndTime.new @invalid_date_params
+        @obj.should_not be_nil
+        @obj.should be_kind_of(WithDateAndTime)
+      end
+      it "should not crash because of an empty value" do
+        @invalid_date_params["exec_date(2i)"] = ""
+        @obj = WithDateAndTime.new @invalid_date_params
+        @obj.should_not be_nil
+        @obj.exec_date.should_not be_kind_of(Date)
+        @obj.should be_kind_of(WithDateAndTime)
+      end
+    end
+
+    # Specific use case for Ruby 2.0.0
+    context "with brackets in value" do
+      let :klass do
+        klass = Class.new(CouchRest::Model::Base)
+        klass.class_eval do
+          property :name, String
+        end
+        klass
+      end
+
+      it "should be accepted" do
+        lambda {
+          @obj = klass.new(:name => 'test (object)')
+        }.should_not raise_error
+      end
+
+    end
+
+  end
+
+end
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -13,12 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -26,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,55 +31,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.22
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,7 +80,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,7 +94,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,55 +101,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -170,7 +150,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -287,6 +266,7 @@ files:
 - spec/unit/embeddable_spec.rb
 - spec/unit/inherited_spec.rb
 - spec/unit/persistence_spec.rb
+- spec/unit/properties_spec.rb
 - spec/unit/property_protection_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/proxyable_spec.rb
@@ -296,28 +276,28 @@ files:
 - spec/unit/utils/migrate_spec.rb
 - spec/unit/validations_spec.rb
 homepage: http://github.com/couchrest/couchrest_model
-licenses: []
+licenses:
+- Apache License 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extends the CouchRest Document for advanced modelling.
 test_files:
 - spec/fixtures/attachments/README
@@ -366,6 +346,7 @@ test_files:
 - spec/unit/embeddable_spec.rb
 - spec/unit/inherited_spec.rb
 - spec/unit/persistence_spec.rb
+- spec/unit/properties_spec.rb
 - spec/unit/property_protection_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/proxyable_spec.rb