scope_chain 0.0.1 → 0.0.3

data/README.md

@@ -31,13 +31,43 @@ Using ScopeChain, you do:
 
 What this will do is setup some expectations that make sure those scope methods are called.
 
+You can do "manual" scopes:
+
+    def manual_scopes
+      User.scoped.where("somethign = else")
+    end
+
+    it "does the right thing" do
+      ScopeChain.for(User).where("something = else")
+
+      manual_scopes
+    end
+
+You can test return values:
+
+    def return_values
+      User.where("thing = 1")
+    end
+
+    it "returns properly" do
+      ScopeChain.for(User).where("thing = 1").returns(5)
+
+      return_values.should eq(5)
+    end
+
+
 Not in order, but called, which is something, right?
 
+## Known Issues
+
+Uh, actual, user defined scopes don't work. Or if they do, I'd be surprised.  And I'm sure I'm
+missing a bunch of the ActiveRecord methods that are used.
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'scope-chain'
+    gem 'scope_chain'
 
 And then execute:
 
@@ -45,7 +75,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install scope-chain
+    $ gem install scope_chain
 
 ## Contributing
 

data/lib/scope_chain/version.rb

@@ -1,3 +1,3 @@
 module ScopeChain
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/scope_chain.rb

@@ -8,28 +8,40 @@ module ScopeChain
   class Chain
     LINKS = [:select, :where, :includes, :order]
 
-    attr_accessor :klass
+    attr_accessor :klass, :expectations
     def initialize(klass, &block)
       self.klass = klass
+      self.expectations = []
+      self.klass.stubs(scoped: klass) # Handle manual scope building
 
       yield self if block_given?
     end
 
     LINKS.each do |link|
-      define_method(link) do |arguments = nil, returned = nil|
-        add_link link, arguments, returned || klass
+      define_method(link) do |*arguments|
+        add_link link, *arguments
       end
     end
 
     def all(returned)
-      add_link :all, nil, returned
+      add_link :all
+      returns returned
     end
-    
+
+    def returns(object)
+      # DON'T LOOK
+      expectations.last.instance_variable_set(:@return_values, Mocha::ReturnValues.build(object))
+      
+      self
+    end
+
     private
-    def add_link(name, arguments = nil, returned = klass)
+    def add_link(name, *arguments)
       expectation = klass.expects(name)
-      expectation.with(arguments) if arguments
-      expectation.returns(returned)
+      expectation.with(*arguments) if arguments.size > 0
+      expectation.returns(klass)
+
+      expectations << expectation
 
       self
     end

data/scope_chain.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mocha'
 
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'activerecord', '~> 3.1.11'
 end

data/spec/scope_chain_spec.rb

@@ -1,9 +1,14 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'active_record'
 require 'mocha/api'
 require 'scope_chain'
 
+class Model < ActiveRecord::Base
+  scope :active, where("column = value")
+end
+
 describe ScopeChain do
   let(:klass) { Class.new }
 
@@ -26,7 +31,7 @@ describe ScopeChain::Chain do
     end
     
     it "adds a link for #{link}" do
-      subject.expects(:add_link).with(link, :arguments, klass)
+      subject.expects(:add_link).with(link, :arguments)
 
       subject.send(link, :arguments)
     end
@@ -37,29 +42,62 @@ describe ScopeChain::Chain do
   end
 
   it "adds a link for all" do
-    subject.expects(:add_link).with(:all, nil, :boom)
+    subject.expects(:add_link).with(:all)
+    subject.expects(:returns).with(:boom)
 
     subject.all(:boom)
   end
 
+  it "supports manual scopes" do
+    subject.select("id")
+
+    klass.scoped.select("id")
+  end
+
+  describe "#returns" do
+    it "modifies the last expectation" do
+      subject.select("id").where("5").returns("9")
+
+      klass.select("id").where("5").should eq("9")
+    end
+  end
+
   describe "#add_link" do
     it "adds a basic expectation" do
       expectation = mock
-      expectation.expects(:returns).with(:returned)
+      expectation.expects(:returns).with(klass)
 
       klass.expects(:expects).with(:name).returns(expectation)
 
-      subject.send :add_link, :name, nil, :returned
+      subject.send :add_link, :name
     end
 
     it "adds an expectation with arguments" do
       expectation = mock
       expectation.expects(:with).with(:arguments)
-      expectation.expects(:returns).with(:returned)
+      expectation.expects(:returns).with(klass)
 
       klass.expects(:expects).with(:name).returns(expectation)
 
-      subject.send :add_link, :name, :arguments, :returned
+      subject.send :add_link, :name, :arguments
+    end
+  end
+
+  describe "with a custom scopes" do
+    it "fails properly" do
+      pending
+
+      ScopeChain.for(Model).where("column != value")
+
+      expect { Model.active.to_a }.to raise_error(Mocha::StubbingError)
+    end
+
+    it "passes properly" do
+      pending
+
+      ScopeChain.for(Model).where("column = value")
+
+      Model.active.to_a
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: scope_chain
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jon Moses
@@ -34,6 +34,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.11
+  type: :development
+  version_requirements: *id003
 description: Easy testing of scope usage
 email: 
 - jon@burningbush.us