power_enum 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893addf87676cb3a7a981c4183799d2b67b7c60f
-  data.tar.gz: a46af4984122a09568cdd6f11ba65114c2a6cde7
+  metadata.gz: 64844e550c505a4a4f76be6db166cb8cfe619211
+  data.tar.gz: a52e8c4606a8466f4427e8c311d77bc5d0191586
 SHA512:
-  metadata.gz: 71d9e4aae317d96629faac94ba16714a1f6ab8b6a3533a4bd19e019d4b38d85ff051965efd58dbf779e2f965e187c3801683ef07c9898811bdb939a2193ec435
-  data.tar.gz: afbd9d683a316c7d34fbc41480a15960db66048dc55b7b98960e6ce0f7164299ee50a0f0ee90eb307c97f44ca663f34275a0c69bc98ed3627cdd7204a6f32687
+  metadata.gz: 8c4eefff7165c2465455555eba9f73a7ecf81d92db1288ebfee7fabf0848cc10ec8c0d71c56485e32df98e5ed1178e827f95c4a6987907f344a8fc188bd29b45
+  data.tar.gz: 79fabb30097902433ad93e59ecc1b3397924c65e9ea5526c8fc12334fb51d3fa5d812abd76f7879eba4a8e7735af2a27e27da87c1dae84ba6e9d965bfffc35db

data/lib/power_enum.rb

@@ -15,7 +15,12 @@ class PowerEnum < Rails::Engine
     ActiveSupport.on_load(:active_record) do
       include PowerEnum::Enumerated
       include PowerEnum::HasEnumerated
-      include PowerEnum::Reflection
+
+      ActiveRecord::Base.module_eval do
+        class << self
+          prepend ::PowerEnum::Reflection
+        end
+      end
 
       ActiveRecord::ConnectionAdapters.module_eval do
         include PowerEnum::Schema::SchemaStatements

data/lib/power_enum/reflection.rb

@@ -5,45 +5,32 @@
 
 # Used to patch ActiveRecord reflections.
 module PowerEnum::Reflection
-  extend ActiveSupport::Concern
-
-  # Class-level extensions injected into ActiveRecord
-  module ClassMethods
-    def self.extended(base) # :nodoc:
-      class << base
-        alias_method_chain :reflect_on_all_associations, :enumeration
-        alias_method_chain :reflect_on_association, :enumeration
-      end
-    end
 
-    # All {PowerEnum::Reflection::EnumerationReflection} reflections
-    def reflect_on_all_enumerated
-      # Need to give it a full namespace to avoid getting Rails confused in development
-      # mode where all objects are reloaded on every request.
-      reflections.values.grep(PowerEnum::Reflection::EnumerationReflection)
-    end
+  # All {PowerEnum::Reflection::EnumerationReflection} reflections
+  def reflect_on_all_enumerated
+    # Need to give it a full namespace to avoid getting Rails confused in development
+    # mode where all objects are reloaded on every request.
+    reflections.values.grep(PowerEnum::Reflection::EnumerationReflection)
+  end
 
-    # If the reflection of the given name is an EnumerationReflection, returns
-    # the reflection, otherwise returns nil.
-    # @return [PowerEnum::Reflection::EnumerationReflection]
-    def reflect_on_enumerated( enumerated )
-      key = if Rails.version =~ /^4\.2\.*/ || Rails.version =~ /^5\.0\.*/
-              enumerated.to_s
-            else
-              enumerated.to_sym
-            end
-      reflections[key].is_a?(PowerEnum::Reflection::EnumerationReflection) ? reflections[key] : nil
-    end
+  # If the reflection of the given name is an EnumerationReflection, returns
+  # the reflection, otherwise returns nil.
+  # @return [PowerEnum::Reflection::EnumerationReflection]
+  def reflect_on_enumerated( enumerated )
+    key = if Rails.version =~ /^4\.2\.*/ || Rails.version =~ /^5\.*/
+            enumerated.to_s
+          else
+            enumerated.to_sym
+          end
+    reflections[key].is_a?(PowerEnum::Reflection::EnumerationReflection) ? reflections[key] : nil
+  end
 
-    # Extend associations with enumerations, preferring enumerations
-    def reflect_on_all_associations_with_enumeration(macro = nil)
-      reflect_on_all_enumerated + reflect_on_all_associations_without_enumeration(macro)
-    end
+  def reflect_on_all_associations(macro = nil)
+    reflect_on_all_enumerated + super(macro)
+  end
 
-    # Extend associations with enumerations, preferring enumerations
-    def reflect_on_association_with_enumeration( associated )
-      reflect_on_enumerated(associated) || reflect_on_association_without_enumeration(associated)
-    end
+  def reflect_on_association(associated)
+    reflect_on_enumerated(associated) || super(associated)
   end
 
   # Reflection class for enum reflections.  See ActiveRecord::Reflection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Trevor Squires
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler