strgen 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 628517c35933dd11f6b3c2a5cc95175081325646
-  data.tar.gz: cbc74078bc5a383cc84a9355bc1f4b45ace88122
+  metadata.gz: 79789edc5347ff826508218b4fe08e2a5fe9e07e
+  data.tar.gz: 695092343161e8fc6fb54e18556e286c470bbad8
 SHA512:
-  metadata.gz: a5ed984381f9194d634e76e533a1e62213b92aee0cd2ce73e4b58a86557106f9924a1385946f1296889139ba0045bbefe7e489e20ce920502c948a6b11926195
-  data.tar.gz: 4efc6d58905cf78c98e37190a98bb6a9ce2a239c8f688102258b35f013b2b18fdd935de41450b2c001dd44bb66392dc361e5617eaed43eac1ac79478d18fb0b5
+  metadata.gz: 4778b29071698bfb8905c92f9f6d72eff399025ae35e19bde6cb54d9f3d942c5b43cc800aab05e44670457d6ee8dd3d05b13f9a919a127ff93d4add66f19815c
+  data.tar.gz: e725a27b7d3a5b17cf82b5e0b9d064ca0f7d10da2ee93b1c8f265c0f9bb9ab887aa87ebf72a01105b66ef6bae64fa0868494bbd31ef0fad3041d01fe0fbd6129

data/.rspec

@@ -1,2 +1 @@
---format documentation
 --color

data/Gemfile.lock

@@ -7,14 +7,25 @@ GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.0)
+    diff-lcs (1.2.5)
     method_source (0.8.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     slop (3.6.0)
 
@@ -25,5 +36,5 @@ DEPENDENCIES
   bundler (~> 1.9)
   pry
   rake (~> 10.0)
-  rspec-core
+  rspec
   strgen!

data/README.md

@@ -1,6 +1,6 @@
-# Strgen
+# Strgen ![Build Status](https://api.travis-ci.org/ConnorAtherton/strgen.svg)
 
-A Ruby arbitrary string generator
+An arbitrary Ruby string generator
 
 ## Usage
 
@@ -20,15 +20,15 @@ end
 
 Include these in the config block when generating the string (see above)
 
-**numbers** - Numbers 0-9
-**symbols**
-**lowercase** - The lowercase alphabet
-**uppercase** - The uppercase alphabet
-**alpha** - A combination of lowercase and uppercase letters.
-**alphanum** -  A combination of the alpha set and numbers
-**length** - The length of the result string
-**repeat** - Whether repeated characters are allowed
-**exclude** - a character array containing individual letters to exclude
+- **numbers** - Numbers 0-9
+- **symbols** - The following set `[! @ # $ % ^ & ( ) { } [ ] - _ < > ?]`
+- **lowercase** - The lowercase alphabet
+- **uppercase** - The uppercase alphabet
+- **alpha** - A combination of lowercase and uppercase letters.
+- **alphanum** -  A combination of the alpha set and numbers
+- **length** - The length of the result string
+- **repeat** - Whether repeated characters are allowed
+- **exclude** - a character array containing individual letters to exclude
 
 #### Example
 
@@ -37,10 +37,10 @@ letters excluding the letters `A` and `B`.
 
 ```ruby
 Strgen.generate do |c|
-  c.lowercase = false;
-  c.numbers = false;
-  c.symbols = false;
-  c.length = 25;
+  c.lowercase = false
+  c.numbers = false
+  c.symbols = false
+  c.length = 25
   c.exclude = %w(A B)
 end
 

data/lib/strgen.rb

@@ -1,11 +1,10 @@
 require 'strgen/version'
-require 'pry'
 
 #
 # Usage:
 #
-# Strgen.generate do |config|
-#   config.length = 10
+# Strgen.generate do
+#   length = 10
 #   exclude = %w(!)
 # end
 #
@@ -13,18 +12,27 @@ class Strgen
   NUMBERS = (1..9).to_a.map(&:to_s)
   LOWERCASE = ('a'..'z').to_a
   UPPERCASE = ('A'..'Z').to_a
-  ALPHA = LOWERCASE.concat UPPERCASE
-  ALPHANUM = ALPHA.concat NUMBERS
+  ALPHA = LOWERCASE.dup.concat UPPERCASE
+  ALPHANUM = ALPHA.dup.concat NUMBERS
   SYMBOLS = %w(! @ # $ % ^ & \( \) { } [ ] - _ < > ?)
   TYPES = %i(numbers lowercase uppercase symbols)
 
   attr_accessor *TYPES, :length, :alpha, :alphanum, :exclude, :repeat
 
+  # Errors
+  class InvalidLengthError < StandardError; end
+
   def self.generate(&block)
     proxy = new
-    block.call(proxy) if block_given?
+
+    if block_given?
+      block.arity > 0 ? block.call(proxy) : proxy.instance_eval(&block)
+    end
+
     proxy.merge_defaults!
 
+    raise InvalidLengthError if proxy.length < 1
+
     previous = nil
     current = nil
     acc = ''
@@ -35,7 +43,6 @@ class Strgen
     proxy.length.times do
       loop do
         current = characters.sample
-
         break if !proxy.exclude?(current) && (!proxy.repeat || current != previous)
       end
 
@@ -50,8 +57,7 @@ class Strgen
       acc[type] = true
       acc
     end.tap do |hash|
-      hash[:length] = 12
-      hash[:repeat] = true
+      hash.merge! length: 12, repeat: true
     end.each do |method, default|
       next unless send(method.to_sym).nil?
       send("#{method}=".to_sym, default)

data/lib/strgen/version.rb

@@ -1,3 +1,3 @@
 class Strgen
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/strgen.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec-core"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strgen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Connor Atherton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="