effective_obfuscation 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663ee3b671c5b2e3ff60b0fda8bbba560a0f6b90
-  data.tar.gz: d359df1a0528541b81a50075bd02000887bd9c25
+  metadata.gz: 136beb68fd38439dfe0d5904a5e0e6dd353b939a
+  data.tar.gz: a39e154c154df56f985d28bcb8c321491640959d
 SHA512:
-  metadata.gz: 817a570976605ae3d0db71c34fc90a0d3f2240616e7f644b5937fcf0f3383438a48db7de41892f5e85b43835bc375eea90328377e70c8e2454db82a5af74c17f
-  data.tar.gz: f93698009988c21e676dbf09bcbef15400cca631dccf7d6459ffee2e0b482f46f01c825bf5cab2e70728f8502aa491bca62907551e67d2cf85476be93f3194ba
+  metadata.gz: 2557b83c462eccf88a25c9bfecaaffadd671c36d19cfec9e9b276aeb5ccf9a2da4452b3a49d876edbe2b005acae6c4f9059aca99e00f5a1d2ec9ee56103ca82c
+  data.tar.gz: eb7f98b1704d724814057648ded7c3dc5ee0fff97cdc62329b71001c2371ae6bb03100a4e7229db14d9c9b6635ad3b1a91fa2a8c48a9fc3b43d894e6e5f27ebf

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

@@ -53,9 +53,7 @@ module ActsAsObfuscated
       } { |parent| parent.table[:id] }
     end
 
-    if Gem::Version.new(Rails.version) >= Gem::Version.new('4.2') && Gem::Version.new(Rails.version) < Gem::Version.new('5')
-      extend FinderMethods
-    end
+    extend FinderMethods if EffectiveObfuscation.extend_klass?
   end
 
   module ClassMethods
@@ -113,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') || Gem::Version.new(Rails.version) >= Gem::Version.new('5')
+    if EffectiveObfuscation.extend_relation?
       def relation
         super.tap { |relation| relation.extend(FinderMethods) }
       end
@@ -122,7 +120,9 @@ module ActsAsObfuscated
 
   module FinderMethods
     def find(*args)
-      return find_by_id(args.first) if (@_effective_obfuscation_reloading || klass.try(:instance_variable_get, :@_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

data/lib/effective_obfuscation/version.rb

@@ -1,3 +1,3 @@
 module EffectiveObfuscation
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.3.2'.freeze
 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.1')
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_obfuscation
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-05-29 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: []
@@ -73,9 +72,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 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: []