acts_as_relation 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a72ef528265e4e2439caa3e118c83ba0b8a0e236
-  data.tar.gz: 9c1d9259eb36d2fe48dcd572ced40e1451e53ce0
+  metadata.gz: bc6b69987a960f143e2cf8b1b7fda99dd40bc1e4
+  data.tar.gz: 09eaed2afe535c9cf739db050575a0923cd1e80b
 SHA512:
-  metadata.gz: b8e696a7fbeac93377ef709302730f00740274b7db2d13523e4f1735e1ca75f2f2507a623525a23d23dad0a11ac5bf296e1e5fee8986d4aa0255d71ced472aaa
-  data.tar.gz: a181edf19a4b1f5fd9e73502323d691bfa5694fc6d1dddd2ca92445a55ae801a6169e9ce8e664d38c4e7364fcdd4021d5c922c9d22490db881756604642ce802
+  metadata.gz: d7ddfd42cd6f28d0d5a78819b92b7cbf9f64f72705a5f6b90d1ed541169304508d0990fb613840104b352e130622d44f68392e5a769291c045e3fa1ecb9839a6
+  data.tar.gz: f61af829ee9f54158e59ed5e3aa6e7b9da82c3ef3c44ae7999c383c4fcbfbd5e45b66f1efe645ba3996f7c94e5138b0cd3d76387be36d6688858b7de792e7def

data/.gitignore

@@ -7,3 +7,4 @@ doc/*
 *.sqlite3
 *.log
 spec/dummy/tmp/*
+coverage/*

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+  - 1.9.3

data/Gemfile

@@ -2,3 +2,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in gemspec
 gemspec
+
+gem 'coveralls', require: false

data/Gemfile.lock

@@ -1,97 +1,125 @@
 PATH
   remote: .
   specs:
-    acts_as_relation (1.0.0)
-      activerecord
+    acts_as_relation (1.1.0)
+      activerecord (>= 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      mail (~> 2.5.4)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
-    builder (3.1.4)
-    database_cleaner (1.0.1)
-    diff-lcs (1.2.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.4)
+    i18n (0.6.11)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    polyglot (0.3.3)
+    mime-types (1.25.1)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    netrc (0.7.7)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+      railties (= 4.1.4)
+      sprockets-rails (~> 2.0)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.2)
+    rake (10.3.2)
+    rest-client (1.7.1)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    sprockets (2.10.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    thread_safe (0.1.0)
-      atomic
+    sqlite3 (1.3.9)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.14)
+    tins (1.3.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -99,8 +127,9 @@ PLATFORMS
 DEPENDENCIES
   acts_as_relation!
   bundler
+  coveralls
   database_cleaner
-  rails
+  rails (>= 3)
   rake
-  rspec-rails
+  rspec-rails (>= 2.14)
   sqlite3

data/README.rdoc

@@ -1,10 +1,14 @@
+{<img src="https://travis-ci.org/hzamani/acts_as_relation.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/hzamani/acts_as_relation]
+{<img src="https://coveralls.io/repos/hzamani/acts_as_relation/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/hzamani/acts_as_relation?branch=master]
+{<img src="https://codeclimate.com/github/hzamani/acts_as_relation.png" />}[https://codeclimate.com/github/hzamani/acts_as_relation]
+
 = ActsAsRelation
 This gem helps implement multiple-table-inheritance (MTI) methods to your ActiveRecord models.
 By default, ActiveRecord only supports single-table inheritance (STI).
 MTI gives you the benefits of STI but without having to place dozens of empty fields into a single table.
 
-Take a traditional e-commerce application for example... 
-A product has common attributes (+name+, +price+, +image+ ...), 
+Take a traditional e-commerce application for example...
+A product has common attributes (+name+, +price+, +image+ ...),
 while each type of product has its own attributes...
 +pen+ has +color+, +book+ has +author+ and +publisher+ and so on.
 
@@ -18,7 +22,7 @@ If you are using Rails 3 you must use '~> 0.1' version specifier in Gemfile.
 
 == Usage
 +acts_as_relation+ uses a polymorphic +has_one+
-association to simulate multiple-table inheritance. 
+association to simulate multiple-table inheritance.
 For the e-commerce example you would declare the product as a +supermodel+ and all types of it as +acts_as+ +:product+
 (if you prefer you can use their aliases +is_a+ and +is_a_superclass+)
 
@@ -34,6 +38,10 @@ For the e-commerce example you would declare the product as a +supermodel+ and a
     acts_as :product
   end
 
+  class Store < ActiveRecord::Base
+    has_many :products
+  end
+
 To make this work, you need to declare both a foreign key column and a type column
 in the model that declares superclass. To do this you can set +:as_relation_superclass+
 option to +true+ on +products+ +create_table+ (or pass it name of the association):
@@ -43,17 +51,25 @@ option to +true+ on +products+ +create_table+ (or pass it name of the associatio
   end
 
 Or declare them as you do on a +polymorphic+ +belongs_to+ association, it this case
-you must pass name to +acts_as+ in +:as+ option:
+you must pass name to +acts_as+ and +acts_as_superclass+ in +:as+ option:
 
   change_table :products do |t|
     t.integer :producible_id
     t.string  :producible_type
   end
 
+  class Product < ActiveRecord::Base
+    acts_as_superclass :as => :producible
+  end
+
   class Pen < ActiveRecord::Base
     acts_as :product, :as => :producible
   end
 
+  class Book < ActiveRecord::Base
+    acts_as :product, :as => :producible
+  end
+
 Now +Pen+ and +Book+ *act* *as* +Product+. This means that they inherit +Product+
 _attributes_, _associations_, _validations_ and _methods_.
 
@@ -81,7 +97,13 @@ methods (includeing accessors) so you can access them directly.
 
 On the other hand you can always access a specific object from its parent by calling +specific+ method on it:
 
-    Product.first.specific # will return a specific product, a pen for example
+  Product.first.specific # will return a specific product, a pen for example
+
+In +has_many+ case you can use subclasses:
+
+  store = Store.create
+  store.products << Pen.create
+  store.products.first # => <Pen: ...>
 
 == Options
 The +acts_as+ relation support these options:
@@ -106,4 +128,5 @@ Note that support for +:conditions+ and +:include+ has been removed. In their pl
 +where()+ and +includes()+:
 
     acts_as :product, -> { where(color: "yellow") }
+    acts_as :person, -> { includes(:friends) }
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rspec/core/rake_task'
 
-task :default => :spec
+task default: :spec
 
 desc 'Run specs'
 RSpec::Core::RakeTask.new

data/acts_as_relation.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'version'
 
 Gem::Specification.new do |s|
@@ -14,20 +14,20 @@ Gem::Specification.new do |s|
   s.summary     = 'Easy multi-table inheritance for rails'
   s.description = "This 'acts_as' extension provides multi-table inheritance for rails models."
 
-
   # Load Paths...
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 1.9'
 
   # Dependencies (installed via 'bundle install')...
-  s.add_development_dependency "rake"
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "rails"
-  s.add_development_dependency "database_cleaner"
-  s.add_dependency "activerecord"
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rspec-rails', '~> 2.14'
+  s.add_development_dependency 'rails', '~> 4.0'
+  s.add_development_dependency 'database_cleaner'
+  s.add_dependency 'activerecord', '~> 4.0'
 end

data/lib/active_record/acts_as_relation.rb

@@ -1,159 +1,78 @@
 module ActiveRecord
-
-  module ActsAsModules end
-
   module ActsAsRelation
     extend ActiveSupport::Concern
 
-    module AccessMethods
-      protected
-      def define_acts_as_accessors(attribs, model_name)
-        attribs.each do |attrib|
-          code = <<-EndCode
-            def #{attrib}
-              #{model_name}.#{attrib}
-            end
-
-            def #{attrib}=(value)
-              #{model_name}.#{attrib} = value
-            end
-
-            def #{attrib}?
-              #{model_name}.#{attrib}?
-            end
-          EndCode
-          class_eval code, __FILE__, __LINE__
-        end
-      end
+    included do
+      alias_method :acts_as?, :is_a?
     end
 
     module ClassMethods
-      def acts_as(model_name, scope=nil, options={})
-        if scope.is_a?(Hash)
-          options = scope
-          scope   = nil
-        end
-
-        if options[:conditions]
-          ActiveSupport::Deprecation.warn(":conditions is no longer supported by acts_as. Please use `where()` instead. Example: `acts_as :person, -> { where(name: 'John') }`")
-        end
-        if options[:include]
-          ActiveSupport::Deprecation.warn(":include is no longer supported by acts_as. Please use `includes()` instead. Example: `acts_as :person, -> { includes(:friends) }`")
-        end
-
-        name             = model_name.to_s.underscore.singularize
-        class_name       = options[:class_name] || name.camelcase
-        association_name = options[:as] || acts_as_association_name(name)
-        module_name      = "ActsAs#{name.camelcase}"
-
-        unless ActiveRecord::ActsAsModules.const_defined? module_name
-          # Create ActsAsModel module
-          acts_as_model = Module.new
-          ActiveRecord::ActsAsModules.const_set(module_name, acts_as_model)
-
-          has_one_options = {
-            :as         => association_name,
-            :class_name => class_name,
-            :autosave   => true,
-            :validate   => false,
-            :dependent  => options.fetch(:dependent, :destroy),
-          }
-
-          acts_as_model.module_eval do
-            singleton = class << self ; self end
-            singleton.send :define_method, :included do |base|
-              base.has_one name.to_sym, scope, has_one_options
-              base.validate "#{name}_must_be_valid".to_sym
-              base.alias_method_chain name.to_sym, :autobuild
-
-              base.extend ActiveRecord::ActsAsRelation::AccessMethods
-              attributes = class_name.constantize.content_columns.map(&:name)
-              associations = class_name.constantize.reflect_on_all_associations.map(&:name)
-              ignored = ["created_at", "updated_at", "#{association_name}_id", "#{association_name}_type", "#{association_name}"]
-              attributes_to_delegate = attributes + associations - ignored
-              base.send :define_acts_as_accessors, attributes_to_delegate, name
-
-              if defined?(::ProtectedAttributes)
-                base.attr_accessible.update(class_name.constantize.attr_accessible)
-              end
-            end
-
-            define_method "#{name}_with_autobuild" do
-              send("#{name}_without_autobuild") || send("build_#{name}")
-            end
-
-            define_method :method_missing do |method, *arg, &block|
-              begin
-                raise NoMethodError if method.to_s == 'id' || method.to_s == name
-
-                send(name).send(method, *arg, &block)
-              rescue NoMethodError
-                super(method, *arg, &block)
-              end
-            end
-
-            define_method 'respond_to?' do |method, include_private_methods = false|
-              super(method, include_private_methods) || send(name).respond_to?(method, include_private_methods)
-            end
-
-            protected
-
-            define_method "#{name}_must_be_valid" do
-              unless send(name).valid?
-                send(name).errors.each do |att, message|
-                  errors.add(att, message)
-                end
-              end
-            end
-          end
-        end
+      def acts_as(model_name, scope = nil, options = {})
+        acts_as = ActsAs.new(model_name, scope, options)
 
         class_eval do
-          include "ActiveRecord::ActsAsModules::#{module_name}".constantize
-        end
+          include ActiveRecord::ActsAsRelation::ActsAsModules[acts_as]
 
-        if options.fetch :auto_join, true
-          class_eval "default_scope -> { joins(:#{name}) }"
+          default_scope -> { includes(acts_as.name) }
         end
 
-        class_eval "default_scope -> { includes(:#{name}) }"
+        class_eval { default_scope -> { joins(acts_as.name) } } if options.fetch :auto_join, true
 
-        code = <<-EndCode
+        instance_eval <<-EndCode, __FILE__, __LINE__ + 1
           def acts_as_other_model?
             true
           end
 
           def acts_as_model_name
-            :#{name}
+            "#{acts_as.name}".to_sym
           end
         EndCode
-        instance_eval code, __FILE__, __LINE__
       end
-      alias :is_a :acts_as
+      alias_method :is_a, :acts_as
+
+      def acts_as_superclass(options = {})
+        association_name = (options[:as] || acts_as_association_name).to_sym
 
-      def acts_as_superclass options={}
-        association_name = options[:as] || acts_as_association_name
+        class_eval do
+          belongs_to association_name, polymorphic: true, dependent: :delete
 
-        code = <<-EndCode
-          belongs_to :#{association_name}, :polymorphic => true
+          alias_method :specific, association_name
+          alias_method :specific_class, :specific
 
-          def specific
-            self.#{association_name}
+          def method_missing(method, *arg, &block)
+            if specific && specific.respond_to?(method)
+              specific.send(method, *arg, &block)
+            else
+              super
+            end
           end
-          alias :specific_class :specific
-        EndCode
-        class_eval code, __FILE__, __LINE__
+
+          def is_a?(klass)
+            (specific && specific.class == klass) ? true : super
+          end
+          alias_method :instance_of?, :is_a?
+          alias_method :kind_of?, :is_a?
+        end
       end
-      alias :is_a_superclass :acts_as_superclass
+      alias_method :is_a_superclass, :acts_as_superclass
 
-      def acts_as_association_name model_name=nil
-        model_name ||= self.name
+      def is_a?(klass)
+        if respond_to?(:acts_as_model_name) && acts_as_model_name == klass.name.downcase.to_sym
+          true
+        else
+          super
+        end
+      end
+      alias_method :acts_as?, :is_a?
+
+      def acts_as_association_name(model_name = nil)
+        model_name ||= name
         "as_#{model_name.to_s.demodulize.singularize.underscore}"
       end
     end
   end
-end
 
-class ActiveRecord::Base
-  include ActiveRecord::ActsAsRelation
+  class Base
+    include ActsAsRelation
+  end
 end