scope_composer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFkNzg5MDA1MTI0Y2ViZTBjMDA3NjBlYTcyMTY5NmI5ZTg3ODYxZA==
+    OTJjNjcxMTFlZGY3OTAwMzE2MjRiMjZlNzcwODA5YmZlODU3MTM0ZA==
   data.tar.gz: !binary |-
-    Y2YwYTU0YTIxYjZmMjQzYzQwOTA2N2Q1MDIyY2RiNWUzYWQ1NTAxMw==
+    ODhiMTAzMTA3ZTQyOWY4M2U3ZjJlYWRiNzZjYjQwODgyOGM2ZjJlMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWI0MGZmMTcwNjFiNTBkMWMzZjA3OGU4MTJmYjVjMzNkMzQ2YjU0ODYzYjNj
-    NTU2OTY1ZTEyZDEwMGM2YTgxMjY3NjUxYzVhMzQ0MTUwOWM1OWIxZGQ5Yjdj
-    NWJjMzljNGU4NDgzOGMwNmU0YjQ5MjNkYmYyYThkNTNjNzUzMzI=
+    MDg5MjQ0OTA5MThkYmNiOTU3NjJkYWMwNjA4ZTcyMDk2NWM3NjcxOTVmZTAy
+    YWIwN2Y0Y2E0Yjg5Y2VlNDE1YWU3MzhjYmNhYWFjZjAyMzkyNjM4NWMyYjA0
+    MmJjMWQ3ODQ0YmVhY2E0NzcxYmY1OTFmOTBiZGFiZWRlNGFmOGI=
   data.tar.gz: !binary |-
-    Mzk0NDBmZDRjODI4OTAzZjk2NzdjNjg0MzA1MWRhZjk5NzVhMzc0ZWEwNzk0
-    M2EzNmE0ZTdlYmRmOTRmZjIyYzljMGUzNTBlYmUxOTdkMWE3ODVlNjAxMjFm
-    ZjFlNDRkMGM2NGJlMDY2OGU0MDZhZjBhYjdmN2I1ZDgxNGE1YjI=
+    MTk5M2I3MmFjMTFiNDBjNmY0NDY2MTFkMzllN2VjODk5NGRlZGY2NzNiZGI2
+    Yzg3ZDVlYjAwNzY1YzdmMTYxMjg4Mzg5MzkxYTkzN2FmZDMxZWNhNjU5YzMy
+    MGZmZTEwODkxMGViZDYzNmM0ODk5MWRkNWZkMDhhYThhZjVkNTI=

data/UPGRADE.md

@@ -1,8 +1,12 @@
+## 0.3.0
+
+* it stores scope_attributes seperately from attributes
+
 ## 0.2.0
 
-subject#where should return self
+* subject#where should return self
 
 
 ## 0.1.0
 
-Initial
+* Initial

data/lib/scope_composer/scope.rb

@@ -92,7 +92,7 @@ class Scope
       # define method
       define_method(name) do |*args|
         # if no value is given, act as a getter and retrieve the value
-        return attributes[name] if args.first.nil?
+        return scope_attributes[name] if args.first.nil?
         # otherwise set the value
         instance_exec(*args, &proc)
         # and return self for chaining
@@ -118,9 +118,9 @@ class Scope
         # init
         value = args.first
         # if no value is given, act as a getter
-        return attributes[name] if value.nil?
+        return scope_attributes[name] if value.nil?
         # otherwise set the value
-        where( name => value )
+        scope_attributes[name] = value
         # and return self for chaining
         return self
       end
@@ -161,5 +161,9 @@ class Scope
     @attributes = self.attributes.merge(attrs)
   end
   
+  def scope_attributes
+    @scope_attributes ||= {}
+  end
+  
 end
 end

data/lib/scope_composer/version.rb

@@ -1,3 +1,3 @@
 module ScopeComposer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/scope_composer/model_spec.rb

@@ -2,24 +2,24 @@
 require 'spec_helper'
 
 describe ScopeComposer::Model do
-  subject do
-    class TestClass
-      include ScopeComposer::Model
-      
-      has_scope_composer
-      scope :say_hi, ->(t){ 'hi' }
-      scope_helper :helper_method, ->(t){ 'hi' }
-      
-      scope_composer_for :search
-      
-      search_scope :limit
-      search_scope :offset, prefix: true
-      search_helper :tester, ->(t){ t.to_i }
-      
-    end
-    TestClass
+
+  class ScopeComposerModelTest
+    include ScopeComposer::Model
+  
+    has_scope_composer
+    scope :say_hi, ->(t){ 'hi' }
+    scope_helper :helper_method, ->(t){ 'hi' }
+  
+    scope_composer_for :search
+    search_scope :limit
+    search_scope :offset, prefix: true
+    search_helper :tester, ->(t){ t.to_i }
+  
   end
   
+  let(:scope){ ScopeComposerModelTest }
+  subject{ scope }
+  
   it { should respond_to :scope_composer_for }
   it { should respond_to :scope_scope }
   it { should respond_to :scope }
@@ -32,12 +32,29 @@ describe ScopeComposer::Model do
   it { should_not respond_to :tester }
 
   it "should define a scope helper" do
-    TestClass.say_hi('hi').should respond_to :helper_method
+    ScopeComposerModelTest.say_hi('hi').should respond_to :helper_method
+  end
+  
+  describe ".search_scope" do
+    let(:scope){ ScopeComposerModelTest.search_scope.new }
+    subject{ scope }
+    before(:each){ scope.limit(10) }
+    
+    its(:scope_attributes){ should eq({ limit: 10 }) }
+    its(:attributes){ should eq({}) }
+    
+    describe "#where" do
+      before(:each){ scope.where( id: 20 ) }
+    
+      its(:scope_attributes){ should eq({ limit: 10 }) }
+      its(:attributes){ should eq({ id: 20 }) }
+    end
+    
   end
   
-  describe "#where" do
+  describe ".scope" do
     it "should return self" do
-      subject.limit(1).where( id: 1 ).class.should eq TestClass::SearchScope
+      subject.limit(1).where( id: 1 ).class.should eq ScopeComposerModelTest::SearchScope
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scope_composer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Blake Hilscher