couch_potato 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2771fb2d4e5b08e8ce5a50afa1d6747a54682807
-  data.tar.gz: 1009498ac99d3d0b5e2bba6a7a5a4624ff5759be
+  metadata.gz: 6f37912f0e7ed48878e92e5ad8ef34d106359f15
+  data.tar.gz: 020faa774590847e21f942504cf9fb02df3683e7
 SHA512:
-  metadata.gz: 665f44a87cc9d5f96b1c0ba3dc416849e6fc1b02888a96658e94e7a295601aa4e81d81423df6a8362e87c4feb41f1a738fa1bd08d18fe716a7d655b03714eff7
-  data.tar.gz: c53f3dba7f3fd8208182ecfc54a8e6d747af55d316ea2097df26762ab70e3544676575e36594922caf1b85033c9b6631e79d2876105b37c901a100f3ce6608f2
+  metadata.gz: 6a6fce1ef1c76b01c073ac3706d894d5c567d05afe20ef4177672950f96db1011c9f6aee607852a7d0c605e303250ecec4ad0acbbc9494b30b603a25690924cd
+  data.tar.gz: 240d66a1fcb88a3214c946fd51e924abf314410c8b14a203423626d6d777633ee0764ebffbfb2e62b707539c218da0b01da29068f717fe2057b69f1f6d9a2921

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.2
   - jruby-19mode
-  - rbx-2.1.1
+  - rbx-2.2.10
 gemfile:
   - active_support_3_2
   - active_support_4_0

data/CHANGES.md

@@ -1,5 +1,11 @@
 ## Changes
 
+### 1.3.0
+
+* Add support for built-in couchdb reduce functions in map reduce specs (Andy Morris)
+* Make specs handle CommonJS modules via module.exports as well as exports (Andy Morris)
+* Changed #attributes to return a HashWithIndifferentAccess (Owen Davies)
+
 ### 1.2.0
 
 * adds optional deep dirty tracking (andymorris)

data/README.md

@@ -360,7 +360,7 @@ You can also pass in custom map/reduce functions with the custom view spec:
 commonJS modules can also be used in custom views:
 
     class User
-      view :all, :map => "function(doc) { emit(null, require("lib/test").test)}", :lib => {:test => "exports.test = 'test'"}, :include_docs => true, :type => :custom
+      view :all, :map => "function(doc) { emit(null, require("views/lib/test").test)}", :lib => {:test => "exports.test = 'test'"}, :include_docs => true, :type => :custom
     end
 
 If you don't want the results to be converted into models the raw view is your friend:

data/lib/couch_potato/persistence.rb

@@ -75,7 +75,7 @@ module CouchPotato
     #     property :year
     #   end
     #   book = Book.new
-    #   book.attributes = {:title => 'Time to Relax', :year => 2009}
+    #   book.attributes = {'title' => 'Time to Relax', 'year' => 2009}
     #   book.title # => 'Time to Relax'
     #   book.year # => 2009
     def attributes=(hash)
@@ -93,9 +93,9 @@ module CouchPotato
     #     property :year
     #   end
     #   book = Book.new :year => 2009
-    #   book.attributes # => {:title => nil, :year => 2009}
+    #   book.attributes # => {'title' => nil, 'year' => 2009}
     def attributes
-      self.class.properties.inject({}) do |res, property|
+      self.class.properties.inject(ActiveSupport::HashWithIndifferentAccess.new) do |res, property|
         property.value(res, self)
         res
       end

data/lib/couch_potato/rspec/matchers/map_reduce_to_matcher.rb

@@ -28,6 +28,45 @@ module CouchPotato
 
       def matches?(view_spec)
         js = <<-JS
+          var sum = function(values) {
+            return values.reduce(function(memo, value) { return memo + value; });
+          };
+          // Equivalents of couchdb built-in reduce functions whose names can be
+          // given as the reduce function in the view_spec:
+          var _sum = function(keys, values, rereduce) {
+            return sum(values);
+          }
+          var _count = function(keys, values, rereduce) {
+            if (rereduce) {
+              return sum(values);
+            } else {
+              return values.length;
+            }
+          }
+          var _stats = function(keys, values, rereduce) {
+            var result = {sum: 0, count: 0, min: Number.MAX_VALUE, max: Number.MIN_VALUE, sumsqr: 0};
+            if (rereduce) {
+              for (var i in values) {
+                var value = values[i];
+                result.sum += value.sum;
+                result.count += value.count;
+                result.min = Math.min(result.min, value.min);
+                result.max = Math.max(result.max, value.max);
+                result.sumsqr += value.sumsqr;
+              }
+            } else {
+              for (var i in values) {
+                var value = values[i];
+                result.sum += value;
+                result.count += 1;
+                result.min = Math.min(result.min, value);
+                result.max = Math.max(result.max, value);
+                result.sumsqr += Math.pow(value, 2);
+              }
+            }
+            return result;
+          }
+
           var docs = #{@input_ruby.to_json};
           var options = #{@options.to_json};
           var map = #{view_spec.map_function};
@@ -36,23 +75,21 @@ module CouchPotato
 
           // Map the input docs
           var require = function(modulePath) {
-            var exports = {};
+            var module = {exports: {}};
+            var exports = module.exports;
             var pathArray = modulePath.split("/").slice(2);
             var result = lib;
             for (var i in pathArray) {
-              result = result[pathArray[i]]
+              result = result[pathArray[i]];
             }
             eval(result);
-            return exports;
+            return module.exports;
           }
 
           var mapResults = [];
           var emit = function(key, value) {
             mapResults.push({key: key, value: value});
           };
-          var sum = function(values) {
-            return values.reduce(function(memo, value) { return memo + value; });
-          };
           for (var i in docs) {
             map(docs[i]);
           }

data/lib/couch_potato/rspec/matchers/map_to_matcher.rb

@@ -28,14 +28,15 @@ module CouchPotato
           var lib = #{view_spec.respond_to?(:lib) && view_spec.lib.to_json};
           var result = [];
           var require = function(modulePath) {
-            var exports = {};
+            var module = {exports: {}};
+            var exports = module.exports;
             var pathArray = modulePath.split("/").slice(2);
             var result = lib;
             for (var i in pathArray) {
-              result = result[pathArray[i]]
+              result = result[pathArray[i]];
             }
             eval(result);
-            return exports;
+            return module.exports;
           }
 
           var emit = function(key, value) {

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/couch_potato/view/view_query.rb

@@ -26,6 +26,17 @@ module CouchPotato
         end
       end
 
+      # mainly useful for testing where you drop the database between tests.
+      # only after clearing the cache design docs will be updated/re-created.
+      def self.clear_cache
+        __updated_views.clear
+      end
+
+      def self.__updated_views
+        @updated_views ||= {}
+        @updated_views
+      end
+
       private
 
       def update_view
@@ -66,8 +77,7 @@ module CouchPotato
       end
 
       def updated_views
-        @@updated_views ||= {}
-        @@updated_views
+        self.class.__updated_views
       end
 
       def query_view(parameters)

data/spec/unit/attributes_spec.rb

@@ -34,15 +34,21 @@ describe "attributes" do
   context "attributes" do
     it "should return the attributes" do
       plant = Plant.new(:leaf_count => 1)
-      plant.attributes.should == {:leaf_count => 1, :created_at => nil, :updated_at => nil,
-                                  :typed_leaf_count => nil, :typed_leaf_size => nil, :branch => nil}
+      plant.attributes.should == {'leaf_count' => 1, 'created_at' => nil, 'updated_at' => nil,
+                                  'typed_leaf_count' => nil, 'typed_leaf_size' => nil, 'branch' => nil}
     end
 
-    it "should return the attributes via []" do
+    it "should return the attributes via [symbol]" do
       plant = Plant.new(:leaf_count => 1)
       plant.attributes[:leaf_count].should eql(plant[:leaf_count])
       plant.attributes[:leaf_count].should eql(1)
     end
+
+    it "should return the attributes via [string]" do
+      plant = Plant.new(:leaf_count => 1)
+      plant.attributes["leaf_count"].should eql(plant[:leaf_count])
+      plant.attributes["leaf_count"].should eql(1)
+    end
   end
 
   context "has_key?" do

data/spec/unit/rspec_matchers_spec.rb

@@ -36,7 +36,7 @@ describe CouchPotato::RSpec::MapToMatcher do
     spec.should map({}).to([nil, "2013-05-17T15:00:00.000Z"])
   end
 
-  it "should work with commonJS modules" do
+  it "should work with commonJS modules that use 'exports'" do
     spec = stub(
       :map_function => "function(doc) { var test = require('views/lib/test'); emit(null, test.test); }",
       :lib => {:test => "exports.test = 'test';"}
@@ -44,6 +44,14 @@ describe CouchPotato::RSpec::MapToMatcher do
     spec.should map({}).to([nil, "test"])
   end
 
+  it "should work with commonJS modules that use 'module.exports'" do
+    spec = stub(
+      :map_function => "function(doc) { var test = require('views/lib/test'); emit(null, test.test); }",
+      :lib => {:test => "module.exports.test = 'test';"}
+    )
+    spec.should map({}).to([nil, "test"])
+  end
+
   describe "failing specs" do
     before(:each) do
       @view_spec = stub(:map_function => "function(doc) {emit(doc.name, null)}")
@@ -137,7 +145,7 @@ describe CouchPotato::RSpec::MapReduceToMatcher do
     spec.should map_reduce({}).to({"key" => nil, "value" => "2013-05-17T15:00:00.000Z"})
   end
 
-  it "should handle date return values" do
+  it "should handle CommonJS requires for modules that use 'exports'" do
     spec = stub(
       :map_function => "function() { var test = require('views/lib/test'); emit(null, test.test); }",
       :reduce_function => "function(keys, values) { return 'test' }",
@@ -145,6 +153,14 @@ describe CouchPotato::RSpec::MapReduceToMatcher do
     spec.should map_reduce({}).to({"key" => nil, "value" => "test"})
   end
 
+  it "should handle CommonJS requires for modules that use 'module.exports'" do
+    spec = stub(
+      :map_function => "function() { var test = require('views/lib/test'); emit(null, test.test); }",
+      :reduce_function => "function(keys, values) { return 'test' }",
+      :lib => {:test => "module.exports.test = 'test'"})
+    spec.should map_reduce({}).to({"key" => nil, "value" => "test"})
+  end
+
   it "should handle sum function" do
     spec = stub(
       :map_function => "function(doc) { emit(null, doc.age); }",
@@ -233,6 +249,38 @@ describe CouchPotato::RSpec::MapReduceToMatcher do
       }.should raise_error('Expected not to map/reduce to [{"key"=>nil, "value"=>8}] but did.')
     end
   end
+
+  describe "couchdb built-in reduce functions" do
+    describe "_sum" do
+      it "should return the sum of emitted values" do
+        spec = stub(:map_function => @view_spec.map_function, :reduce_function => "_sum")
+        spec.should map_reduce(@docs).to({"key" => nil, "value" => 36})
+      end
+    end
+
+    describe "_count" do
+      it "should return the count of emitted values" do
+        spec = stub(:map_function => @view_spec.map_function, :reduce_function => "_count")
+        spec.should map_reduce(@docs).to({"key" => nil, "value" => 8})
+      end
+    end
+
+    describe "_stats" do
+      it "should return the numerical statistics of emitted values" do
+        spec = stub(:map_function => @view_spec.map_function, :reduce_function => "_stats")
+        spec.should map_reduce(@docs).to({
+            "key" => nil,
+            "value" => {
+              "sum" => 36,
+              "count" => 8,
+              "min" => 1,
+              "max" => 8,
+              "sumsqr" => 204
+            }
+          })
+      end
+    end
+  end
 end
 
 describe CouchPotato::RSpec::ListAsMatcher do

data/spec/unit/view_query_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe CouchPotato::View::ViewQuery, 'query_view!' do
   before(:each) do
     CouchRest.stub(:get => nil)
+    CouchPotato::View::ViewQuery.clear_cache
   end
 
   it "does not pass a key if conditions are empty" do
@@ -24,6 +25,28 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
     CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}}, nil, {'test' => "<lib_code>"}).query_view!
   end
 
+  it 'only updates a view once' do
+    db = double :db, view: nil
+    db.stub(:get).and_return({'views' => {}}, {'views' => {}, x: 1}) # return something different on the second call otherwise it would never try to update the views twice
+    query = CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}})
+
+    db.should_receive(:save_doc).once
+
+    2.times { query.query_view! }
+  end
+
+  it 'updates a view again after clearing the view cache' do
+    db = double :db, view: nil
+    db.stub(:get).and_return({'views' => {}}, {'views' => {}, x: 1}) # return something different on the second call otherwise it would never try to update the views twice
+    query = CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}})
+
+    db.should_receive(:save_doc).twice
+
+    query.query_view!
+    CouchPotato::View::ViewQuery.clear_cache
+    query.query_view!
+  end
+
   it 'updates a view in erlang if it does not exist' do
     db = mock 'db', :get => nil, :view => nil
 
@@ -49,8 +72,10 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
   end
 
   it "does not update a view when the lib function hasn't changed" do
-    db = mock 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}, 'lib' => {'test' => '<lib_code>'}}, :view => nil
+    db = mock 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}, 'lib' => {'test' => '<lib_code>'}}}, :view => nil
+
     db.should_not_receive(:save_doc)
+
     CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}}, nil, {'test' => "<lib_code>"}).query_view!
   end
 
@@ -67,8 +92,10 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
   end
 
   it "updates a view when the lib hash has changed" do
-    db = mock 'db', :get => {'views' => {'view4' => {'map' => '<map_code>'}}, 'lib' => {'test' => "<test_lib>"}}, :view => nil
+    db = mock 'db', :get => {'views' => {'view4' => {'map' => '<map_code>'}}}, 'lib' => {'test' => "<test_lib>"}, :view => nil
+
     db.should_receive(:save_doc)
+
     CouchPotato::View::ViewQuery.new(db, 'design', {:view4 => {:map => '<map_code>'}}, nil, {:test => "<test_lib>"}).query_view!
   end
 
@@ -76,8 +103,8 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
     db = mock 'db', :get => {'views' => {'view5' => {'map' => '<map_code>'}, 'lib' => {'test' => "<test_lib>"}}}, :view => nil
     db.should_receive(:save_doc).with({
       'views' => {
-         'view5' => {'map' => '<map_code>'},
-         'lib' => {'test' => '<test_lib>', 'test1' => '<test1_lib>'}
+        'view5' => {'map' => '<map_code>'},
+        'lib' => {'test' => '<test_lib>', 'test1' => '<test1_lib>'}
       }
     })
     CouchPotato::View::ViewQuery.new(db, 'design', {:view5 => {:map => '<map_code>'}}, nil, {'test1' => '<test1_lib>'}).query_view!
@@ -85,12 +112,14 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
 
   it "overrides libs with the same name" do
     db = mock 'db', :get => {'views' => {'view6' => {'map' => '<map_code>'}, 'lib' => {'test' => "<test_lib>"}}}, :view => nil
+
     db.should_receive(:save_doc).with({
       'views' => {
-         'view6' => {'map' => '<map_code>'},
-         'lib' => {'test' => '<test1_lib>'}
-      }
+        'view6' => {'map' => '<map_code>'},
+        'lib' => {'test' => '<test1_lib>'}
+      },
     })
+
     CouchPotato::View::ViewQuery.new(db, 'design', {:view6 => {:map => '<map_code>'}}, nil, {'test' => '<test1_lib>'}).query_view!
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json