scoped_associations 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04ccbeb140afbf311d49706224e27f270945e24
-  data.tar.gz: 357ec935059c9e0657f1eba5b22e35ddce8b31cf
+  metadata.gz: 9c920f87d0a7b46ba8aa7031eb49201b5be9b36f
+  data.tar.gz: 6f146f97633e3611894daa4e832f257cab5dfa28
 SHA512:
-  metadata.gz: 665ce8e29af580228fa003f7f9348a14ffedab668cef5ebff06b6eaabb41ea54b7b799060cd4948f9eded1afef0aa3ecaeda612516333b2e21f060aa9512d027
-  data.tar.gz: bcb5ac38011ce283316dec718b0a1711cf88748413b9b93b41fc353a34eb2d70c98a8ac59cfd43260410e7991270e5aeb1e45ce7c88ae3e6aca560bfb638e8e2
+  metadata.gz: 67099c7e7d825ec9253952c4e890801f145f259598d58604207e756bfc3fac0b3f18012e3799c743f80f4a5391bdbec76659644b11aff2c53bfb2c0b7120c049
+  data.tar.gz: 5b270420fbcd6612de18a6b0087d505e11f17b9085c3e48f2d921a60233b753befe3d1462e1bad75ec2d2c9a0876cd1ad95858871c1f9ad90d4389a3fffe0704

data/.travis.yml

@@ -4,10 +4,27 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "2.2.2"
+  - "2.3.0"
 
 gemfile:
   - "gemfiles/activerecord40.gemfile"
   - "gemfiles/activerecord41.gemfile"
   - "gemfiles/activerecord42.gemfile"
+  - "gemfiles/activerecord50.gemfile"
+  - "gemfiles/activerecord51.gemfile"
+
+matrix:
+  exclude:
+    - rvm: "1.9.3"
+      gemfile: "gemfiles/activerecord50.gemfile"
+    - rvm: "1.9.3"
+      gemfile: "gemfiles/activerecord51.gemfile"
+    - rvm: "2.0.0"
+      gemfile: "gemfiles/activerecord50.gemfile"
+    - rvm: "2.0.0"
+      gemfile: "gemfiles/activerecord51.gemfile"
+
+before_install:
+  - gem install bundler
 
 script: "bundle exec rake spec"

data/Appraisals

@@ -9,3 +9,11 @@ end
 appraise "activerecord42" do
   gem "activerecord", "4.2.1"
 end
+
+appraise "activerecord50" do
+  gem "activerecord", "~> 5.0.0"
+end
+
+appraise "activerecord51" do
+  gem "activerecord", ">= 5.1.0.rc1", "< 5.2"
+end

data/gemfiles/activerecord50.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~> 5.0.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord51.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", ">= 5.1.0.rc1", "< 5.2"
+
+gemspec :path => "../"

data/lib/scoped_associations/activerecord5/has_many.rb

@@ -0,0 +1,57 @@
+module ScopedAssociations
+  module ActiveRecord5
+    module HasManyClassMethods
+      def valid_options(options)
+        super + [:scoped]
+      end
+
+      def build(model, name, scope, options, &block)
+        reflection = super(model, name, scope, options, &block)
+        extend_reflection(reflection)
+        reflection
+      end
+
+      def extend_reflection(reflection)
+        if reflection.options[:scoped]
+          reflection.extend ReflectionExtension
+        end
+      end
+
+      class ScopedHasManyAssociation < ActiveRecord::Associations::HasManyAssociation
+        def creation_attributes
+          attributes = super
+          attributes[reflection.foreign_scope] = reflection.name.to_s
+          attributes
+        end
+      end
+
+      module ReflectionExtension
+        def foreign_scope
+          if options[:as]
+            "#{options[:as]}_scope"
+          else
+            name = active_record.name
+            name.underscore.demodulize + "_scope"
+          end
+        end
+
+        def scope
+          old_scope = super
+          scope_conditions = { foreign_scope => name }
+          proc_scope = proc { where(scope_conditions) }
+          if old_scope.nil?
+            proc { instance_eval(&proc_scope) }
+          else
+            proc { instance_eval(&proc_scope).instance_eval(&old_scope) }
+          end
+        end
+
+        def association_class
+          ScopedHasManyAssociation
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::Builder::HasMany.send :extend, ScopedAssociations::ActiveRecord5::HasManyClassMethods

data/lib/scoped_associations/activerecord5/has_one.rb

@@ -0,0 +1,57 @@
+module ScopedAssociations
+  module ActiveRecord5
+    module HasOne
+      def valid_options(options)
+        super + [:scoped]
+      end
+
+      def build(model, name, scope, options, &block)
+        reflection = super(model, name, scope, options, &block)
+        extend_reflection(reflection)
+        reflection
+      end
+
+      def extend_reflection(reflection)
+        if reflection.options[:scoped]
+          reflection.extend ReflectionExtension
+        end
+      end
+
+      class ScopedHasOneAssociation < ActiveRecord::Associations::HasOneAssociation
+        def creation_attributes
+          attributes = super
+          attributes[reflection.foreign_scope] = reflection.name.to_s
+          attributes
+        end
+      end
+
+      module ReflectionExtension
+        def foreign_scope
+          if options[:as]
+            "#{options[:as]}_scope"
+          else
+            name = active_record.name
+            name.underscore.demodulize + "_scope"
+          end
+        end
+
+        def scope
+          old_scope = super
+          scope_conditions = { foreign_scope => name }
+          proc_scope = proc { where(scope_conditions) }
+          if old_scope.nil?
+            proc { instance_eval(&proc_scope) }
+          else
+            proc { instance_eval(&proc_scope).instance_eval(&old_scope) }
+          end
+        end
+
+        def association_class
+          ScopedHasOneAssociation
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::Builder::HasOne.send :extend, ScopedAssociations::ActiveRecord5::HasOne

data/lib/scoped_associations/version.rb

@@ -1,3 +1,3 @@
 module ScopedAssociations
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/scoped_associations.rb

@@ -1,10 +1,9 @@
 if defined?(ActiveRecord::Base)
-  if ActiveRecord::VERSION::MAJOR == 4
+  if ActiveRecord::VERSION::MAJOR == 5
+    require 'scoped_associations/activerecord5/has_many'
+    require 'scoped_associations/activerecord5/has_one'
+  elsif ActiveRecord::VERSION::MAJOR == 4
     require 'scoped_associations/activerecord4/has_many'
     require 'scoped_associations/activerecord4/has_one'
-  elsif ActiveRecord::VERSION::MAJOR == 3
-    require 'scoped_associations/activerecord3/has_many'
-    require 'scoped_associations/activerecord3/has_one'
   end
 end
-

data/scoped_associations.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_dependency 'activerecord', ['>= 4.0', '< 4.3']
+  spec.add_dependency 'activerecord', ['>= 4.0', '< 5.2']
   spec.add_dependency 'activesupport'
 end

data/spec/spec_helper.rb

@@ -61,10 +61,7 @@ class Tag < ActiveRecord::Base
 end
 
 class Post < ActiveRecord::Base
-  has_one :primary_tag, as: :owner,
-          class_name: "Tag",
-          scoped: true
-
+  has_one :primary_tag, as: :owner, class_name: "Tag", scoped: true
   accepts_nested_attributes_for :primary_tag
 
   has_one :active_tag,
@@ -73,16 +70,20 @@ class Post < ActiveRecord::Base
           class_name: "Tag",
           scoped: true
 
+  has_one :secondary_tag, as: :owner, class_name: "Tag", scoped: true
 
+  has_one :primary_comment, class_name: "Comment", scoped: true
+  accepts_nested_attributes_for :primary_comment
 
-  has_one :secondary_tag, as: :owner,
-          class_name: "Tag",
+  has_one :secondary_comment, class_name: "Comment", scoped: true
+
+  has_one :active_comment,
+          -> { where(active: true) },
+          class_name: "Comment",
           scoped: true
 
-  has_many :primary_tags, as: :owner,
-           class_name: "Tag",
-           scoped: true
 
+  has_many :primary_tags, as: :owner, class_name: "Tag", scoped: true
   accepts_nested_attributes_for :primary_tags
 
   has_many :active_tags,
@@ -91,41 +92,17 @@ class Post < ActiveRecord::Base
            class_name: "Tag",
            scoped: true
 
-
-  has_many :secondary_tags,
-           as: :owner,
-           class_name: "Tag",
-           scoped: true
+  has_many :secondary_tags, as: :owner, class_name: "Tag", scoped: true
 
   has_many :comments
 
-  has_one :primary_comment,
-          class_name: "Comment",
-          scoped: true
-
-  has_one :active_comment,
-          -> { where(active: true) },
-          class_name: "Comment",
-          scoped: true
-
-  accepts_nested_attributes_for :primary_comment
-
-  has_one :secondary_comment,
-          class_name: "Comment",
-          scoped: true
+  has_many :primary_comments, class_name: "Comment", scoped: true
+  accepts_nested_attributes_for :primary_comments
 
-  has_many :primary_comments,
-           class_name: "Comment",
-           scoped: true
+  has_many :secondary_comments, class_name: "Comment", scoped: true
 
   has_many :active_comments,
            -> { where(active: true) },
            class_name: "Comment",
            scoped: true
-
-  accepts_nested_attributes_for :primary_comments
-
-  has_many :secondary_comments,
-           class_name: "Comment",
-           scoped: true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Stefano Verna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -149,16 +149,19 @@ files:
 - gemfiles/activerecord40.gemfile
 - gemfiles/activerecord41.gemfile
 - gemfiles/activerecord42.gemfile
+- gemfiles/activerecord50.gemfile
+- gemfiles/activerecord51.gemfile
 - lib/scoped_associations.rb
 - lib/scoped_associations/activerecord4/has_many.rb
 - lib/scoped_associations/activerecord4/has_one.rb
+- lib/scoped_associations/activerecord5/has_many.rb
+- lib/scoped_associations/activerecord5/has_one.rb
 - lib/scoped_associations/version.rb
 - scoped_associations.gemspec
 - spec/has_many_polymorphic_spec.rb
 - spec/has_many_spec.rb
 - spec/has_one_polymorphic_spec.rb
 - spec/has_one_spec.rb
-- spec/integration_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/stefanoverna/scoped_associations
 licenses:
@@ -180,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create multiple `has_to` and `has_many` associations between two ActiveRecord
@@ -190,5 +193,4 @@ test_files:
 - spec/has_many_spec.rb
 - spec/has_one_polymorphic_spec.rb
 - spec/has_one_spec.rb
-- spec/integration_spec.rb
 - spec/spec_helper.rb

data/spec/integration_spec.rb

@@ -1,186 +0,0 @@
-require 'spec_helper'
-
-describe 'ScopedAssociations' do
-  let(:post) { Post.new }
-
-  context "non polymorphic" do
-
-    describe "has_one" do
-      it "works with direct assignment" do
-        post.secondary_comment = Comment.new(comment: "foo")
-        post.save!
-        post.reload
-
-        expect(post.secondary_comment).to be_present
-        expect(post.primary_comment).to be_nil
-      end
-
-      it "works with nested attributes" do
-        post = Post.new(primary_comment_attributes: { comment: "foo" })
-        post.save!
-        post.reload
-
-        expect(post.primary_comment).to be_present
-        expect(post.secondary_comment).to be_nil
-      end
-
-      it "works with .build" do
-        post.build_secondary_comment(comment: "foo")
-        post.save!
-        post.reload
-
-        expect(post.secondary_comment).to be_present
-        expect(post.primary_comment).to be_nil
-      end
-    end
-
-    describe "has_many" do
-      it "works with direct assignment" do
-        post.secondary_comments = [ Comment.new(comment: "foo") ]
-        post.save!
-
-        post.reload
-        expect(post.secondary_comments.size).to eq 1
-        expect(post.primary_comments.size).to eq 0
-      end
-
-      it "works with <<" do
-        post.save
-        post.secondary_comments << Comment.new(comment: "foo")
-
-        post.reload
-        expect(post.secondary_comments.size).to eq 1
-        expect(post.primary_comments.size).to eq 0
-      end
-
-      it "works with .build" do
-        post.secondary_comments.build(comment: "foo")
-        post.save
-
-        post.reload
-        expect(post.secondary_comments.size).to eq 1
-        expect(post.primary_comments.size).to eq 0
-      end
-
-      it "works with nested attributes" do
-        post = Post.new(primary_comments_attributes: [ { comment: "foo" } ])
-        post.save!
-        post.reload
-
-        expect(post.primary_comments.size).to eq 1
-        expect(post.secondary_comments.size).to eq 0
-      end
-    end
-
-    describe "using more relation" do
-      before do
-        post.primary_comment = Comment.new(comment: "foo")
-        post.primary_comments.build(comment: "bar")
-        post.save!
-        post.reload
-      end
-
-      it "has one element" do
-        expect(post.primary_comment).to be_present
-      end
-
-      it "has many has 1 elements" do
-        expect(post.primary_comments.size).to eq(1)
-      end
-
-      it "not contain the has_one element inside has_many elements" do
-        expect(post.primary_comments).to_not include(post.primary_comment)
-      end
-    end
-  end
-
-  context "polymorphic" do
-    describe "has_one" do
-      it "works with direct assignment" do
-        post.secondary_tag = Tag.new(name: "foo")
-        post.save!
-        post.reload
-
-        expect(post.secondary_tag).to be_present
-        expect(post.primary_tag).to be_nil
-      end
-
-      it "works with nested attributes" do
-        post = Post.new(primary_tag_attributes: { name: "foo" })
-        post.save!
-        post.reload
-
-        expect(post.primary_tag).to be_present
-        expect(post.secondary_tag).to be_nil
-      end
-
-      it "works with .build" do
-        post.build_secondary_tag(name: "foo")
-        post.save!
-        post.reload
-
-        expect(post.secondary_tag).to be_present
-        expect(post.primary_tag).to be_nil
-      end
-    end
-
-    describe "has_many" do
-      it "works with direct assignment" do
-        post.secondary_tags = [ Tag.new(name: "foo") ]
-        post.save!
-
-        post.reload
-        expect(post.secondary_tags.size).to eq 1
-        expect(post.primary_tags.size).to eq 0
-      end
-
-      it "works with <<" do
-        post.save
-        post.secondary_tags << Tag.new(name: "foo")
-
-        post.reload
-        expect(post.secondary_tags.size).to eq 1
-        expect(post.primary_tags.size).to eq 0
-      end
-
-      it "works with .build" do
-        post.secondary_tags.build(name: "foo")
-        post.save
-
-        post.reload
-        expect(post.secondary_tags.size).to eq 1
-        expect(post.primary_tags.size).to eq 0
-      end
-
-      it "works with nested attributes" do
-        post = Post.new(primary_tags_attributes: [ { name: "foo" } ])
-        post.save!
-        post.reload
-
-        expect(post.primary_tags.size).to eq 1
-        expect(post.secondary_tags.size).to eq 0
-      end
-    end
-
-    describe "using more relation" do
-      before do
-        post.primary_tag = Tag.new(name: "foo")
-        post.primary_tags.build(name: "bar")
-        post.save!
-        post.reload
-      end
-
-      it "has one element" do
-        expect(post.primary_tag).to be_present
-      end
-
-      it "has many has 1 elements" do
-        expect(post.primary_tags.size).to eq(1)
-      end
-
-      it "not contain the has_one element inside has_many elements" do
-        expect(post.primary_tags).to_not include(post.primary_tag)
-      end
-    end
-  end
-end