hashid-rails 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d9ab4bf57ba4701a2c7b6b3623918acf8d6d5b
-  data.tar.gz: 9c3d4ddb80707ba6d37527fb42866a5d207476a4
+  metadata.gz: 507694ba57b2e4a2bcdfa90869828753f0cb30d1
+  data.tar.gz: 91496f73e9b29be5cb2a4c72693de1f60c545b08
 SHA512:
-  metadata.gz: 890565c0d8146c4cd14767b6532c00173e94f2d0d88945575a763ad657c68c01cca430740849914321024f46978006f49e1f4c3818b270dfdfabe6477cf0de63
-  data.tar.gz: 462f649bb6208099c1aa5901d6868fb2ee94841121864f1c4d5a29059b8dc3abdf230804d9deb052469071345c29e7fc9959a7975afc2cbcda2a516c1856d227
+  metadata.gz: 661591b2767fae3adc5556e7e6c78fe912cbad133fedcd4266ee1d2317fc82cd29afe6fdf9d2870b2f4ce41d3f4e89fa7d56c0cc23ea5eed20c475eb96460006
+  data.tar.gz: 01c86a260f13fa72a9a253175ff3728d583ee41a70fc2e1960546efe0f716994ef2c4c2b7abe59218745543c501542dcd2abf62f93e8b54fa037b32472eae0e1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.0 (2017-11-17)
+- Fix regression where `find_by_hashid` and `find_by_hashid!` attempt to decode
+  values that are not hashids. ([#41](https://github.com/jcypret/hashid-rails/pull/41))
+
 ## 1.1.1 (2017-11-03)
 - Fix eager loading and finding records through a parent. ([#39](https://github.com/jcypret/hashid-rails/pull/39))
 

data/README.md

@@ -18,7 +18,7 @@ be added or removed at any time.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'hashid-rails'
+gem 'hashid-rails', '~> 1.0'
 ```
 
 And then execute:
@@ -30,7 +30,7 @@ $ bundle
 Or install it yourself as:
 
 ```shell
-$ gem install hashid-rails
+$ gem install hashid-rails -v 1.0
 ```
 
 ## Basic Usage

data/lib/hashid/rails.rb

@@ -52,11 +52,14 @@ module Hashid
         end
       end
 
-      def decode_id(ids)
+      # @param ids [String, Integer, Array<Integer, String>] id(s) to decode.
+      # @param fallback [Boolean] indicates whether to return the passed in
+      #   id(s) if unable to decode or if already decoded.
+      def decode_id(ids, fallback: false)
         if ids.is_a?(Array)
-          ids.map { |id| hashid_decode(id) }
+          ids.map { |id| hashid_decode(id, fallback: fallback) }
         else
-          hashid_decode(ids)
+          hashid_decode(ids, fallback: fallback)
         end
       end
 
@@ -67,18 +70,18 @@ module Hashid
         uniq_ids = uniq_ids.first unless expects_array || uniq_ids.size > 1
 
         if Hashid::Rails.configuration.override_find
-          super(decode_id(uniq_ids))
+          super(decode_id(uniq_ids, fallback: true))
         else
           super
         end
       end
 
       def find_by_hashid(hashid)
-        find_by(id: decode_id(hashid))
+        find_by(id: decode_id(hashid, fallback: false))
       end
 
       def find_by_hashid!(hashid)
-        find_by!(id: decode_id(hashid))
+        find_by!(id: decode_id(hashid, fallback: false))
       end
 
       private
@@ -95,10 +98,12 @@ module Hashid
         end
       end
 
-      def hashid_decode(id)
+      def hashid_decode(id, fallback:)
         decoded_hashid = hashids.decode(id.to_s)
+        fallback_value = fallback ? id : nil
+
         if Hashid::Rails.configuration.sign_hashids
-          valid_hashid?(decoded_hashid) ? decoded_hashid.last : id
+          valid_hashid?(decoded_hashid) ? decoded_hashid.last : fallback_value
         else
           decoded_hashid.first
         end

data/lib/hashid/rails/version.rb

@@ -1,5 +1,5 @@
 module Hashid
   module Rails
-    VERSION = "1.1.1".freeze
+    VERSION = "1.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashid-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Justin Cypret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler