unscoped_associations 0.5.0 → 0.6.0

data/README.md

@@ -1,6 +1,6 @@
 # Unscoped Associations
 
-[![Gem Version](https://badge.fury.io/rb/unscoped_associations.png)](http://badge.fury.io/rb/unscoped_associations)
+[![Gem Version](https://badge.fury.io/rb/unscoped_associations.svg)](http://badge.fury.io/rb/unscoped_associations)
 [![Build Status](https://travis-ci.org/markets/unscoped_associations.svg?branch=master)](https://travis-ci.org/markets/unscoped_associations)
 
 Want to skip the `default_scope` when you get objects through associations (for some strange reasons)? Do it easily with this lib. Supported associations:
@@ -30,13 +30,13 @@ class User < ActiveRecord::Base
   has_many :all_comments, class_name: 'Comment', unscoped: true
   has_one  :last_comment, class_name: 'Comment', order: 'created_at DESC', unscoped: true
 
-  default_scope where( active: true )
+  default_scope { where(active: true) }
 end
 
 class Comment < ActiveRecord::Base
   belongs_to :user, unscoped: true
 
-  default_scope where( public: true )
+  default_scope { where(public: true) }
 end
 
 @user.comments # => return public comments

data/lib/unscoped_associations/version.rb

@@ -1,3 +1,3 @@
 module UnscopedAssociations
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/unscoped_associations.rb

@@ -45,9 +45,9 @@ module UnscopedAssociations
     end
 
     def add_unscoped_association(association_name)
-      define_method(association_name) do |*args|
+      define_method(association_name) do
         self.class.reflect_on_association(association_name).klass.unscoped do
-          super(*args)
+          super(association_name)
         end
       end
     end

data/spec/spec_helper.rb

@@ -6,42 +6,11 @@ require 'unscoped_associations'
 
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 
-ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => ':memory:'
-)
-
-ActiveRecord::Schema.define do
-  self.verbose = false
-
-  create_table :users, :force => true do |t|
-    t.boolean :active
-  end
-
-  create_table :comments, :force => true do |t|
-    t.integer :user_id
-    t.boolean :public
-  end
-end
-
-class User < ActiveRecord::Base
-  has_many :comments
-  has_many :all_comments, class_name: 'Comment', unscoped: true
-  has_one  :last_comment, class_name: 'Comment', order: 'id DESC', unscoped: true
-
-  default_scope where( active: true )
-end
-
-class Comment < ActiveRecord::Base
-  belongs_to :user, unscoped: true
-
-  default_scope where( public: true )
-end
+Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
   config.mock_with :rspec
   config.order = 'random'
 end

data/spec/support/models.rb

@@ -0,0 +1,16 @@
+class User < ActiveRecord::Base
+  has_many :comments
+  has_many :unscoped_comments, class_name: 'Comment', unscoped: true
+  has_one  :last_comment, class_name: 'Comment', order: 'created_at DESC'
+  has_one  :unscoped_last_comment, class_name: 'Comment', order: 'created_at DESC', unscoped: true
+
+  default_scope { where(active: true) }
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :scoped_user, class_name: 'User', foreign_key: 'user_id', unscoped: false
+  belongs_to :unscoped_user, class_name: 'User', foreign_key: 'user_id', unscoped: true
+
+  default_scope { where(public: true) }
+end

data/spec/support/schema.rb

@@ -0,0 +1,18 @@
+ActiveRecord::Base.establish_connection(
+  adapter: 'sqlite3',
+  database: ':memory:'
+)
+
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :users, force: true do |t|
+    t.boolean :active
+  end
+
+  create_table :comments, force: true do |t|
+    t.integer :user_id
+    t.boolean :public
+    t.timestamps
+  end
+end

data/spec/unscoped_associations_spec.rb

@@ -1,10 +1,50 @@
 require 'spec_helper'
 
 describe UnscopedAssociations do
-  it 'belongs_to with unscoped option should skip default_scope' do
-    user = User.create(:active => false)
-    comment = Comment.create(:user_id => user.id)
+  context 'unscoped association omits default_scope' do
+    it 'belongs_to' do
+      user = User.creatse(active: false)
+      comment = Comment.create(user_id: user.id)
 
-    expect(comment.user).to eq(user)
+      expect(comment.unscoped_user).to eq(user)
+    end
+
+    it 'has_many' do
+      user = User.create
+      comment = Comment.create(user_id: user.id, public: false)
+
+      expect(user.unscoped_comments).to be_present
+    end
+
+    it 'has_one' do
+      user = User.create
+      comment = Comment.create(user_id: user.id, public: false)
+
+      expect(user.unscoped_last_comment).to be_present
+    end
+  end
+
+  context 'no unscoped association takes default_scope' do
+    it 'belongs_to' do
+      user = User.create(active: false)
+      comment = Comment.create(user_id: user.id)
+
+      expect(comment.user).to be_nil
+      expect(comment.scoped_user).to be_nil
+    end
+
+    it 'has_many' do
+      user = User.create
+      comment = Comment.create(user_id: user.id, public: false)
+
+      expect(user.comments).to be_empty
+    end
+
+    it 'has_one' do
+      user = User.create
+      comment = Comment.create(user_id: user.id, public: false)
+
+      expect(user.last_comment).to be_nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unscoped_associations
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,6 +91,8 @@ files:
 - lib/unscoped_associations.rb
 - lib/unscoped_associations/version.rb
 - spec/spec_helper.rb
+- spec/support/models.rb
+- spec/support/schema.rb
 - spec/unscoped_associations_spec.rb
 - unscoped_associations.gemspec
 homepage: https://github.com/markets/unscoped_associations
@@ -120,4 +122,6 @@ specification_version: 3
 summary: Skip default_scope in your associations
 test_files:
 - spec/spec_helper.rb
+- spec/support/models.rb
+- spec/support/schema.rb
 - spec/unscoped_associations_spec.rb