couchrest_model 2.0.0.beta2 → 2.0.0

data/spec/unit/property_spec.rb

@@ -381,75 +381,111 @@ describe "nested models (not casted)" do
     @cat.siblings.first.name.should eql("Feather")
     @cat.siblings.last.casted_by.should eql(@cat)
   end
-
 end
 
 describe "Property Class" do
 
+  let :klass do
+    CouchRest::Model::Property
+  end
+
   it "should provide name as string" do
-    property = CouchRest::Model::Property.new(:test, String)
+    property = CouchRest::Model::Property.new(:test, :type => String)
     property.name.should eql('test')
     property.to_s.should eql('test')
   end
 
+  it "should provide name as a symbol" do 
+    property = CouchRest::Model::Property.new(:test, :type => String)
+    property.name.to_sym.should eql(:test)
+    property.to_sym.should eql(:test)
+  end
+
   it "should provide class from type" do
-    property = CouchRest::Model::Property.new(:test, String)
-    property.type_class.should eql(String)
+    property = CouchRest::Model::Property.new(:test, :type => String)
+    property.type.should eql(String)
+    property.array.should be_false
   end
 
   it "should provide base class from type in array" do
-    property = CouchRest::Model::Property.new(:test, [String])
-    property.type_class.should eql(String)
+    property = CouchRest::Model::Property.new(:test, :type => [String])
+    property.type.should eql(String)
+    property.array.should be_true
+  end
+
+  it "should provide base class and set array type" do
+    property = CouchRest::Model::Property.new(:test, :type => String, :array => true)
+    property.type.should eql(String)
+    property.array.should be_true
   end
 
   it "should raise error if type as string requested" do
     lambda {
-      property = CouchRest::Model::Property.new(:test, 'String')
+      property = CouchRest::Model::Property.new(:test, :type => 'String')
     }.should raise_error
   end
 
   it "should leave type nil and return class as nil also" do
-    property = CouchRest::Model::Property.new(:test, nil)
+    property = CouchRest::Model::Property.new(:test, :type => nil)
     property.type.should be_nil
-    property.type_class.should be_nil
   end
 
   it "should convert empty type array to [Object]" do
-    property = CouchRest::Model::Property.new(:test, [])
-    property.type_class.should eql(Object)
+    property = CouchRest::Model::Property.new(:test, :type => [])
+    property.type.should eql(Object)
   end
 
   it "should set init method option or leave as 'new'" do
     # (bad example! Time already typecast)
-    property = CouchRest::Model::Property.new(:test, Time)
+    property = CouchRest::Model::Property.new(:test, :type => Time)
     property.init_method.should eql('new')
-    property = CouchRest::Model::Property.new(:test, Time, :init_method => 'parse')
+    property = CouchRest::Model::Property.new(:test, :type => Time, :init_method => 'parse')
     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 = CouchRest::Model::Property.new(:test, :type => 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 = CouchRest::Model::Property.new(:test, :type => String, :allow_blank => false)
     property.allow_blank.should be_false
   end
 
+  it "should convert block to type" do
+    prop = klass.new(:test) do
+      property :testing
+    end
+    prop.array.should be_false
+    prop.type.should_not be_nil
+    prop.type.class.should eql(Class)
+    obj = prop.type.new
+    obj.should respond_to(:testing)
+  end
+
+  it "should convert block to type with array" do
+    prop = klass.new(:test, :array => true) do
+      property :testing
+    end
+    prop.type.should_not be_nil
+    prop.type.class.should eql(Class)
+    prop.array.should be_true
+  end
+
   describe "#build" do
     it "should allow instantiation of new object" do
-      property = CouchRest::Model::Property.new(:test, Date)
+      property = CouchRest::Model::Property.new(:test, :type => Date)
       obj = property.build(2011, 05, 21)
       obj.should eql(Date.new(2011, 05, 21))
     end
     it "should use init_method if provided" do
-      property = CouchRest::Model::Property.new(:test, Date, :init_method => 'parse')
+      property = CouchRest::Model::Property.new(:test, :type => Date, :init_method => 'parse')
       obj = property.build("2011-05-21")
       obj.should eql(Date.new(2011, 05, 21))
     end
     it "should use init_method Proc if provided" do
-      property = CouchRest::Model::Property.new(:test, Date, :init_method => Proc.new{|v| Date.parse(v)})
+      property = CouchRest::Model::Property.new(:test, :type => Date, :init_method => Proc.new{|v| Date.parse(v)})
       obj = property.build("2011-05-21")
       obj.should eql(Date.new(2011, 05, 21))
     end
@@ -463,14 +499,20 @@ describe "Property Class" do
 
   describe "casting" do
     it "should cast a value" do
-      property = CouchRest::Model::Property.new(:test, Date)
+      property = CouchRest::Model::Property.new(:test, :type => Date)
       parent = mock("FooObject")
       property.cast(parent, "2010-06-16").should eql(Date.new(2010, 6, 16))
       property.cast_value(parent, "2010-06-16").should eql(Date.new(2010, 6, 16))
     end
 
     it "should cast an array of values" do
-      property = CouchRest::Model::Property.new(:test, [Date])
+      property = CouchRest::Model::Property.new(:test, :type => [Date])
+      parent = mock("FooObject")
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).should eql([Date.new(2010, 6, 1), Date.new(2010, 6, 2)])
+    end
+
+    it "should cast an array of values with array option" do
+      property = CouchRest::Model::Property.new(:test, :type => Date, :array => true)
       parent = mock("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).should eql([Date.new(2010, 6, 1), Date.new(2010, 6, 2)])
     end
@@ -481,30 +523,30 @@ describe "Property Class" do
       end
 
       it "should convert blank to nil" do
-        property = CouchRest::Model::Property.new(:test, String, :allow_blank => false)
+        property = CouchRest::Model::Property.new(:test, :type => 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 = CouchRest::Model::Property.new(:test, :type => [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])
+      property = CouchRest::Model::Property.new(:test, :type => [Object])
       parent = mock("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(CouchRest::Model::CastedArray)
     end
 
     it "should set a CastedArray on array of Strings" do
-      property = CouchRest::Model::Property.new(:test, [String])
+      property = CouchRest::Model::Property.new(:test, :type => [String])
       parent = mock("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(CouchRest::Model::CastedArray)
     end
 
     it "should allow instantion of model via CastedArray#build" do
-      property = CouchRest::Model::Property.new(:dates, [Date])
+      property = CouchRest::Model::Property.new(:dates, :type => [Date])
       parent = Article.new
       ary = property.cast(parent, [])
       obj = ary.build(2011, 05, 21)
@@ -521,20 +563,20 @@ describe "Property Class" do
         def initialize(val); self.ary = val; end
         def as_json; ary; end
       end
-      property = CouchRest::Model::Property.new(:test, prop)
+      property = CouchRest::Model::Property.new(:test, :type => prop)
       parent = mock("FooClass")
       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])
+      property = CouchRest::Model::Property.new(:test, :type => [Object])
       parent = mock("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).casted_by.should eql(parent)
     end
 
     it "should set casted_by on new value" do
-      property = CouchRest::Model::Property.new(:test, CatToy)
+      property = CouchRest::Model::Property.new(:test, :type => CatToy)
       parent = mock("CatObject")
       cast = property.cast(parent, {:name => 'catnip'})
       cast.casted_by.should eql(parent)

data/spec/unit/translations_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe "ActiveModel Translations" do
+
+  describe ".human_attribute_name" do
+    it "should provide translation" do
+      Card.human_attribute_name(:first_name).should eql("First name")
+    end
+  end
+
+  describe ".i18n_scope" do
+    it "should provide activemodel default" do
+      Card.i18n_scope.should eql(:couchrest)
+    end
+  end
+
+  describe ".lookup_ancestors" do
+    it "should provide basic lookup" do
+      Cat.lookup_ancestors.should eql([Cat])
+    end
+
+    it "should provide lookup with ancestors" do
+      ChildCat.lookup_ancestors.should eql([ChildCat, Cat])
+    end
+
+    it "should provide Base if request directly" do
+      CouchRest::Model::Base.lookup_ancestors.should eql([CouchRest::Model::Base])
+    end
+  end
+end

data/spec/unit/typecast_spec.rb

@@ -69,6 +69,20 @@ describe "Type Casting" do
     end
   end
 
+  describe "when type primitive is a Symbol" do
+    it "keeps symbol value unchanged" do
+      value = :a_symbol
+      @course.symbol = value
+      @course['symbol'].should equal(:a_symbol)
+    end
+
+    it "it casts to symbol representation of the value" do
+      @course.symbol = "a_symbol"
+      @course['symbol'].should equal(:a_symbol)
+    end
+  end
+
+
   describe 'when type primitive is a Float' do
     it 'returns same value if a float' do
       value = 24.0
@@ -166,10 +180,29 @@ describe "Type Casting" do
       @course.estimate.should eql(24.35)
     end
 
-    [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |value|
-      it "does not typecast non-numeric value #{value.inspect}" do
+    it "should handle numbers with unit strings" do
+      @course.estimate = "23.21 points"
+      @course['estimate'].should eql(23.21)
+    end
+
+    [ '', 'string', ' foo ' ].each do |value|
+      it "should typecast string without a number to nil (#{value.inspect})" do
+        @course.estimate = value
+        @course['estimate'].should be_nil
+      end
+    end
+
+    [ '00.0', '0.', '-.0' ].each do |value|
+      it "should typecast strings with strange numbers to zero (#{value.inspect})" do
+        @course.estimate = value
+        @course['estimate'].should eql(0.0)
+      end
+    end
+
+    [ Object.new, true ].each do |value|
+      it "should not typecast non-numeric value that won't respond to #to_f (#{value.inspect})" do
         @course.estimate = value
-        @course['estimate'].should equal(value)
+        @course['estimate'].should equal(nil)
       end
     end
 
@@ -257,12 +290,37 @@ describe "Type Casting" do
       @course['hours'].should eql(24)
     end
 
-    [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |value|
-      it "does not typecast non-numeric value #{value.inspect}" do
+    it "should handle numbers with string units" do
+      @course.hours = "23 hours"
+      @course['hours'].should eql(23)
+    end
+
+    it "should typecast an empty string to nil" do
+      @course.hours = ""
+      @course['hours'].should be_nil
+    end
+
+    [ '', 'string', ' foo ' ].each do |value|
+      it "should typecast string without a number to nil (#{value.inspect})" do
         @course.hours = value
-        @course['hours'].should equal(value)
+        @course['hours'].should be_nil
       end
     end
+
+    [ '00.0', '0.', '-.0' ].each do |value|
+      it "should typecast strings with strange numbers to zero (#{value.inspect})" do
+        @course.hours = value
+        @course['hours'].should eql(0)
+      end
+    end
+
+    [ Object.new, true ].each do |value|
+      it "should not typecast non-numeric value that won't respond to #to_i (#{value.inspect})" do
+        @course.hours = value
+        @course['hours'].should equal(nil)
+      end
+    end
+
   end
 
   describe 'when type primitive is a BigDecimal' do
@@ -347,12 +405,37 @@ describe "Type Casting" do
       @course['profit'].should eql(BigDecimal('24.35'))
     end
 
-    [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |value|
-      it "does not typecast non-numeric value #{value.inspect}" do
+    it "should handle numbers with strings" do
+      @course.profit = "22.23 euros"
+      @course['profit'].should eql(BigDecimal('22.23'))
+    end
+
+    it "should typecast an empty string to nil" do
+      @course.profit = ""
+      @course['profit'].should be_nil
+    end
+
+    [ '', 'string', ' foo ' ].each do |value|
+      it "should typecast string without a number to nil (#{value.inspect})" do
         @course.profit = value
-        @course['profit'].should equal(value)
+        @course['profit'].should be_nil
       end
     end
+
+    [ '00.0', '0.', '-.0' ].each do |value|
+      it "should typecast strings with strange numbers to zero (#{value.inspect})" do
+        @course.profit = value
+        @course['profit'].should eql(0.0)
+      end
+    end
+
+    [ Object.new, true ].each do |value|
+      it "should typecast non-numeric value that won't respond to to_d (#{value.inspect}) as nil" do
+        @course.profit = value
+        @course['profit'].should equal(nil)
+      end
+    end
+
   end
 
   describe 'when type primitive is a DateTime' do
@@ -387,7 +470,7 @@ describe "Type Casting" do
 
     it 'does not typecast non-datetime values' do
       @course.updated_at = 'not-datetime'
-      @course['updated_at'].should eql('not-datetime')
+      @course['updated_at'].should be_nil
     end
   end
 
@@ -419,7 +502,7 @@ describe "Type Casting" do
 
     it 'does not typecast non-date values' do
       @course.started_on = 'not-date'
-      @course['started_on'].should eql('not-date')
+      @course['started_on'].should be_nil
     end
   end
 
@@ -477,12 +560,9 @@ describe "Type Casting" do
       @course.ends_at.to_i.should eql(Time.utc(2011, 4, 1, 16, 50, 32).to_i)
     end
 
-    if RUBY_VERSION >= "1.9.1"
-      # In ruby 1.8.7 Time.parse will always return a value. D'OH
-      it 'does not typecast non-time values' do
-        @course.ends_at = 'not-time'
-        @course['ends_at'].should eql('not-time')
-      end
+    it 'does not typecast non-time values' do
+      @course.ends_at = 'not-time'
+      @course['ends_at'].should be_nil
     end
   end
 
@@ -500,7 +580,7 @@ describe "Type Casting" do
 
     it 'does not typecast non-class values' do
       @course.klass = 'NoClass'
-      @course['klass'].should eql('NoClass')
+      @course['klass'].should be_nil
     end
   end
 
@@ -523,7 +603,7 @@ describe "Type Casting" do
     [ 'string', 2, 1.0, BigDecimal('1.0'), DateTime.now, Time.now, Date.today, Class, Object.new, ].each do |value|
       it "does not typecast value #{value.inspect}" do
         @course.active = value
-        @course['active'].should equal(value)
+        @course['active'].should be_nil
       end
     end
 

data/spec/unit/utils/migrate_spec.rb

@@ -0,0 +1,25 @@
+
+require 'spec_helper'
+
+describe CouchRest::Model::Utils::Migrate do
+
+  before :each do
+    @module = CouchRest::Model::Utils::Migrate
+  end
+
+  describe "#load_all_models" do
+    it "should not do anything if Rails is not available" do
+      @module.load_all_models
+    end
+    it "should detect if Rails is available and require models" do
+      Rails = mock()
+      Rails.stub!(:root).and_return("")
+      Dir.should_receive(:[]).with("app/models/**/*.rb").and_return(['failed_require'])
+      # we can't mock require, so just expect an error
+      expect {
+        @module.load_all_models
+      }.to raise_error(LoadError)
+    end
+  end
+
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -36,7 +36,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
@@ -44,7 +44,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -52,7 +52,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -60,7 +60,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -68,7 +68,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.22
   type: :runtime
@@ -76,7 +76,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.22
 - !ruby/object:Gem::Dependency
@@ -144,13 +144,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: debugger
+  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
-        version: 1.2.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -158,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.14.1
 description: CouchRest Model provides aditional features to the standard CouchRest
   Document class such as properties, view designs, associations, callbacks, typecasting
   and validations.
@@ -172,6 +188,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -193,22 +210,24 @@ files:
 - lib/couchrest/model/connection.rb
 - lib/couchrest/model/core_extensions/hash.rb
 - lib/couchrest/model/core_extensions/time_parsing.rb
+- lib/couchrest/model/design.rb
 - lib/couchrest/model/designs.rb
-- lib/couchrest/model/designs/design.rb
+- lib/couchrest/model/designs/design_mapper.rb
 - lib/couchrest/model/designs/view.rb
 - lib/couchrest/model/dirty.rb
 - lib/couchrest/model/document_queries.rb
 - lib/couchrest/model/embeddable.rb
 - lib/couchrest/model/errors.rb
 - lib/couchrest/model/extended_attachments.rb
-- lib/couchrest/model/migrate.rb
 - lib/couchrest/model/persistence.rb
 - lib/couchrest/model/properties.rb
 - lib/couchrest/model/property.rb
 - lib/couchrest/model/property_protection.rb
 - lib/couchrest/model/proxyable.rb
 - lib/couchrest/model/support/couchrest_database.rb
+- lib/couchrest/model/translation.rb
 - lib/couchrest/model/typecast.rb
+- lib/couchrest/model/utils/migrate.rb
 - lib/couchrest/model/validations.rb
 - lib/couchrest/model/validations/casted_model.rb
 - lib/couchrest/model/validations/locale/en.yml
@@ -232,6 +251,7 @@ files:
 - spec/fixtures/models/cat.rb
 - spec/fixtures/models/client.rb
 - spec/fixtures/models/course.rb
+- spec/fixtures/models/designs.rb
 - spec/fixtures/models/event.rb
 - spec/fixtures/models/invoice.rb
 - spec/fixtures/models/key_chain.rb
@@ -259,7 +279,8 @@ files:
 - spec/unit/configuration_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/core_extensions/time_parsing.rb
-- spec/unit/designs/design_spec.rb
+- spec/unit/design_spec.rb
+- spec/unit/designs/design_mapper_spec.rb
 - spec/unit/designs/view_spec.rb
 - spec/unit/designs_spec.rb
 - spec/unit/dirty_spec.rb
@@ -270,7 +291,9 @@ files:
 - spec/unit/property_spec.rb
 - spec/unit/proxyable_spec.rb
 - spec/unit/subclass_spec.rb
+- spec/unit/translations_spec.rb
 - spec/unit/typecast_spec.rb
+- spec/unit/utils/migrate_spec.rb
 - spec/unit/validations_spec.rb
 homepage: http://github.com/couchrest/couchrest_model
 licenses: []
@@ -284,9 +307,6 @@ 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:
@@ -310,6 +330,7 @@ test_files:
 - spec/fixtures/models/cat.rb
 - spec/fixtures/models/client.rb
 - spec/fixtures/models/course.rb
+- spec/fixtures/models/designs.rb
 - spec/fixtures/models/event.rb
 - spec/fixtures/models/invoice.rb
 - spec/fixtures/models/key_chain.rb
@@ -337,7 +358,8 @@ test_files:
 - spec/unit/configuration_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/core_extensions/time_parsing.rb
-- spec/unit/designs/design_spec.rb
+- spec/unit/design_spec.rb
+- spec/unit/designs/design_mapper_spec.rb
 - spec/unit/designs/view_spec.rb
 - spec/unit/designs_spec.rb
 - spec/unit/dirty_spec.rb
@@ -348,5 +370,7 @@ test_files:
 - spec/unit/property_spec.rb
 - spec/unit/proxyable_spec.rb
 - spec/unit/subclass_spec.rb
+- spec/unit/translations_spec.rb
 - spec/unit/typecast_spec.rb
+- spec/unit/utils/migrate_spec.rb
 - spec/unit/validations_spec.rb