salty 0.0.6 → 0.0.7

data/README.rdoc

@@ -19,17 +19,17 @@ and get the file locally. It's less than 1KB.
 
     require 'salty'  # you may need to do './salty' if you used wget
 
-    password = salty('mypassword') # iterative salted SHA1 hash
+    password = Salty.hash('mypassword') # iterative salted SHA512 hash
 
-    if salty_eq('mypassword',password)
+    if Salty.check('mypassword',password)
       puts "You're logged in!"
     else
       puts "Wrong password"
     end
 
-A salt is generated and embeded in the output from <code>salty('mypassword')</code>. +salty_eq+ will then extract this salt, so there is no need to handle the salt yourself.
+A salt is generated and embeded in the output from <code>Salty.hash</code>. +Salty.check+ 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.
+Obviously, the order of arguments to +Salty.check+ is important. The plain-text data must come first, followed by the previously-hashed data.
 
 == Contributing to salty
  

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/salty.rb

@@ -1,38 +1,46 @@
 require 'digest/sha1'
 
-SALT_LENGTH=30
-ALPHA = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+module Salty
 
-def hash_fn(str)
-  sha512 = Digest::SHA2.new(512)
-  sha512.hexdigest(str)
-end
+  SALT_LENGTH=30
+  ALPHA = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
 
-def generate_salt
-  (1..SALT_LENGTH).map{ALPHA.sample}.join
-end
+  def Salty.hash_fn(str)
+    sha512 = Digest::SHA2.new(512)
+    sha512.hexdigest(str)
+  end
 
-def salted_hash(str,salt)
-  res = str
-  100.times do
-    res = hash_fn(res+salt)
+  def Salty.generate_salt
+    (1..SALT_LENGTH).map{ALPHA.sample}.join
+  end
+
+  def Salty.salted_hash(str,salt)
+    res = str
+    100.times do
+      res = hash_fn(res+salt)
+    end
+    res
   end
-  res
-end
 
-def salty(str)
-  salt = generate_salt
+  def Salty.hash(str)
+    salt = generate_salt
 
-  res = salted_hash(str,salt)
+    res = salted_hash(str,salt)
 
-  n = str.length
-  res[0...n] + salt + res[n..-1]
-end
+    n = str.length
+    res[0...n] + salt + res[n..-1]
+  end
 
-def salty_eq(unhashed,hashed)
-  n = unhashed.length
-  salt = hashed[n,SALT_LENGTH]
-  myhashed = hashed[0...n] + hashed[n+SALT_LENGTH..-1]
+  def Salty.check(unhashed,hashed)
+    begin 
+      n = unhashed.length
+      salt = hashed[n,SALT_LENGTH]
+      myhashed = hashed[0...n] + hashed[n+SALT_LENGTH..-1]
+
+      return myhashed == salted_hash(unhashed,salt)
+    rescue
+      return false
+    end
+  end
 
-  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.6"
+  s.version = "0.0.7"
 
   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

@@ -1,7 +1,7 @@
 require 'helper'
 
 def random_string
-  generate_salt
+  Salty.generate_salt
 end
 
 class TestSalty < Test::Unit::TestCase
@@ -10,18 +10,18 @@ class TestSalty < Test::Unit::TestCase
       10.times do
         str = random_string
 
-        hashed = salty(str)
-        assert salty_eq(str,hashed)
+        hashed = Salty.hash(str)
+        assert Salty.check(str,hashed)
       end
     end
 
     should "hash inequaliy" do
       10.times do
         str = random_string
-        hashed = salty(str)
+        hashed = Salty.hash(str)
 
         other = random_string
-        assert(other == str || (not salty_eq(other,hashed)))
+        assert(other == str || (not Salty.check(other,hashed)))
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salty
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13650980 !ruby/object:Gem::Requirement
+  requirement: &14423040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13650980
+  version_requirements: *14423040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13962520 !ruby/object:Gem::Requirement
+  requirement: &14735680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *13962520
+  version_requirements: *14735680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14327980 !ruby/object:Gem::Requirement
+  requirement: &15074500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14327980
+  version_requirements: *15074500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14449700 !ruby/object:Gem::Requirement
+  requirement: &15158700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *14449700
+  version_requirements: *15158700
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &14470840 !ruby/object:Gem::Requirement
+  requirement: &15240260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14470840
+  version_requirements: *15240260
 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: -516840171916166722
+      hash: -1670934301516923058
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: