acts_as_hashids 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 566fc3dc46c7d62d6b380440acc8f5b58a168be0
-  data.tar.gz: bd082d7e564dad63be19230dd89c5662b111d1b1
+SHA256:
+  metadata.gz: c5b2d3eb197bd3107dd4ddfea07983d1d630caa4ee38826d26d2fef4f304b072
+  data.tar.gz: f25d68793d382f453f28ffe86cc56382719b93de6062fcbd924d0c8ef1402d33
 SHA512:
-  metadata.gz: 359269409ec054b38093f527a6b57b2b0ee6bae5103828e40d14504a897901e4eb72f42b2e486350ebd352500c79f83603bc611ec2fa41155c30b341bcc5880c
-  data.tar.gz: 89b03a0959d3bd501b047d1d42cd0110d3419420116936fe31a58f5023d7be6f2341e93fa32341adcbf3b658fc77ad4399977ae1c384d5fed7e9cbaa772e54c9
+  metadata.gz: 435ab3722ecb4a43578463c93296c7bd9759f416ef85df10cfb11558f8e49be3759f8e2a825e388776af773f0d4d908606653a53eea3414fac9a32e86d445a11
+  data.tar.gz: a9251eee6f872cf9a99529049d74fec714f7473afb8e8092f0090535a8cf9ae95193912216c0b1c1a6c2b1293399eb88beea02012a38fd5b8f89addec320e173

data/.rubocop.yml

@@ -19,17 +19,32 @@ Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity:
   Max: 10
+Metrics/BlockLength:
+  Enabled: false
 Documentation:
   Enabled: false
 Style/SignalException:
   EnforcedStyle: only_raise
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
-Style/IndentArray:
+Layout/IndentArray:
   EnforcedStyle: consistent
-Lint/EndAlignment:
-  AlignWith: variable
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+Lint/InheritException:
+  Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 RSpec/AnyInstance:
   Enabled: false
+RSpec/NestedGroups:
+  Max: 4
+RSpec/ContextWording:
+  Prefixes:
+    - when
+    - with
+    - without
+    - for
+    - as
+RSpec/MultipleExpectations:
+  Max: 2

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 env:
   -
   - ACTIVE_RECORD_VERSION=4.0.0
@@ -12,16 +13,21 @@ env:
   - ACTIVE_RECORD_VERSION=5.0.0
 matrix:
   allow_failures:
-    - rvm: 2.4.0
+    - rvm: 2.4
       env: ACTIVE_RECORD_VERSION=4.0.0
-    - rvm: 2.4.0
+    - rvm: 2.4
+      env: ACTIVE_RECORD_VERSION=4.1.0
+    - rvm: 2.5
+      env: ACTIVE_RECORD_VERSION=4.0.0
+    - rvm: 2.5
       env: ACTIVE_RECORD_VERSION=4.1.0
-cache: bundler
 before_install:
   - gem update --system
   - gem --version
-  - gem update bundler
-  - bundler --version
+install:
+  - gem install bundler
+  - bundle --version
+  - bundle install --jobs=3 --retry=3
 script:
   - 'bundle exec rake'
 notifications:

data/README.md

@@ -91,7 +91,7 @@ class Foo < ActiveRecord::Base
   acts_as_hashids alphabet: '0123456789uvwxyz'
 end
 
-Foo3.create(id: 1).to_param
+Foo.create(id: 1).to_param
 # => "4xw8zwyv"
 ```
 

data/Rakefile

@@ -7,4 +7,4 @@ require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
 task(:default).clear
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/acts_as_hashids.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'acts_as_hashids/version'
 
@@ -20,17 +19,17 @@ 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.5']
+  spec.required_ruby_version = ['>= 2.2.2', '< 2.6']
 
-  spec.add_runtime_dependency 'hashids', '~> 1.0'
   spec.add_runtime_dependency 'activerecord', '>= 4.0', '< 6.0'
+  spec.add_runtime_dependency 'hashids', '~> 1.0'
 
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.5'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
-  spec.add_development_dependency 'rubocop', '= 0.37.2'
-  spec.add_development_dependency 'rubocop-rspec', '= 1.4.0'
+  spec.add_development_dependency 'rubocop', '~> 0.54.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.24.0'
   spec.add_development_dependency 'simplecov', '~> 0.11'
-  spec.add_development_dependency 'coveralls', '~> 0.8'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.5'
+  spec.add_development_dependency 'sqlite3', '~> 1.3'
 end

data/lib/acts_as_hashids/version.rb

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

data/spec/acts_as_hashids/core_spec.rb

@@ -31,31 +31,33 @@ RSpec.describe ActsAsHashids::Core do
   end
 
   describe '.find' do
-    subject { CoreFoo }
+    subject(:model) { CoreFoo }
+
     let!(:foo1) { CoreFoo.create }
     let!(:foo2) { CoreFoo.create }
+
     context 'for single argument' do
       it 'decodes hash id and returns the record' do
-        expect(subject.find(foo1.to_param)).to eq foo1
+        expect(model.find(foo1.to_param)).to eq foo1
       end
       context 'with unexisting hash id' do
         it 'raises an exception' do
-          expect { subject.find('GXbMabNA') }.to raise_error(
+          expect { model.find('GXbMabNA') }.to raise_error(
             ActiveRecord::RecordNotFound, "Couldn't find CoreFoo with 'id'=\"GXbMabNA\""
           )
         end
       end
       it 'returns the record when finding by string id' do
-        expect(subject.find(foo1.id.to_s)).to eq foo1
+        expect(model.find(foo1.id.to_s)).to eq foo1
       end
     end
     context 'for multiple arguments' do
       it 'decodes hash id and returns the record' do
-        expect(subject.find([foo1.to_param, foo2.to_param])).to eq [foo1, foo2]
+        expect(model.find([foo1.to_param, foo2.to_param])).to eq [foo1, foo2]
       end
       context 'with unexisting hash id' do
         it 'raises an exception' do
-          expect { subject.find(%w(GXbMabNA ePQgabdg)) }.to raise_error(
+          expect { model.find(%w[GXbMabNA ePQgabdg]) }.to raise_error(
             ActiveRecord::RecordNotFound,
             "Couldn't find all CoreFoos with 'id': (\"GXbMabNA\", \"ePQgabdg\") (found 1 results, but was looking for 2)"
           )
@@ -64,49 +66,59 @@ RSpec.describe ActsAsHashids::Core do
     end
     context 'as ActiveRecord_Relation' do
       it 'decodes hash id and returns the record' do
-        expect(subject.where(nil).find(foo1.to_param)).to eq foo1
+        expect(model.where(nil).find(foo1.to_param)).to eq foo1
       end
     end
     context 'as ActiveRecord_Associations_CollectionProxy' do
-      let!(:bar3) { CoreBar.create core_foo: foo1 }
-      let!(:bar4) { CoreBar.create core_foo: foo1 }
+      let(:bar3) { CoreBar.create core_foo: foo1 }
+      let(:bar4) { CoreBar.create core_foo: foo1 }
+
+      before do
+        bar3
+        bar4
+      end
+
       it 'decodes hash id and returns the record' do
         expect(foo1.core_bars.find(bar3.to_param)).to eq bar3
       end
       context 'without arguments' do
         it 'delegates to detect method' do
-          expect(foo1.core_bars).to receive(:detect).once.and_call_original
+          allow(foo1.core_bars).to receive(:detect).once.and_call_original
           expect(foo1.core_bars.find { |bar| bar == bar3 }).to eq bar3
+          expect(foo1.core_bars).to have_received(:detect).once
         end
       end
     end
-    context 'reloaded' do
-      subject { CoreFoo.create }
+    context 'when reloaded' do
+      subject(:model) { CoreFoo.create }
+
       it 'decodes hash id and returns the record' do
         expect do
-          subject.reload
+          model.reload
         end.not_to raise_error
       end
     end
   end
   describe '.with_hashids' do
-    subject { CoreFoo }
+    subject(:model) { CoreFoo }
+
     let!(:foo1) { CoreFoo.create }
     let!(:foo2) { CoreFoo.create }
+
     it 'decodes hash id and returns the record' do
-      expect(subject.with_hashids([foo1.to_param, foo2.to_param]).all).to eq [foo1, foo2]
+      expect(model.with_hashids([foo1.to_param, foo2.to_param]).all).to eq [foo1, foo2]
     end
     context 'with invalid hash id' do
       it 'raises an exception' do
-        expect { subject.with_hashids('@').all }.to raise_error(ActsAsHashids::Exception, 'Decode error: ["@"]')
+        expect { model.with_hashids('@').all }.to raise_error(ActsAsHashids::Exception, 'Decode error: ["@"]')
       end
     end
   end
   describe '#to_param' do
-    subject { CoreFoo.create }
+    subject(:model) { CoreFoo.create id: 5 }
+
     it 'returns hash id' do
-      allow(subject).to receive(:id).and_return 5
-      expect(subject.to_param).to eq 'GXbMabNA'
+      expect(model.to_param).to eq 'GXbMabNA'
     end
   end
 end

data/spec/acts_as_hashids/methods_spec.rb

@@ -28,46 +28,53 @@ RSpec.describe ActsAsHashids::Methods do
   end
 
   describe '.hashids_secret' do
-    subject { create_model 'MethodsFoo' }
+    subject(:model) { create_model 'MethodsFoo' }
+
     it 'returns the class name' do
-      expect(subject.hashids_secret).to eq 'MethodsFoo'
+      expect(model.hashids_secret).to eq 'MethodsFoo'
     end
     context 'for STI' do
-      let!(:bar) { create_model 'MethodsBar' }
-      subject { create_model 'MethodsFoo', base: MethodsBar }
+      subject(:model) { create_model 'MethodsFoo', base: MethodsBar }
+
       it 'returns the base class name' do
-        expect(subject.hashids_secret).to eq 'MethodsBar'
+        create_model 'MethodsBar'
+        expect(model.hashids_secret).to eq 'MethodsBar'
       end
     end
     context 'with custom secret' do
-      subject { create_model 'MethodsFoo', secret: '^_^' }
+      subject(:model) { create_model 'MethodsFoo', secret: '^_^' }
+
       it 'returns the custom secret' do
-        expect(subject.hashids_secret).to eq '^_^'
+        expect(model.hashids_secret).to eq '^_^'
       end
       context 'with executable secret' do
-        subject { create_model 'MethodsFoo', secret: -> { "#{self.name} ^_^" } }
+        subject(:model) { create_model 'MethodsFoo', secret: -> { "#{name} ^_^" } }
+
         it 'returns the custom secret' do
-          expect(subject.hashids_secret).to eq 'MethodsFoo ^_^'
+          expect(model.hashids_secret).to eq 'MethodsFoo ^_^'
         end
       end
     end
   end
 
   describe '.hashids' do
-    subject { create_model 'MethodsFoo' }
+    subject(:model) { create_model 'MethodsFoo' }
+
     it 'returns the hashids instance' do
-      expect(subject.hashids.encode(1)).to eq Hashids.new('MethodsFoo', 8).encode(1)
+      expect(model.hashids.encode(1)).to eq Hashids.new('MethodsFoo', 8).encode(1)
     end
     context 'with custom length' do
-      subject { create_model 'MethodsFoo', length: 16 }
+      subject(:model) { create_model 'MethodsFoo', length: 16 }
+
       it 'returns the hashids instance' do
-        expect(subject.hashids.encode(1)).to eq Hashids.new('MethodsFoo', 16).encode(1)
+        expect(model.hashids.encode(1)).to eq Hashids.new('MethodsFoo', 16).encode(1)
       end
     end
     context 'with custom alphabet' do
-      subject { create_model 'MethodsFoo', alphabet: '1234567890abcdef' }
+      subject(:model) { create_model 'MethodsFoo', alphabet: '1234567890abcdef' }
+
       it 'returns the hashids instance' do
-        expect(subject.hashids.encode(1)).to eq Hashids.new('MethodsFoo', 8, '1234567890abcdef').encode(1)
+        expect(model.hashids.encode(1)).to eq Hashids.new('MethodsFoo', 8, '1234567890abcdef').encode(1)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 # Test Coverage
 require 'codeclimate-test-reporter'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_hashids
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - dtaniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashids
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -45,117 +31,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: hashids
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
 description: Use Youtube-Like ID in ActiveRecord seamlessly.
 email:
 - daisuketaniwaki@gmail.com
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Use Youtube-Like ID in ActiveRecord seamlessly.