hashit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b100c155f7b4135120494f95793eef768cbb07
-  data.tar.gz: d9a7206146c820db2683967a1777377a21c419c0
+  metadata.gz: beffcc18c2dc50482e9b341149136dc4f0240365
+  data.tar.gz: ca9eedf8bef02179ea1750fe11576598bcca7940
 SHA512:
-  metadata.gz: 759b516205a9504eb81202b722183e8eec19fdc990b58e0dc92ee3d809b34265e2b2fecaa5304919cb449237de6598727d6d54bc4ff6877e3b082f2281e153bd
-  data.tar.gz: 82a5f38d310917f1de26cf009c3ab2ac8a71936d41961c1e33b93cd82cac30d8291e18eb0dc24d83893f9bf155e8d61409afba87dec1e327bd9fd4181eb2ec05
+  metadata.gz: 4a6bb0d4aef6dfa2413d6ca8f9f24ba5833b513282f3a37acea2def47cc8e22c8699359093252b51c5adab718852efe62e6f94656f328feec1d07279ecef8462
+  data.tar.gz: 5a36dd04fc4e313b0a06f4717976887afae92a10a467b391400e94eb6c942d0a41d06d653aec66a22a785a8070aafb2c6c60815c60def10a37ab15a8270a906c

data/lib/hashit.rb

@@ -1,6 +1,6 @@
 require "hashit/digests"
-require "hashit/verifier"
 
 module Hashit
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
+  extend Digests
 end

data/lib/hashit/digests.rb

@@ -3,20 +3,22 @@ require 'date'
 require 'hashit/prepare'
 
 module Hashit
-  class << self
-    %w[md2 md4 md5 sha sha1 sha224 sha256 sha384 sha512].each do |type|
+  module Digests
+    HASHING_DIGESTS = %w[md2 md4 md5 sha sha1 sha224 sha256 sha384 sha512]
+
+    HASHING_DIGESTS.each.with_index do |type, i|
       define_method(type.to_sym) do |key, text|
-        "#{type}|" + generate_hash(OpenSSL::Digest.const_get(type.upcase.to_sym).new, key, text)
+        "r#{i}|" + generate_hash(OpenSSL::Digest.const_get(type.upcase.to_sym).new, key, text)
       end
 
       define_method("timed_#{type}".to_sym) do |key, text|
         key = ([] << key).flatten << current_time
-        "timed_#{type}|" + generate_hash(OpenSSL::Digest.const_get(type.upcase.to_sym).new, key, text)
+        "t#{i}|" + generate_hash(OpenSSL::Digest.const_get(type.upcase.to_sym).new, key, text)
       end
 
       define_method("previous_#{type}".to_sym) do |key, text|
         key = ([] << key).flatten << last_time
-        "timed_#{type}|" + generate_hash(OpenSSL::Digest.const_get(type.upcase.to_sym).new, key, text)
+        "t#{i}|" + generate_hash(OpenSSL::Digest.const_get(type.upcase.to_sym).new, key, text)
       end
     end
 
@@ -31,11 +33,11 @@ module Hashit
     end
 
     def generate_hash digest, key, text
-      text = Hashit.prepare text
+      text = prepare text
 
       if key.is_a? Array
         key.reduce(text) do |text, k|
-          k = Hashit.prepare k
+          k = prepare k
           OpenSSL::HMAC.hexdigest(digest, k, text)
         end
       else
@@ -43,5 +45,51 @@ module Hashit
         OpenSSL::HMAC.hexdigest(digest, key, text)
       end
     end
+
+    def prepare obj
+      return obj if obj.is_a? String
+
+      if obj.is_a? Array
+        obj = prepare_array obj
+      elsif obj.nil?
+        raise ArgumentError, "Nil passed in as a text parameter"
+      elsif obj.respond_to? :to_s
+          obj = obj.to_s
+      else
+        raise ArgumentError, "Parameter #{obj} cannot be converted to string"
+      end
+
+      obj
+    end
+
+    def prepare_array arr
+      arr.reduce("") do |str, el|
+        str += prepare el
+      end
+    end
+
+    def matches? hash, key, text
+      type = get_hash_type hash.split('|').first
+      raise ArgumentError, "invalid hash" if type.nil? || !Hashit.respond_to?(type)
+      new_hash = Hashit.send type, key, text
+      new_hash == hash
+    end
+
+    def did_match? hash, key, text
+      type = get_hash_type hash.split('|').first
+      fn = type.to_s.sub("timed", "previous").to_sym
+      raise ArgumentError, "invalid hash" if type.nil? || !Hashit.respond_to?(fn)
+      new_hash = Hashit.send fn, key, text
+      new_hash == hash
+    end
+
+    private
+      def get_hash_type segment
+        i = segment[1..-1].to_i
+        return nil if segment[1..-1] != i.to_s
+        type = HASHING_DIGESTS[i]
+        type = "timed_#{type}" if segment[0] == 't'
+        type.to_sym
+      end
   end
 end

data/spec/digests_spec.rb

@@ -10,7 +10,7 @@ describe "Hashit Digests" do
   it 'generates a hash from a key and text' do
     key = "Key"
     text = "Some Text"
-    hash = "sha256|cd904d6df2122eddf1d6df1240730d29056c171539f171a57ada2a16f5a54bf0"
+    hash = "r6|cd904d6df2122eddf1d6df1240730d29056c171539f171a57ada2a16f5a54bf0"
 
     expect(Hashit.sha256 key, text).to be == hash
   end
@@ -18,7 +18,7 @@ describe "Hashit Digests" do
   it 'generates a hash from an array of strings' do
     key = "key"
     text = %w[nitzan gabriel]
-    hash = "sha256|08665f6532b0b28c1298955e2db2558a7ef06624708ac6cba6e73e88e0351b7d"
+    hash = "r6|08665f6532b0b28c1298955e2db2558a7ef06624708ac6cba6e73e88e0351b7d"
 
     expect(Hashit.sha256 key, text).to be == hash
   end
@@ -26,7 +26,7 @@ describe "Hashit Digests" do
   it 'generates a recursive hash from an array of keys' do
     key = %w[ron vivi]
     text = "text"
-    hash = "sha256|54b11c895b426b527bc8c7029b3064d9b48dace3359b143268dac21d472def9c"
+    hash = "r6|54b11c895b426b527bc8c7029b3064d9b48dace3359b143268dac21d472def9c"
 
     expect(Hashit.sha256 key, text).to be == hash
   end
@@ -34,7 +34,7 @@ describe "Hashit Digests" do
   it 'converts parameters to strings' do
     key = 32
     text = 45
-    hash="sha256|ef4f59fe5e91a86be6720d34a0b3413b1119638e271bcc4d2c24dbb7ef6a4bba"
+    hash="r6|ef4f59fe5e91a86be6720d34a0b3413b1119638e271bcc4d2c24dbb7ef6a4bba"
 
     expect(Hashit.sha256 key, text).to be == hash
   end
@@ -49,17 +49,19 @@ describe "Hashit Digests" do
   it 'generates a timed hash' do
     key = "key"
     text = "some text"
-    hash = "timed_#{Hashit.sha256([key, Hashit.current_time], text)}"
+    allow(Hashit).to receive(:current_time).and_return(1408350600)
+    hash = Hashit.sha256([key, 1408350600], text)
 
-    expect(Hashit.timed_sha256 key, text).to be == hash
+    expect(Hashit.timed_sha256(key, text)[1..-1]).to be == hash[1..-1]
   end
 
   it 'generates a previous timed hash' do
     key = "key"
     text = "some text"
-    hash = "timed_#{Hashit.sha256([key, Hashit.last_time], text)}"
+    allow(Hashit).to receive(:current_time).and_return(1408350600)
+    hash = Hashit.sha256([key, 1408348800], text)
 
-    expect(Hashit.previous_sha256 key, text).to be == hash
+    expect(Hashit.previous_sha256(key, text)[1..-1]).to be == hash[1..-1]
   end
 
 end

data/spec/verifier_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Hashit Verifier" do
 
   it 'can verify an old hash' do
-    hash = "sha256|cd904d6df2122eddf1d6df1240730d29056c171539f171a57ada2a16f5a54bf0"
+    hash = "r6|cd904d6df2122eddf1d6df1240730d29056c171539f171a57ada2a16f5a54bf0"
     key = "Key"
     text = "Some Text"
 
@@ -21,6 +21,7 @@ describe "Hashit Verifier" do
   it 'matches timed hashes' do
     key = "Key"
     text = "Some Text"
+    allow(Hashit).to receive(:current_time).and_return(1408350600)
     hash = Hashit.timed_sha256 key, text
 
     expect(Hashit.matches? hash, key, text).to be true
@@ -29,6 +30,7 @@ describe "Hashit Verifier" do
   it 'matches previous hashes' do
     key = "Key"
     text = "Some Text"
+    allow(Hashit).to receive(:current_time).and_return(1408350600)
     hash = Hashit.previous_sha256 key, text
 
     expect(Hashit.matches? hash, key, text).to be false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nitzan Blankleder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,6 @@ files:
 - hashit.gemspec
 - lib/hashit.rb
 - lib/hashit/digests.rb
-- lib/hashit/prepare.rb
-- lib/hashit/verifier.rb
 - spec/digests_spec.rb
 - spec/hashit_spec.rb
 - spec/spec_helper.rb

data/lib/hashit/prepare.rb

@@ -1,25 +0,0 @@
-module Hashit
-  class << self
-    def prepare obj
-      return obj if obj.is_a? String
-
-      if obj.is_a? Array
-        obj = prepare_array obj
-      elsif obj.nil?
-        raise ArgumentError, "Nil passed in as a text parameter"
-      elsif obj.respond_to? :to_s
-          obj = obj.to_s
-      else
-        raise ArgumentError, "Parameter #{obj} cannot be converted to string"
-      end
-
-      obj
-    end
-
-    def prepare_array arr
-      arr.reduce("") do |str, el|
-        str += prepare el
-      end
-    end
-  end
-end

data/lib/hashit/verifier.rb

@@ -1,19 +0,0 @@
-require 'hashit/digests'
-
-module Hashit
-  class << self
-    def matches? hash, key, text
-      type = hash.split('|').first
-      raise ArgumentError, "invalid hash" unless Hashit.respond_to?(type.to_sym)
-      new_hash = Hashit.send type.to_sym, key, text
-      new_hash == hash
-    end
-
-    def did_match? hash, key, text
-      type = hash.split('|').first.sub("timed", "previous")
-      raise ArgumentError, "invalid hash" unless Hashit.respond_to?(type.to_sym)
-      new_hash = Hashit.send type.to_sym, key, text
-      new_hash == hash
-    end
-  end
-end