paraphrase 0.6.0 → 0.6.1

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/edd_d/src/paraphrase
   specs:
-    paraphrase (0.6.0)
+    paraphrase (0.6.1)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
 

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/edd_d/src/paraphrase
   specs:
-    paraphrase (0.6.0)
+    paraphrase (0.6.1)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
 

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/edd_d/src/paraphrase
   specs:
-    paraphrase (0.6.0)
+    paraphrase (0.6.1)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
 

data/lib/paraphrase/scope_mapping.rb

@@ -64,7 +64,7 @@ module Paraphrase
         return relation
       end
 
-      scope.arity == 0 ? scope.call : scope.call(*inputs)
+      scope.arity == 0 ? relation.send(method_name) : relation.send(method_name, *inputs)
     end
 
     private

data/lib/paraphrase/version.rb

@@ -1,3 +1,3 @@
 module Paraphrase
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/paraphrase/query_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 module Paraphrase
   describe Query do
-    subject { AccountQuery }
-    let(:query) { Account.paraphrase(:name => 'Tyrion Lannister', :nickname => 'Half Man') }
-
     describe ".map" do
+      subject { Class.new(Query) }
+
       it "adds information to Query.mappings" do
         subject.map :name_like, :to => :name
 
@@ -13,11 +12,21 @@ module Paraphrase
       end
 
       it "raises an error if a scope is added twice" do
+        subject.map :name_like, :to => :name
+
         expect { subject.map :name_like, :to => :name }.to raise_error Paraphrase::DuplicateScopeError
       end
     end
 
     describe "on initialization" do
+      let(:query) do
+        klass = Class.new(Query) do
+          map :name_like, :to => :name
+        end
+
+        klass.new({ :name => '', :nickname => '' }, Account)
+      end
+
       it "filters out params not specified in mappings" do
         query.params.should_not have_key :nickname
         query.params.should have_key :name
@@ -29,22 +38,47 @@ module Paraphrase
     end
 
     describe "#results" do
-      before :all do
-        subject.map :title_like, :to => :title, :require => true
+      let(:klass) do
+        Class.new(Query) do
+          map :name_like, :to => :name
+          map :title_like, :to => :title, :require => true
+        end
       end
 
       it "loops through scope methods and applies them to source" do
         Account.should_receive(:title_like).and_return(Account.scoped)
         Account.should_receive(:name_like).and_return(Account.scoped)
 
-        query = Account.paraphrase(:name => 'Jon Snow', :title => 'Wall Watcher')
+        query = klass.new({ :name => 'Jon Snow', :title => 'Wall Watcher'}, Account)
         query.results
       end
 
       it "returns empty array if inputs were missing and required" do
-        query = Account.paraphrase({})
+        query = klass.new({}, Account)
         query.results.should eq []
       end
     end
+
+    describe "preserves" do
+      let(:accounts) do
+        user = User.create!
+        user.accounts << Account.create!
+      end
+
+      let(:results) do
+        klass = Class.new(Query) do
+          map :name_like, :to => :name
+        end
+
+        klass.new({ :name => 'name' }, accounts).results.to_a
+      end
+
+      it "the relation passed in during initialization" do
+        # Create an extra account that shouldn't be in the results
+        Account.create!
+
+        results.should eq accounts.to_a
+      end
+    end
   end
 end

data/spec/paraphrase/scope_mapping_spec.rb

@@ -2,36 +2,45 @@ require 'spec_helper'
 
 module Paraphrase
   describe ScopeMapping do
-    let(:mapping) { ScopeMapping.new(:name_like, :to => :name) }
-    let(:compound_mapping) { ScopeMapping.new(:name_like, :to => [:first_name, :last_name], :require => :last_name) }
-    let(:query) { Account.scoped }
 
     describe "#chain" do
-      it "applies scope method to query object with values from params hash" do
+      let(:mapping) { ScopeMapping.new(:name_like, :to => :name) }
+
+      it "applies scope method to Account.scoped object with values from params hash" do
         Account.should_receive(:name_like).with('Jon Snow')
-        mapping.chain({ :name => 'Jon Snow' }, query)
+
+        mapping.chain({ :name => 'Jon Snow' }, Account.scoped)
       end
 
       it "does nothing if values are missing" do
         Account.should_not_receive(:name_like).with('Jon Snow')
-        mapping.chain({}, query)
+
+        mapping.chain({}, Account.scoped)
       end
 
       it "passes through nil values if scope has been whitelisted" do
         mapping = ScopeMapping.new(:name_like, :to => :name, :whitelist => true)
 
         Account.should_receive(:name_like).with(nil)
-        mapping.chain({}, query)
+
+        mapping.chain({}, Account.scoped)
       end
     end
 
-    it "can require a subset of a compound key" do
-      Account.should_receive(:name_like).with(nil, 'Lannister')
-      compound_mapping.chain({ :last_name => 'Lannister' }, query)
-    end
+    describe "compound keys" do
+      let(:compound_mapping) do
+        ScopeMapping.new(:name_like, :to => [:first_name, :last_name], :require => :last_name)
+      end
+
+      it "can require a subset of a compound key" do
+        Account.should_receive(:name_like).with(nil, 'Lannister')
 
-    it "whitelists the the non-required keys of a compound key" do
-      compound_mapping.whitelist.include?(:first_name).should be_true
+        compound_mapping.chain({ :last_name => 'Lannister' }, Account.scoped)
+      end
+
+      it "whitelists the the non-required keys of a compound key" do
+        compound_mapping.whitelist.include?(:first_name).should be_true
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraphrase
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord