strandom 1.0.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84788b91e8f3983ab0d906b88f15a083ab3291c
-  data.tar.gz: 8874fb694b62d40ed4b6304ff3c7687f88369d84
+  metadata.gz: 50efedb190938b9aff3b35885fdfd290bfab92f2
+  data.tar.gz: b9f110f65fabf9ded8216883a94197da1facfb9e
 SHA512:
-  metadata.gz: 22eaf304e191faadf282194123b7bacc96a96c839012b1337c4019375fdba93fedd2c88ae539045e43f5157fbfaba459fbf67916a9043856347dae55662956bf
-  data.tar.gz: d5f3d11a710e959aa3c20cbec08cb9d56470c044165be2e6431286d5ec890b808acb9fd8eaee02ed20a4f24e5b0f3ae8e028f051a28d857095f17284a30e0735
+  metadata.gz: 89e9026f4b518b55ac04d5a43647aac1d8efcd8a79aa91b423ed8cdefddcc8203e31aa63d5258cb8f3f97a7f5d7a5d535d6de5da42b32556dc223bfba2dd9bdb
+  data.tar.gz: 9d33f38ada006e25bca0e9f0f7da9fa5a7c4c7c958b059821d183cad0a02f77f48088d02eea5f844d0742c5681fe001c62bec1ee96cd598670806447402cec9f

data/README.md

@@ -1,11 +1,14 @@
-# Thoom::Strandom
-Random string command line script
+Thoom::Strandom
+===============
+Random string command line generator
 
-## Installation
+Installation
+------------
 
     gem install strandom
 
-## CLI HELP 
+CLI Help 
+--------
 
     Usage: strandom [options]
 
@@ -26,7 +29,9 @@ Random string command line script
 	        --help                       Shows this message
 	        --version                    Current version
 
-### Examples
+Examples
+--------
+
 #### Basic
 
     $ strandom --lownum 10
@@ -48,3 +53,18 @@ Examples:
 	
     $ strandom --custom "%|4|*|,|?",10,"|"
     => ??4,%%,*%4
+		
+License
+-------
+
+Licensed under [MIT](https://github.com/thoom/strandom/blob/master/LICENSE).
+
+ChangeLog
+---------
+
+#### 2.0
+Fixes Issues [#1](https://github.com/thoom/strandom/issues/1) and [#2](https://github.com/thoom/strandom/issues/2).
+Complete refactor of the library class.
+Added unit tests.
+
+

data/bin/strandom

@@ -10,8 +10,8 @@ cust_delimiter = ''
 
 parser = OptionParser.new do |o|
   o.banner = 'Usage: strandom [options]'
-  o.separator ""
-  o.separator "Specific options:"
+  o.separator ''
+  o.separator 'Specific options:'
 
   o.on('--alnum  [length]', 'Characters a-z, A-Z, 0-9') do |length|
     type = :alnum
@@ -67,8 +67,8 @@ parser = OptionParser.new do |o|
     len = length if length
   end
 
-  o.separator ""
-  o.separator "Common options:"
+  o.separator ''
+  o.separator 'Common options:'
 
   o.on_tail('--help', 'Shows this message') do
     puts o
@@ -78,10 +78,10 @@ parser = OptionParser.new do |o|
   o.on_tail('--version', 'Current version') do
     puts <<TXT
 
-Thoom Strandom v.1.0
---------------------
+Thoom Strandom v. 2.0
+---------------------
 e: zdp@thoomtech.com
-w: https://github.com/thoom/randstr
+w: https://github.com/thoom/strandom
 
 TXT
     exit
@@ -91,16 +91,28 @@ end
 parser.parse! ARGV
 
 len = len.to_i
-if type == :hex
-  result = Thoom::Strandom.hex(len: len)
-elsif type == :uuid
-  result = Thoom::Strandom.uuid()
-elsif type == :custom
-  cust = cust_vals.split(cust_delimiter)
-  result = Thoom::Strandom.rand(len: len, type: type, cust: cust)
-else
-  result = Thoom::Strandom.rand(len: len, type: type)
-end
+result = case type
+         when :alpha
+           Thoom::Strandom.alphabetic(len)
+         when :alnum
+           Thoom::Strandom.alphanumeric(len)
+         when :custom
+           cust = cust_vals.split(cust_delimiter)
+           Thoom::Strandom.custom(len: len, values: cust)
+         when :hex
+           Thoom::Strandom.hex(len)
+         when :num
+           Thoom::Strandom.numeric(len)
+         when :lower
+           Thoom::Strandom.lower_alphabetic(len)
+         when :lownum
+           Thoom::Strandom.lower_alphanumeric(len)
+         when :upper
+           Thoom::Strandom.upper_alphabetic(len)
+         when :upnum
+           Thoom::Strandom.upper_alphanumeric(len)
+         when :uuid
+           Thoom::Strandom.uuid
+         end
 
 puts result
-

data/lib/strandom.rb

@@ -1,47 +1,61 @@
 require 'securerandom'
 
 module Thoom
+  # Provides several convenience methods to generating random strings
   class Strandom
+    @num_range = (48..57).to_a
+    @upper_range = (65..90).to_a
+    @lower_range = (97..122).to_a
+
     class << self
-      def hex(len: 2)
-        SecureRandom.hex(len  / 2)
-      end
-
-      def rand(len: 0, type: :alnum, cust: [])
-        num = (48..57).to_a
-        upper = (65..90).to_a
-        lower = (97..122).to_a
-
-        case type
-        when :alpha
-          range = upper + lower
-        when :upper
-          range = upper
-        when :upnum
-          range = num + upper
-        when :lower
-          range = lower
-        when :lownum
-          range = num + lower
-        when :num
-          range = num
-        when :custom
-          range = cust
-        else
-          range = num + upper + lower
-        end
+      attr_reader :num_range, :upper_range, :lower_range
 
-        # pulled from http://codereview.stackexchange.com/questions/15958
-        if type == :cust
-          ([nil] * len).map { range.sample }.join
-        else
-          ([nil] * len).map { range.sample.chr }.join
-        end
+      def alphabetic(len = 0)
+        randomize(len, upper_range + lower_range)
+      end
+
+      def alphanumeric(len = 0)
+        randomize(len, num_range + upper_range + lower_range)
+      end
+
+      def custom(len: 0, values: [])
+        ([nil] * len).map { values.sample }.join
+      end
+
+      def hex(len = 2)
+        SecureRandom.hex(len / 2)
+      end
+
+      def numeric(len = 0)
+        randomize(len, num_range)
+      end
+
+      def lower_alphabetic(len = 0)
+        randomize(len, lower_range)
+      end
+
+      def lower_alphanumeric(len = 0)
+        randomize(len, num_range + lower_range)
       end
 
-      def uuid()
+      def upper_alphabetic(len = 0)
+        randomize(len, upper_range)
+      end
+
+      def upper_alphanumeric(len = 0)
+        randomize(len, num_range + upper_range)
+      end
+
+      def uuid
         SecureRandom.uuid
       end
+
+      private
+
+      def randomize(len, range)
+        # pulled from http://codereview.stackexchange.com/questions/15958
+        ([nil] * len).map { range.sample.chr }.join
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strandom
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '2.0'
 platform: ruby
 authors:
 - Z.d. Peacock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies: []
 description: An executable for generating a random string
 email: zdp@thoomtech.com
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Thoom Strandom: A random string generator'