hashids 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ce10327504b42999d641f7f5e1c1783cf20208
-  data.tar.gz: 72dde477590fe6e4618cfa38d21a17a7923ca5ad
+  metadata.gz: 7838e770d8464e2dee709af97762ffe81aa169a6
+  data.tar.gz: 9d6d15ad2f68c4a00d000f752ad47d45fa5ec4df
 SHA512:
-  metadata.gz: fb41de55bd4c95a0ec76ad8f851f85aaaff6a710a822c46e50f8453e5f70927fa7c8aaf221cc41d7c493907542fd48e8359bb0ceec47a1e5e026b9c2d53ead3f
-  data.tar.gz: 5cc3fe49ce4849d4e720f83c9d09ef0ad984610187a1ab1db549d55351c247d79e3e3c238e1a537187842b46e39b793b03c1b4eaad1efa84cfd9197a98c03b19
+  metadata.gz: 87ddcc37962df16da3cd708207ed69b2ff7f08d97fea78b7ad9a3b936f94ecfbb7486efbfcea8cf4fbcb9392256c151cdeef745ffe6ce2553dfb325eb4544d46
+  data.tar.gz: 8556ae0a406ac8179e401d0023ded1a78577ce8d27ef4e1ae05c899d1b067009edce64fa5eba4731585f63422235ee88f5f68a9c646d582940fdf1d37049f6d5

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
+
 bundler_args: --without documentation
+
 rvm:
-  - 2.1.2
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - 2.1.10
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - jruby-9.1.6.0
+  - jruby-1.7.26
+
+sudo: false

data/Gemfile

@@ -6,3 +6,7 @@ gemspec
 group :development do
   gem "rake"
 end
+
+group :test do
+  gem "minitest"
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Peter Hellberg
+Copyright (c) 2013-2016 Peter Hellberg
 
 MIT License
 

data/README.md

@@ -5,8 +5,8 @@ Use hashids when you do not want to expose your database ids to the user.
 
 [http://hashids.org/ruby/](http://hashids.org/ruby/)
 
-[![Build Status](https://secure.travis-ci.org/peterhellberg/hashids.rb.png)](http://travis-ci.org/peterhellberg/hashids.rb)
-(2.1.2, 2.0.0, 1.9.3, jruby-19mode, rbx-19mode)
+[![Build Status](https://travis-ci.org/peterhellberg/hashids.rb.svg?branch=master)](http://travis-ci.org/peterhellberg/hashids.rb)
+(2.4.0 2.3.1, 2.2.5, 2.1.9, 2.0.0, jruby-9.0.5.0, jruby-1.7.20)
 
 ## What is it?
 
@@ -208,6 +208,14 @@ hex_str = hashids.decode_hex("kRNrpKlJ")
 
 ## Changelog
 
+**1.0.3**
+
+ - Support for Ruby 2.4.0
+
+**1.0.2**
+
+  - Handle invalid input by raising InputError
+
 **1.0.1**
 
  - Final alphabet length can now be shorter than the minimum alphabet length

data/lib/hashids.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class Hashids
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 
   MIN_ALPHABET_LENGTH = 16
   SEP_DIV             = 3.5
@@ -26,11 +26,11 @@ class Hashids
   def encode(*numbers)
     numbers.flatten! if numbers.length == 1
 
-    if numbers.empty? || numbers.reject { |n| Integer(n) && n >= 0 }.any?
-      ""
-    else
-      internal_encode(numbers)
-    end
+    numbers.map! { |n| Integer(n) } # raises if conversion fails
+
+    return '' if numbers.empty? || numbers.any? { |n| n < 0 }
+
+    internal_encode(numbers)
   end
 
   def encode_hex(str)
@@ -114,18 +114,18 @@ class Hashids
   def internal_decode(hash, alphabet)
     ret = []
 
-    breakdown = hash.gsub(/[#{@guards}]/, " ")
+    breakdown = hash.tr(@guards, " ")
     array     = breakdown.split(" ")
 
     i = [3,2].include?(array.length) ? 1 : 0
 
     if breakdown = array[i]
       lottery   = breakdown[0]
-      breakdown = breakdown[1 .. -1].gsub(/[#{@seps}]/, " ")
+      breakdown = breakdown[1 .. -1].tr(@seps, " ")
       array     = breakdown.split(" ")
 
-      array.length.times do |i|
-        sub_hash = array[i]
+      array.length.times do |time|
+        sub_hash = array[time]
         buffer   = lottery + salt + alphabet
         alphabet = consistent_shuffle(alphabet, buffer[0, alphabet.length])
 
@@ -259,8 +259,8 @@ class Hashids
       raise SaltError, "The salt must be a String"
     end
 
-    unless min_hash_length.kind_of?(Fixnum)
-      raise MinLengthError, "The min length must be a Fixnum"
+    unless min_hash_length.kind_of?(Integer)
+      raise MinLengthError, "The min length must be a Integer"
     end
 
     unless min_hash_length >= 0

data/spec/hashids_spec.rb

@@ -115,6 +115,15 @@ describe Hashids do
       hashids.encode([1,2,3]).must_equal "laHquq"
     end
 
+    it "can encode  string encoded number" do
+      hashids.encode('1').must_equal "NV"
+      hashids.encode('-1').must_equal ""
+    end
+
+    it "raises exception if integer conversion fails" do
+      -> { hashids.encode('-') }.must_raise ArgumentError
+    end
+
     it "returns an empty string if no numbers" do
       hashids.encode.must_equal ""
     end
@@ -241,8 +250,8 @@ describe Hashids do
         must_raise Hashids::SaltError
     end
 
-    it "raises an ArgumentError unless the min_length is a Fixnum" do
-      -> { Hashids.new('salt', :not_a_fixnum)}.
+    it "raises an ArgumentError unless the min_length is an Integer" do
+      -> { Hashids.new('salt', :not_an_integer)}.
         must_raise Hashids::MinLengthError
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashids
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Peter Hellberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies: []
 description: Use hashids when you do not want to expose your database ids to the user.
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Generate YouTube-like hashes from one or many numbers.