securer_randomer 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ef5479ad3ab003521008c6187af14d0fd1bc95
-  data.tar.gz: b8de5c893bcdae29488f1001445c73031f667f1d
+  metadata.gz: 7cba7c11c88f376cd4e607ce3257ead37f85627a
+  data.tar.gz: 9b8f50ff4c3ded6e183525eec67e92f3384ed856
 SHA512:
-  metadata.gz: f0ad82e2504fbaec7836f307a5406adf40c1e68af9eb1254440c9bc0b16e310659102e8ceee0a72b444f2dea580fa00590c973d58dcd52b6d3901ae695238d95
-  data.tar.gz: 06ef5ada69966a6e9811267098e8ecc3702f63eefad7e51160583d8390220f0149af2599e9b6f0537086f869564240e18fa0edd9d35b87ae243f300d7dbb879c
+  metadata.gz: eb8dc02d517df6ccc33c3ef75faec746f6ed659d8185115bb147cef400d575212637ebc44df23a68fa430f5472a2020086b023cdcb4f186530935d140caf4602
+  data.tar.gz: f0c6807fad93b80a32318642b16a8ebbb4b43ef090743dbd737283bce4610ddf99a4d5f298ce03a9be682d7e590d1369144fb0f06527200172c293262bcc4e23

data/.travis.yml

@@ -7,6 +7,10 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - jruby-1.7.23
+  - jruby-9.0.5.0
+jdk:
+  - oraclejdk8
 before_install:
   - gem install bundler -v 1.11.2
   - sudo add-apt-repository -y ppa:chris-lea/libsodium

data/README.md

@@ -92,7 +92,7 @@ Or install it yourself as:
 ## Compatibility
 
 SecurerRandomer has been tested under MRI/YARV versions 1.9.3, 2.0, 2.1, 2.2,
-and 2.3.
+and 2.3, and JRuby 1.7 and 9.0 (both under Oracle Java 8).
 
 ## DISCLAIMER
 

data/lib/securer_randomer/monkeypatch/secure_random.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'securerandom'
-
 module SecureRandom
   if respond_to?(:gen_random)
     def self.gen_random(n)
@@ -19,6 +17,8 @@ module SecureRandom
         case n
         when nil
           0
+        when Numeric
+          n > 0 ? n : 0
         when Range
           if n.end < n.begin
             0
@@ -27,8 +27,6 @@ module SecureRandom
           else
             n
           end
-        when Numeric
-          n > 0 ? n : 0
         end
 
       raise TypeError unless arg

data/lib/securer_randomer/rand.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module SecurerRandomer
+  def self.kernel_rand(max = 0)
+    rand(max, true)
+  end
+
+  def self.rand(n = 0, emulate_kernel = false)
+    if n.is_a?(Range)
+      unless n.begin.is_a?(Numeric) and n.end.is_a?(Numeric)
+        if emulate_kernel and defined?(JRUBY_VERSION)
+          raise NoMethodError, "undefined method `-' for \"#{n.end}\""
+        else
+          raise TypeError, 'no implicit conversion of Range into Fixnum'
+        end
+      end
+
+      if n.end < n.begin
+        if emulate_kernel
+          raise ArgumentError, "invalid argument - #{n}" if defined?(JRUBY_VERSION)
+
+          nil
+        else
+          m = Range.new(n.end, n.begin, false)
+
+          while true # TODO: better way to do this than looping?
+            q = _rand_range(m)
+
+            break q unless n.exclude_end? and q == n.end
+          end
+        end
+      elsif n.begin == n.end and n.exclude_end?
+        raise ArgumentError, "invalid argument - #{n}" if emulate_kernel and defined?(JRUBY_VERSION)
+
+        nil
+      else
+        _rand_range(n)
+      end
+    else
+      raise TypeError, "no implicit conversion of #{n.class} into Fixnum" \
+        unless n.nil? or n.is_a?(Numeric)
+
+      if n.nil? or n.zero?
+        _randex
+      elsif emulate_kernel
+        _rand_range(Range.new(0, n.to_i.abs, true))
+      else
+        _rand_range(Range.new(0, n.abs, true)) * (n < 0 ? -1 : 1)
+      end
+    end
+  end
+
+  def self._randex
+    i64 = RbNaCl::Random.random_bytes(8).unpack('Q').first
+    Math.ldexp(i64 >> (64 - Float::MANT_DIG), -Float::MANT_DIG)
+  end
+
+  def self._randin
+    _randex >= 0.5 ? 1 - _randex : _randex
+  end
+
+  def self._rand_range(n)
+    n.begin + if n.end.is_a?(Float) or n.begin.is_a?(Float)
+      (n.exclude_end? ? _randex : _randin) * (n.end - n.begin)
+    else
+      (_randex * (n.end - n.begin + (n.exclude_end? ? 0 : 1))).to_i
+    end
+  end
+
+  private_class_method(:_randex, :_randin, :_rand_range) if respond_to?(:private_class_method)
+end

