handshakejs 0.0.1 → 0.0.2

data/.travis.yml

@@ -1 +1,5 @@
 script: "bundle exec rspec"
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"

data/README.md

@@ -2,9 +2,12 @@
 
 Makes interacting with handshakejs easier in ruby.
 
+[![Build Status](https://travis-ci.org/handshakejs/handshakejs-ruby.svg?branch=master)](https://travis-ci.org/handshakejs/handshakejs-ruby)
+[![Gem Version](https://badge.fury.io/rb/handshakejs.svg)](http://badge.fury.io/rb/handshakejs)
+
 ```ruby
 Handshakejs.salt = "your_long_secret_salt"
-Handshakejs.valid?({email: email, hash: hash})
+Handshakejs.validate({:email => email, :hash => hash})
 ```
 
 ## Running Specs
@@ -19,7 +22,7 @@ You first need to request access from [scottmotte](http://github.com/scottmotte)
 
 ```
 gem build handshakejs.gemspec
-gem push handshakejs-0.0.1.gem
+gem push handshakejs-0.0.2.gem
 ```
 
 

data/handshakejs.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Rubygem for Handshakejs session check.}
   gem.homepage      = "http://github.com/scottmotte/handshakejs-ruby"
 
-  gem.add_dependency "pbkdf2", "0.1.0"
+  gem.add_dependency "armor", "0.0.3"
   
   gem.add_development_dependency "foreman"
   gem.add_development_dependency "pry"

data/lib/handshakejs.rb

@@ -1,4 +1,4 @@
-require "pbkdf2"
+require "armor"
 require "handshakejs/version"
 
 module Handshakejs
@@ -37,20 +37,26 @@ module Handshakejs
     16
   end
 
-  def validate(params={})
-    pbkdf2 = PBKDF2.new do |p| 
-      p.password      = params[:email] 
-      p.salt          = Handshakejs.salt 
-      p.iterations    = Handshakejs.iterations
-      p.key_length    = Handshakejs.key_length
-      p.hash_function = "sha1"
-    end
+  def hash_function=(hash_function)
+    @hash_function = hash_function
+
+    @hash_function
+  end
+
+  def hash_function
+    return @hash_function if @hash_function
+    "sha1"
+  end
+
+  def digest
+    Armor::Digest.new(hash_function)
+  end
 
-    puts pbkdf2.hex_string
+  def validate(params={})
+    password  = params[:email]
 
-    params[:hash] == pbkdf2.hex_string 
+    result    = Armor.hex(Armor.pbkdf2(digest, password, salt, Integer(iterations), key_length))
 
-    #pbkdf2  = PBKDF2.new(:password=>params[:email], :salt=>Hanshakejs.salt, :iterations=>1000, :key_length => 16, :hash_function => "sha1")
-    #session[:user] = params[:email] if pbkdf2.hex_string == params[:hash]
+    params[:hash] == result
   end
 end

data/lib/handshakejs/version.rb

@@ -1,3 +1,3 @@
 module Handshakejs
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/handshakejs_spec.rb

@@ -7,9 +7,10 @@ describe Handshakejs do
     end
 
     it { Handshakejs.salt.should eq "salt_required" }
-    it { Handshakejs::VERSION.should eq "0.0.1" }
+    it { Handshakejs::VERSION.should eq "0.0.2" }
     it { Handshakejs.iterations.should eq 1000 }
     it { Handshakejs.key_length.should eq 16 }
+    it { Handshakejs.hash_function.should eq "sha1" }
   end
 
   describe "setting values" do
@@ -32,28 +33,28 @@ describe Handshakejs do
     end
 
     it "is valid against against a correct email, hash combination" do
-      result = Handshakejs.validate({email: email, hash: hash})
+      result = Handshakejs.validate({:email => email, :hash => hash})
 
       result.should be_true 
     end
 
     it "is invalid against against an incorrect email" do
       email   = "different@email.com"
-      result  = Handshakejs.validate({email: email, hash: hash})
+      result  = Handshakejs.validate({:email => email, :hash => hash})
 
       result.should be_false 
     end
 
     it "is invalid against against an incorrect hash" do
       hash    = "differenthash"
-      result  = Handshakejs.validate({email: email, hash: hash})
+      result  = Handshakejs.validate({:email => email, :hash => hash})
 
       result.should be_false 
     end
 
     it "is invalid against against a different salt" do
       Handshakejs.salt = "different"
-      result  = Handshakejs.validate({email: email, hash: hash})
+      result  = Handshakejs.validate({:email => email, :hash => hash})
 
       result.should be_false 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handshakejs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pbkdf2
+  name: armor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement