hashid-rails 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6796fd1b0c38d1df8d7fcd78d34b94d33f4a3369
-  data.tar.gz: d350084ba5b79ab7a1a8ad0804971a9ab63602f6
+SHA256:
+  metadata.gz: b4ea795a68ca182b4cf66429705dc4281272502ef4e9922551082ddb1dfad022
+  data.tar.gz: 38f04be13d9159eadd37075091f90ddb57bef4eaac679718681deae67cfc33d1
 SHA512:
-  metadata.gz: 7ef74a3bfaae4abc770f454c40904c8a3d011d730957fbd80177249c9c8486d52e9d41796f654df243b63ab97b57c9547aa8868635bab88b51d0bb6df505e863
-  data.tar.gz: 625758b6b7f65a6a470b7bfbdabc53b5eaee834d8c26dbdc3c73f2a55ef975ba58fb5bb6c7b5985b08128751f91aee7d8db6a9578401973e5188aad06db2d371
+  metadata.gz: 94cecc8c493920fb3aa1e0495e307989d6d1051ca8284580f11be3090f55a3c9821c34f8cb4248511c70537c618db1066f5ebdb3a654a7e1182c700f67e7eb30
+  data.tar.gz: 2ed1f2740f8f1d67fd2ce1997b6c06d6de4d8925eca00eb13dd9251a75406bac09635429d8a7e8177a4ef3b62af88825330e93fd7530746fcbd30ffeebd221cc

data/.rubocop.yml

@@ -1,10 +1,15 @@
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-Style/IndentArray:
+AllCops:
+  TargetRubyVersion: 2.3
+Layout/IndentArray:
   EnforcedStyle: consistent
-Style/Documentation:
-  Enabled: false
 Metrics/BlockLength:
   Exclude:
   - "*.gemspec"
   - "spec/**/*.rb"
+Naming/PredicateName:
+  NameWhitelist:
+    - has_many
+Style/Documentation:
+  Enabled: false
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.travis.yml

@@ -1,9 +1,15 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=37aee70bb2e818f3bf4d2af88ea4a4355393901ba98b3876c244d42ed20fdbe1
 language: ruby
 cache: bundler
 rvm:
   - 2.3.0
-addons:
-  code_climate:
-    repo_token: 37aee70bb2e818f3bf4d2af88ea4a4355393901ba98b3876c244d42ed20fdbe1
-after_success:
-  - bundle exec codeclimate-test-reporter
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.2 (2018-07-29)
+### Fixed
+- Handle exception raised when using a letter-only alphabet and attempting to
+  decode an integer ID from [@Drakula2k](https://github.com/Drakula2k) ([#54](https://github.com/jcypret/hashid-rails/pull/54)).
+
 ## 1.2.1 (2018-01-13)
 - Found issue where unsigned hashids with `find` did not fall back to passed in ID ([#46](https://github.com/jcypret/hashid-rails/pull/46)).
 - Move finder specs to a shared example run against both the signed and unsigned hashids.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in hashid-rails.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "hashid/rails"

data/hashid-rails.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "hashid/rails/version"
@@ -10,13 +11,13 @@ Gem::Specification.new do |spec|
   spec.email         = ["jcypret@gmail.com"]
 
   spec.summary       = "Use Hashids in your Rails app models."
-  spec.description   = <<-EOM
+  spec.description   = <<-DESCRIPTION
     This gem allows you to easily use [Hashids](http://hashids.org/ruby/)
     in your Rails app. Instead of your models using sequential numbers like 1,
     2, 3, they will instead have unique short hashes like "yLA6m0oM",
     "5bAyD0LO", and "wz3MZ49l". The database will still use integers under
     the hood, so this gem can be added or removed at any time.
-  EOM
+  DESCRIPTION
   spec.homepage      = "https://github.com/jcypret/hashid-rails"
   spec.license       = "MIT"
 
@@ -28,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.4.0"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
-  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "sqlite3"
 
   spec.add_runtime_dependency "activerecord", ">= 4.0"
   spec.add_runtime_dependency "hashids", "~> 1.0"

data/lib/hashid/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "hashid/rails/version"
 require "hashid/rails/configuration"
 require "hashids"
@@ -38,7 +40,7 @@ module Hashid
         super.tap { |r| r.extend ClassMethods }
       end
 
-      def has_many(*args, &block) # rubocop:disable Style/PredicateName
+      def has_many(*args, &block)
         options = args.extract_options!
         options[:extend] = Array(options[:extend]).push(ClassMethods)
         super(*args, options, &block)
@@ -99,14 +101,16 @@ module Hashid
       end
 
       def hashid_decode(id, fallback:)
-        decoded_hashid = hashids.decode(id.to_s)
         fallback_value = fallback ? id : nil
+        decoded_hashid = hashids.decode(id.to_s)
 
         if Hashid::Rails.configuration.sign_hashids
           valid_hashid?(decoded_hashid) ? decoded_hashid.last : fallback_value
         else
           decoded_hashid.first || fallback_value
         end
+      rescue Hashids::InputError
+        fallback_value
       end
 
       def valid_hashid?(decoded_hashid)

data/lib/hashid/rails/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hashid
   module Rails
     class Configuration

data/lib/hashid/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Hashid
   module Rails
-    VERSION = "1.2.1".freeze
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashid-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Justin Cypret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Use Hashids in your Rails app models.