data/lib/securer_randomer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SecurerRandomer
-  VERSION = '0.1.4' # rubocop:disable Style/MutableConstant
+  VERSION = '0.1.5' # rubocop:disable Style/MutableConstant
 end

data/lib/securer_randomer.rb

@@ -1,69 +1,11 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 require 'rbnacl/sodium'
 require 'rbnacl/util'
 require 'rbnacl/random'
 
 require 'securer_randomer/version'
+require 'securer_randomer/rand'
 require 'securer_randomer/monkeypatch/secure_random'
-
-module SecurerRandomer
-  def self.kernel_rand(max = 0)
-    rand(max, true)
-  end
-
-  def self.rand(n = 0, emulate_kernel = false)
-    if n.is_a?(Range)
-      raise TypeError, 'no implicit conversion of Range into Fixnum' \
-        unless n.begin.is_a?(Numeric) and n.end.is_a?(Numeric)
-
-      if n.end < n.begin
-        if emulate_kernel
-          nil
-        else
-          m = Range.new(n.end, n.begin, false)
-
-          while true # TODO: better way to do this than looping?
-            q = _rand_range(m)
-
-            break q unless n.exclude_end? and q == n.end
-          end
-        end
-      elsif n.begin == n.end and n.exclude_end?
-        nil
-      else
-        _rand_range(n)
-      end
-    else
-      raise TypeError, "no implicit conversion of #{n.class} into Fixnum" \
-        unless n.nil? or n.is_a?(Numeric)
-
-      if n.nil? or n.zero?
-        _randex
-      elsif emulate_kernel
-        _rand_range(Range.new(0, n.to_i.abs, true))
-      else
-        _rand_range(Range.new(0, n.abs, true)) * (n < 0 ? -1 : 1)
-      end
-    end
-  end
-
-  def self._randex
-    i64 = RbNaCl::Random.random_bytes(8).unpack('Q').first
-    Math.ldexp(i64 >> (64 - Float::MANT_DIG), -Float::MANT_DIG)
-  end
-
-  def self._randin
-    _randex >= 0.5 ? 1 - _randex : _randex
-  end
-
-  def self._rand_range(n)
-    n.begin + if n.end.is_a?(Float) or n.begin.is_a?(Float)
-      (n.exclude_end? ? _randex : _randin) * (n.end - n.begin)
-    else
-      (_randex * (n.end - n.begin + (n.exclude_end? ? 0 : 1))).to_i
-    end
-  end
-
-  private_class_method(:_randex, :_randin, :_rand_range) if respond_to?(:private_class_method)
-end

metadata

@@ -1,100 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: securer_randomer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mike Pastore
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 11.1.1
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 11.1.1
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.0
-  type: :development
+  name: rspec-given
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.39.0
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.39.0
 - !ruby/object:Gem::Dependency
-  name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-  type: :runtime
+  name: rbnacl
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-description: 
+description:
 email:
 - mike@oobak.org
 executables: []
@@ -113,13 +113,14 @@ files:
 - bin/setup
 - lib/securer_randomer.rb
 - lib/securer_randomer/monkeypatch/secure_random.rb
+- lib/securer_randomer/rand.rb
 - lib/securer_randomer/version.rb
 - securer_randomer.gemspec
 homepage: https://github.com/mwpastore/securer_randomer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,9 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Monkeypatch SecureRandom with RbNaCl
 test_files: []