active_record_inherit_assoc 1.1.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 68f5c1fa10a139e363086482ac9016918c6a9cc2
+  data.tar.gz: 4bbd75ce69f53018564f83dacf7d4f305d3e57d0
+SHA512:
+  metadata.gz: d09953245b3770aeaeaf21c29bb5d1a940abdacae4c8f15356b2aab5af1134f5043fa90011d4b0e208f6c89b80489654147bfbe3c63d56c6728ed6978b619322
+  data.tar.gz: c69f7e24d708a3dd0f68b86715119068c9eabdac447046c8fcb87af4ccf37c62975b306fee004b5e0d29d6dce33b0bbc7f77ad922788137b69e4f296b91683be

data/.travis.yml

@@ -1,16 +1,8 @@
 script: "bundle exec rake test"
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0
+  - 2.1.1
 gemfile:
-  - gemfiles/rails2.3.gemfile
-  - gemfiles/rails3.0.gemfile
-  - gemfiles/rails3.1.gemfile
   - gemfiles/rails3.2.gemfile
-matrix:
-  exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/rails2.3.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails3.0.gemfile
+  - gemfiles/rails4.gemfile

data/Appraisals

@@ -1,15 +1,7 @@
-appraise "rails2.3" do
-  gem "activerecord", "~> 2.3.14", :require => 'active_record'
-end
-
-appraise "rails3.0" do
-  gem "activerecord", "~> 3.0.15", :require => 'active_record'
-end
-
-appraise "rails3.1" do
-  gem "activerecord", "~> 3.1.0", :require => 'active_record'
-end
-
 appraise "rails3.2" do
   gem "activerecord", "~> 3.2.0", :require => 'active_record'
 end
+
+appraise "rails4" do
+  gem "activerecord", "~> 4.0", :require => 'active_record'
+end

data/Gemfile

@@ -1,8 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'appraisal'
+gem 'minitest'
+gem 'appraisal', '< 1'
 gem 'rake'
 gem 'rails'
 gem 'bundler'
@@ -12,5 +13,7 @@ gem 'shoulda'
 gem 'jeweler'
 gem 'ruby-debug', :platforms => :ruby_18
 gem 'debugger', :platforms => :ruby_19
+gem 'byebug', :platforms => [:ruby_20, :ruby_21]
 gem 'test-unit', '>=2.5.1'
 gem 'activerecord', :require => 'active_record'
+gem "activesupport"

data/active_record_inherit_assoc.gemspec

@@ -1,13 +1,13 @@
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 name = "active_record_inherit_assoc"
 
-Gem::Specification.new name, "1.1.0" do |s|
+Gem::Specification.new name, "2.0.0" do |s|
   s.summary = "Attribute inheritance for AR associations"
   s.authors = ["Ben Osheroff"]
   s.email = ["ben@gimbo.net"]
   s.files = `git ls-files`.split("\n")
   s.license = "Apache License Version 2.0"
   s.homepage = "http://github.com/zendesk/#{name}"
-  s.add_runtime_dependency "activerecord"
+  s.add_runtime_dependency "activerecord", ">=3.2.0", "< 5"
 end
 

data/gemfiles/rails3.2.gemfile

@@ -1,8 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
-gem "appraisal"
+gem "minitest"
+gem "appraisal", "< 1"
 gem "rake"
 gem "rails"
 gem "bundler"
@@ -12,7 +13,9 @@ gem "shoulda"
 gem "jeweler"
 gem "ruby-debug", :platforms=>:ruby_18
 gem "debugger", :platforms=>:ruby_19
+gem "byebug", :platforms=>[:ruby_20, :ruby_21]
 gem "test-unit", ">=2.5.1"
+gem "activesupport"
 gem "activerecord", "~> 3.2.0", :require=>"active_record"
 
 gemspec :path=>"../"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,18 +1,18 @@
 PATH
-  remote: /Users/staugaard/code/active_record_inherit_assoc
+  remote: ../
   specs:
-    active_record_inherit_assoc (1.1.0)
-      activerecord
+    active_record_inherit_assoc (2.0.0)
+      activerecord (>= 3.2.0, < 5)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
+      mail (~> 2.5.4)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -20,93 +20,138 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    addressable (2.3.6)
     appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
+    arel (3.0.3)
     builder (3.0.4)
-    bump (0.4.1)
-    columnize (0.3.6)
-    debugger (1.5.0)
+    bump (0.5.0)
+    byebug (3.1.2)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+    columnize (0.8.9)
+    debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
+    debugger-ruby_core_source (1.3.5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.2)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.7)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.1.0)
+    highline (1.6.21)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     journey (1.0.4)
-    json (1.7.7)
+    json (1.8.1)
+    jwt (1.0.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.2)
-    polyglot (0.3.3)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    minitest (5.3.5)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    polyglot (0.3.5)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (0.9.5)
-      actionmailer (>= 0.6.1)
-      actionpack (>= 1.4.0)
-      activerecord (>= 1.6.0)
-      rake (>= 0.4.15)
-    rake (10.0.4)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
+      bundler (~> 1.0)
+      railties (= 3.2.18)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.2)
     rbx-require-relative (0.0.9)
-    rdoc (4.0.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    shoulda (3.4.0)
+    shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.1)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    test-unit (2.5.4)
-    tilt (1.4.0)
-    treetop (1.4.12)
+    sqlite3 (1.3.9)
+    test-unit (2.5.5)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
@@ -114,11 +159,14 @@ PLATFORMS
 DEPENDENCIES
   active_record_inherit_assoc!
   activerecord (~> 3.2.0)
-  appraisal
+  activesupport
+  appraisal (< 1)
   bump
   bundler
+  byebug
   debugger
   jeweler
+  minitest
   rails
   rake
   ruby-debug

data/gemfiles/{rails2.3.gemfile → rails4.gemfile}

@@ -1,8 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
-gem "appraisal"
+gem "minitest"
+gem "appraisal", "< 1"
 gem "rake"
 gem "rails"
 gem "bundler"
@@ -12,7 +13,9 @@ gem "shoulda"
 gem "jeweler"
 gem "ruby-debug", :platforms=>:ruby_18
 gem "debugger", :platforms=>:ruby_19
+gem "byebug", :platforms=>[:ruby_20, :ruby_21]
 gem "test-unit", ">=2.5.1"
-gem "activerecord", "~> 2.3.14", :require=>"active_record"
+gem "activesupport"
+gem "activerecord", "~> 4.0", :require=>"active_record"
 
 gemspec :path=>"../"

data/gemfiles/rails4.gemfile.lock

@@ -0,0 +1,174 @@
+PATH
+  remote: ../
+  specs:
+    active_record_inherit_assoc (2.0.0)
+      activerecord (>= 3.2.0, < 5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.2)
+      actionpack (= 4.1.2)
+      actionview (= 4.1.2)
+      mail (~> 2.5.4)
+    actionpack (4.1.2)
+      actionview (= 4.1.2)
+      activesupport (= 4.1.2)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.2)
+      activesupport (= 4.1.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.2)
+      activesupport (= 4.1.2)
+      builder (~> 3.1)
+    activerecord (4.1.2)
+      activemodel (= 4.1.2)
+      activesupport (= 4.1.2)
+      arel (~> 5.0.0)
+    activesupport (4.1.2)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    bump (0.5.0)
+    byebug (3.1.2)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+    columnize (0.8.9)
+    debugger (1.6.8)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    erubis (2.7.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.7)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.1.0)
+    highline (1.6.21)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    json (1.8.1)
+    jwt (1.0.0)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    minitest (5.3.5)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    polyglot (0.3.5)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.2)
+      actionmailer (= 4.1.2)
+      actionpack (= 4.1.2)
+      actionview (= 4.1.2)
+      activemodel (= 4.1.2)
+      activerecord (= 4.1.2)
+      activesupport (= 4.1.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.2)
+      sprockets-rails (~> 2.0)
+    railties (4.1.2)
+      actionpack (= 4.1.2)
+      activesupport (= 4.1.2)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    rbx-require-relative (0.0.9)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.1)
+      activesupport (>= 3.0.0)
+    sprockets (2.12.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    test-unit (2.5.5)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_record_inherit_assoc!
+  activerecord (~> 4.0)
+  activesupport
+  appraisal (< 1)
+  bump
+  bundler
+  byebug
+  debugger
+  jeweler
+  minitest
+  rails
+  rake
+  ruby-debug
+  shoulda
+  sqlite3
+  test-unit (>= 2.5.1)

data/lib/active_record_inherit_assoc.rb

@@ -1,9 +1,30 @@
 require 'active_record'
 
-if ActiveRecord::VERSION::STRING < "3.1"
-  require 'active_record_inherit_assoc/ar_23_and_30'
+if ActiveRecord::VERSION::MAJOR < 4
+  ActiveRecord::Associations::Builder::HasMany.valid_options   << :inherit
+  ActiveRecord::Associations::Builder::HasOne.valid_options    << :inherit
+  ActiveRecord::Associations::Builder::BelongsTo.valid_options << :inherit
 else
-  require 'active_record_inherit_assoc/ar_31_and_32'
+  ActiveRecord::Associations::Builder::Association.valid_options << :inherit
+end
+
+ActiveRecord::Associations::Association.class_eval do
+  def association_scope_with_value_inheritance
+    if inherited_attributes = attribute_inheritance_hash
+      association_scope_without_value_inheritance.where(inherited_attributes)
+    else
+      association_scope_without_value_inheritance
+    end
+  end
+
+  alias_method_chain :association_scope, :value_inheritance
+
+  private
+
+  def attribute_inheritance_hash
+    return nil unless reflection.options[:inherit]
+    Array(reflection.options[:inherit]).inject({}) { |hash, obj| hash[obj] = owner.send(obj) ; hash }
+  end
 end
 
 class ActiveRecord::Base

data/test/helper.rb

@@ -2,8 +2,14 @@ require 'bundler'
 Bundler.setup
 Bundler.require
 
+if ActiveRecord::VERSION::MAJOR == 4
+  # voodoo!
+  require 'minitest/autorun'
+end
+
 require 'active_support/test_case'
 
+
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
   :database => ":memory:"

data/test/test_inherit_assoc.rb

@@ -5,7 +5,9 @@ class TestInheritAssoc < ActiveSupport::TestCase
     has_many :others, :inherit => :account_id
     has_one :third, :inherit => :account_id
     has_many :fourths, :inherit => [:account_id, :blah_id]
-    has_many :conditional_others, :inherit => :account_id, :conditions => {:val => "foo"}, :class_name => "Other"
+    if ActiveRecord::VERSION::MAJOR < 4
+      has_many :conditional_others, :inherit => :account_id, :conditions => {:val => "foo"}, :class_name => "Other"
+    end
   end
 
   class Other < ActiveRecord::Base
@@ -32,16 +34,31 @@ class TestInheritAssoc < ActiveSupport::TestCase
       assert_equal 2, @main.others.size
     end
 
-    should "set conditions on find" do
-      assert_equal 2, @main.others.find(:all).size
-    end
+    if ActiveRecord::VERSION::MAJOR < 4
+      should "set conditions on find" do
+        assert_equal 2, @main.others.find(:all).size
+      end
 
-    should "merge conditions on find" do
-      assert_equal 1, @main.others.all(:conditions => "val = 'foo'").size
-    end
+      should "merge conditions on find" do
+        assert_equal 1, @main.others.all(:conditions => "val = 'foo'").size
+      end
+
+      should "merge conditions" do
+        assert_equal 1, @main.conditional_others.size
+      end
+    else
+      should "set conditions on find" do
+        assert_equal 2, @main.others.all.size
+      end
+
+      should "merge conditions on find" do
+        assert_equal 1, @main.others.all.where("val = 'foo'").size
+      end
+
+      should_eventually "merge conditions" do
+        assert_equal 1, @main.conditional_others.size
+      end
 
-    should "merge conditions" do
-      assert_equal 1, @main.conditional_others.size
     end
   end
 
@@ -95,5 +112,4 @@ class TestInheritAssoc < ActiveSupport::TestCase
     other = main.create_third
     assert_equal main.account_id, other.account_id
   end
-
 end

metadata

@@ -1,32 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inherit_assoc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: 
 email:
 - ben@gimbo.net
@@ -34,25 +37,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - active_record_inherit_assoc.gemspec
-- gemfiles/rails2.3.gemfile
-- gemfiles/rails2.3.gemfile.lock
-- gemfiles/rails3.0.gemfile
-- gemfiles/rails3.0.gemfile.lock
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.1.gemfile.lock
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
+- gemfiles/rails4.gemfile
+- gemfiles/rails4.gemfile.lock
 - lib/active_record_inherit_assoc.rb
-- lib/active_record_inherit_assoc/ar_23_and_30.rb
-- lib/active_record_inherit_assoc/ar_31_and_32.rb
 - test/helper.rb
 - test/schema.rb
 - test/test_belongs_to_association.rb
@@ -60,32 +57,25 @@ files:
 homepage: http://github.com/zendesk/active_record_inherit_assoc
 licenses:
 - Apache License Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 738801861665246186
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 738801861665246186
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attribute inheritance for AR associations
 test_files: []

data/gemfiles/rails2.3.gemfile.lock

@@ -1,81 +0,0 @@
-PATH
-  remote: /Users/staugaard/code/active_record_inherit_assoc
-  specs:
-    active_record_inherit_assoc (1.1.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.18)
-      actionpack (= 2.3.18)
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activerecord (2.3.18)
-      activesupport (= 2.3.18)
-    activeresource (2.3.18)
-      activesupport (= 2.3.18)
-    activesupport (2.3.18)
-    appraisal (0.5.2)
-      bundler
-      rake
-    bump (0.4.1)
-    columnize (0.3.6)
-    debugger (1.5.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    rack (1.1.6)
-    rails (2.3.18)
-      actionmailer (= 2.3.18)
-      actionpack (= 2.3.18)
-      activerecord (= 2.3.18)
-      activeresource (= 2.3.18)
-      activesupport (= 2.3.18)
-      rake (>= 0.8.3)
-    rake (10.0.4)
-    rbx-require-relative (0.0.9)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.2)
-    shoulda-matchers (1.0.0)
-    sqlite3 (1.3.7)
-    test-unit (2.5.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record_inherit_assoc!
-  activerecord (~> 2.3.14)
-  appraisal
-  bump
-  bundler
-  debugger
-  jeweler
-  rails
-  rake
-  ruby-debug
-  shoulda
-  sqlite3
-  test-unit (>= 2.5.1)

data/gemfiles/rails3.0.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "appraisal"
-gem "rake"
-gem "rails"
-gem "bundler"
-gem "bump"
-gem "sqlite3"
-gem "shoulda"
-gem "jeweler"
-gem "ruby-debug", :platforms=>:ruby_18
-gem "debugger", :platforms=>:ruby_19
-gem "test-unit", ">=2.5.1"
-gem "activerecord", "~> 3.0.15", :require=>"active_record"
-
-gemspec :path=>"../"

data/gemfiles/rails3.0.gemfile.lock

@@ -1,120 +0,0 @@
-PATH
-  remote: /Users/staugaard/code/active_record_inherit_assoc
-  specs:
-    active_record_inherit_assoc (1.1.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.20)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (2.0.10)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (2.1.2)
-    bump (0.4.1)
-    columnize (0.3.6)
-    debugger (1.5.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    polyglot (0.3.3)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (0.9.5)
-      actionmailer (>= 0.6.1)
-      actionpack (>= 1.4.0)
-      activerecord (>= 1.6.0)
-      rake (>= 0.4.15)
-    rake (10.0.4)
-    rbx-require-relative (0.0.9)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (3.4.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    sqlite3 (1.3.7)
-    test-unit (2.5.4)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record_inherit_assoc!
-  activerecord (~> 3.0.15)
-  appraisal
-  bump
-  bundler
-  debugger
-  jeweler
-  rails
-  rake
-  ruby-debug
-  shoulda
-  sqlite3
-  test-unit (>= 2.5.1)

data/gemfiles/rails3.1.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "appraisal"
-gem "rake"
-gem "rails"
-gem "bundler"
-gem "bump"
-gem "sqlite3"
-gem "shoulda"
-gem "jeweler"
-gem "ruby-debug", :platforms=>:ruby_18
-gem "debugger", :platforms=>:ruby_19
-gem "test-unit", ">=2.5.1"
-gem "activerecord", "~> 3.1.0", :require=>"active_record"
-
-gemspec :path=>"../"

data/gemfiles/rails3.1.gemfile.lock

@@ -1,128 +0,0 @@
-PATH
-  remote: /Users/staugaard/code/active_record_inherit_assoc
-  specs:
-    active_record_inherit_assoc (1.1.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.12)
-      actionpack (= 3.1.12)
-      mail (~> 2.4.4)
-    actionpack (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (2.2.3)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (3.0.4)
-    bump (0.4.1)
-    columnize (0.3.6)
-    debugger (1.5.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
-    erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.2)
-    i18n (0.6.4)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.2)
-    polyglot (0.3.3)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (0.9.5)
-      actionmailer (>= 0.6.1)
-      actionpack (>= 1.4.0)
-      activerecord (>= 1.6.0)
-      rake (>= 0.4.15)
-    rake (10.0.4)
-    rbx-require-relative (0.0.9)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (3.4.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    test-unit (2.5.4)
-    tilt (1.4.0)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_record_inherit_assoc!
-  activerecord (~> 3.1.0)
-  appraisal
-  bump
-  bundler
-  debugger
-  jeweler
-  rails
-  rake
-  ruby-debug
-  shoulda
-  sqlite3
-  test-unit (>= 2.5.1)

data/lib/active_record_inherit_assoc/ar_23_and_30.rb

@@ -1,75 +0,0 @@
-require 'active_record'
-require 'active_record/base'
-require 'active_record/reflection'
-require 'active_record/associations/association_proxy'
-require 'active_record/associations/association_collection'
-
-ActiveRecord::Base.valid_keys_for_has_many_association   << :inherit
-ActiveRecord::Base.valid_keys_for_has_one_association    << :inherit
-ActiveRecord::Base.valid_keys_for_belongs_to_association << :inherit
-
-module ActiveRecord
-  module Associations
-    AssociationProxy.class_eval do
-      def conditions_with_value_inheritance
-        return conditions_without_value_inheritance unless @reflection.klass.respond_to?(:sanitize_sql) # ActiveHash TODO test this!
-        copied_merge_conditions(attribute_inheritance_hash, conditions_without_value_inheritance)
-      end
-
-      alias_method_chain :conditions, :value_inheritance
-
-      private
-
-      # copied from activerecord 2.3 to fix compatability with 3.0
-      # Merges conditions so that the result is a valid +condition+
-      def copied_merge_conditions(*conditions)
-        segments = []
-
-        conditions.each do |condition|
-          unless condition.blank?
-            sql = sanitize_sql(condition)
-            segments << sql unless sql.blank?
-          end
-        end
-
-        "(#{segments.join(') AND (')})" unless segments.empty?
-      end
-
-      def attribute_inheritance_hash
-        return {} unless @reflection.options[:inherit]
-        Array(@reflection.options[:inherit]).inject({}) { |hash, obj| hash[obj] = @owner.send(obj) ; hash }
-      end
-    end
-
-    AssociationCollection.class_eval do
-      # this is *maybe* not the correct place to patch in, but it covers all the cases
-      # without having to patch build, create, create!, etc
-      def add_record_to_target_with_callbacks_with_value_inheritance(record, &block)
-        attribute_inheritance_hash.each do |k, v|
-          record[k] = v
-        end
-        add_record_to_target_with_callbacks_without_value_inheritance(record, &block)
-      end
-
-      alias_method_chain :add_record_to_target_with_callbacks, :value_inheritance
-    end
-
-    HasOneAssociation.class_eval do
-      def create_with_value_inheritance(attrs = {}, replace_existing = true)
-        attrs ||= {}
-        create_without_value_inheritance(attribute_inheritance_hash.merge(attrs), replace_existing)
-      end
-
-      def create_with_value_inheritance!(attrs = {}, replace_existing = true)
-        attrs ||= {}
-        create_without_value_inheritance!(attribute_inheritance_hash.merge(attrs), replace_existing)
-      end
-
-      def build_with_value_inheritance(attrs = {}, replace_existing = true)
-        attrs ||= {}
-        build_without_value_inheritance(attribute_inheritance_hash.merge(attrs), replace_existing)
-      end
-      [:create, :create!, :build].each { |sym| alias_method_chain sym, :value_inheritance }
-    end
-  end
-end

data/lib/active_record_inherit_assoc/ar_31_and_32.rb

@@ -1,22 +0,0 @@
-require 'active_record'
-
-ActiveRecord::Associations::Builder::HasMany.valid_options   << :inherit
-ActiveRecord::Associations::Builder::HasOne.valid_options    << :inherit
-ActiveRecord::Associations::Builder::BelongsTo.valid_options << :inherit
-
-ActiveRecord::Associations::Association.class_eval do
-  def association_scope_with_value_inheritance
-    if inherited_attributes = attribute_inheritance_hash
-      association_scope_without_value_inheritance.where(inherited_attributes)
-    else
-      association_scope_without_value_inheritance
-    end
-  end
-
-  alias_method_chain :association_scope, :value_inheritance
-
-  def attribute_inheritance_hash
-    return nil unless reflection.options[:inherit]
-    Array(reflection.options[:inherit]).inject({}) { |hash, obj| hash[obj] = owner.send(obj) ; hash }
-  end
-end