context_aware_scope 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/context_aware_scope.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{context_aware_scope}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simplificator", "Fabio Kuhn"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-08-27}
   s.description = %q{Allows to add a context to a named_scope that will be passed through the whole scope chain}
   s.email = %q{info@simplificator.com}
   s.extra_rdoc_files = [

data/lib/context_aware_scope.rb

@@ -18,7 +18,7 @@ module ContextAwareScope
             recursive_context
           else
             # add default scope context if on active_record
-            default_scoping.inject(@context){|context, scope| context.keep_merge(scope[:find][:context])}
+            default_scoping.inject(@context){|context, scope| context.keep_merge(scope[:find][:context] || {})}
           end
         end
 

data/test/models.rb

@@ -21,6 +21,8 @@ class City < ActiveRecord::Base
 end
 
 class Product < ActiveRecord::Base
+  default_scope :order => 'product.id ASC'
+
   named_scope :luxurious, :conditions => ['price > ?', 100], :context => {:price => 'luxurious'}
   named_scope :recent, :conditions => ['created_at > ?', 1.week.ago], :context => {:created_at => 'brand new'}
 end

data/test/units/default_scope_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class DefaultScopeTest < Test::Unit::TestCase
-  context 'cities' do
+  context 'a model' do
     setup do
       seed_models
     end
@@ -37,5 +37,21 @@ class DefaultScopeTest < Test::Unit::TestCase
         assert_equal ({:order => 'name asc', :name => 'Basel'}), @cities.context
       end
     end
+
+    context 'with a default scope without context' do
+      setup do
+        @products = Product.scoped({})
+      end
+
+      should 'should have results' do
+        assert_equal 2, @products.count
+      end
+
+      should 'have context on list' do
+        assert_equal ActiveRecord::NamedScope::Scope, @products.class
+        assert_equal Hash, @products.context.class
+        assert_equal ({}), @products.context
+      end
+    end
   end
 end

data/test/units/readme_sample_test.rb

@@ -10,7 +10,7 @@ class ReadmeSampleTest < Test::Unit::TestCase
     should 'should have results' do
       assert_equal 1, @products.count
       assert_equal ({:price => 'luxurious', :created_at => 'brand new'}), @products.context
-      assert_equal "You are looking at brand new and luxurious products", "You are looking at #{@products.context.values.to_sentence} products"
+      assert_equal "You are looking at brand new and luxurious products", "You are looking at #{@products.context.values.sort.to_sentence} products"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: context_aware_scope
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Simplificator
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-08-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency