dynamic_default_scoping 0.0.2 → 0.0.3

data/README.rdoc

@@ -51,3 +51,8 @@ Here is how it should be:
 == When there will be a normal implementation of this feature?
 
 http://rails.lighthouseapp.com/projects/8994/tickets/1812-default_scope-cant-take-procs
+
+== Credits
+
+* Adam Wróbel (https://github.com/amw)
+* Ivan Ukhov (https://github.com/UVSoft)

data/lib/dynamic_default_scoping/version.rb

@@ -1,3 +1,3 @@
 module DynamicDefaultScoping
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'
 end

data/spec/models/post.rb

@@ -0,0 +1,14 @@
+class Post < ActiveRecord::Base
+  scope :recent, limit(5)
+
+  include DynamicDefaultScoping
+
+  default_scope :language, lambda { |*args|
+    case locale = (args[0].presence || I18n.locale).to_s
+    when 'any', 'all'
+      where :locale => I18n.available_locales.map(&:to_s)
+    else
+      where :locale => locale
+    end
+  }
+end

data/spec/spec_helper.rb

@@ -5,39 +5,14 @@ require 'active_support/all'
 require 'active_record'
 require 'dynamic_default_scoping'
 
+%w(models support).each do |directory|
+  Dir[File.join(File.dirname(__FILE__), "#{ directory }/**/*.rb")].each do |file|
+    require file
+  end
+end
+
 RSpec.configure do |config|
   config.before(:each) do
     Post.unscoped.delete_all
   end
 end
-
-ActiveRecord::Base.establish_connection \
-  :adapter => 'mysql2',
-  :hostname => 'localhost',
-  :database => 'dynamic_default_scoping',
-  :username => 'root',
-  :password => ''
-
-connection = ActiveRecord::Base.connection
-connection.drop_table 'posts' if connection.table_exists? 'posts'
-connection.create_table 'posts' do |table|
-  table.string :locale
-  table.timestamps
-end
-
-LOCALES = [ :en, :ru ]
-
-class Post < ActiveRecord::Base
-  scope :recent, limit(5)
-
-  include DynamicDefaultScoping
-
-  default_scope :language, lambda { |*args|
-    case locale = (args[0].presence || I18n.locale).to_s
-    when 'any', 'all'
-      where :locale => LOCALES.map(&:to_s)
-    else
-      where :locale => locale
-    end
-  }
-end

data/spec/support/connection.rb

@@ -0,0 +1,15 @@
+ActiveRecord::Base.establish_connection \
+  :adapter  => 'mysql2',
+  :hostname => 'localhost',
+  :database => 'dynamic_default_scoping',
+  :username => 'root',
+  :password => ''
+
+connection = ActiveRecord::Base.connection
+
+ActiveRecord::Base.descendants.each do |model|
+  table_name = model.table_name
+  connection.drop_table table_name if connection.table_exists? table_name
+  table = File.join File.dirname(__FILE__), '..', "tables/#{ table_name }.rb"
+  connection.instance_eval File.open(table).read if File.exist? table
+end

data/spec/support/matchers.rb

@@ -0,0 +1,7 @@
+RSpec::Matchers.define :have_valid_locale do |*args|
+  locales = Array.wrap(args[0] || I18n.locale).map &:to_s
+
+  match do |*records|
+    records.flatten.all? { |record| locales.include? record.locale }
+  end
+end

data/spec/tables/posts.rb

@@ -0,0 +1,4 @@
+create_table 'posts' do |table|
+  table.string :locale
+  table.timestamps
+end

data/spec/unit/dynamic_default_scoping_spec.rb

@@ -1,28 +1,24 @@
 require 'spec_helper'
 
 describe DynamicDefaultScoping do
-  def should_have_valid_locale *args
-    options = args.extract_options!
-    locale = (options[:locale].presence || I18n.locale).to_s
-    args.flatten.all?{ |post| post.locale == locale }.should be_true
+  let :locales do
+    [ :en, :ru ]
   end
 
-  let(:locales) { LOCALES }
-  let(:per_locale) do
+  let :per_locale do
     hash = {}
     locales.each_with_index { |locale, i| hash[locale] = 3 + i }
     hash
   end
 
-  describe 'when switching between locales' do
-    before do
-      locales.each do |locale|
-        per_locale[locale].times do
-          Post.create! :locale => locale.to_s
-        end
-      end
+  before do
+    I18n.stub(:available_locales).and_return locales
+    per_locale.each do |locale, count|
+      count.times { Post.create! :locale => locale.to_s }
     end
+  end
 
+  describe 'when switching between locales' do
     around do |block|
       locales.each do |locale|
         I18n.locale = locale
@@ -30,85 +26,75 @@ describe DynamicDefaultScoping do
       end
     end
 
-    context 'when the locale is not specified' do
+    shared_examples_for 'a well localized class' do
+      it 'generates the right query' do
+        part = if @locale.is_a? Array
+          %[`locale` IN (#{ @locale.map{ |l| "'#{ l }'" }.join(', ') })]
+        else
+          %[`locale` = '#{ @locale }']
+        end
+        @relation.to_sql.should include part
+      end
+
       it 'finds records only in the current locale' do
-        should_have_valid_locale Post.first, Post.all
+        [ @relation.first, @relation.all ].should have_valid_locale @locale
       end
 
       it 'counts records only in the current locale' do
-        Post.count.should == per_locale[I18n.locale]
+        count = Array.wrap(@locale).map{ |l| per_locale[l] }.sum
+        @relation.count.should == count
       end
     end
 
-    context 'when the locale is specified' do
-      shared_examples_for 'well localized class' do
-        it 'generates correct query' do
-          sql = @scoped.to_sql
-          sql.should include %[`locale` = '#{ @locale }']
-        end
-
-        it 'finds records in the specified locale' do
-          all = @scoped.all
-          all.length.should == per_locale[@locale]
-          should_have_valid_locale all, :locale => @locale
-        end
-
-        it 'counts records in the specified locale' do
-          @scoped.count.should == per_locale[@locale]
-        end
+    context 'when the locale is not specified' do
+      before do
+        @relation, @locale = Post.scoped, I18n.locale
       end
 
+      it_behaves_like 'a well localized class'
+    end
+
+    context 'when the locale is specified' do
       context 'when there is another scope before' do
         around do |block|
           locales.each do |locale|
-            @locale = locale
-            @scoped = Post.recent.language(locale)
+            @relation, @locale = Post.recent.language(locale), locale
             block.call
           end
         end
 
-        it_behaves_like 'well localized class'
+        it_behaves_like 'a well localized class'
       end
 
       context 'when there is another scope after' do
         around do |block|
           locales.each do |locale|
-            @locale = locale
-            @scoped = Post.language(locale).recent
+            @relation, @locale = Post.language(locale).recent, locale
             block.call
           end
         end
 
-        it_behaves_like 'well localized class'
+        it_behaves_like 'a well localized class'
       end
 
       context 'when there is no another scope' do
         around do |block|
           locales.each do |locale|
-            @locale = locale
-            @scoped = Post.language(locale)
+            @relation, @locale = Post.language(locale), locale
             block.call
           end
         end
 
-        it_behaves_like 'well localized class'
+        it_behaves_like 'a well localized class'
       end
     end
 
     context 'when we are interested in all locales' do
-      let(:scoped) { Post.language :any }
-
-      it 'finds all records' do
-        sql = scoped.to_sql
-        locales.each do |locale|
-          sql.should =~ %r[`locale` IN \(.*'#{ locale }'.*\)]
-        end
-        scoped.length.should == per_locale.values.sum
+      before do
+        @relation, @locale = Post.language(:any), locales
       end
 
-      it 'counts all records' do
-        scoped.count.should == per_locale.values.sum
-      end
+      it_behaves_like 'a well localized class'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamic_default_scoping
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ivan Ukhov
@@ -84,7 +84,11 @@ files:
 - dynamic_default_scoping.gemspec
 - lib/dynamic_default_scoping.rb
 - lib/dynamic_default_scoping/version.rb
+- spec/models/post.rb
 - spec/spec_helper.rb
+- spec/support/connection.rb
+- spec/support/matchers.rb
+- spec/tables/posts.rb
 - spec/unit/dynamic_default_scoping_spec.rb
 has_rdoc: true
 homepage: https://github.com/UVSoft/dynamic_default_scoping
@@ -121,5 +125,9 @@ signing_key:
 specification_version: 3
 summary: Make ActiveRecord::Base.default_scope take a proc and have a name.
 test_files: 
+- spec/models/post.rb
 - spec/spec_helper.rb
+- spec/support/connection.rb
+- spec/support/matchers.rb
+- spec/tables/posts.rb
 - spec/unit/dynamic_default_scoping_spec.rb