active_record-acts_as 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc78a4f0d220edb01b5336e81199401fc1da77c
-  data.tar.gz: 2d09cdc24ca238012d043badca0a143a67942e2f
+  metadata.gz: 72b7784416ad69a0731cce15396045c59b98c4c2
+  data.tar.gz: 7afa85a1598de8f937c6c6c91b7eea2b97862c09
 SHA512:
-  metadata.gz: 2afb1348df5ac807e39ffaa3ad9cad8ca02fb6177d39a20f03dbedb80f1abab1750096d20c1db652846f81c933c4caecfa8627306032bebb8843dc66e3314052
-  data.tar.gz: ba3005c9fcf570174d6908a939209d0df816b147090554946a6b6321af61d0b25bd950f85d1ce8649473c6db74ef08a71b2175b78c2fe4c19afa1d0d1607dc6f
+  metadata.gz: b789d5515ffe491052354386627199337c2ca975513d41755a0519d07158ea9393da5e346c501af60efe23c604dd1ad9f70f0e9cd7507738c0e3846c4a870fb0
+  data.tar.gz: 9c2c0991e5ce87f8b39eb04898fa0e2c8aa9469e29ee388f6b2a9e9b644f6dd91c858007bb45fe3d00727e0f8b492c2496150dff5614132ac0b03ea9a50148e8

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.9] - 2017-03-02
+### Fixed
+- Fix handling of query conditions that contain a dot
+
 ## [2.0.8] - 2017-02-17
 ### Fixed
 - Avoid circular dependency on destroy
@@ -49,22 +53,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Fixed `remove_actable` migration helper (https://github.com/hzamani/active_record-acts_as/pull/71, thanks to [nuclearpidgeon](https://github.com/nuclearpidgeon)!)
 
-[Unreleased]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.7...HEAD
-[2.0.7]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.6...v2.0.7
-[2.0.6]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.5...v2.0.6
-[2.0.5]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.4...v2.0.5
-[2.0.4]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.3...v2.0.4
-[2.0.3]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.2...v2.0.3
-[2.0.2]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.1...v2.0.2
-[2.0.1]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.0...v2.0.1
-[2.0.0]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.8...v2.0.0
-[1.0.8]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.7...v1.0.8
-[1.0.7]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.6...v1.0.7
-[1.0.6]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.5...v1.0.6
-[1.0.5]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.4...v1.0.5
-[1.0.4]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.3...v1.0.4
-[1.0.3]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.2...v1.0.3
-[1.0.2]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.1...v1.0.2
-[1.0.1]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.0...v1.0.1
-[1.0.0]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.0.rc...v1.0.0
-[1.0.0.rc]: https://github.com/hzamani/active_record-acts_as/compare/v1.0.0.pre...v1.0.0.rc
+[Unreleased]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.9...HEAD
+[2.0.9]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.8...v2.0.9
+[2.0.8]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.7...v2.0.8
+[2.0.7]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.6...v2.0.7
+[2.0.6]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.5...v2.0.6
+[2.0.5]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.4...v2.0.5
+[2.0.4]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.3...v2.0.4
+[2.0.3]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.2...v2.0.3
+[2.0.2]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.1...v2.0.2
+[2.0.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.8...v2.0.0
+[1.0.8]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.7...v1.0.8
+[1.0.7]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.6...v1.0.7
+[1.0.6]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.5...v1.0.6
+[1.0.5]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.4...v1.0.5
+[1.0.4]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.0.rc...v1.0.0
+[1.0.0.rc]: https://github.com/krautcomputing/active_record-acts_as/compare/v1.0.0.pre...v1.0.0.rc

data/Guardfile

@@ -0,0 +1,15 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/README.md

@@ -1,8 +1,8 @@
 [![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)
-[![Dependency Status](https://gemnasium.com/hzamani/active_record-acts_as.svg)](https://gemnasium.com/hzamani/active_record-acts_as)
+[![Build Status](https://travis-ci.org/krautcomputing/active_record-acts_as.svg)](https://travis-ci.org/krautcomputing/active_record-acts_as)
+[![Code Climate](https://codeclimate.com/github/krautcomputing/active_record-acts_as.png)](https://codeclimate.com/github/krautcomputing/active_record-acts_as)
+[![Coverage Status](https://coveralls.io/repos/krautcomputing/active_record-acts_as/badge.png)](https://coveralls.io/r/krautcomputing/active_record-acts_as)
+[![Dependency Status](https://gemnasium.com/krautcomputing/active_record-acts_as.svg)](https://gemnasium.com/krautcomputing/active_record-acts_as)
 
 # ActiveRecord::ActsAs
 
@@ -202,7 +202,7 @@ end
 
 ## Contributing
 
-1. Fork it ( https://github.com/hzamani/active_record-acts_as/fork )
+1. Fork it ( https://github.com/krautcomputing/active_record-acts_as/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Test changes don't break anything (`rspec`)
 4. Add specs for your new feature

data/active_record-acts_as.gemspec

@@ -6,11 +6,11 @@ require 'active_record/acts_as/version'
 Gem::Specification.new do |spec|
   spec.name          = "active_record-acts_as"
   spec.version       = ActiveRecord::ActsAs::VERSION
-  spec.authors       = ["Hassan Zamani"]
-  spec.email         = ["hsn.zamani@gmail.com"]
+  spec.authors       = ["Hassan Zamani", "Manuel Meurer"]
+  spec.email         = ["hsn.zamani@gmail.com", "manuel@krautcomputing.com"]
   spec.summary       = %q{Simulate multi-table inheritance for activerecord models}
   spec.description   = %q{Simulate multi-table inheritance for activerecord models using a plymorphic association}
-  spec.homepage      = "http://github.com/hzamani/active_record-acts_as"
+  spec.homepage      = "http://github.com/krautcomputing/active_record-acts_as"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "rake", "~> 10"
   spec.add_development_dependency "appraisal", "~> 2.1"
+  spec.add_development_dependency "guard-rspec", "~> 4.7"
 
   spec.add_dependency "activesupport", ">= 4.2"
   spec.add_dependency "activerecord", ">= 4.2"

data/lib/active_record/acts_as/class_methods.rb

@@ -14,6 +14,10 @@ module ActiveRecord
       def validators_on(*args)
         super + acting_as_model.validators_on(*args)
       end
+
+      def actables
+        acting_as_model.where(actable_id: select(:id))
+      end
     end
   end
 end

data/lib/active_record/acts_as/instance_methods.rb

@@ -10,7 +10,7 @@ module ActiveRecord
       end
 
       def changed?
-        super || acting_as.changed? || @_acting_as_changed
+        super || acting_as.changed? || (defined?(@_acting_as_changed) ? @_acting_as_changed : false)
       end
 
       def acting_as_foreign_key
@@ -68,11 +68,11 @@ module ActiveRecord
       private :write_attribute, :write_store_attribute
 
       def attributes
-        acting_as_persisted? ? acting_as.attributes.except(acting_as_reflection.type, acting_as_reflection.foreign_key).merge(super) : super
+        acting_as.attributes.except(acting_as_reflection.type, acting_as_reflection.foreign_key).merge(super)
       end
 
       def attribute_names
-        acting_as_persisted? ? super | (acting_as.attribute_names - [acting_as_reflection.type, acting_as_reflection.foreign_key]) : super
+        super | (acting_as.attribute_names - [acting_as_reflection.type, acting_as_reflection.foreign_key])
       end
 
       def has_attribute?(attr_name, as_original_class = false)

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.0.9"
+    VERSION = "2.1.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -306,6 +306,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
         p.price = 0.8
         expect(p).to be_valid
       end
+
       it "unless validates_actable is set to false" do
         p = IsolatedPen.new
         expect(p).to be_invalid
@@ -345,46 +346,42 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       store.products << pen
       expect(pen.store).to eq(store)
     end
+  end
 
-    context "includes supermodel attributes in .to_json response" 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",
-            "pen_collection_id": null
-          }
-        '''))
-      end
+  describe "#attributes" do
+    it "returns the attribute names of the supermodel and submodel" do
+      expect(pen.attributes).to eq(
+        "id"                => nil,
+        "name"              => "pen",
+        "price"             => 0.8,
+        "store_id"          => nil,
+        "settings"          => {},
+        "created_at"        => nil,
+        "updated_at"        => nil,
+        "color"             => "red",
+        "pen_collection_id" => nil
+      )
+    end
+  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,
-            "pen_collection_id": null,
-            "settings": {},
-            "color": "red",
-            "created_at": ' + pen.created_at.to_json + ',
-            "updated_at": ' + pen.updated_at.to_json + '
-          }
-        '''))
-      end
+  describe "#attribute_names" do
+    it "returns the attribute names of the supermodel and submodel" do
+      expect(pen.attribute_names).to eq(["id", "color", "pen_collection_id", "name", "price", "store_id", "settings", "created_at", "updated_at"])
     end
+  end
 
-    context "includes supermodel attribute names in .attribute_names response" do
-      it "unless the submodel instance association doesn't exist" do
-        expect(pen.attribute_names).to include("id", "color")
-      end
-      it "if the submodel instance association exists" do
-        p = Product.new(name: 'Test Pen', price: 0.8, actable: pen)
-        p.save
-        expect(pen.attribute_names).to include("id", "color", "name", "price", "store_id")
-      end
+  describe ".actables" do
+    before(:each) { clear_database }
+
+    it "returns a query for the actable records" do
+      red_pen   = Pen.create!(name: 'red pen',   price: 0.8, color: 'red')
+      blue_pen  = Pen.create!(name: 'blue pen',  price: 0.8, color: 'blue')
+      black_pen = Pen.create!(name: 'black pen', price: 0.9, color: 'black')
+
+      actables = Pen.where(price: 0.8).actables
+
+      expect(actables).to be_kind_of(ActiveRecord::Relation)
+      expect(actables.to_a).to eq([red_pen.acting_as, blue_pen.acting_as])
     end
   end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Hassan Zamani
+- Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -80,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +127,7 @@ description: Simulate multi-table inheritance for activerecord models using a pl
   association
 email:
 - hsn.zamani@gmail.com
+- manuel@krautcomputing.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -122,6 +138,7 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -144,7 +161,7 @@ files:
 - spec/models.rb
 - spec/rspec_matchers_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/hzamani/active_record-acts_as
+homepage: http://github.com/krautcomputing/active_record-acts_as
 licenses:
 - MIT
 metadata: {}
@@ -164,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models
@@ -177,4 +194,3 @@ test_files:
 - spec/models.rb
 - spec/rspec_matchers_spec.rb
 - spec/spec_helper.rb
-has_rdoc: