context_aware_scope 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/context_aware_scope.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{context_aware_scope}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simplificator", "Fabio Kuhn"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "test/database.yml",
      "test/models.rb",
      "test/test_helper.rb",
+     "test/units/default_scope_test.rb",
      "test/units/lambda_scope_test.rb",
      "test/units/normal_scope_test.rb",
      "test/units/readme_sample_test.rb"
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/models.rb",
      "test/test_helper.rb",
+     "test/units/default_scope_test.rb",
      "test/units/lambda_scope_test.rb",
      "test/units/normal_scope_test.rb",
      "test/units/readme_sample_test.rb"

data/lib/context_aware_scope.rb

@@ -17,7 +17,8 @@ module ContextAwareScope
             recursive_context = recursive_context.keep_merge(@context)
             recursive_context
           else
-            @context
+            # add default scope context if on active_record
+            default_scoping.inject(@context){|context, scope| context.keep_merge(scope[:find][:context])}
           end
         end
 
@@ -35,6 +36,12 @@ module ContextAwareScope
   end
 end
 
+class ActiveRecord::Base
+  def context
+
+  end
+end
+
 class ActiveRecord::NamedScope::Scope
   include ContextAwareScope
 end

data/test/models.rb

@@ -14,7 +14,10 @@ class Customer < ActiveRecord::Base
 end
 
 class City < ActiveRecord::Base
-  has_many    :customers
+  default_scope :order => 'cities.name ASC', :context => {:order => 'name asc'}
+  named_scope   :basel, :conditions => {:name => 'Basel'}, :context => {:name => 'Basel'}
+
+  has_many      :customers
 end
 
 class Product < ActiveRecord::Base
@@ -64,6 +67,7 @@ def seed_models
   order2 = Order.create(:customer => customer1, :product_name => 'old lamp', :price => 5, :purchased_at => '2010-07-22')
   order3 = Order.create(:customer => customer2, :product_name => 'camel', :price => 1200, :purchased_at => '2010-07-24')
   product = Product.create(:name => 'Bracelet', :price => 324, :created_at => 1.day.ago)
+  product = Product.create(:name => 'Carpet', :price => 12, :created_at => 1.day.ago)
 end
 
 def cleanup_database

data/test/units/default_scope_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class DefaultScopeTest < Test::Unit::TestCase
+  context 'cities' do
+    setup do
+      seed_models
+    end
+
+    context 'with a default scope' do
+      setup do
+        @cities = City.scoped({})
+      end
+
+      should 'should have results' do
+        assert_equal 2, @cities.count
+      end
+
+      should 'have context on list' do
+        assert_equal ActiveRecord::NamedScope::Scope, @cities.class
+        assert_equal Hash, @cities.context.class
+        assert_equal ({:order => 'name asc'}), @cities.context
+      end
+    end
+
+    context 'with a default scope and a named scope' do
+      setup do
+        @cities = City.basel.scoped({})
+      end
+
+      should 'should have results' do
+        assert_equal 1, @cities.count
+      end
+
+      should 'have context on list' do
+        assert_equal ActiveRecord::NamedScope::Scope, @cities.class
+        assert_equal Hash, @cities.context.class
+        assert_equal ({:order => 'name asc', :name => 'Basel'}), @cities.context
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: context_aware_scope
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Simplificator
@@ -82,6 +82,7 @@ files:
 - test/database.yml
 - test/models.rb
 - test/test_helper.rb
+- test/units/default_scope_test.rb
 - test/units/lambda_scope_test.rb
 - test/units/normal_scope_test.rb
 - test/units/readme_sample_test.rb
@@ -122,6 +123,7 @@ summary: Add context to named_scopes in ActiveRecord
 test_files: 
 - test/models.rb
 - test/test_helper.rb
+- test/units/default_scope_test.rb
 - test/units/lambda_scope_test.rb
 - test/units/normal_scope_test.rb
 - test/units/readme_sample_test.rb