active_record-acts_as 1.0.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ec0528a63347a0575f88a79865139353ed16b2
-  data.tar.gz: 03ff53a5a895ef19f2d740e85327f93afa76dafc
+  metadata.gz: e23d681d9272dad587e888164a0a1699cac86717
+  data.tar.gz: e2fca48672513bae073e702cfdd5631241f1b6d1
 SHA512:
-  metadata.gz: d4a00877c147b27f50ecc2abaf15abe4578e2ee5cdf45b2c6c3b9acbae4e2bc3f78700bbb0da94e07ed36d685a707bd71033759e88a07b5added7b22c89d01bb
-  data.tar.gz: cfd9cd5ba545e01f676f418c09b5cb161d83428c44869e8dd95f28f014c71474a93a469004dffb987c9460093603ff2a2673e90df9604aaaa61c6541c83b14a7
+  metadata.gz: 54e3c3e84139c8ac514e13366cb02d3411a1cd9becbe4bbed6b6aa9b3045151a03f8dde9a7c29d287d82972f6c52e4fe8ff7860c6d94cef21d4f09d8e15af295
+  data.tar.gz: 323da76a14e32627d7b52395a3244c87e813fa6df650df302983e0ca51ed815c81129cdf2e57ba5a47f3f7b09cd45bfce37c196c29dd0ba91f784b5762b93201

data/.gitignore

@@ -21,4 +21,5 @@ tmp
 *.a
 mkmf.log
 .ruby-gemset
-.ruby-version
+.ruby-version
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.0
-  - 2.2.3
-  - 2.1.7
-  - 2.0.0
-  - 1.9.3
+  - 2.2.5
+  - 2.3.1
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'rails-4.2' do
+  gem 'rails', '~> 4.2.0'
+end
+
+appraise 'rails-5.0' do
+  gem 'rails', '~> 5.0.0'
+end

data/README.md

@@ -21,7 +21,9 @@ a separate table for each product type, i.e. a `pens` table with `color` column.
 
 ## Requirements
 
-`AciveRecord ~> 4.1.2` or newest
+* Ruby >= 2.2
+* ActiveSupport >= 4.2
+* ActiveRecord >= 4.2
 
 ## Installation
 

data/active_record-acts_as.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'active_record/acts_as/version'
 
 Gem::Specification.new do |spec|
@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 1.9"
+  spec.required_ruby_version = ">= 2.2"
 
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "appraisal", "~> 2.1"
 
-  spec.add_dependency "activesupport", "~> 4"
-  spec.add_dependency "activerecord", "~> 4", ">= 4.1.2"
+  spec.add_dependency "activesupport", ">= 4.2"
+  spec.add_dependency "activerecord", ">= 4.2"
 end

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "coveralls", :require => false
+gem "rails", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

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

data/lib/active_record/acts_as/class_methods.rb

@@ -1,13 +1,15 @@
 module ActiveRecord
   module ActsAs
-    module ClassMethods
-      def self.included(module_)
-        module_.alias_method_chain :_reflections, :acts_as
+    module ReflectionsWithActsAs
+      def _reflections
+        @_reflections_acts_as_cache ||=
+          super.reverse_merge(acting_as_model._reflections)
       end
+    end
 
-      def _reflections_with_acts_as
-        @_reflections_acts_as_cache ||=
-          _reflections_without_acts_as.reverse_merge(acting_as_model._reflections)
+    module ClassMethods
+      def self.included(module_)
+        module_.prepend ReflectionsWithActsAs
       end
 
       def validators_on(*args)

data/lib/active_record/acts_as/migration.rb

@@ -16,7 +16,7 @@ module ActiveRecord
         def remove_actable(options = {})
           name = options.delete(:as) || :actable
           options[:polymorphic] = true
-          @base.remove_reference(@table_name, name, options)
+          @base.remove_reference(@name, name, options)
         end
       end
     end

data/lib/active_record/acts_as/querying.rb

@@ -1,25 +1,30 @@
-
 module ActiveRecord
-  module QueryMethods
-    def where_with_acts_as(opts = :chain, *rest)
-      if acting_as? && opts.is_a?(Hash)
-        opts, acts_as_opts = opts.stringify_keys.partition { |k,v| attribute_method?(k) }
-        opts, acts_as_opts = Hash[opts], Hash[acts_as_opts]
-        opts[acting_as_model.table_name] = acts_as_opts unless acts_as_opts.empty?
+  module ActsAs
+    module QueryMethods
+      def where(opts = :chain, *rest)
+        if acting_as? && opts.is_a?(Hash)
+          opts = opts.merge(opts.delete(klass.table_name) || {})
+
+          opts, acts_as_opts = opts.stringify_keys.partition { |k,v| attribute_method?(k) }
+          opts, acts_as_opts = Hash[opts], Hash[acts_as_opts]
+          opts[acting_as_model.table_name] = acts_as_opts unless acts_as_opts.empty?
+        end
+
+        super
       end
-      where_without_acts_as(opts, *rest)
     end
-    alias_method_chain :where, :acts_as
-  end
 
-  class Relation
-    def scope_for_create_with_acts_as
-      @scope_for_create ||= if acting_as?
-        where_values_hash.merge(where_values_hash(acting_as_model.table_name)).merge(create_with_value)
-      else
-        where_values_hash.merge(create_with_value)
+    module ScopeForCreate
+      def scope_for_create
+        @scope_for_create ||= if acting_as?
+          where_values_hash.merge(where_values_hash(acting_as_model.table_name)).merge(create_with_value)
+        else
+          where_values_hash.merge(create_with_value)
+        end
       end
     end
-    alias_method_chain :scope_for_create, :acts_as
   end
+
+  Relation.send(:prepend, ActsAs::QueryMethods)
+  Relation.send(:prepend, ActsAs::ScopeForCreate)
 end

data/lib/active_record/acts_as/relation.rb

@@ -7,12 +7,22 @@ module ActiveRecord
       module ClassMethods
         def acts_as(name, scope = nil, options = {})
           options, scope = scope, nil if Hash === scope
+          association_method = options.delete(:association_method)
           options = {as: :actable, dependent: :destroy, validate: false, autosave: true}.merge options
 
           cattr_reader(:validates_actable) { options.delete(:validates_actable) == false ? false : true }
 
           reflections = has_one name, scope, options
-          default_scope -> { includes(name) }
+          default_scope -> {
+            case association_method
+              when :eager_load
+                eager_load(name)
+              when :joins
+                joins(name)
+              else
+                includes(name)
+            end
+          }
           validate :actable_must_be_valid
           after_update :touch_actable
 

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "1.0.8"
+    VERSION = "2.0.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -349,4 +349,54 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(subject.acting_as_model).to eq Inventory::ProductFeature
     end
   end
+
+  context 'different association_methods' do
+    before(:each) do
+      Object.send(:remove_const, :Pen)
+    end
+
+    it "should not include the selected attribute when associating using 'eager_load'" do
+      class Pen < ActiveRecord::Base
+        acts_as :product , {association_method: :eager_load}
+        store_accessor :settings, :option1
+        validates_presence_of :color
+      end
+      Pen.create pen_attributes
+
+      expect(Pen.select("'something' as thing").first['thing']).to be_nil
+    end
+
+    it "should include the selected attribute in the model when associating using 'includes'" do
+      class Pen < ActiveRecord::Base
+        acts_as :product , {association_method: :includes}
+        store_accessor :settings, :option1
+        validates_presence_of :color
+      end
+      Pen.create pen_attributes
+
+      expect(Pen.select("'something' as thing").first['thing']).to eq 'something'
+    end
+
+    it "should include the selected attribute in the model not specifying an association_method" do
+      class Pen < ActiveRecord::Base
+        acts_as :product
+        store_accessor :settings, :option1
+        validates_presence_of :color
+      end
+      Pen.create pen_attributes
+
+      expect(Pen.select("'something' as thing").first['thing']).to eq 'something'
+    end
+
+    it "should include a selected attribute from the parent when associating using 'joins'" do
+      class Pen < ActiveRecord::Base
+        acts_as :product, {association_method: :joins}
+        store_accessor :settings, :option1
+        validates_presence_of :color
+      end
+      Pen.create pen_attributes
+
+      expect(Pen.select("price as thing").first['thing']).to eq 0.8
+    end
+  end
 end

data/spec/migrations_spec.rb

@@ -5,22 +5,77 @@ require 'active_record/acts_as'
 class Product < ActiveRecord::Base
 end
 
+class RemoveActableFromProducts < ActiveRecord::Migration
+  def change
+    change_table(:products) do |t|
+      t.remove_actable
+    end
+  end
+end
+
+class RemoveProduceableFromProducts < ActiveRecord::Migration
+  def change
+    change_table(:products) do |t|
+      t.remove_actable(as: :produceable)
+    end
+  end
+end
 
 RSpec.describe ".actable" do
   context "in .create_table block" do
     after { initialize_schema }
     context "with :as options" do
-      it "creates plymorphic reference columns with given name" do
+      it "creates polymorphic reference columns with given name" do
         initialize_database { create_table(:products) { |t| t.actable(as: :produceable) } }
         expect(Product.column_names).to include('produceable_id', 'produceable_type')
       end
     end
 
     context "with no args" do
-      it "creates plymorphic reference columns" do
+      it "creates polymorphic reference columns" do
         initialize_database { create_table(:products) { |t| t.actable } }
         expect(Product.column_names).to include('actable_id', 'actable_type')
       end
     end
   end
 end
+
+RSpec.describe ".remove_actable" do
+  context "in .modify_table block" do
+    after { initialize_schema }
+
+    context "with :as options" do
+      before do
+        initialize_database do
+          create_table(:products) do |t|
+            t.string :name
+            t.actable(as: :produceable)
+          end
+        end
+      end
+      it "removes polymorphic reference columns with given name" do
+        mig = RemoveProduceableFromProducts.new
+        mig.exec_migration(ActiveRecord::Base.connection, :up)
+        Product.reset_column_information
+        expect(Product.column_names).not_to include('produceable_id', 'produceable_type')
+      end
+    end
+
+    context "with no args" do
+      before do
+        initialize_database do
+          create_table(:products) do |t|
+            t.string :name
+            t.actable
+          end
+        end
+      end
+      it "creates polymorphic reference columns" do
+        mig = RemoveActableFromProducts.new
+        mig.exec_migration(ActiveRecord::Base.connection, :up)
+        Product.reset_column_information
+        expect(Product.column_names).not_to include('actable_id', 'actable_type')
+      end
+    end
+  end
+end

data/spec/models.rb

@@ -80,7 +80,7 @@ def initialize_schema
     create_table :inventory_product_features do |t|
       t.string :name
       t.float :price
-      t.actable
+      t.actable index: { name: 'index_inventory_product_features_on_actable' }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -67,39 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
+        version: '2.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '4.2'
 description: Simulate multi-table inheritance for activerecord models using a plymorphic
   association
 email:
@@ -111,11 +119,14 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - active_record-acts_as.gemspec
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - lib/active_record/acts_as.rb
 - lib/active_record/acts_as/class_methods.rb
 - lib/active_record/acts_as/instance_methods.rb
@@ -144,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -152,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models
@@ -165,3 +176,4 @@ test_files:
 - spec/models.rb
 - spec/rspec_matchers_spec.rb
 - spec/spec_helper.rb
+has_rdoc: