couch_potato 0.2.13 → 0.2.14

data/README.md

@@ -293,9 +293,11 @@ Couch Potato provides custom RSpec matchers for testing the map and reduce funct
     end
     
     #RSpec
+    require 'couch_potato/rspec/matchers'
+    
     describe User, 'by_name' do
       it "should map users to their name" do
-        User.by_name.should map({:name => 'bill', :age => 23}).to([['bill', null]])
+        User.by_name.should map({:name => 'bill', :age => 23}).to(['bill', null])
       end
       
       it "should reduce the users to the sum of their age" do
@@ -307,7 +309,7 @@ Couch Potato provides custom RSpec matchers for testing the map and reduce funct
       end
     end
     
-This will actually run your map/reduce functions in a JavaScript interpreter, passing the arguments as JSON and converting the results back to Ruby.
+This will actually run your map/reduce functions in a JavaScript interpreter, passing the arguments as JSON and converting the results back to Ruby. For more examples see the [spec](http://github.com/langalex/couch_potato/blob/master/spec/unit/rspec_matchers_spec.rb).
 
 In order for this to work you must have the `js` executable in your PATH. This is usually part of the _spidermonkey_ package/port. (On MacPorts that's _spidemonkey_, on Linux it could be one of _libjs_, _libmozjs_ or _libspidermonkey_). When you installed CouchDB via your packet manager Spidermonkey should already be there.
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 13
+:patch: 14
 :major: 0

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

@@ -1,41 +1,14 @@
 require 'json'
 
-module Spec
-  module Matchers
-    def map(document)
-      CouchPotato::RSpec::MapToProxy.new(document)
-    end
-    
-    def reduce(docs, keys)
-      CouchPotato::RSpec::ReduceToProxy.new(docs, keys)
-    end
-    
-    def rereduce(docs, keys)
-      CouchPotato::RSpec::ReduceToProxy.new(docs, keys, true)
-    end
-  end
-end
 
 module CouchPotato
   module RSpec
-    
-    module RunJS
-      private
-      
-      def run_js(js)
-        path = 'couch_potato_js_runner.js'
-        File.open(path, 'w') {|f| f << js}
-        `js #{path}`
-      end
-    end
-    
-    
     class MapToProxy
       def initialize(input_ruby)
         @input_ruby = input_ruby
       end
       
-      def to(expected_ruby)
+      def to(*expected_ruby)
         MapToMatcher.new(expected_ruby, @input_ruby)
       end
     end
@@ -72,54 +45,5 @@ module CouchPotato
         "Expected not to map to #{@actual_ruby.inspect} but did."
       end
     end
-
-    class ReduceToProxy
-      def initialize(docs, keys, rereduce = false)
-        @docs, @keys, @rereduce = docs, keys, rereduce
-      end
-      
-      def to(expected_ruby)
-        ReduceToMatcher.new(expected_ruby, @docs, @keys, @rereduce)
-      end
-    end
-    
-    class ReduceToMatcher
-      include RunJS
-      
-      def initialize(expected_ruby, docs, keys, rereduce = false)
-        @expected_ruby, @docs, @keys, @rereduce = expected_ruby, docs, keys, rereduce
-      end
-      
-      def matches?(view_spec)
-        js = <<-JS
-          #{File.read(File.dirname(__FILE__) + '/print_r.js')}
-          
-          sum = function(values) {
-            var rv = 0;
-            for (var i in values) {
-              rv += values[i];
-            }
-            return rv;
-          };
-          
-          var docs = #{@docs.to_json};
-          var keys = #{@keys.to_json};
-          var reduce = #{view_spec.reduce_function};
-          print(print_r({result: reduce(docs, keys, #{@rereduce})}));
-        JS
-        @actual_ruby = JSON.parse(run_js(js))['result']
-        @expected_ruby == @actual_ruby
-      end
-      
-      def failure_message_for_should
-        "Expected to reduce to #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
-      end
-      
-      def failure_message_for_should_not
-        "Expected not to reduce to #{@actual_ruby.inspect} but did."
-      end
-      
-    end
-    
   end
 end

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

@@ -1,6 +1,50 @@
 module CouchPotato
   module RSpec
+    class ReduceToProxy
+      def initialize(docs, keys, rereduce = false)
+        @docs, @keys, @rereduce = docs, keys, rereduce
+      end
+      
+      def to(expected_ruby)
+        ReduceToMatcher.new(expected_ruby, @docs, @keys, @rereduce)
+      end
+    end
+    
     class ReduceToMatcher
+      include RunJS
+      
+      def initialize(expected_ruby, docs, keys, rereduce = false)
+        @expected_ruby, @docs, @keys, @rereduce = expected_ruby, docs, keys, rereduce
+      end
+      
+      def matches?(view_spec)
+        js = <<-JS
+          #{File.read(File.dirname(__FILE__) + '/print_r.js')}
+          
+          sum = function(values) {
+            var rv = 0;
+            for (var i in values) {
+              rv += values[i];
+            }
+            return rv;
+          };
+          
+          var docs = #{@docs.to_json};
+          var keys = #{@keys.to_json};
+          var reduce = #{view_spec.reduce_function};
+          print(print_r({result: reduce(docs, keys, #{@rereduce})}));
+        JS
+        @actual_ruby = JSON.parse(run_js(js))['result']
+        @expected_ruby == @actual_ruby
+      end
+      
+      def failure_message_for_should
+        "Expected to reduce to #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
+      end
+      
+      def failure_message_for_should_not
+        "Expected not to reduce to #{@actual_ruby.inspect} but did."
+      end
     end
   end
 end

data/lib/couch_potato/rspec/matchers.rb

@@ -1,2 +1,34 @@
+module CouchPotato
+  module RSpec
+    module RunJS
+      private
+  
+      def run_js(js)
+        path = 'couch_potato_js_runner.js'
+        File.open(path, 'w') {|f| f << js}
+        `js #{path}`
+      end
+    end
+  end
+end
+
+
 require File.dirname(__FILE__) + '/matchers/map_to_matcher'
-require File.dirname(__FILE__) + '/matchers/reduce_to_matcher'
+require File.dirname(__FILE__) + '/matchers/reduce_to_matcher'
+
+module Spec
+  module Matchers
+    def map(document)
+      CouchPotato::RSpec::MapToProxy.new(document)
+    end
+    
+    def reduce(docs, keys)
+      CouchPotato::RSpec::ReduceToProxy.new(docs, keys)
+    end
+    
+    def rereduce(docs, keys)
+      CouchPotato::RSpec::ReduceToProxy.new(docs, keys, true)
+    end
+  end
+end
+

data/spec/unit/rspec_matchers_spec.rb

@@ -10,11 +10,11 @@ describe CouchPotato::RSpec::MapToMatcher do
     end
 
     it "should pass if the given function emits the expected javascript" do
-      @view_spec.should map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 2]])
+      @view_spec.should map({:name => 'horst', :tags => ['person', 'male']}).to(['horst', 2])
     end
 
     it "should not pass if the given function emits different javascript" do
-      @view_spec.should_not map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 3]])
+      @view_spec.should_not map({:name => 'horst', :tags => ['person', 'male']}).to(['horst', 3])
     end
   end
   
@@ -24,11 +24,11 @@ describe CouchPotato::RSpec::MapToMatcher do
     end
     
     it "should pass if the given function emits the expected javascript" do
-      @view_spec.should map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 2], ['person', 'male']])
+      @view_spec.should map({:name => 'horst', :tags => ['person', 'male']}).to(['horst', 2], ['person', 'male'])
     end
   
     it "should return false if the given function emits different javascript" do
-      @view_spec.should_not map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 2], ['male', 'person']])
+      @view_spec.should_not map({:name => 'horst', :tags => ['person', 'male']}).to(['horst', 2], ['male', 'person'])
     end
   end
   
@@ -39,13 +39,13 @@ describe CouchPotato::RSpec::MapToMatcher do
     
     it "should have a nice error message for failing should" do
       lambda {
-        @view_spec.should map({:name => 'bill'}).to([['linus', nil]])
+        @view_spec.should map({:name => 'bill'}).to(['linus', nil])
       }.should raise_error('Expected to map to [["linus", nil]] but got [["bill", nil]].')
     end
     
     it "should have a nice error message for failing should not" do
       lambda {
-        @view_spec.should_not map({:name => 'bill'}).to([['bill', nil]])
+        @view_spec.should_not map({:name => 'bill'}).to(['bill', nil])
       }.should raise_error('Expected not to map to [["bill", nil]] but did.')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors: 
 - Alexander Lang