power_enum 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7106c64cd85124483414f071a41693b1db42d7f
-  data.tar.gz: 7c47e87dc6bc4733972a84fc7236a9c32c002a8c
+  metadata.gz: e1ae76f99b2ab01315cd8580800c3f24dad92f4c
+  data.tar.gz: 8a25997728648e1a3c2ae8378a5f3ee006cba18a
 SHA512:
-  metadata.gz: b18dae6376623e5556ef9b79a5e3e237602efd74db5ad27de7e0caa9e00a7c14327e7a2d5b71c2b8c2c32f9d7adee96e531871f80d9b9b69b8bcf2cf5ebafebc
-  data.tar.gz: d3b3af4731a65de4f2b6d55ec95216fc60c753d2f42ac91ed632a50e962c7bd1c4b74172764624ad6a73207c80cf54b7e5755a91e90ecfacd5666dbaf1266c7c
+  metadata.gz: ae5ca031835e1190255e0583300b518c5ae743425c08b77c2b5314d77da2922ea01fb794fd857c280748b33f30cfbb235106a85336fe352715d76c62d5baa1fc
+  data.tar.gz: a0558ae37ba8aff1b6b556c6af0f7c2a87deee1eed197779173fdd3e8c0c80b1bec51baa5e1c60963da506cb4dfe984aab89b5b80a0efde56c273e661b64122c

data/README.markdown

@@ -6,11 +6,11 @@ https://github.com/albertosaurus/power_enum_2
 [![Code Climate](https://codeclimate.com/github/albertosaurus/power_enum_2.png)](https://codeclimate.com/github/albertosaurus/power_enum_2)
 [![Gem Version](https://badge.fury.io/rb/power_enum.png)](http://badge.fury.io/rb/power_enum)
 
-Enumerations for Rails 4 Done Right.
+Enumerations for Rails 4.X Done Right.
 
 ## Versions
 
-* PowerEnum 2.X (this version) supports Rails 4.
+* PowerEnum 2.X (this version) supports Rails 4.X
 * PowerEnum 1.X supports Rails 3.1/3.2, available here: https://github.com/albertosaurus/power_enum
 
 ## What is this?:
@@ -177,7 +177,8 @@ end
 # It's highly recommended to add a foreign key constraint here.
 # Ideally, you would use a gem of some sort to handle this.
 # I have been using PgPower https://rubygems.org/gems/pg_power with much
-# success.
+# success. It's fork, PgSaurus https://rubygems.org/gems/pg_saurus should
+# work just as well.
 execute "ALTER TABLE bookings ADD 'bookings_bookings_status_id_fk'"\
     " FOREIGN KEY (status_id) REFERENCES booking_statuses (id);"
 ```

data/lib/power_enum/has_enumerated.rb

@@ -125,9 +125,14 @@ module PowerEnum::HasEnumerated
     def create_ar_reflection(part_id, options)
       reflection = PowerEnum::Reflection::EnumerationReflection.new(part_id, options, self)
 
-      # ActiveRecord 4.1.2 handles this differently.
+      # ActiveRecord >= 4.1 handles this differently.
       if self.respond_to? :_reflections=
-        self._reflections = self._reflections.merge(part_id => reflection)
+        if Rails.version =~ /^4\.2.*/
+          self._reflections = self._reflections.merge(part_id.to_s => reflection)
+        else
+          self._reflections = self._reflections.merge(part_id => reflection)
+        end
+
       else
         self.reflections = self.reflections.merge(part_id => reflection)
       end

data/lib/power_enum/reflection.rb

@@ -27,7 +27,12 @@ module PowerEnum::Reflection
     # the reflection, otherwise returns nil.
     # @return [PowerEnum::Reflection::EnumerationReflection]
     def reflect_on_enumerated( enumerated )
-      reflections[enumerated.to_sym].is_a?(PowerEnum::Reflection::EnumerationReflection) ? reflections[enumerated.to_sym] : nil
+      key = if Rails.version =~ /^4\.2.*/
+              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
@@ -46,9 +51,48 @@ module PowerEnum::Reflection
     attr_reader :counter_cache_column
     attr_accessor :parent_reflection
 
-    # See ActiveRecore::Reflection::MacroReflection
+    # See ActiveRecord::Reflection::MacroReflection
     def initialize( name, options, active_record )
-      super :has_enumerated, name, nil, options, active_record
+      if Rails.version =~ /^4\.2.*/
+        super name, nil, options, active_record
+      else
+        super :has_enumerated, name, nil, options, active_record
+      end
+    end
+
+    if Rails.version =~ /^4\.2.*/
+      def macro
+        :has_enumerated
+      end
+
+      def check_preloadable!
+        return unless scope
+        if scope.arity > 0
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+The association scope '#{name}' is instance dependent (the scope
+block takes an argument). Preloading happens before the individual
+instances are created. This means that there is no instance being
+passed to the association scope. This will most likely result in
+broken or incorrect behavior. Joining, Preloading and eager loading
+of these associations is deprecated and will be removed in the future.
+          MSG
+        end
+      end
+      alias :check_eager_loadable! :check_preloadable!
+
+      def active_record_primary_key
+        @active_record_primary_key ||= options[:primary_key] || active_record.primary_key
+      end
+
+      def klass
+        @klass ||= active_record.send(:compute_type, class_name)
+      end
+
+      EnumJoinKeys = Struct.new(:key, :foreign_key)
+
+      def join_keys(_)
+        EnumJoinKeys.new(active_record_primary_key, foreign_key)
+      end
     end
 
     # Returns the class name of the enum

data/lib/power_enum/schema/schema_statements.rb

@@ -80,7 +80,7 @@ module PowerEnum::Schema
     def create_enum(enum_name, options = {}, &block)
       enum_table_name = enum_name.pluralize
 
-      # For compatibility with PgPower
+      # For compatibility with PgPower/PgSaurus
       schema_name = options[:schema]
       enum_table_name  = "#{schema_name}.#{enum_table_name}" if schema_name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Trevor Squires
@@ -33,7 +33,7 @@ cert_chain:
   GeAMWE+ojHN5Yf9ycx76Wig/hxvGZ7y1dUA89/lJ8cUWfnS+FSILVnmIrhPfrDqw
   inXoFunB72EL6opwukc7cD9pUmsNsV0HdAStCG5jOhc5TxL1ZXhX8Qqe2iNong==
   -----END CERTIFICATE-----
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,16 +81,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,20 +105,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: genspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.8
 description: |
   Power Enum allows you to treat instances of your ActiveRecord models as though they were an enumeration of values.
   It allows you to cleanly solve many of the problems that the traditional Rails alternatives handle poorly if at all.
@@ -175,4 +161,3 @@ specification_version: 4
 summary: Allows you to treat instances of your ActiveRecord models as though they
   were an enumeration of values
 test_files: []
-has_rdoc: