power_enum 2.12.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64844e550c505a4a4f76be6db166cb8cfe619211
-  data.tar.gz: a52e8c4606a8466f4427e8c311d77bc5d0191586
+  metadata.gz: b2ba1df5d5a34dddc9be7b609aa4199fc2c6a996
+  data.tar.gz: 9bb8768b88f047dc4a51aa65e37fe693aa4fde3d
 SHA512:
-  metadata.gz: 8c4eefff7165c2465455555eba9f73a7ecf81d92db1288ebfee7fabf0848cc10ec8c0d71c56485e32df98e5ed1178e827f95c4a6987907f344a8fc188bd29b45
-  data.tar.gz: 79fabb30097902433ad93e59ecc1b3397924c65e9ea5526c8fc12334fb51d3fa5d812abd76f7879eba4a8e7735af2a27e27da87c1dae84ba6e9d965bfffc35db
+  metadata.gz: 5422edc2be751e1600cbbb121d08fdebeae474906466326fc71f3b79650af60a54766bca362a63edf817bc992414e3dd40c962b4f0e6f4308fa6389cd8bb0571
+  data.tar.gz: a23a77a642de5ded4564d3aec2e946a87dd5ec39ccad94bced7f50cc70431c3b0114ff7d6a4d96514638887c47223dc330820ec8e59752291f8b1c2cf2df64ab

data/README.markdown

@@ -10,7 +10,8 @@ Enumerations for Rails Done Right.
 
 ## Versions
 
-* PowerEnum 2.X (this version) supports Rails 4.X and Rails 5.0
+* PowerEnum 3.X (this version) supports Rails 4.2 and Rails 5.X
+* PowerEnum 2.X supports Rails 4.X and Rails 5.0
 * PowerEnum 1.X supports Rails 3.1/3.2, available here: https://github.com/albertosaurus/power_enum
 
 ## What is this?:
@@ -50,10 +51,15 @@ See "How to use it" below for more information.
 
 ## Requirements
 
+### PowerEnum 3.X
+
+* Ruby 2.1 or later (JRuby should work but isn't extensively tested; Travis is being difficult).
+* Rails 4.2, 5.0, 5.1
+
 ### PowerEnum 2.X
 
 * Ruby 1.9.3, 2.0, JRuby 1.7+ (Ruby 1.9.3 or 2.0 required for development)
-* Rails 4.0
+* Rails 4.0, 4.1, 4.2, 5.0
 
 ## Installation
 

data/lib/power_enum/has_enumerated.rb

@@ -125,17 +125,7 @@ module PowerEnum::HasEnumerated
     def create_ar_reflection(part_id, options)
       reflection = PowerEnum::Reflection::EnumerationReflection.new(part_id, options, self)
 
-      # ActiveRecord >= 4.1 handles this differently.
-      if self.respond_to? :_reflections=
-        if Rails.version =~ /^4\.2\.*/ || Rails.version =~ /^5\.0\.*/
-          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
+      self._reflections = self._reflections.merge(part_id.to_s => reflection)
       reflection
     end
     private :create_ar_reflection

data/lib/power_enum/reflection.rb

@@ -17,11 +17,7 @@ module PowerEnum::Reflection
   # 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
+    key = enumerated.to_s
     reflections[key].is_a?(PowerEnum::Reflection::EnumerationReflection) ? reflections[key] : nil
   end
 
@@ -39,47 +35,42 @@ module PowerEnum::Reflection
     attr_accessor :parent_reflection
 
     # See ActiveRecord::Reflection::MacroReflection
-    def initialize( name, options, active_record )
-      if Rails.version =~ /^4\.2\.*/ || Rails.version =~ /^5\.0\.*/
-        super name, nil, options, active_record
-      else
-        super :has_enumerated, name, nil, options, active_record
-      end
+    def initialize(name, options, active_record)
+      super name, nil, options, active_record
     end
 
-    if Rails.version =~ /^4\.2\.*/ || Rails.version =~ /^5\.0\.*/
-      def macro
-        :has_enumerated
-      end
+    def macro
+      :has_enumerated
+    end
 
-      def check_preloadable!
-        return unless scope
-        if scope.arity > 0
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+    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
+        MSG
       end
-      alias :check_eager_loadable! :check_preloadable!
+    end
 
-      def active_record_primary_key
-        @active_record_primary_key ||= options[:primary_key] || active_record.primary_key
-      end
+    alias :check_eager_loadable! :check_preloadable!
 
-      def klass
-        @klass ||= active_record.send(:compute_type, class_name)
-      end
+    def active_record_primary_key
+      @active_record_primary_key ||= options[:primary_key] || active_record.primary_key
+    end
 
-      EnumJoinKeys = Struct.new(:key, :foreign_key)
+    def klass
+      @klass ||= active_record.send(:compute_type, class_name)
+    end
 
-      def join_keys(_)
-        EnumJoinKeys.new(active_record_primary_key, foreign_key)
-      end
+    EnumJoinKeys = Struct.new(:key, :foreign_key)
+
+    def join_keys(*_)
+      EnumJoinKeys.new(active_record_primary_key, foreign_key)
     end
 
     # Returns the class name of the enum

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Trevor Squires
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,60 +61,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 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.