effective_obfuscation 1.2.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 66c78820411ac85c68890ea7c820e8edde646c71
-  data.tar.gz: abc972df5fc6965e0aee00aa6a07853fd801b646
+SHA256:
+  metadata.gz: 8c6e7de8d7952b1908c410cb22eac9d30fcde46d61cba65afa8261c684d6386e
+  data.tar.gz: 25556589bebd12bd7c1986ee5ce4d5e46afc359be6911e2b331252bebcb19315
 SHA512:
-  metadata.gz: 22abb8a737752142e3c2811b46820f81319884e6630fc80646a242791e300d4e23bd4a457a23f9e22e85cd4ca0ab510324327e6780428ff66ed75af5cf0e4321
-  data.tar.gz: 7a7f19881dbe5cc360ed4376e36cffcf9f2b822bce399268279de9e3288f8f1c54f771f2d70472b8cd1b661a2d961928d96fd78acf1fa881969cd4324413d8c4
+  metadata.gz: 33293e400fab0e47d49ec08d3b53e5b7a47029689ecc9a5dcfeb52876259424abad7abf99f4c8b9a715e999c69a969a502ac221b81f99159cb952a8bd7233332
+  data.tar.gz: 3d3815196f2a571b47e267bb8455b21fe775fb944d1226efa03419f131c6545802af3cf4c57e003abc8f7a091e1224f3b62737a9fdf6b5e9a649ad1e35889eed

data/README.md

@@ -33,7 +33,7 @@ This is a Rails 4 compatible version of obfuscate_id (https://github.com/namick/
 Add to Gemfile:
 
 ```ruby
-gem 'effective_obfuscation', :git => 'https://github.com/code-and-effect/effective_obfuscation.git'
+gem 'effective_obfuscation'
 ```
 
 Run the bundle command to install it:

data/app/models/concerns/acts_as_obfuscated.rb

@@ -50,10 +50,10 @@ module ActsAsObfuscated
       ransacker :id, :formatter => Proc.new { |original|
         obfuscated_id = original.to_s.delete('^0-9').first(10)
         obfuscated_id.length == 10 ? deobfuscate(original) : 0
-      } { |parent| parent.table[:id] }
+      } do |parent| parent.table[:id] end
     end
 
-    extend FinderMethods if Gem::Version.new(Rails.version) >= Gem::Version.new('4.2.0')
+    extend FinderMethods if EffectiveObfuscation.extend_klass?
   end
 
   module ClassMethods
@@ -111,7 +111,7 @@ module ActsAsObfuscated
       acts_as_obfuscated_opts[:max_id] ||= (self.unscoped.maximum(:id) rescue 2147483647)
     end
 
-    if Gem::Version.new(Rails.version) < Gem::Version.new('4.2')
+    if EffectiveObfuscation.extend_relation?
       def relation
         super.tap { |relation| relation.extend(FinderMethods) }
       end
@@ -120,7 +120,9 @@ module ActsAsObfuscated
 
   module FinderMethods
     def find(*args)
-      return find_by_id(args.first) if @_effective_obfuscation_reloading
+      if @_effective_obfuscation_reloading || (respond_to?(:klass) && klass.try(:instance_variable_get, :@_effective_obfuscation_reloading))
+        return find_by_id(args.first)
+      end
 
       super(deobfuscate(args.first, false))
     end
@@ -150,7 +152,7 @@ module ActsAsObfuscated
           next unless (d = deobfuscator(left))
           args.first[left] = d.call(right)
         end
-      elsif args.first.class.parent == Arel::Nodes
+      elsif args.first.kind_of?(String) == false
         deobfuscate_arel!(args.first)
       end
 
@@ -185,4 +187,3 @@ module ActsAsObfuscated
   end
 
 end
-

data/lib/effective_obfuscation.rb

@@ -10,4 +10,17 @@ module EffectiveObfuscation
   def self.show(id, spin)
     ::ScatterSwap.reverse_hash(id, spin).to_i
   end
+
+  def self.extend_klass?
+    return false if Gem::Version.new(Rails.version) < Gem::Version.new('4.2')
+    return true if Gem::Version.new(Rails.version) >= Gem::Version.new('5')
+    false
+  end
+
+  def self.extend_relation?
+    return true if Gem::Version.new(Rails.version) < Gem::Version.new('4.2')
+    return true if Gem::Version.new(Rails.version) >= Gem::Version.new('5')
+    false
+  end
+
 end

data/lib/effective_obfuscation/version.rb

@@ -1,3 +1,3 @@
 module EffectiveObfuscation
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_obfuscation
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,9 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
-description: Display unique 10-digit numbers instead of ActiveRecord IDs.  Hides the
-  ID param so curious website visitors are unable to determine your user or order
-  count.
+description: Display unique 10-digit numbers instead of ActiveRecord IDs. Hides the
+  ID param so curious website visitors are unable to determine your resource count.
 email:
 - info@codeandeffect.com
 executables: []
@@ -57,7 +56,7 @@ homepage: https://github.com/code-and-effect/effective_obfuscation
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,10 +71,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
-summary: Display unique 10-digit numbers instead of ActiveRecord IDs.  Hides the ID
-  param so curious website visitors are unable to determine your user or order count.
+summary: Display unique 10-digit numbers instead of ActiveRecord IDs. Hides the ID
+  param so curious website visitors are unable to determine your resource count.
 test_files: []