cipher 0.1.0 → 0.1.1

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "cipher"
-  gem.homepage = "http://github.com/evanwalsh/cipher"
+  gem.homepage = "http://github.com/massivedanger/cipher"
   gem.license = "MIT"
   gem.summary = %Q{Generate and validate license keys}
   gem.description = %Q{Generate and validate license keys}

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/cipher.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cipher"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Walsh"]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_cipher.rb"
   ]
-  s.homepage = "http://github.com/evanwalsh/cipher"
+  s.homepage = "http://github.com/massivedanger/cipher"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"

data/lib/cipher/generator.rb

@@ -1,11 +1,18 @@
-class Cipher
-  
-  module Generator
-    
-    def generate(unique)
+class Cipher  
+  module Generator    
+    def generate(args = {})
+      @key_length ||= args[:key_length]
+      @section_length ||= args[:section_length]
+      @seperator ||= args[:seperator]
+      unique = args[:unique]
+      
       output = ''
       i = 0
       
+      if unique.nil?
+        raise ArgumentError, 'You need to pass a hash with a unique to generate a key'
+      end
+      
       while i < (@key_length/@section_length).ceil do
         output << hash(unique + i.to_s)[0..@section_length-1] + @seperator
         i += 1
@@ -15,6 +22,8 @@ class Cipher
     end
     
     def hash(string)
+      @hasher ||= 'sha1'
+      
       case @hasher
       when 'sha1'
         require 'digest/sha1'
@@ -27,8 +36,6 @@ class Cipher
         Digest::SHA1.hexdigest(string)
       end
     end
-    private :hash
-    
-  end
-  
+    private :hash    
+  end  
 end

data/lib/cipher/validator.rb

@@ -1,7 +1,14 @@
 class Cipher
   module Validator
     def validate(args = {})
-      generate(args[:unique]) == args[:key]
+      unique = args[:unique]
+      key = args[:key]
+      
+      if unique.nil? || key.nil?
+        raise ArgumentError, 'You need to pass a hash with a unique string and a key to validate'
+      end
+      
+      generate({ unique: unique }) == key
     end
   end
 end

data/test/test_cipher.rb

@@ -11,10 +11,28 @@ class TestCipher < Test::Unit::TestCase
   end
   
   should 'generate a key' do
-    assert_instance_of String, @cipher.generate
+    assert_instance_of String, @cipher.generate({ unique: 'Evan Walsh' })
   end
   
   should 'validate a key' do
-    assert @cipher.validate(@cipher.generate)
+    assert @cipher.validate({ unique: 'Evan Walsh', key: @cipher.generate({ unique: 'Evan Walsh' }) })
+  end
+  
+  should 'raise ArgumentError if non-unique generation is done' do
+    assert_raises ArgumentError do
+      @cipher.generate
+    end
+  end
+  
+  should 'raise ArgumentError if non-unique validation is done' do
+    assert_raises ArgumentError do
+      @cipher.validate
+    end
+  end
+  
+  should 'get rid of the end seperator' do
+    key = @cipher.generate({ unique: 'Evan Walsh' })
+    
+    assert key[-1] != @cipher.seperator[-1]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cipher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70301263059640 !ruby/object:Gem::Requirement
+  requirement: &70123088850340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301263059640
+  version_requirements: *70123088850340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70301263059020 !ruby/object:Gem::Requirement
+  requirement: &70123088849640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70301263059020
+  version_requirements: *70123088849640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70301263036520 !ruby/object:Gem::Requirement
+  requirement: &70123088848800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70301263036520
+  version_requirements: *70123088848800
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70301263036040 !ruby/object:Gem::Requirement
+  requirement: &70123088848260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301263036040
+  version_requirements: *70123088848260
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70301263035460 !ruby/object:Gem::Requirement
+  requirement: &70123088847780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *70301263035460
+  version_requirements: *70123088847780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70301263034860 !ruby/object:Gem::Requirement
+  requirement: &70123088847200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70301263034860
+  version_requirements: *70123088847200
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70301263034360 !ruby/object:Gem::Requirement
+  requirement: &70123088846640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70301263034360
+  version_requirements: *70123088846640
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70301263033780 !ruby/object:Gem::Requirement
+  requirement: &70123088846160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70301263033780
+  version_requirements: *70123088846160
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70301263033180 !ruby/object:Gem::Requirement
+  requirement: &70123088845480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70301263033180
+  version_requirements: *70123088845480
 description: Generate and validate license keys
 email: evan@massivedanger.com
 executables:
@@ -133,7 +133,7 @@ files:
 - lib/cipher/version.rb
 - test/helper.rb
 - test/test_cipher.rb
-homepage: http://github.com/evanwalsh/cipher
+homepage: http://github.com/massivedanger/cipher
 licenses:
 - MIT
 post_install_message: 
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2626577843440635959
+      hash: 2444294562060335112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: