couchrest_model 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e473840521261d3dfe005eea56cd1585b4b245f4
-  data.tar.gz: 1df0369dc5e7a80c4d681eb9efdbb939f0df77f5
+  metadata.gz: 38d13ee6807a1d8e08ec19b1402ec3e222c62731
+  data.tar.gz: c5eec5eea342a0c58ca60df0e63f45239398fbfb
 SHA512:
-  metadata.gz: b8d8ded40ab8343e7f2e13969af3e319d1989724024b50ec00b3736d0b88eb0b118f807cf6e92a74d508b19581ff14a5e33b05a5d80cb14285c00e25794948e3
-  data.tar.gz: 31b1ecc35ec710094bec15bfa04fb2fa0eb3c208b966d787988fbfdd0bcd3c643684242f4508f98f6111d8f4075081e540b9969ab65050129054c4e85859721d
+  metadata.gz: 20fa41cff63d880fb8b681338935ffd946ff9bc32e2bb6de33a913d01e466c341708c80af011cf0c7785cd992e7d2963c7ebdce2c5ca625fe43b4e20360c7300
+  data.tar.gz: 10af0f1dee17c7ca5098ccd0aab103686b1714ce95b0f3cccbbe9544faa716d024e11c9b579a04e4ae10594d5dcc5b4da9a45c819316fa3ea631ac034fc4bee8

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.3

data/couchrest_model.gemspec

@@ -24,15 +24,14 @@ 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.3")
-  s.add_dependency(%q<mime-types>, ">= 1.15")
-  s.add_dependency(%q<activemodel>, ">= 3.0")
+  s.add_dependency(%q<couchrest>, ">= 1.2")
+  s.add_dependency(%q<mime-types>, ">= 1.16")
+  s.add_dependency(%q<activemodel>, ">= 4.0", ">= 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(%q<activemodel>, ">= 4.0")
   #s.add_development_dependency("debugger", "~> 1.2.0") # TODO put in Gemfile
   #s.add_development_dependency(%q<oj>, "~> 1.3.4") # TODO put in Gemfile (fails in JRuby)
   s.add_development_dependency("kaminari", "~> 0.14.1")

data/history.md

@@ -1,5 +1,15 @@
 # CouchRest Model Change History
 
+## 2.0.3 - 2014-07-04 
+
+  * Added find_by_view! method support for raising DocumentNotFound error when searching.
+  * Upgraded CouchRest to ~> 1.2.0
+
+## 2.0.2 - 2014-02-06
+
+  * Fix for model_type_value, not being used correctly from database.
+  * CastedArray now supports `as_couch_json` method.
+
 ## 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.)

data/lib/couchrest/model/casted_array.rb

@@ -72,6 +72,10 @@ module CouchRest::Model
       obj
     end
 
+    def as_couch_json
+      map{ |v| (v.respond_to?(:as_couch_json) ? v.as_couch_json : v)}
+    end
+
     protected
 
     def instantiate_and_cast(obj, change = true)

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

@@ -522,6 +522,9 @@ module CouchRest
               def find_#{name}(*key)
                 #{name}.key(*key).first()
               end
+              def find_#{name}!(*key)
+                find_#{name}(*key) || raise(CouchRest::Model::DocumentNotFound)
+              end
             EOS
           end
 

data/lib/couchrest/model/persistence.rb

@@ -120,7 +120,7 @@ module CouchRest
         #
         def build_from_database(doc = {}, options = {}, &block)
           src = doc[model_type_key]
-          base = (src.blank? || src == self.to_s) ? self : src.constantize
+          base = (src.blank? || src == model_type_value) ? self : src.constantize
           base.new(doc, options.merge(:directly_set_attributes => true), &block)
         end
 

data/lib/couchrest/model/proxyable.rb

@@ -119,6 +119,9 @@ module CouchRest
                 def find_#{name}(*key)
                   #{name}.key(*key).first()
                 end
+                def find_#{name}!(*key)
+                  find_#{name}(*key) || raise(CouchRest::Model::DocumentNotFound)
+                end
               EOS
             end
           end

data/lib/couchrest/model/typecast.rb

@@ -66,7 +66,7 @@ module CouchRest
         end
 
         def typecast_to_symbol(value)
-          value.to_sym
+          value.kind_of?(Symbol) || !value.to_s.empty? ? value.to_sym : nil
         end
 
         # Typecast a value to a true or false

data/spec/unit/casted_array_spec.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+require "spec_helper"
+
+#
+# TODO This requires much more testing, although most of the basics
+# are checked by other parts of the code.
+#
+
+describe CouchRest::Model::CastedArray do
+
+  let :klass do
+    CouchRest::Model::CastedArray
+  end
+
+  describe "#initialize" do
+    it "should set the casted properties" do
+      prop   = double('Property')
+      parent = double('Parent')
+      obj = klass.new([], prop, parent)
+      obj.casted_by_property.should eql(prop)
+      obj.casted_by.should eql(parent)
+      obj.should be_empty
+    end
+  end
+
+  describe "#as_couch_json" do
+    let :property do
+      CouchRest::Model::Property.new(:cat, :type => Cat)
+    end
+    let :obj do
+      klass.new([
+        { :name => 'Felix' },
+        { :name => 'Garfield' }
+      ], property)
+    end
+    it "should return an array" do
+      obj.as_couch_json.should be_a(Array)
+    end
+    it "should call as_couch_json on each value" do
+      obj.first.should_receive(:as_couch_json)
+      obj.as_couch_json
+    end
+    it "should return value if no as_couch_json method" do
+      obj = klass.new(['Felix', 'Garfield'], CouchRest::Model::Property.new(:title, :type => String))
+      obj.first.should_not respond_to(:as_couch_json)
+      obj.as_couch_json.first.should eql('Felix')
+    end
+
+  end
+end

data/spec/unit/designs/view_spec.rb

@@ -182,6 +182,25 @@ describe "Design View" do
           @design_doc.should_receive('view').and_return(view)
           @model.find_by_name('fred')
         end
+        it "should create find_! view method" do
+          @klass.create_model_methods(@design_doc, 'by_name')
+          @model.should respond_to('find_by_name!')
+          obj = mock("SomeKlass")
+          view = mock("View")
+          view.should_receive('key').with('fred').and_return(view)
+          view.should_receive('first').and_return(obj)
+          @design_doc.should_receive('view').and_return(view)
+          @model.find_by_name!('fred').should eql(obj)
+        end
+        it "should create find_! view method and raise error when nil" do
+          @klass.create_model_methods(@design_doc, 'by_name')
+          view = mock("View")
+          view.should_receive('key').with('fred').and_return(view)
+          view.should_receive('first').and_return(nil)
+          @design_doc.should_receive('view').and_return(view)
+          lambda { @model.find_by_name!('fred') }.should raise_error(CouchRest::Model::DocumentNotFound)
+        end
+
       end
     end
 

data/spec/unit/persistence_spec.rb

@@ -19,13 +19,14 @@ describe CouchRest::Model::Persistence do
       doc.class.should eql(Article)
     end
 
-    it "should instantialize document of different type" do
+    it "should instantiate document of different type" do
       doc = Article.build_from_database({'_id' => 'testitem2', '_rev' => 123, Article.model_type_key => 'WithTemplateAndUniqueID', 'name' => 'my test'})
       doc.class.should eql(WithTemplateAndUniqueID)
     end
 
   end
 
+
   describe "basic saving and retrieving" do
     it "should work fine" do
       @obj.name = "should be easily saved and retrieved"
@@ -482,6 +483,32 @@ describe CouchRest::Model::Persistence do
     it "should always return string value of class" do
       Article.model_type_value.should eql('Article')
     end
+
+    describe "usage" do
+      let :klass do
+        Class.new(CouchRest::Model::Base) do
+          property :name, String
+          def self.model_type_value
+            'something_else'
+          end
+        end
+      end
+      it "should use the model type value if overridden" do
+        obj = klass.build_from_database(
+          '_id' => '1234', 'type' => 'something_else', 'name' => 'Test'
+        )
+        obj['type'].should eql('something_else')
+        obj.name.should eql('Test')
+      end
+      it "should fail if different model type value provided" do
+        expect {
+          obj = klass.build_from_database(
+            '_id' => '1234', 'type' => 'something', 'name' => 'Test'
+          )
+        }.to raise_error(NameError)
+      end
+
+    end
   end
 
 end

data/spec/unit/proxyable_spec.rb

@@ -194,6 +194,7 @@ describe CouchRest::Model::Proxyable do
         @obj.should respond_to('by_name')
         @obj.should respond_to('find_all')
         @obj.should respond_to('find_by_name')
+        @obj.should respond_to('find_by_name!')
       end
 
       it "should create 'all' view method that forward to model's view with proxy" do
@@ -214,6 +215,14 @@ describe CouchRest::Model::Proxyable do
         @obj.find_by_name('name')
       end
 
+      it "should create 'find_by_name!' that raises error when there are no results" do
+        view = mock('view')
+        view.should_receive('key').with('name').and_return(view)
+        view.should_receive('first').and_return(nil)
+        @obj.should_receive(:by_name).and_return(view)
+        lambda { @obj.find_by_name!('name') }.should raise_error(CouchRest::Model::DocumentNotFound)
+      end
+
     end
 
     describe "instance" do

data/spec/unit/typecast_spec.rb

@@ -80,6 +80,11 @@ describe "Type Casting" do
       @course.symbol = "a_symbol"
       @course['symbol'].should equal(:a_symbol)
     end
+
+    it "turns blank value into nil" do
+      @course.symbol = ""
+      @course['symbol'].should be_nil
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,146 +12,138 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.22
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
 description: CouchRest Model provides aditional features to the standard CouchRest
@@ -165,9 +157,9 @@ extra_rdoc_files:
 - README.md
 - THANKS.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -254,6 +246,7 @@ files:
 - spec/unit/assocations_spec.rb
 - spec/unit/attachment_spec.rb
 - spec/unit/base_spec.rb
+- spec/unit/casted_array_spec.rb
 - spec/unit/casted_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/connection_spec.rb
@@ -285,17 +278,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extends the CouchRest Document for advanced modelling.
@@ -334,6 +327,7 @@ test_files:
 - spec/unit/assocations_spec.rb
 - spec/unit/attachment_spec.rb
 - spec/unit/base_spec.rb
+- spec/unit/casted_array_spec.rb
 - spec/unit/casted_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/connection_spec.rb