salty 0.0.3 → 0.0.4

data/README.rdoc

@@ -19,15 +19,18 @@ and get the file locally. It's less than 1KB.
 
     require 'salty'  # you may need to do './salty' if you used wget
 
-    salt = generate_salt
-    password = salty("mypassword",salt) # iterative salted SHA1 hash
+    password = salty("mypassword") # iterative salted SHA1 hash
 
-    if salty_eq("mypassword",password,salt)
+    if salty_eq("mypassword",password)
       puts "You're logged in!"
     else
       puts "Wrong password"
     end
 
+A salt is generated and embeded in the output from (({salty("mypassword")})). (({salty_eq})) will then extract this salt. So there is no need to handle the salt yourself.
+
+Obviously, the order of arguments to (({salty_eq})) is important. The plain-text data must come first, followed by the previously-hashed data.
+
 == Contributing to salty
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/salty.rb

@@ -1,9 +1,16 @@
 require 'digest/sha1'
 
+SALT_LENGTH=30
+ALPHA = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+
 def hash_fn(str)
   Digest::SHA1.hexdigest str
 end
 
+def generate_salt
+  (1..SALT_LENGTH).map{ALPHA.sample}.join
+end
+
 def salted_hash(str,salt)
   res = str
   100.times do
@@ -12,14 +19,19 @@ def salted_hash(str,salt)
   res
 end
 
-alias :salty :salted_hash
+def salty(str)
+  salt = generate_salt
+
+  res = salted_hash(str,salt)
 
-def salty_eq(unhashed,hashed,salt)
-  hashed == salted_hash(unhashed,salt)
+  n = str.length
+  res[0...n] + salt + res[n..-1]
 end
 
-ALPHA = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+def salty_eq(unhashed,hashed)
+  n = unhashed.length
+  salt = hashed[n,SALT_LENGTH]
+  myhashed = hashed[0...n] + hashed[n+SALT_LENGTH..-1]
 
-def generate_salt(n=30)
-  (1..n).map{ALPHA.sample}.join
+  myhashed == salted_hash(unhashed,salt)
 end

data/salty.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{salty}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Alec Benzer}]

data/test/test_salty.rb

@@ -6,24 +6,23 @@ end
 
 class TestSalty < Test::Unit::TestCase
   context "test salt" do
-    should "basic" do
-      salt = generate_salt
-      hashed = salty("bob",salt)
-    end
-
     should "hash equality" do
-      str = random_string
-      salt = generate_salt
+      10.times do
+        str = random_string
 
-      assert_equal salted_hash(str,salt), salted_hash(str,salt)
+        hashed = salty(str)
+        assert salty_eq(str,hashed)
+      end
     end
 
-    should "hash equality method" do
-      str = random_string
-      salt = generate_salt
+    should "hash inequaliy" do
+      10.times do
+        str = random_string
+        hashed = salty(str)
 
-      hashed = salted_hash(str,salt)
-      assert salty_eq(str,hashed,salt)
+        other = random_string
+        assert(other == str || (not salty_eq(other,hashed)))
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salty
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &25936460 !ruby/object:Gem::Requirement
+  requirement: &16996260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25936460
+  version_requirements: *16996260
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &25935860 !ruby/object:Gem::Requirement
+  requirement: &16995080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *25935860
+  version_requirements: *16995080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25891600 !ruby/object:Gem::Requirement
+  requirement: &16993980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *25891600
+  version_requirements: *16993980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25891120 !ruby/object:Gem::Requirement
+  requirement: &16993120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *25891120
+  version_requirements: *16993120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &25890540 !ruby/object:Gem::Requirement
+  requirement: &16992300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25890540
+  version_requirements: *16992300
 description: stupid little gem for salted hashing
 email: alecbenzer@gmail.com
 executables: []
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -118519924956232819
+      hash: -3069907584758105957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: