active_record-acts_as 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7387f8a9b958e1010c9c86367631e5be078d6329
-  data.tar.gz: 31705e7f709ae00673bc2cf9bddcf72cc7a2eda9
+  metadata.gz: b9ec0528a63347a0575f88a79865139353ed16b2
+  data.tar.gz: 03ff53a5a895ef19f2d740e85327f93afa76dafc
 SHA512:
-  metadata.gz: 507a0fd8e3609ceb749a1f8a3ee9ae051de0094fb769778a661ff91f0ed9bf0bb4f8001267c68db76f70f02f64f0c088d48533c599f40d76b12eacf1e8932b04
-  data.tar.gz: aebd0d7c848b0f53639491582c3d29187ed0d152324d861ebfbbb0441f792c83a61f95bb8d0d8ccce6993be6f899203dc0d1c790ac523c09d16d3f55179a4e85
+  metadata.gz: d4a00877c147b27f50ecc2abaf15abe4578e2ee5cdf45b2c6c3b9acbae4e2bc3f78700bbb0da94e07ed36d685a707bd71033759e88a07b5added7b22c89d01bb
+  data.tar.gz: cfd9cd5ba545e01f676f418c09b5cb161d83428c44869e8dd95f28f014c71474a93a469004dffb987c9460093603ff2a2673e90df9604aaaa61c6541c83b14a7

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.1.1
+  - 2.3.0
+  - 2.2.3
+  - 2.1.7
   - 2.0.0
   - 1.9.3

data/README.md

@@ -86,8 +86,13 @@ change_table :products do |t|
 end
 ```
 
-Now `Pen` and `Book` *acts as* `Product`, i.e. they inherit `Product`s *attributes*,
-*methods* and *validations*. Now you can do things like these:
+**Make sure** that column names do not match on parent and subclass tables,
+that will make SQL statements ambiguous and invalid!
+Specially **DO NOT** use timestamps on subclasses, if you need them define them
+on parent table and they will be touched after submodel updates.
+
+Now `Pen` and `Book` **acts as** `Product`, i.e. they inherit `Product`s **attributes**,
+**methods** and **validations**. Now you can do things like these:
 
 ```Ruby
 Pen.create name: 'Penie!', price: 0.8, color: 'red'
@@ -171,6 +176,28 @@ 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.
 
 
+## RSpec custom matchers
+
+To use this library custom RSpec matchers, you must require the `rspec/acts_as_matchers` file.
+
+Examples:
+
+```Ruby
+require "active_record/acts_as/matchers"
+
+RSpec.describe "Pen acts like a Product" do
+  it { is_expected.to act_as(:product) }
+  it { is_expected.to act_as(Product) }
+
+  it { expect(Person).to act_as(:product) }
+  it { expect(Person).to act_as(Product) }
+end
+
+RSpec.describe "Product is actable" do
+  it { expect(Product).to be_actable }
+end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/hzamani/active_record-acts_as/fork )

data/lib/active_record/acts_as/class_methods.rb

@@ -9,6 +9,10 @@ module ActiveRecord
         @_reflections_acts_as_cache ||=
           _reflections_without_acts_as.reverse_merge(acting_as_model._reflections)
       end
+
+      def validators_on(*args)
+        super + acting_as_model.validators_on(*args)
+      end
     end
   end
 end

data/lib/active_record/acts_as/instance_methods.rb

@@ -20,6 +20,10 @@ module ActiveRecord
         !acting_as.id.nil? && !acting_as_foreign_key.nil?
       end
 
+      def touch_actable
+        acting_as.touch
+      end
+
       def actable_must_be_valid
         if validates_actable
           unless acting_as.valid?

data/lib/active_record/acts_as/matchers.rb

@@ -0,0 +1,19 @@
+RSpec::Matchers.define :act_as do |actable|
+  match do |actor|
+    if actor.is_a?(ActiveRecord::Base)
+      actor.class.acting_as?(actable)
+    else
+      actor.acting_as?(actable)
+    end
+  end
+end
+
+RSpec::Matchers.define :be_actable do
+  match do |actable|
+    if actable.is_a?(ActiveRecord::Base)
+      actable.class.actable?
+    else
+      actable.actable?
+    end
+  end
+end

data/lib/active_record/acts_as/relation.rb

@@ -12,13 +12,15 @@ module ActiveRecord
           cattr_reader(:validates_actable) { options.delete(:validates_actable) == false ? false : true }
 
           reflections = has_one name, scope, options
-          default_scope -> { eager_load(name) }
+          default_scope -> { includes(name) }
           validate :actable_must_be_valid
+          after_update :touch_actable
 
           cattr_reader(:acting_as_reflection) { reflections.stringify_keys[name.to_s] }
           cattr_reader(:acting_as_name) { name.to_s }
           cattr_reader(:acting_as_model) { (options[:class_name] || name.to_s.camelize).constantize }
-          class_eval "def acting_as() #{name} || build_#{name} end"
+          class_eval "def #{name}; super || build_#{name} end"
+          alias_method :acting_as, name
           alias_method :acting_as=, "#{name}=".to_sym
 
           include ActsAs::InstanceMethods

data/lib/active_record/acts_as/version.rb

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

data/spec/acts_as_spec.rb

@@ -16,6 +16,10 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     expect(association.options).to have_key(:as)
   end
 
+  it "autobuilds the has_one relation" do
+    expect(subject.new.product).not_to be_nil
+  end
+
   it "has a cattr_reader for the acting_as_model" do
     expect(subject.acting_as_model).to eq Product
   end
@@ -139,6 +143,13 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
   end
 
+  describe ".validators_on" do
+    it "merges the validations on both superclass and subclass" do
+      expect(Pen.validators_on(:name, :price)).to contain_exactly(
+        *Product.validators_on(:name, :price))
+    end
+  end
+
   describe "._reflections" do
     it "merges the reflections on both superclass and subclass" do
       expect(Pen._reflections.length).to eq(Product._reflections.length + 1)
@@ -181,7 +192,18 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       isolated_pen.reload
       expect(pen.option1).to eq('value1')
       expect(isolated_pen).to_not respond_to('option1')
-      expect(JSON.parse(pen.to_json)).to eq(JSON.parse('{"id":' + pen.id.to_s + ',"name":"pen","price":0.8,"store_id":null,"settings":{"global_option":"globalvalue","option1":"value1"},"color":"red"}'))
+      expect(JSON.parse(pen.to_json)).to eq(JSON.parse('''
+        {
+          "id": '+ pen.id.to_s + ',
+          "name": "pen",
+          "price": 0.8,
+          "store_id": null,
+          "settings": {"global_option":"globalvalue", "option1":"value1"},
+          "color": "red",
+          "created_at": ' + pen.created_at.to_json + ',
+          "updated_at": ' + pen.updated_at.to_json + '
+        }
+      '''))
     end
 
     it "saves supermodel attributes on save" do
@@ -192,6 +214,15 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(pen.color).to eq('red')
     end
 
+    it "touches supermodel on save" do
+      pen.save
+      pen.reload
+      update = pen.product.updated_at
+      pen.color = "gray"
+      pen.save
+      expect(pen.updated_at).not_to eq(update)
+    end
+
     it "raises NoMethodEror on unexisting method call" do
       expect { pen.unexisted_method }.to raise_error(NoMethodError)
     end
@@ -243,10 +274,22 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       it "unless the submodel instance association doesn't exist" do
         expect(JSON.parse(isolated_pen.to_json)).to eq(JSON.parse('{"id":null,"color":"red"}'))
       end
+
       it "if the submodel instance association exists" do
         p = Product.new(name: 'Test Pen', price: 0.8, actable: pen)
         p.save
-        expect(JSON.parse(pen.to_json)).to eq(JSON.parse('{"id":' + pen.id.to_s + ',"name":"pen","price":0.8,"store_id":null,"settings": {},"color":"red"}'))
+        expect(JSON.parse(pen.to_json)).to eq(JSON.parse('''
+          {
+            "id": '+ pen.id.to_s + ',
+            "name": "pen",
+            "price": 0.8,
+            "store_id": null,
+            "settings": {},
+            "color": "red",
+            "created_at": ' + pen.created_at.to_json + ',
+            "updated_at": ' + pen.updated_at.to_json + '
+          }
+        '''))
       end
     end
 

data/spec/migrations_spec.rb

@@ -8,6 +8,7 @@ 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
         initialize_database { create_table(:products) { |t| t.actable(as: :produceable) } }

data/spec/models.rb

@@ -54,30 +54,34 @@ module Inventory
   end
 end
 
-initialize_database do
-  create_table :pens do |t|
-    t.string :color
-  end
+def initialize_schema
+  initialize_database do
+    create_table :pens do |t|
+      t.string :color
+    end
 
-  create_table :products do |t|
-    t.string :name
-    t.float :price
-    t.integer :store_id
-    t.text :settings
-    t.actable
-  end
+    create_table :products do |t|
+      t.string :name
+      t.float :price
+      t.integer :store_id
+      t.text :settings
+      t.timestamps null: true
+      t.actable
+    end
 
-  create_table :stores do |t|
-    t.string :name
-  end
+    create_table :stores do |t|
+      t.string :name
+    end
 
-  create_table :inventory_pen_lids do |t|
-    t.string :color
-  end
+    create_table :inventory_pen_lids do |t|
+      t.string :color
+    end
 
-  create_table :inventory_product_features do |t|
-    t.string :name
-    t.float :price
-    t.actable
+    create_table :inventory_product_features do |t|
+      t.string :name
+      t.float :price
+      t.actable
+    end
   end
 end
+initialize_schema

data/spec/rspec_matchers_spec.rb

@@ -0,0 +1,12 @@
+require 'models'
+require 'active_record/acts_as/matchers'
+
+RSpec.describe "Custom RSpec matchers" do
+  it { expect(Product).to be_actable }
+  it { expect(Product.new).to be_actable }
+
+  it { expect(Pen).to act_as(:product) }
+  it { expect(Pen).to act_as(Product) }
+  it { expect(Pen.new).to act_as(:product) }
+  it { expect(Pen.new).to act_as(Product) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -119,6 +119,7 @@ files:
 - lib/active_record/acts_as.rb
 - lib/active_record/acts_as/class_methods.rb
 - lib/active_record/acts_as/instance_methods.rb
+- lib/active_record/acts_as/matchers.rb
 - lib/active_record/acts_as/migration.rb
 - lib/active_record/acts_as/querying.rb
 - lib/active_record/acts_as/relation.rb
@@ -129,6 +130,7 @@ files:
 - spec/database_helper.rb
 - spec/migrations_spec.rb
 - spec/models.rb
+- spec/rspec_matchers_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/hzamani/active_record-acts_as
 licenses:
@@ -150,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models
@@ -161,4 +163,5 @@ test_files:
 - spec/database_helper.rb
 - spec/migrations_spec.rb
 - spec/models.rb
+- spec/rspec_matchers_spec.rb
 - spec/spec_helper.rb