couchrest_model 2.0.0.beta → 2.0.0.beta2

data/VERSION

@@ -1 +1 @@
-2.0.0.beta
+2.0.0.beta2

data/couchrest_model.gemspec

@@ -23,14 +23,15 @@ 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.2")
+  s.add_dependency(%q<couchrest>, "~> 1.1.3")
   s.add_dependency(%q<mime-types>, "~> 1.15")
-  s.add_dependency(%q<activemodel>, "~> 3.1.0")
+  s.add_dependency(%q<activemodel>, "~> 3.0")
   s.add_dependency(%q<tzinfo>, "~> 0.3.22")
   s.add_development_dependency(%q<rspec>, "~> 2.6.0")
   s.add_development_dependency(%q<json>, ["~> 1.5.1"])
   s.add_development_dependency(%q<rack-test>, ">= 0.5.7")
   s.add_development_dependency("rake", ">= 0.8.0")
+  s.add_development_dependency("debugger", "~> 1.2.0")
   # s.add_development_dependency("jruby-openssl", ">= 0.7.3")
 end
 

data/history.md

@@ -1,11 +1,15 @@
 # CouchRest Model Change History
 
-## 2.0.0.beta - 2012-06-14
+## 2.0.0.beta2 - 2012-08-02
 
   * Added design doc migration support, including for proxied models
   * Rake tasks available for migrations
   * Rails config option now available: `config.couchrest_model.auto_update_design_docs = false`
   * Skipping 1.2 version due to design doc API changes
+  * Added 'couchrest_typecast' class method support for typecasting with special classes.
+  * Added :allow_blank option to properties so that empty strings are forced to nil.
+  * Modified associations to use allow_blank property
+  * Incorported Rails 3.2 support changes (Thanks @jodosha)
 
 ## 1.2.0.beta - 2012-06-08
 

data/lib/couchrest/model/associations.rb

@@ -38,7 +38,7 @@ module CouchRest
         def belongs_to(attrib, *options)
           opts = merge_belongs_to_association_options(attrib, options.first)
 
-          property(opts[:foreign_key], opts)
+          property(opts[:foreign_key], String, opts)
 
           create_belongs_to_getter(attrib, opts)
           create_belongs_to_setter(attrib, opts)
@@ -88,7 +88,7 @@ module CouchRest
           opts[:foreign_key] = opts[:foreign_key].pluralize
           opts[:readonly] = true
 
-          property(opts[:foreign_key], [], opts)
+          property(opts[:foreign_key], [String], opts)
 
           create_collection_of_property_setter(attrib, opts)
           create_collection_of_getter(attrib, opts)
@@ -101,8 +101,9 @@ module CouchRest
         def merge_belongs_to_association_options(attrib, options = nil)
           opts = {
             :foreign_key => attrib.to_s.singularize + '_id',
-            :class_name => attrib.to_s.singularize.camelcase,
-            :proxy_name => attrib.to_s.pluralize
+            :class_name  => attrib.to_s.singularize.camelcase,
+            :proxy_name  => attrib.to_s.pluralize,
+            :allow_blank => false
           }
           opts.merge!(options) if options.is_a?(Hash)
 
@@ -224,6 +225,15 @@ module CouchRest
         raise "Object cannot be added to #{casted_by.class.to_s}##{casted_by_property.to_s} collection unless saved" if obj.new?
       end
 
+      # Override CastedArray instantiation_and_cast method for a simpler
+      # version that will not try to cast the model.
+      def instantiate_and_cast(obj, change = true)
+        couchrest_parent_will_change! if change && use_dirty?
+        obj.casted_by = casted_by if obj.respond_to?(:casted_by)
+        obj.casted_by_property = casted_by_property if obj.respond_to?(:casted_by_property)
+        obj
+      end
+
     end
 
   end

data/lib/couchrest/model/base.rb

@@ -2,7 +2,8 @@ module CouchRest
   module Model
     class Base < CouchRest::Document
 
-      extend ActiveModel::Naming
+      extend  ActiveModel::Naming
+      include ActiveModel::Conversion
 
       include CouchRest::Model::Configuration
       include CouchRest::Model::Connection
@@ -62,11 +63,6 @@ module CouchRest
         run_callbacks(:initialize) { self }
       end
 
-      def to_key
-        new? ? nil : [id]
-      end
-
-      alias :to_param :id
       alias :new_record? :new?
       alias :new_document? :new?
 

data/lib/couchrest/model/properties.rb

@@ -40,7 +40,7 @@ module CouchRest
       # with a property and update dirty status
       def write_attribute(property, value)
         prop = find_property!(property)
-        value = prop.is_a?(String) ? value : prop.cast(self, value)
+        value = prop.cast(self, value)
         couchrest_attribute_will_change!(prop.name) if use_dirty? && self[prop.name] != value
         self[prop.name] = value
       end

data/lib/couchrest/model/property.rb

@@ -4,7 +4,7 @@ module CouchRest::Model
 
     include ::CouchRest::Model::Typecast
 
-    attr_reader :name, :type, :type_class, :read_only, :alias, :default, :casted, :init_method, :options
+    attr_reader :name, :type, :type_class, :read_only, :alias, :default, :casted, :init_method, :options, :allow_blank
 
     # Attribute to define.
     # All Properties are assumed casted unless the type is nil.
@@ -33,6 +33,7 @@ module CouchRest::Model
           raise "Expecting an array or keyed hash for property #{parent.class.name}##{self.name}"
         end
         arr = value.collect { |data| cast_value(parent, data) }
+        arr.reject!{ |data| data.nil? } unless allow_blank
         # allow casted_by calls to be passed up chain by wrapping in CastedArray
         CastedArray.new(arr, self, parent)
       elsif (type == Object || type == Hash) && (value.is_a?(Hash))
@@ -45,8 +46,12 @@ module CouchRest::Model
 
     # Cast an individual value
     def cast_value(parent, value)
-      value = typecast_value(value, self)
-      associate_casted_value_to_parent(parent, value)
+      if !allow_blank && value.to_s.empty?
+        nil
+      else
+        value = typecast_value(parent, self, value)
+        associate_casted_value_to_parent(parent, value)
+      end
     end
 
     def default_value
@@ -64,6 +69,7 @@ module CouchRest::Model
     # a normal call to the class.
     def build(*args)
       raise StandardError, "Cannot build property without a class" if @type_class.nil?
+
       if @init_method.is_a?(Proc)
         @init_method.call(*args)
       else
@@ -102,13 +108,13 @@ module CouchRest::Model
       end
 
       def parse_options(options)
-        @validation_format  = options.delete(:format)     if options[:format]
-        @read_only          = options.delete(:read_only)  if options[:read_only]
-        @alias              = options.delete(:alias)      if options[:alias]
-        @default            = options.delete(:default)    unless options[:default].nil?
-        @init_method        = options[:init_method] ? options.delete(:init_method) : 'new'
+        @validation_format  = options.delete(:format)      if options[:format]
+        @read_only          = options.delete(:read_only)   if options[:read_only]
+        @alias              = options.delete(:alias)       if options[:alias]
+        @default            = options.delete(:default)     unless options[:default].nil?
+        @init_method        = options.delete(:init_method) || 'new'
+        @allow_blank        = options[:allow_blank].nil? ? true : options.delete(:allow_blank)
         @options            = options
       end
-
   end
 end

data/lib/couchrest/model/typecast.rb

@@ -2,7 +2,7 @@ module CouchRest
   module Model
     module Typecast
 
-      def typecast_value(value, property) # klass, init_method)
+      def typecast_value(parent, property, value)
         return nil if value.nil?
         klass = property.type_class
         if value.instance_of?(klass) || klass == Object
@@ -11,6 +11,8 @@ module CouchRest
           else
             value
           end
+        elsif klass.respond_to?(:couchrest_typecast)
+          klass.couchrest_typecast(parent, property, value)
         elsif [String, TrueClass, Integer, Float, BigDecimal, DateTime, Time, Date, Class].include?(klass)
           send('typecast_to_'+klass.to_s.downcase, value)
         else

data/spec/fixtures/models/course.rb

@@ -1,10 +1,12 @@
 require 'question'
 require 'person'
+require 'money'
 
 class Course < CouchRest::Model::Base
   use_database TEST_SERVER.default_database
   
   property :title, String
+  property :subtitle, String, :allow_blank => false
   property :questions, [Question]
   property :professor, Person
   property :participants, [Object]
@@ -17,6 +19,8 @@ class Course < CouchRest::Model::Base
   property :active, :type => TrueClass
   property :very_active, :type => TrueClass
   property :klass, :type => Class
+  property :currency, String, :default => 'EUR'
+  property :price, Money
 
   design do
     view :by_title

data/spec/fixtures/models/money.rb

@@ -0,0 +1,24 @@
+
+# Really simple money class for testing
+class Money
+
+  attr_accessor :cents, :currency
+
+  def initialize(cents, currency = nil)
+    self.cents = cents.to_i
+    self.currency = currency
+  end
+
+  def to_s
+    (self.cents.to_f / 100).to_s
+  end
+
+  def self.couchrest_typecast(parent, property, value)
+    if parent.respond_to?(:currency)
+      new(value, parent.currency)
+    else
+      new(value)
+    end
+  end
+
+end

data/spec/unit/assocations_spec.rb

@@ -70,6 +70,11 @@ describe "Assocations" do
       @invoice.client
     end
 
+    it "should ignore blank ids" do
+      @invoice.client_id = ""
+      @invoice.client_id.should be_nil
+    end
+
     it "should allow override of foreign key" do
       @invoice.respond_to?(:alternate_client).should be_true
       @invoice.respond_to?("alternate_client=").should be_true
@@ -116,6 +121,11 @@ describe "Assocations" do
       @invoice.entries.first.should eql(@entries.first)
     end
 
+    it "should ignore blank ids when set directly" do
+      @invoice.entry_ids = ["", @entries.first.id]
+      @invoice.entry_ids.length.should be(1)
+    end
+
     it "should replace collection if ids replaced" do
       @invoice.entry_ids = @entries.collect{|i| i.id}
       @invoice.entries.length.should eql(3) # load once

data/spec/unit/base_spec.rb

@@ -560,24 +560,6 @@ describe "Model Base" do
           'index' => "function(doc) { ret = new Document(); ret.add(doc['name'], {'field':'name'}); return ret; }" }
       @db.save_doc({'_id' => '_design/search', 'fulltext' => {'cats' => search_function}})
     end
-
-    it "should be able to paginate through a large set of search results" do
-      if couchdb_lucene_available?
-        names = []
-        Cat.paginated_each(:design_doc => "search", :view_name => "cats",
-             :q => 'name:S*', :search => true, :include_docs => true, :per_page => 3) do |cat|
-           cat.should_not be_nil
-           names << cat.name
-        end
-
-        names.size.should == 5
-        names.should include('Sockington')
-        names.should include('Smitty')
-        names.should include('Sammy')
-        names.should include('Samson')
-        names.should include('Simon')
-      end
-    end
   end
 
 end

data/spec/unit/dirty_spec.rb

@@ -33,11 +33,26 @@ describe "Dirty" do
 
   describe "changes" do
 
-    it "should return changes on an attribute" do
-      @card = Card.new(:first_name => "matt")
-      @card.first_name = "andrew"
-      @card.first_name_changed?.should be_true
-      @card.changes.should == { "first_name" => ["matt", "andrew"] }
+    context "when new record" do
+      it "should return changes on an attribute" do
+        @card = Card.new(:first_name => "matt")
+        @card.first_name = "andrew"
+        @card.first_name_changed?.should be_true
+        if ActiveModel::VERSION::STRING > "3.2.0"
+          @card.changes.should == { "first_name" => [nil, "andrew"] }
+        else
+          @card.changes.should == { "first_name" => ["matt", "andrew"] }
+        end
+      end
+    end
+
+    context "when persisted" do
+      it "should return changes on an attribute" do
+        @card = Card.create!(:first_name => "matt")
+        @card.first_name = "andrew"
+        @card.first_name_changed?.should be_true
+        @card.changes.should == { "first_name" => ["matt", "andrew"] }
+      end
     end
 
   end

data/spec/unit/property_spec.rb

@@ -328,7 +328,6 @@ describe "properties of array of casted models" do
     @course.questions.last.class.should eql(Question)
   end
 
-
   it "should raise an error if attempting to set single value for array type" do
     lambda {
       @course.questions = Question.new(:q => 'test1')
@@ -428,6 +427,16 @@ describe "Property Class" do
     property.init_method.should eql('parse')
   end
 
+  it "should set the allow_blank option to true by default" do
+    property = CouchRest::Model::Property.new(:test, String)
+    property.allow_blank.should be_true
+  end
+
+  it "should allow setting of the allow_blank option to false" do
+    property = CouchRest::Model::Property.new(:test, String, :allow_blank => false)
+    property.allow_blank.should be_false
+  end
+
   describe "#build" do
     it "should allow instantiation of new object" do
       property = CouchRest::Model::Property.new(:test, Date)
@@ -466,6 +475,22 @@ describe "Property Class" do
       property.cast(parent, ["2010-06-01", "2010-06-02"]).should eql([Date.new(2010, 6, 1), Date.new(2010, 6, 2)])
     end
 
+    context "when allow_blank is false" do
+      let :parent do
+        mock("FooObject")
+      end
+
+      it "should convert blank to nil" do
+        property = CouchRest::Model::Property.new(:test, String, :allow_blank => false)
+        property.cast(parent, "").should be_nil
+      end
+
+      it "should remove blank array entries" do
+        property = CouchRest::Model::Property.new(:test, [String], :allow_blank => false)
+        property.cast(parent, ["", "foo"]).should eql(["foo"])
+      end
+    end
+
     it "should set a CastedArray on array of Objects" do
       property = CouchRest::Model::Property.new(:test, [Object])
       parent = mock("FooObject")

data/spec/unit/typecast_spec.rb

@@ -14,6 +14,28 @@ describe "Type Casting" do
     end
   end
 
+  describe "when value is empty string" do
+    it "leaves the value unchanged" do
+      @course.title = ""
+      @course['title'].should == ""
+    end
+  end
+
+  describe "when blank is not allow on property" do
+    it "leaves nil as nil" do
+      @course.subtitle = nil
+      @course['subtitle'].should == nil
+    end
+    it "converts blank to nil" do
+      @course.subtitle = ""
+      @course['subtitle'].should == nil
+    end
+    it "leaves text as text" do
+      @course.subtitle = "Test"
+      @course['subtitle'].should == "Test"
+    end
+  end
+
   describe "when type primitive is an Object" do
     it "it should not cast given value" do
       @course.participants = [{}, 'q', 1]
@@ -26,6 +48,14 @@ describe "Type Casting" do
     end
   end
 
+  describe "when class responds to .couchrest_typecast" do
+    it "should accept call" do
+      @course.price = "1299"
+      @course.price.cents.should eql(1299)
+      @course.price.currency.should eql('EUR')
+    end
+  end
+
   describe "when type primitive is a String" do
     it "keeps string value unchanged" do
       value = "1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -22,7 +22,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: CouchRest Model provides aditional features to the standard CouchRest
   Document class such as properties, view designs, associations, callbacks, typecasting
   and validations.
@@ -220,6 +236,7 @@ files:
 - spec/fixtures/models/invoice.rb
 - spec/fixtures/models/key_chain.rb
 - spec/fixtures/models/membership.rb
+- spec/fixtures/models/money.rb
 - spec/fixtures/models/person.rb
 - spec/fixtures/models/project.rb
 - spec/fixtures/models/question.rb
@@ -267,6 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2665370531854453498
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,6 +314,7 @@ test_files:
 - spec/fixtures/models/invoice.rb
 - spec/fixtures/models/key_chain.rb
 - spec/fixtures/models/membership.rb
+- spec/fixtures/models/money.rb
 - spec/fixtures/models/person.rb
 - spec/fixtures/models/project.rb
 - spec/fixtures/models/question.rb