micro_token 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf7c23f62271e5acf8354c0ccb9179a91184e65
-  data.tar.gz: 0930aa0dfcdec54bf852b050dc61f5b11db1f758
+  metadata.gz: 344e232941e019cafdbe2fdb47cd6c0a587b64a1
+  data.tar.gz: b2bc64c84ecee92c11d48b1f38a896a2992a149a
 SHA512:
-  metadata.gz: 0c79c1a4d62a19cb6a5d2188d231b4acfc579b022e76e5c6d5d1311c255ce22f6b020f0c250a28df9e5b6b95ad485807ec2cd50990139fd22ae0a631af9ab4b3
-  data.tar.gz: d9e7cf0107416672c31e275eb300e44b687377cabde95435f15925c9e2f2ead2583e35985341ee2d31792cd63ba59d5855d66d9683208a9c0861abc42d57f230
+  metadata.gz: c296227b6658ed366140097cbf72d766fe293a641cd8f42a4688194223aa8d729fa466e8fbb53602154601aa461ddf3cf7ea5faea18428b29314047cc181e103
+  data.tar.gz: 670fd4f827010631d2764509e4dc0645bb60514022375029147216071b6d2778c07938a3d40d5d40335253b0c342d067e329b03bb8d96d4cb29830131dd9cb4e

data/lib/micro_token.rb

@@ -2,30 +2,47 @@ require "micro_token/version"
 require 'securerandom'
 
 module MicroToken
-  ALPHA_CHARS = ('a'..'z').to_a + ('A'..'Z').to_a
+  LOWER_ALPHA_CHARS = ('a'..'z').to_a
+  UPPER_ALPHA_CHARS = ('A'..'Z').to_a
+  NUMERIC_CHARS = (0..9).to_a
+  ALPHA_CHARS = LOWER_ALPHA_CHARS + UPPER_ALPHA_CHARS
+  ALPHANUMERIC_CHARS = ALPHA_CHARS + NUMERIC_CHARS
 
-  def self.generate(length=8,format=:alphanumeric)
-    (1..length).collect { self.send("_generate_#{format}_char") }.join
-  end
+  class << self
 
-  private
+    def generate(length=8,format=:alphanumeric)
+      (1..length).collect { self.send("_generate_#{format}_char") }.join
+    end
 
-  def self._generate_alphanumeric_char
-    (i = rand(62); i += ((i < 10) ? 48 : ((i < 36) ? 55 : 61 ))).chr
-  end
+    private
 
-  def self._generate_numeric_char
-    rand(9)
-  end
+    def _generate_uppercase_char
+      pick_from(UPPER_ALPHA_CHARS)
+    end
 
-  def self._generate_alpha_char
-    ALPHA_CHARS[rand(ALPHA_CHARS.size)]
-  end
+    def _generate_lowercase_char
+      pick_from(LOWER_ALPHA_CHARS)
+    end
+
+    def _generate_alphanumeric_char
+      pick_from(ALPHANUMERIC_CHARS)
+    end
 
-  private
+    def _generate_numeric_char
+      pick_from(NUMERIC_CHARS)
+    end
+
+    def _generate_alpha_char
+      pick_from(ALPHA_CHARS)
+    end
+
+    def rand(n)
+      SecureRandom.random_number(n)
+    end
+
+    def pick_from(ary)
+      ary[rand(ary.size)]
+    end
 
-  def rand(n)
-    SecureRandom.random_number(n)
   end
 end
-

data/lib/micro_token/version.rb

@@ -1,3 +1,3 @@
 module MicroToken
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/micro_token_spec.rb

@@ -53,6 +53,26 @@ describe MicroToken do
         end
       end
     end
+
+    context 'set to uppercase' do
+      let(:format) { :uppercase }
+
+      23.times do
+        it 'contains only uppercase letters' do
+          expect(subject.split.all? { |c| c =~ /[A-Z]/ }).to be_true
+        end
+      end
+    end
+
+    context 'set to lowercase' do
+      let(:format) { :lowercase }
+
+      23.times do
+        it 'contains only lowercase letters' do
+          expect(subject.split.all? { |c| c =~ /[a-z]/ }).to be_true
+        end
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micro_token
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - James Harton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A tiny random token generator