active_record-acts_as 1.0.0.pre → 1.0.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e30b0cf3d5bebc22c5d3e9a63f81bced680e579
-  data.tar.gz: 11a3af36ca6331fe13cf84a962e6ba1728f9572a
+  metadata.gz: c137b5172e254e835624861325efa82e6ca2e609
+  data.tar.gz: c1836efae6258976e635b8232d1c7654b3e33838
 SHA512:
-  metadata.gz: 64f7cc31a9033eb4954981f24b6ae5edd5ac8c73ca05de836d2a01d62b5f8c59c41983caa91cf0e76b365a35e7d32ed96f5e02567ad125ef2d23be046ee0f496
-  data.tar.gz: 97c3f506fa35cfb4fa391b16f5ca3636db662b1f6963b8fc74d4f9e4fe02f8b50585f31142efe1c6f99b9aa7f06aafc222b8ebedc55f2e0b28f4f085cb21d82e
+  metadata.gz: 17f92b735d3520d7a66da1f75b6e7455963df6d1721557faceaca82c98949fbaab4110588f8254b94268dbeb30ddba1d6f1226424f1cf5edfb3e9e8db61effe2
+  data.tar.gz: 14117fe50dfde347a40a607ac783eca19aedbc46fe3c1a4d66a1bbdb594deb26c4e185d584fa68200c39ad020e7be4af6cc3908fe77356ebe346510015a51815

data/Gemfile

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

data/README.md

@@ -1,5 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/active_record-acts_as.svg)](http://badge.fury.io/rb/active_record-acts_as)
 [![Build Status](https://travis-ci.org/hzamani/active_record-acts_as.svg)](https://travis-ci.org/hzamani/active_record-acts_as)
 [![Code Climate](https://codeclimate.com/github/hzamani/active_record-acts_as.png)](https://codeclimate.com/github/hzamani/active_record-acts_as)
+[![Coverage Status](https://coveralls.io/repos/hzamani/active_record-acts_as/badge.png)](https://coveralls.io/r/hzamani/active_record-acts_as)
 
 # ActiveRecord::ActsAs
 
@@ -148,6 +150,12 @@ acts_as :person, -> { includes(:friends) }
 Make sure you know what you are doing when ovrewriting `polymorphic` option.
 
 
+## Migrating from acts_as_relation
+
+Replace `acts_as_superclass` in models with `actable` and if you where using
+`:as_relation_superclass` option on `create_table` remove it and use `t.actable` on column definitions.
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/hzamani/active_record-acts_as/fork )

data/lib/active_record/acts_as/instance_methods.rb

@@ -20,7 +20,7 @@ module ActiveRecord
       protected :actable_must_be_valid
 
       def read_attribute(attr_name, *args, &block)
-        if attribute_method?(attr_name)
+        if attribute_method?(attr_name.to_s)
           super
         else
           acting_as.read_attribute(attr_name, *args, &block)
@@ -28,7 +28,7 @@ module ActiveRecord
       end
 
       def write_attribute(attr_name, value, *args, &block)
-        if attribute_method?(attr_name)
+        if attribute_method?(attr_name.to_s)
           super
         else
           acting_as.send(:write_attribute, attr_name, value, *args, &block)
@@ -40,10 +40,19 @@ module ActiveRecord
         acting_as.attributes.except(acting_as_reflection.type, acting_as_reflection.foreign_key).merge(super)
       end
 
+      def attribute_names
+        super | (acting_as.attribute_names - [acting_as_reflection.type, acting_as_reflection.foreign_key])
+      end
+
+
       def respond_to?(name, include_private = false)
         super || acting_as.respond_to?(name)
       end
 
+      def dup
+        super.acting_as = acting_as.dup
+      end
+
       def method_missing(method, *args, &block)
         if acting_as.respond_to?(method)
           acting_as.send(method, *args, &block)

data/lib/active_record/acts_as/querying.rb

@@ -20,4 +20,16 @@ module ActiveRecord
       end
     end
   end
+
+  class Relation
+    alias_method :scope_for_create_without_acting_as, :scope_for_create
+
+    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
 end

data/lib/active_record/acts_as/relation.rb

@@ -17,14 +17,16 @@ module ActiveRecord
           cattr_reader(:acting_as_name) { name.to_s }
           cattr_reader(:acting_as_model) { name.to_s.camelize.constantize }
           class_eval "def acting_as() #{name} || build_#{name} end"
+          alias_method :acting_as=, "#{name}=".to_sym
 
           include ActsAs::InstanceMethods
           extend  ActsAs::Querying
         end
 
         def acting_as?(other = nil)
-          if respond_to? :acting_as_name
-            other.nil? || acting_as_name == other.to_s.underscore
+          if respond_to?(:acting_as_reflection) &&
+              acting_as_reflection.is_a?(ActiveRecord::Reflection::AssociationReflection)
+            other.nil? || acting_as_reflection.name.to_s == other.to_s.underscore
           else
             false
           end
@@ -37,10 +39,17 @@ module ActiveRecord
         def actable(options = {})
           name = options.delete(:as) || :actable
 
-          belongs_to name, {polymorphic: true, dependent: :delete, autosave: true}.merge(options)
+          reflections = belongs_to name, {polymorphic: true, dependent: :delete, autosave: true}.merge(options)
+
+          cattr_reader(:actable_reflection) { reflections[name] }
 
           alias_method :specific, name
         end
+
+        def actable?
+          respond_to?(:actable_reflection) &&
+            actable_reflection.is_a?(ActiveRecord::Reflection::AssociationReflection)
+        end
       end
     end
   end

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 
 module ActiveRecord
   module ActsAs
-    VERSION = "1.0.0.pre"
+    VERSION = "1.0.0.rc"
   end
 end

data/spec/actable_spec.rb

@@ -13,6 +13,16 @@ RSpec.describe "ActiveRecord::Base subclass with #actable" do
     expect(association).to be_polymorphic
   end
 
+  describe "#actable?" do
+    it "returns true for actable models" do
+      expect(Product.actable?).to be true
+    end
+
+    it "returns false for none actable models" do
+      expect(Pen.actable?).to be false
+    end
+  end
+
   describe ".specific" do
     it "return specific submodel" do
       pen.save

data/spec/acts_as_spec.rb

@@ -67,6 +67,23 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
   end
 
+  describe "#acting_as=" do
+    it "sets acts_as model" do
+      product = Product.new(name: 'new product', price: 0.99)
+      pen = Pen.new
+      pen.acting_as = product
+      expect(pen.acting_as).to eq(product)
+    end
+  end
+
+  describe "#dup" do
+    it "duplicates actable model as well" do
+      p = pen.dup
+      expect(p.name).to eq('pen')
+      expect(p.price).to eq(0.8)
+    end
+  end
+
   it "have supermodel attributes accessible on creation" do
     expect{Pen.create(pen_attributes)}.to_not raise_error
   end
@@ -128,6 +145,10 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     it "includes supermodel attributes in .to_json responce" do
       expect(pen.to_json).to eq('{"id":null,"name":"pen","price":0.8,"store_id":null,"color":"red"}')
     end
+
+    it "includes supermodel attribute names in .attribute_names responce" do
+      expect(pen.attribute_names).to include("id", "color", "name", "price", "store_id")
+    end
   end
 
   context "Querying" do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'coveralls'
+Coveralls.wear!
 
 RSpec.configure do |config|
   config.disable_monkey_patching!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.rc
 platform: ruby
 authors:
 - Hassan Zamani