code_generator 0.0.2 → 0.0.3

data/README.md

@@ -21,13 +21,13 @@ Or install it yourself as:
 Really simple:
 
     # creating random token
-    token = CodeGenerator.generate
+    token = CodeGenerator::Generate.generate
     
     # specific length
-    token = CodeGenerator.generate(length: 10)
+    token = CodeGenerator::Generate.generate(length: 10)
 
     # unique for particular field in a model
-    token = CodeGenerator.generator(uniqueness: { scope: :user, field: :confirmation_code })
+    token = CodeGenerator::Generate.generate(uniqueness: { model: :user, field: :confirmation_code })
 
 ## Configuration
 
@@ -35,10 +35,11 @@ You can configure the tokens to be generated. Simply create a new code_generator
 
     CodeGenerator.configure do |code|
       code.length         = 6               # length of the tokens to be generated.
-      code.use_chars      = :numeric        # type of token to be generated.
+      code.use_chars      = :numeric        # type of token to be generated. (default: :alpha_numeric)
       code.invalid_chars  = [ 0, 1, 7 ]     # do not use these characters.
       code.valid_chars    = [ 3, 4, 5, 6 ]  # use only these characters (ignores :use_chars).
-      code.include_chars  = [ "$", "%" ]    # use these characters as well (do not ignore :use_chars).
+      code.include_chars  = [ "$", "%" ]    # use these characters as well (does not ignore :use_chars).
+      code.repeat_chars   = false           # each character to be used once. (default: true)
     end
 
 You can use :alpha, :lower_alpha, :upper_alpha, :numeric, :lower_alpha_numeric, :upper_alpha_numeric, :alpha_numeric as various token types. Default is :alpha_numeric.

data/lib/code_generator/configure.rb

@@ -21,6 +21,9 @@ module CodeGenerator
   @@invalid_chars = Array.new
   
   mattr_accessor :valid_chars
+
+  mattr_accessor :repeat_chars
+  @@repeat_chars = true
   
   class << self
     def configure

data/lib/code_generator/generator.rb

@@ -6,25 +6,34 @@ module CodeGenerator
   
   class Generator
     
-    attr_reader :scoped_class
+    attr_reader :model
     attr_accessor :length, :uniqueness
   
     def initialize(opts = {})
       opts.symbolize_keys!
       @length     = opts.delete(:length) || CodeGenerator.length
       @uniqueness = opts.delete(:uniqueness)
-      set_scoped_class_and_field! if uniqueness
+      set_model_and_field! if uniqueness
     end
   
     def unique?
-      @scoped_class.send(:where, {@field_name => @code}).empty?
+      @model.send(:where, {@field_name => @code}).empty?
     end
     
     def random_string
-      chars = CodeGenerator.valid_characters
-      Array.new(length){ chars.sample() }.join
+      chars = CodeGenerator.valid_characters.dup
+      generator = if CodeGenerator.repeat_chars
+        lambda{ chars.sample() }
+      else
+        lambda{ chars.delete_at(rand(chars.length)) }
+      end
+      randomized_array &generator      
     end
   
+    def randomized_array(&block)
+      Array.new(length){ block.call }.join
+    end
+    
     def generate_code
       @code = random_string
       if generate_unique?
@@ -42,16 +51,16 @@ module CodeGenerator
   
     private
   
-      def get_scoped_class
-        uniqueness[:scope].to_s.classify.constantize
+      def get_model
+        uniqueness[:model].to_s.classify.constantize
       rescue
         raise CodeGenerator::ClassNotFoundError
       end
     
-      def set_scoped_class_and_field!
-        raise CodeGenerator::ScopeNotSpecifiedError if uniqueness[:scope].blank?
+      def set_model_and_field!
+        raise CodeGenerator::ScopeNotSpecifiedError if uniqueness[:model].blank?
         raise CodeGenerator::FieldNotSpecifiedError if uniqueness[:field].blank?
-        @scoped_class = get_scoped_class
+        @model = get_model
         @field_name = uniqueness[:field]
         #TODO - raise an error if field not found for the model. Needs to be indepedent for ActiveRecord & Mongoid.
       end

data/lib/code_generator/version.rb

@@ -1,5 +1,5 @@
 module CodeGenerator
   
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: