acts_as_hashids 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b2d3eb197bd3107dd4ddfea07983d1d630caa4ee38826d26d2fef4f304b072
-  data.tar.gz: f25d68793d382f453f28ffe86cc56382719b93de6062fcbd924d0c8ef1402d33
+  metadata.gz: 92ccec5715b0a4a426d6e1e07a6b6fa9b11745b67cc0bafb0c80c250c5811b3d
+  data.tar.gz: ee9a2fb503e7deb91145d9ddf3941f20f13d74464269592687931c206bc62e40
 SHA512:
-  metadata.gz: 435ab3722ecb4a43578463c93296c7bd9759f416ef85df10cfb11558f8e49be3759f8e2a825e388776af773f0d4d908606653a53eea3414fac9a32e86d445a11
-  data.tar.gz: a9251eee6f872cf9a99529049d74fec714f7473afb8e8092f0090535a8cf9ae95193912216c0b1c1a6c2b1293399eb88beea02012a38fd5b8f89addec320e173
+  metadata.gz: 16fedb61fad08ef6178334bdde02ec9fef11d59c8a33faf9d55d112392b4ab1190b51eaccee999bb5e792f6e0d3ed9336e7f2125365ed9c7e06477299003df3f
+  data.tar.gz: cb8ab63791d6f1a00cea289854777f8cdd5afa8c7a9c5988f76db3baf15a7bb55925095eb61e8229399d42d8c78a6d19fcf23fbab72e6065ccc3704229d0a82b

data/.travis.yml

@@ -1,26 +1,33 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2
-  - 2.3
   - 2.4
   - 2.5
+  - 2.6
 env:
+  jobs:
   -
-  - ACTIVE_RECORD_VERSION=4.0.0
-  - ACTIVE_RECORD_VERSION=4.1.0
-  - ACTIVE_RECORD_VERSION=4.2.0
-  - ACTIVE_RECORD_VERSION=5.0.0
+  - ACTIVE_RECORD_VERSION=4.0.0 SQLITE3_VERSION=1.3.13
+  - ACTIVE_RECORD_VERSION=4.1.0 SQLITE3_VERSION=1.3.13
+  - ACTIVE_RECORD_VERSION=4.2.0 SQLITE3_VERSION=1.3.13
+  - ACTIVE_RECORD_VERSION=5.0.0 SQLITE3_VERSION=1.3.13
+  - ACTIVE_RECORD_VERSION=6.0.0
 matrix:
   allow_failures:
     - rvm: 2.4
-      env: ACTIVE_RECORD_VERSION=4.0.0
+      env: ACTIVE_RECORD_VERSION=4.0.0 SQLITE3_VERSION=1.3.13
     - rvm: 2.4
-      env: ACTIVE_RECORD_VERSION=4.1.0
+      env: ACTIVE_RECORD_VERSION=4.1.0 SQLITE3_VERSION=1.3.13
     - rvm: 2.5
-      env: ACTIVE_RECORD_VERSION=4.0.0
+      env: ACTIVE_RECORD_VERSION=4.0.0 SQLITE3_VERSION=1.3.13
     - rvm: 2.5
-      env: ACTIVE_RECORD_VERSION=4.1.0
+      env: ACTIVE_RECORD_VERSION=4.1.0 SQLITE3_VERSION=1.3.13
+    - rvm: 2.6
+      env: ACTIVE_RECORD_VERSION=4.0.0 SQLITE3_VERSION=1.3.13
+    - rvm: 2.6
+      env: ACTIVE_RECORD_VERSION=4.1.0 SQLITE3_VERSION=1.3.13
+    - rvm: 2.4
+      env: ACTIVE_RECORD_VERSION=6.0.0
 before_install:
   - gem update --system
   - gem --version

data/Gemfile

@@ -6,3 +6,4 @@ gem 'gem-release'
 gem 'pry'
 
 gem 'activerecord', "~> #{ENV['ACTIVE_RECORD_VERSION']}" if ENV['ACTIVE_RECORD_VERSION'].to_s != ''
+gem 'sqlite3', "~> #{ENV['SQLITE3_VERSION']}" if ENV['SQLITE3_VERSION'].to_s != ''

data/acts_as_hashids.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ['>= 2.2.2', '< 2.6']
+  spec.required_ruby_version = ['>= 2.2.2', '< 2.7']
 
-  spec.add_runtime_dependency 'activerecord', '>= 4.0', '< 6.0'
+  spec.add_runtime_dependency 'activerecord', '>= 4.0', '< 6.1'
   spec.add_runtime_dependency 'hashids', '~> 1.0'
 
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.5'

data/lib/acts_as_hashids/core.rb

@@ -15,7 +15,7 @@ module ActsAsHashids
 
         encoded_ids = Array(ids).map do |id|
           begin
-            id = id.to_i if Float(id)
+            id = id.to_i if Integer(id)
             hashids.encode(id)
           rescue TypeError, ArgumentError
             id

data/lib/acts_as_hashids/version.rb

@@ -1,3 +1,3 @@
 module ActsAsHashids
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/spec/acts_as_hashids/core_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe ActsAsHashids::Core do
 
   class Base < ActiveRecord::Base
     self.abstract_class = true
-    acts_as_hashids
+    acts_as_hashids length: 4
   end
 
   class CoreFoo < Base
@@ -42,11 +42,24 @@ RSpec.describe ActsAsHashids::Core do
       end
       context 'with unexisting hash id' do
         it 'raises an exception' do
-          expect { model.find('GXbMabNA') }.to raise_error(
-            ActiveRecord::RecordNotFound, "Couldn't find CoreFoo with 'id'=\"GXbMabNA\""
+          expect { model.find('bMab') }.to raise_error(
+            ActiveRecord::RecordNotFound, "Couldn't find CoreFoo with 'id'=\"bMab\""
           )
         end
       end
+      context 'with hash id which looks like a logarithm' do
+        let!(:foo1) { CoreFoo.create(id: CoreFoo.hashids.decode('4E93')[0]) }
+        let!(:foo2) { CoreFoo.create(id: '4') }
+
+        it 'decodes hash id which looks like a logarithm and returns the record' do
+          expect(model.find('4E93')).to eq foo1
+          expect(model.find('4')).not_to eq foo1
+        end
+        it 'decodes hash id and returns the record' do
+          expect(model.find('4E93')).not_to eq foo2
+          expect(model.find('4')).to eq foo2
+        end
+      end
       it 'returns the record when finding by string id' do
         expect(model.find(foo1.id.to_s)).to eq foo1
       end
@@ -57,9 +70,9 @@ RSpec.describe ActsAsHashids::Core do
       end
       context 'with unexisting hash id' do
         it 'raises an exception' do
-          expect { model.find(%w[GXbMabNA ePQgabdg]) }.to raise_error(
+          expect { model.find(%w[bMab Qgab]) }.to raise_error(
             ActiveRecord::RecordNotFound,
-            "Couldn't find all CoreFoos with 'id': (\"GXbMabNA\", \"ePQgabdg\") (found 1 results, but was looking for 2)"
+            "Couldn't find all CoreFoos with 'id': (\"bMab\", \"Qgab\") (found 1 results, but was looking for 2)"
           )
         end
       end
@@ -118,7 +131,7 @@ RSpec.describe ActsAsHashids::Core do
     subject(:model) { CoreFoo.create id: 5 }
 
     it 'returns hash id' do
-      expect(model.to_param).to eq 'GXbMabNA'
+      expect(model.to_param).to eq 'bMab'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_hashids
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - dtaniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: hashids
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="