couch_potato 0.2.28 → 0.2.29

data/CHANGES.md

@@ -1,5 +1,9 @@
 ## Changes
 
+### master
+* nicer inspect() for models (mattmatt)
+* fixed (re)reduce for property views wasn't working (langalex)
+
 ### 0.2.28
 * fixed reloading nested classes (langalex)
 * fixed constant missing error when loading models with uninitialized classes via views (langalex)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:major: 0
 :minor: 2
-:patch: 28
+:patch: 29
 :build: 
-:major: 0

data/lib/couch_potato/persistence.rb

@@ -94,6 +94,10 @@ module CouchPotato
     def ==(other) #:nodoc:
       other.class == self.class && self.to_json == other.to_json
     end
-    
+   
+    def inspect
+      attributes_as_string = attributes.map {|attribute, value| "#{attribute}: '#{value}'"}.join(", ")
+      "#<#{self.class} _id: '#{_id}', _rev: '#{_rev}', #{attributes_as_string}>"
+    end
   end    
 end

data/lib/couch_potato/view/properties_view_spec.rb

@@ -11,6 +11,18 @@ module CouchPotato
         end
       end
       
+      def reduce_function
+        <<-JS
+          function(key, values, rereduce) {
+            if(rereduce) {
+              return sum(values);
+            } else {
+              return values.length;
+            }
+          }
+        JS
+      end
+      
       def process_results(results)
         results['rows'].map do |row|
           klass.json_create row['value'].merge(:_id => row['id'])

data/spec/property_spec.rb

@@ -271,4 +271,37 @@ describe 'properties' do
       clock.attributes[:cuckoo].should == 'bavarian'
     end
   end
+  
+  describe "inspecting an object" do
+    let(:comment) do
+      comment = Comment.new(:title => 'title')
+      comment.instance_eval do
+        @_id = "123456abcdef"
+        @_rev = "1-654321fedcba"
+      end
+      comment
+    end
+    
+    it "should not include change-tracking variables" do
+      comment.inspect.should_not include('title_was')
+    end
+    
+    it "should include the normal persistent variables" do
+      comment.inspect.should include("title: 'title'")
+    end
+    
+    it "should include the id" do
+      comment.inspect.should include("_id: '123456abcdef',")
+    end
+    
+    it "should include the revision" do
+      comment.inspect.should include("_rev: '1-654321fedcba',")
+    end
+    
+    it "should return a complete string" do
+      # stub to work around (un)sorted hash on different rubies
+      comment.stub!(:attributes).and_return([['created_at', ''], ['updated_at', ''], ['title', 'title']])
+      comment.inspect.should == "#<Comment _id: '123456abcdef', _rev: '1-654321fedcba', created_at: '', updated_at: '', title: 'title'>"
+    end
+  end
 end

data/spec/unit/properties_view_spec_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'couch_potato/rspec'
+
+class Contract
+  include CouchPotato::Persistence
+  
+  property :date
+  property :terms
+  
+  view :by_date, :type => :properties, :key => :_id, :properties => [:date]
+end
+
+describe CouchPotato::View::PropertiesViewSpec do
+  it "should map the given properties" do
+    Contract.by_date.should map(
+      Contract.new(:date => '2010-01-01', :_id => '1')
+    ).to(['1', {"date" => "2010-01-01"}])
+  end
+  
+  it "should reduce to the number of documents" do
+    Contract.by_date.should reduce(
+      ['1', {"date" => "2010-01-01"}], ['2', {"date" => "2010-01-02"}]
+    ).to(2)
+  end
+  
+  it "should rereduce the number of documents" do
+    Contract.by_date.should rereduce(
+      nil, [12, 13]
+    ).to(25)
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 28
-  version: 0.2.28
+  - 29
+  version: 0.2.29
 platform: ruby
 authors: 
 - Alexander Lang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2010-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - spec/unit/dirty_attributes_spec.rb
 - spec/unit/json_create_id_spec.rb
 - spec/unit/model_view_spec_spec.rb
+- spec/unit/properties_view_spec_spec.rb
 - spec/unit/rspec_matchers_spec.rb
 - spec/unit/rspec_stub_db_spec.rb
 - spec/unit/string_spec.rb
@@ -191,6 +192,7 @@ test_files:
 - spec/unit/dirty_attributes_spec.rb
 - spec/unit/json_create_id_spec.rb
 - spec/unit/model_view_spec_spec.rb
+- spec/unit/properties_view_spec_spec.rb
 - spec/unit/rspec_matchers_spec.rb
 - spec/unit/rspec_stub_db_spec.rb
 - spec/unit/string_spec.rb