monarchy 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c15282927b5b58ca3da1c4102405a299faa6e6a9
-  data.tar.gz: 0ad457f343ef448dbede073ade8fe820011b13dc
+  metadata.gz: 815ca965ee47bec334658cc90ce50557a8d0154e
+  data.tar.gz: 8353cc02f268a429bf61b117c421b5481942a2c4
 SHA512:
-  metadata.gz: 79f77cba2b572d85260f640727bdca9dc6f3b53d80e72e5cab50e2f48f5584a19ed03d31d0d1e2128e0c3b66ea366e0a923c8541f606bb13e3e616ba22c571e7
-  data.tar.gz: ea747c578065b293e644d3b4ef982a9b6b62c21e50636895a39ed5898779ef217d0fbf1e72205fe3bf9fb5a464744b89bd02b49c943effa164e3cd13d90d1898
+  metadata.gz: 3a11658a76ea5dc9cf75567c7c2485c0501fb95cc8003ed64b650bfdc13c6ae64db63037ee30b8c79d7c9b2c48a55e585faec53a99e26483f5d260568b55d143
+  data.tar.gz: aa8c93f91f7a4bcf48154e1207bd7bdfd81f58f5391a8488eade7a16da410a9507286f3425442ab928ff91b1f087b1f4a5646ad9de65d9c6f52fef81796c1a82

data/.github_changelog_generator

@@ -1 +1 @@
-future-release=2.2.1
+future-release=2.2.2

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## [2.2.1](https://github.com/Exelord/Monarchy/tree/2.2.1) (2017-05-29)
-[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.2.0...2.2.1)
+## [2.2.2](https://github.com/Exelord/Monarchy/tree/2.2.2) (2017-06-14)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.2.1...2.2.2)
+
+**Fixed bugs:**
+
+- Fix parent as [\#78](https://github.com/Exelord/Monarchy/issues/78)
+- Fix parent\_as [\#75](https://github.com/Exelord/Monarchy/pull/75) ([Exelord](https://github.com/Exelord))
+
+## [v2.2.1](https://github.com/Exelord/Monarchy/tree/v2.2.1) (2017-05-29)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.2.0...v2.2.1)
 
 **Merged pull requests:**
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monarchy (2.2.1)
+    monarchy (2.2.2)
       active_record_union (= 1.2.0)
       activerecord (>= 4.2.7.1)
       closure_tree (= 6.5.0)
@@ -71,23 +71,23 @@ GEM
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     ffaker (2.5.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.8.1)
-    json (2.0.3)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.4)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -97,7 +97,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.6)
       pry (>= 0.10.4)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.2)
@@ -112,9 +112,9 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (5.0.2)
@@ -123,7 +123,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -159,7 +160,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -174,7 +175,7 @@ GEM
     tqdm (0.3.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -206,4 +207,4 @@ RUBY VERSION
    ruby 2.4.0p0
 
 BUNDLED WITH
-   1.14.3
+   1.15.1

data/dummy/app/models/project.rb

@@ -2,7 +2,7 @@
 
 class Project < ActiveRecord::Base
   acts_as_resource parent_as: :resource
-  belongs_to :resource
+  belongs_to :resource, foreign_key: :parent_id
   has_one :status
 
   after_create :create_status

data/dummy/db/migrate/20160502212213_parent_as_setup.rb

@@ -1,7 +1,7 @@
 class ParentAsSetup < ActiveRecord::Migration
   def change
     remove_column :resources, :memo_id
-    add_column :projects, :resource_id, :integer
+    add_column :projects, :parent_id, :integer
     add_column :memos, :project_id, :integer
   end
 end

data/dummy/db/schema.rb

@@ -71,9 +71,9 @@ ActiveRecord::Schema.define(version: 20160818205534) do
 
   create_table "projects", force: :cascade do |t|
     t.string   "name"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.integer  "resource_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer  "parent_id"
   end
 
   create_table "resources", force: :cascade do |t|

data/lib/monarchy/acts_as_resource.rb

@@ -105,11 +105,17 @@ module Monarchy
         parentize = self.class.parentize_name
         return unless parentize
 
-        was_changed = changes["#{parentize}_id"] || changes["#{parentize}_type"]
+        keys = relation_keys(parentize)
+        was_changed = changes[keys[:foreign_key]] || changes[keys[:foreign_type]]
         Monarchy::Validators.resource(send(parentize), true, false)
         self.parent = send(parentize) if was_changed || force
       end
 
+      def relation_keys(relation_name)
+        reflection = self.class.reflections[relation_name.to_s]
+        { foreign_key: reflection.foreign_key, foreign_type: reflection.foreign_type }
+      end
+
       def children_resources
         c = hierarchy.try(:children)
         return nil if c.nil?

data/lib/monarchy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Monarchy
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord