dionysus 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/dionysus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dionysus}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis D. Warlick, Jr."]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-21}
   s.email = %q{warlickt@operissystems.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -41,11 +41,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A helpful set of utility classes, generators, and command-line tools.}
   s.test_files = [
-    "spec/configuration_spec.rb",
-     "spec/dionysus_spec.rb",
+    "spec/string_spec.rb",
      "spec/spec_helper.rb",
+     "spec/configuration_spec.rb",
      "spec/string_security_spec.rb",
-     "spec/string_spec.rb"
+     "spec/dionysus_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/dionysus/security/string.rb

@@ -8,76 +8,48 @@ require 'dionysus/string'
 # Adds String hashing and salting convenience methods.
 #
 #   require 'dionysus/security/string'
+#
+# The hash methods may be accessed by the <tt>digest</tt> method or by the 
+# dynamic convenience methods.
+#
+# Examples:
+# 
+#     'my password'.digest(:sha1)
+#     'my password'.sha1
 class String
   ##
   # Generate a random, binary salt with the given length (default 16)
   def self.salt( length = 16 )
-    length.times.to_a.collect {|v| rand(255).chr}.join[0...length]
+    length.times.to_a.collect {|val| rand(255).chr}.join[0...length]
   end
   
   ##
-  # Generate the SHA 512 HASh, with the given salt appended
+  # Generate the given digest hash.
   # 
   # Options:
   # [salt]      Salt to append to the string.
   #             Default: ''
   # [encoding]  Encoding for the hash: <tt>:binary</tt>, <tt>:hex</tt>, <tt>:hexidecimal</tt>, <tt>:base64</tt>
   #             Default: <tt>:base64</tt>
-  def sha512( options = {} )
-    d = Digest::SHA512.digest(_salted(options[:salt]))
-    _encode(d, options[:encoding] || :base64)
-  end
-  
-  ##
-  # Generate the SHA 256 HASh, with the given salt appended
-  # 
-  # Options:
-  # [salt]      Salt to append to the string.
-  #             Default: ''
-  # [encoding]  Encoding for the hash: <tt>:binary</tt>, <tt>:hex</tt>, <tt>:hexidecimal</tt>, <tt>:base64</tt>
-  #             Default: <tt>:base64</tt>
-  def sha256( options = {} )
-    d = Digest::SHA256.digest(_salted(options[:salt]))
-    _encode(d, options[:encoding] || :base64)
-  end
-  
-  ##
-  # Generate the SHA 2 HASh, with the given salt appended
-  # 
-  # Options:
-  # [salt]      Salt to append to the string.
-  #             Default: ''
-  # [encoding]  Encoding for the hash: <tt>:binary</tt>, <tt>:hex</tt>, <tt>:hexidecimal</tt>, <tt>:base64</tt>
-  #             Default: <tt>:base64</tt>
-  def sha2( options = {} )
-    d = Digest::SHA2.digest(_salted(options[:salt]))
-    _encode(d, options[:encoding] || :base64)
-  end
-  
-  ##
-  # Generate the SHA 1 hash, with the given salt appended
-  # 
-  # Options:
-  # [salt]      Salt to append to the string.
-  #             Default: ''
-  # [encoding]  Encoding for the hash: <tt>:binary</tt>, <tt>:hex</tt>, <tt>:hexidecimal</tt>, <tt>:base64</tt>
-  #             Default: <tt>:base64</tt>
-  def sha1( options = {} )
-    d = Digest::SHA1.digest(_salted(options[:salt]))
-    _encode(d, options[:encoding] || :base64)
+  def digest( klass, options = {} )
+    unless klass.is_a?(Class)
+      klass = Digest.const_get(klass.to_s.upcase)
+    end
+    
+    digest = klass.digest(_salted(options[:salt]))
+    _encode(digest, options[:encoding] || :base64)
   end
   
   ##
-  # Generate the MD5 hash, with the given salt appended.
-  # 
-  # Options:
-  # [salt]      Salt to append to the string.
-  #             Default: ''
-  # [encoding]  Encoding for the hash: <tt>:binary</tt>, <tt>:hex</tt>, <tt>:hexidecimal</tt>, <tt>:base64</tt>
-  #             Default: <tt>:base64</tt>
-  def md5( options = {} )
-    d = Digest::MD5.digest(_salted(options[:salt]))
-    _encode(d, options[:encoding] || :base64)
+  # Call the appropriate digest method.
+  def method_missing( method, *args )
+    super if block_given?
+    
+    begin
+      return self.digest(method, *args)
+    rescue NameError
+    end
+    super
   end
   
   private
@@ -97,7 +69,7 @@ class String
     when :base64
       value.encode64s
     when :hex, :hexidecimal
-      value.encodeHex
+      value.encode_hex
     else
       raise ArgumentError, "Invalid encoding: #{encoding}"
     end

data/lib/dionysus/string.rb

@@ -20,11 +20,11 @@ class String
   
   ##
   # Encode to hexidecimal
-  def encodeHexidecimal() self.unpack('H*').first; end
-  alias_method :encodeHex, :encodeHexidecimal
+  def encode_hexidecimal() self.unpack('H*').first; end
+  alias_method :encode_hex, :encode_hexidecimal
   
   ##
   # Decode from hexidecimal
-  def decodeHexidecimal() [self].pack('H*'); end
-  alias_method :decodeHex, :decodeHexidecimal
+  def decode_hexidecimal() [self].pack('H*'); end
+  alias_method :decode_hex, :decode_hexidecimal
 end

data/spec/string_security_spec.rb

@@ -13,26 +13,38 @@ describe String do
   
   it "should calculate sha512 in base64" do
     digest = "KHErTuI/5urCF3vi6yTDxvAHBydW1CN3zVfBWDP/ItbmgeVi5IFq47ew0hPHzyK3AuMDh+Z9MBBlf3/mACgVMQ=="
+    "abcde\240z405".digest(:sha512).should == digest
     "abcde\240z405".sha512.should == digest
     "abcde\240z405".sha512(:encoding => :base64).should == digest
   end
   
+  it "should calculate sha384 in base64" do
+    digest = "PcQPzxc6tAaom+DG31XCi/A/7ZB6N0PgkBK9e1NMOadc7VxYSWoGq03f2+DiflT5"
+    "abcde\240z405".digest(:sha384).should == digest
+    "abcde\240z405".sha384.should == digest
+    "abcde\240z405".sha384(:encoding => :base64).should == digest
+  end
+  
   it "should calculate sha256/sha2 in base64" do
     digest = "vGeWpAMcqj2XuE8P4FirA2oUt1S78c6puQk03EOdnQY="
+    "abcde\240z405".digest(:sha256).should == digest
     "abcde\240z405".sha256.should == digest
     "abcde\240z405".sha256(:encoding => :base64).should == digest
+    "abcde\240z405".digest(:sha2).should == digest
     "abcde\240z405".sha2.should == digest
     "abcde\240z405".sha2(:encoding => :base64).should == digest
   end
   
   it "should calculate sha1 in base64" do
     digest = "wxeCFXPVXePFcpwuFDjonyn1G/w="
+    "abcde\240z405".digest(:sha1).should == digest
     "abcde\240z405".sha1.should == digest
     "abcde\240z405".sha1(:encoding => :base64).should == digest
   end
   
   it "should calculate md5 in base64" do
     digest = "ThT0y7KbAinjLpuChqsRuQ=="
+    "abcde\240z405".digest(:md5).should == digest
     "abcde\240z405".md5.should == digest
     "abcde\240z405".md5(:encoding => :base64).should == digest
   end
@@ -40,36 +52,62 @@ describe String do
   it "should calculate sha512 with a salt" do
     salt = 'abcdefg'
     digest = "oxoD5Mwq6ck4B1P2tfsrCQnNHzBYQRKOFGTj1T0EFPWeNuy1/YPtsKGiz2os9ljt0/OwXEt/l8LsK/ktbwEHbg=="
+    "abcde\240z405".digest(:sha512, :salt => salt).should == digest
     "abcde\240z405".sha512(:salt => salt).should == digest
   end
   
+  it "should calculate sha384 with a salt" do
+    salt = 'abcdefg'
+    digest = "XVHvPSZDdUNC8zY0oriwlXfwhMPeJusx59kWkGq3bEqrz1tlbmMJ+UGUOqYKbdYK"
+    "abcde\240z405".digest(:sha384, :salt => salt).should == digest
+    "abcde\240z405".sha384(:salt => salt).should == digest
+  end
+  
   it "should calculate sha256/sha2 with a salt" do
     salt = 'abcdefg'
     digest = "fWzU2g2GFAS5EAgTS09djo2eDDQdNp1xSTdrRO7m9v4="
+    "abcde\240z405".digest(:sha256, :salt => salt).should == digest
     "abcde\240z405".sha256(:salt => salt).should == digest
+    "abcde\240z405".digest(:sha2, :salt => salt).should == digest
     "abcde\240z405".sha2(:salt => salt).should == digest
   end
   
   it "should calculate sha1 with a salt" do
     salt = 'abcdefg'
     digest = "JFdwlGl341qtbqX6mPQbjs8d1/U="
+    "abcde\240z405".digest(:sha1, :salt => salt).should == digest
     "abcde\240z405".sha1(:salt => salt).should == digest
   end
   
   it "should calculate md5 with a salt" do
     salt = 'abcdefg'
     digest = "m59029ys/bc2HpeuZqcQ3w=="
+    "abcde\240z405".digest(:md5, :salt => salt).should == digest
     "abcde\240z405".md5(:salt => salt).should == digest
   end
   
   it "should calculate sha512 in hex/hexidecimal" do
     digest = "28712b4ee23fe6eac2177be2eb24c3c6f007072756d42377cd57c15833ff22d6e681e562e4816ae3b7b0d213c7cf22b702e30387e67d3010657f7fe600281531"
+    "abcde\240z405".digest(:sha512, :encoding => :hex).should == digest
+    "abcde\240z405".digest(:sha512, :encoding => :hexidecimal).should == digest
     "abcde\240z405".sha512(:encoding => :hex).should == digest
     "abcde\240z405".sha512(:encoding => :hexidecimal).should == digest
   end
   
+  it "should calculate sha384 in hex/hexidecimal" do
+    digest = "3dc40fcf173ab406a89be0c6df55c28bf03fed907a3743e09012bd7b534c39a75ced5c58496a06ab4ddfdbe0e27e54f9"
+    "abcde\240z405".digest(:sha384, :encoding => :hex).should == digest
+    "abcde\240z405".digest(:sha384, :encoding => :hexidecimal).should == digest
+    "abcde\240z405".sha384(:encoding => :hex).should == digest
+    "abcde\240z405".sha384(:encoding => :hexidecimal).should == digest
+  end
+  
   it "should calculate sha256/sha2 in hex/hexidecimal" do
     digest = "bc6796a4031caa3d97b84f0fe058ab036a14b754bbf1cea9b90934dc439d9d06"
+    "abcde\240z405".digest(:sha256, :encoding => :hex).should == digest
+    "abcde\240z405".digest(:sha256, :encoding => :hexidecimal).should == digest
+    "abcde\240z405".digest(:sha2, :encoding => :hex).should == digest
+    "abcde\240z405".digest(:sha2, :encoding => :hexidecimal).should == digest
     "abcde\240z405".sha256(:encoding => :hex).should == digest
     "abcde\240z405".sha2(:encoding => :hex).should == digest
     "abcde\240z405".sha256(:encoding => :hexidecimal).should == digest
@@ -78,34 +116,49 @@ describe String do
   
   it "should calculate sha1 in hex/hexidecimal" do
     digest = "c317821573d55de3c5729c2e1438e89f29f51bfc"
+    "abcde\240z405".digest(:sha1, :encoding => :hex).should == digest
+    "abcde\240z405".digest(:sha1, :encoding => :hexidecimal).should == digest
     "abcde\240z405".sha1(:encoding => :hex).should == digest
     "abcde\240z405".sha1(:encoding => :hexidecimal).should == digest
   end
   
   it "should calculate md5 in hex/hexidecimal" do
     digest = "4e14f4cbb29b0229e32e9b8286ab11b9"
+    "abcde\240z405".digest(:md5, :encoding => :hex).should == digest
+    "abcde\240z405".digest(:md5, :encoding => :hexidecimal).should == digest
     "abcde\240z405".md5(:encoding => :hex).should == digest
     "abcde\240z405".md5(:encoding => :hexidecimal).should == digest
   end
   
   it "should calculate sha512 in binary" do
     digest = "(q+N\342?\346\352\302\027{\342\353$\303\306\360\a\a'V\324#w\315W\301X3\377\"\326\346\201\345b\344\201j\343\267\260\322\023\307\317\"\267\002\343\003\207\346}0\020e\177\177\346\000(\0251"
+    "abcde\240z405".digest(:sha512, :encoding => :binary).should == digest
     "abcde\240z405".sha512(:encoding => :binary).should == digest
   end
   
+  it "should calculate sha384 in binary" do
+    digest = "=\304\017\317\027:\264\006\250\233\340\306\337U\302\213\360?\355\220z7C\340\220\022\275{SL9\247\\\355\\XIj\006\253M\337\333\340\342~T\371"
+    "abcde\240z405".digest(:sha384, :encoding => :binary).should == digest
+    "abcde\240z405".sha384(:encoding => :binary).should == digest
+  end
+  
   it "should calculate sha256/sha2 in binary" do
     digest = "\274g\226\244\003\034\252=\227\270O\017\340X\253\003j\024\267T\273\361\316\251\271\t4\334C\235\235\006"
+    "abcde\240z405".digest(:sha256, :encoding => :binary).should == digest
+    "abcde\240z405".digest(:sha2, :encoding => :binary).should == digest
     "abcde\240z405".sha256(:encoding => :binary).should == digest
     "abcde\240z405".sha2(:encoding => :binary).should == digest
   end
   
   it "should calculate sha1 in binary" do
     digest = "\303\027\202\025s\325]\343\305r\234.\0248\350\237)\365\e\374"
+    "abcde\240z405".digest(:sha1, :encoding => :binary).should == digest
     "abcde\240z405".sha1(:encoding => :binary).should == digest
   end
   
   it "should calculate md5 in binary" do
     digest = "N\024\364\313\262\233\002)\343.\233\202\206\253\021\271"
+    "abcde\240z405".digest(:md5, :encoding => :binary).should == digest
     "abcde\240z405".md5(:encoding => :binary).should == digest
   end
 end

data/spec/string_spec.rb

@@ -15,12 +15,13 @@ describe String do
     "YWJjZGWgejQwNQ==\n".decode64.should == "abcde\240z405"
   end
   
-  it "should encodeHex" do
-    "abcde\240z405".encodeHex.should == "6162636465a07a343035"
-    "abcde\240z405".encodeHexidecimal.should == "6162636465a07a343035"
+  it "should encode_hex" do
+    "abcde\240z405".encode_hex.should == "6162636465a07a343035"
+    "abcde\240z405".encode_hexidecimal.should == "6162636465a07a343035"
   end
   
-  it "should decodeHex" do
-    '6162636465a07a343035'.decodeHexidecimal.should == "abcde\240z405"
+  it "should decode_hex" do
+    '6162636465a07a343035'.decode_hex.should == "abcde\240z405"
+    '6162636465a07a343035'.decode_hexidecimal.should == "abcde\240z405"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Travis D. Warlick, Jr.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -05:00
+date: 2010-03-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,8 +105,8 @@ signing_key:
 specification_version: 3
 summary: A helpful set of utility classes, generators, and command-line tools.
 test_files: 
-- spec/configuration_spec.rb
-- spec/dionysus_spec.rb
+- spec/string_spec.rb
 - spec/spec_helper.rb
+- spec/configuration_spec.rb
 - spec/string_security_spec.rb
-- spec/string_spec.rb
+- spec/dionysus_spec.rb