samlown-couchrest_extended_document 1.0.3 → 1.0.4

data/lib/couchrest/extended_document.rb

@@ -8,7 +8,7 @@ module CouchRest
   # Same as CouchRest::Document but with properties and validations
   class ExtendedDocument < Document
 
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
 
     include CouchRest::Mixins::Callbacks
     include CouchRest::Mixins::DocumentQueries    

data/lib/couchrest/mixins/properties.rb

@@ -119,10 +119,10 @@ module CouchRest
               end
             EOS
 
-            if property.type == 'boolean'
+            if ['boolean', TrueClass.to_s.downcase].include?(property.type.to_s.downcase)
               class_eval <<-EOS, __FILE__, __LINE__
                 def #{property.name}?
-                  if self['#{property.name}'].nil? || self['#{property.name}'] == false || self['#{property.name}'].to_s.downcase == 'false'
+                  if self['#{property.name}'].nil? || self['#{property.name}'] == false
                     false
                   else
                     true

data/lib/couchrest/mixins/views.rb

@@ -130,7 +130,7 @@ module CouchRest
           begin
             design_doc.view_on(db, view_name, opts, &block)
             # the design doc may not have been saved yet on this database
-          rescue HttpAbstraction::ResourceNotFound => e
+          rescue RestClient::ResourceNotFound => e
             if retryable
               save_design_doc(db)
               retryable = false

data/spec/couchrest/property_spec.rb

@@ -578,6 +578,11 @@ describe "ExtendedDocument properties" do
     end
     
     describe 'when type primitive is a Boolean' do
+      class RootBeerFloat < CouchRest::ExtendedDocument	
+        use_database DB
+        property :tasty, TrueClass
+      end
+ 
       [ true, 'true', 'TRUE', '1', 1, 't', 'T' ].each do |value|
         it "returns true when value is #{value.inspect}" do
           @course.active = value
@@ -598,7 +603,32 @@ describe "ExtendedDocument properties" do
           @course['active'].should equal(value)
         end
       end
+
+      it "should respond to requests with ? modifier" do
+        @course.active = 'false'
+        @course.active?.should be_false
+      end
+
+      it "should add an accessor with a '?' for boolean attributes that returns true or false" do
+        RootBeerFloat.new(:tasty => true).tasty?.should == true
+        RootBeerFloat.new(:tasty => 'you bet').tasty?.should == true
+        RootBeerFloat.new(:tasty => 123).tasty?.should == true
+      
+        RootBeerFloat.new(:tasty => false).tasty?.should == false
+        RootBeerFloat.new(:tasty => 'false').tasty?.should == false
+        RootBeerFloat.new(:tasty => 'FaLsE').tasty?.should == false
+        RootBeerFloat.new(:tasty => nil).tasty?.should == false
+      end
+
+    end
+
+    describe 'when type primitive is a TrueClass' do
+      it "should respond to requests with ? modifier" do
+        @course.very_active = 'true'
+        @course.very_active?.should be_true
+      end
     end
+
   end
 end
 

data/spec/fixtures/more/course.rb

@@ -15,6 +15,7 @@ class Course < CouchRest::ExtendedDocument
   property :started_on, :type => 'Date'
   property :updated_at, :type => 'DateTime'
   property :active, :type => 'Boolean'
+  property :very_active, :type => TrueClass
   property :klass, :type => 'Class'
   
   view_by :title

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +02:00
+date: 2010-05-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,23 +174,23 @@ specification_version: 3
 summary: Extend CouchRest Document class with useful features.
 test_files: 
 - spec/spec_helper.rb
-- spec/couchrest/extended_doc_inherited_spec.rb
+- spec/couchrest/property_spec.rb
+- spec/couchrest/extended_doc_view_spec.rb
 - spec/couchrest/extended_doc_attachment_spec.rb
+- spec/couchrest/extended_doc_inherited_spec.rb
+- spec/couchrest/casted_model_spec.rb
 - spec/couchrest/attribute_protection_spec.rb
+- spec/couchrest/casted_extended_doc_spec.rb
 - spec/couchrest/extended_doc_subclass_spec.rb
 - spec/couchrest/extended_doc_spec.rb
-- spec/couchrest/property_spec.rb
-- spec/couchrest/casted_model_spec.rb
-- spec/couchrest/extended_doc_view_spec.rb
-- spec/couchrest/casted_extended_doc_spec.rb
-- spec/fixtures/more/invoice.rb
-- spec/fixtures/more/service.rb
-- spec/fixtures/more/course.rb
-- spec/fixtures/more/article.rb
+- spec/fixtures/more/card.rb
+- spec/fixtures/more/event.rb
 - spec/fixtures/more/user.rb
+- spec/fixtures/more/article.rb
+- spec/fixtures/more/service.rb
+- spec/fixtures/more/invoice.rb
 - spec/fixtures/more/person.rb
-- spec/fixtures/more/cat.rb
-- spec/fixtures/more/event.rb
 - spec/fixtures/more/question.rb
-- spec/fixtures/more/card.rb
+- spec/fixtures/more/cat.rb
+- spec/fixtures/more/course.rb
 - examples/model/example.rb