hashid-rails 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 526e0841f450314d3c8d049941ab61275891ed64
-  data.tar.gz: 75ff98d44c3648286577d9e2feb1d290c043a340
+  metadata.gz: 4fe325595eeafbc4188f0913be0ac17741e189aa
+  data.tar.gz: b4185d19550070bcf9c0f39b68879143ac63f573
 SHA512:
-  metadata.gz: f1cad18e7420750ccc5f92df1cd74ebea98d5f228b2b59d10dd95013e754fb06cc7aaee719be90fc5abff2c085d714517c02f0bc5d294b5ef5b46a2e049d2261
-  data.tar.gz: 005259636916b84aad080f30295f65bc5529e75b60cdfea28eace0e1f312099f64072dff5f426664e368def2dd0c88a132190bb57cd0a11f36770c672a078794
+  metadata.gz: df5fe6370f8361bc180b47af9786012639d5d84a7bebaf921c4da895f54f6bb72cf8193912a82cd7e0d7e00d1fbcd7d8a67be1909d3a905e7536b9596101ad2b
+  data.tar.gz: 83b1355d0319263be80bf7e6e6138800a803fab8eb84114650f03b55b0552a8b55297df579c3b87cfae257b244f335f999fb04c6707bfea8c395cc26ef37b63c

data/.rubocop.yml

@@ -0,0 +1,10 @@
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/IndentArray:
+  EnforcedStyle: consistent
+Style/Documentation:
+  Enabled: false
+Style/BlockLength:
+  Exclude:
+  - "*.gemspec"
+  - "spec/**/*.rb"

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.0
-  - 2.1
   - 2.2.5
   - 2.3.1
 addons:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.6.0 (2017-01-07)
+- Add Rubocop and adjust styles to be consistent.
+- Fix issue where finding multiple non-hashids returns an array of nils.
+- Switch over testing to use SQLite for more accurate db interactions.
+
 ## 0.5.0 (2016-10-15)
 - Update specs to support Rails 5.x series.
 

data/Gemfile

@@ -1,6 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in hashid-rails.gemspec
 gemspec
-
-gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

@@ -1,4 +1,5 @@
 # Hashid Rails
+[![Gem Version](https://badge.fury.io/rb/hashid-rails.svg)](https://badge.fury.io/rb/hashid-rails)
 [![Build Status](https://travis-ci.org/jcypret/hashid-rails.svg?branch=master)](https://travis-ci.org/jcypret/hashid-rails)
 [![Code Climate](https://codeclimate.com/github/jcypret/hashid-rails/badges/gpa.svg)](https://codeclimate.com/github/jcypret/hashid-rails)
 [![Test Coverage](https://codeclimate.com/github/jcypret/hashid-rails/badges/coverage.svg)](https://codeclimate.com/github/jcypret/hashid-rails/coverage)
@@ -29,8 +30,6 @@ Or install it yourself as:
 $ gem install hashid-rails
 ```
 
-> Note: This gem is not yet compatible with Rails 5.
-
 ## Basic Usage
 
 Just use `Model#find` passing in the hashid instead of the model id.

data/Rakefile

@@ -1,7 +1,7 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
-task :test => :spec
+task default: :spec
+task test: :spec

data/hashid-rails.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hashid/rails/version'
+require "hashid/rails/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'hashid-rails'
+  spec.name          = "hashid-rails"
   spec.version       = Hashid::Rails::VERSION
-  spec.authors       = ['Justin Cypret']
-  spec.email         = ['jcypret@gmail.com']
+  spec.authors       = ["Justin Cypret"]
+  spec.email         = ["jcypret@gmail.com"]
 
-  spec.summary       = %q{Use Hashids in your Rails app models.}
+  spec.summary       = "Use Hashids in your Rails app models."
   spec.description   = <<-EOM
     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,
@@ -17,18 +17,24 @@ Gem::Specification.new do |spec|
     "5bAyD0LO", and "wz3MZ49l". The database will still use integers under
     the hood, so this gem can be added or removed at any time.
   EOM
-  spec.homepage      = 'https://github.com/jcypret/hashid-rails'
-  spec.license       = 'MIT'
+  spec.homepage      = "https://github.com/jcypret/hashid-rails"
+  spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
+  spec.files         = `git ls-files -z`
+                       .split("\x0")
+                       .reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 3.4.0"
+  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "byebug"
 
-  spec.add_runtime_dependency 'activerecord', '>= 4.0'
-  spec.add_runtime_dependency 'hashids', '~> 1.0'
+  spec.add_runtime_dependency "activerecord", ">= 4.0"
+  spec.add_runtime_dependency "hashids", "~> 1.0"
 end

data/lib/hashid/rails.rb

@@ -1,10 +1,10 @@
-require 'hashid/rails/version'
-require 'hashids'
-require 'active_record'
+require "hashid/rails/version"
+require "hashid/rails/configuration"
+require "hashids"
+require "active_record"
 
 module Hashid
   module Rails
-
     # Get configuration or load defaults
     def self.configuration
       @configuration ||= Configuration.new
@@ -31,10 +31,9 @@ module Hashid
     def to_param
       encoded_id
     end
-    alias_method :hashid, :to_param
+    alias hashid to_param
 
     module ClassMethods
-
       def hashids
         secret = Hashid::Rails.configuration.secret
         length = Hashid::Rails.configuration.length
@@ -56,14 +55,15 @@ module Hashid
 
       def decode_id(ids)
         if ids.is_a?(Array)
-          ids.map { |id| hashid_decode(id) }
+          decoded_ids = ids.map { |id| hashid_decode(id) }
+          decoded_ids.any? ? decoded_ids : nil
         else
           hashid_decode(ids)
         end
       end
 
       def find(hashid)
-        model_reload? ? super(hashid) : super( decode_id(hashid) || hashid )
+        model_reload? ? super(hashid) : super(decode_id(hashid) || hashid)
       end
 
       def find_by_hashid(hashid)
@@ -73,7 +73,7 @@ module Hashid
       private
 
       def model_reload?
-        caller.any? {|s| s =~ /active_record\/persistence.*reload/}
+        caller.any? { |s| s =~ %r{ active_record/persistence.*reload } }
       end
 
       def hashid_decode(id)
@@ -84,17 +84,6 @@ module Hashid
         hashids.encode(id)
       end
     end
-
-    class Configuration
-      attr_accessor :secret, :length, :alphabet
-
-      def initialize
-        @secret = ''
-        @length = 6
-        @alphabet = nil
-      end
-    end
-
   end
 end
 

data/lib/hashid/rails/configuration.rb

@@ -0,0 +1,13 @@
+module Hashid
+  module Rails
+    class Configuration
+      attr_accessor :secret, :length, :alphabet
+
+      def initialize
+        @secret = ""
+        @length = 6
+        @alphabet = nil
+      end
+    end
+  end
+end

data/lib/hashid/rails/version.rb

@@ -1,5 +1,5 @@
 module Hashid
   module Rails
-    VERSION = '0.5.0'
+    VERSION = "0.6.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashid-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Cypret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +150,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -104,6 +161,7 @@ files:
 - bin/setup
 - hashid-rails.gemspec
 - lib/hashid/rails.rb
+- lib/hashid/rails/configuration.rb
 - lib/hashid/rails/version.rb
 homepage: https://github.com/jcypret/hashid-rails
 licenses: