dohruby 0.3.4 → 0.3.5

data/lib/doh/core/date.rb

@@ -71,7 +71,7 @@ class Date
 end
 
 class DateTime
-  SECONDS_IN_DAY = (24 * 60 * 60).freeze
+  DOHRUBY_SECONDS_IN_DAY = (24 * 60 * 60).freeze
 
   def self.zow
     obj = now
@@ -87,7 +87,7 @@ class DateTime
   end
 
   def add_seconds(seconds)
-    self + Rational(seconds, SECONDS_IN_DAY)
+    self + Rational(seconds, DOHRUBY_SECONDS_IN_DAY)
   end
 
   def sub_seconds(seconds)
@@ -96,6 +96,10 @@ class DateTime
 
   # subtract another DateTime object, return difference in seconds
   def sub_dt(other)
-    ((self - other) * SECONDS_IN_DAY).to_i
+    ((self - other) * DOHRUBY_SECONDS_IN_DAY).to_i
+  end
+
+  def make_datetime
+    self
   end
 end

data/lib/doh/core/string.rb

@@ -76,4 +76,24 @@ class String
     result
   end
 
+  def hex_encode
+    bytes.to_a.collect do |byte|
+      "%02x" % byte
+    end.join
+  end
+
+  def hex_decode
+    byte_array = []
+    upcase.chars.each_slice(2) do |slice|
+      byte_array.push(hex_to_int(slice[0].getbyte(0))*16 + hex_to_int(slice[1].getbyte(0)))
+    end
+    byte_array.pack('c*')
+  end
+
+private
+  def hex_to_int(byte)
+    return byte - 48 if byte < 60
+    return byte - 55
+  end
+
 end

data/lib/doh/crypt.rb

@@ -0,0 +1 @@
+require 'doh/crypt/3des'

data/lib/doh/crypt/3des.rb

@@ -0,0 +1,21 @@
+require 'openssl'
+
+module DohCrypt
+  def self.encrypt3des(key, str)
+    des = OpenSSL::Cipher::Cipher.new('des-ede3')
+    des.encrypt
+    des.key = key
+    result = des.update(str)
+    result << des.final
+    result
+  end
+
+  def self.decrypt3des(key, str)
+    des = OpenSSL::Cipher::Cipher.new('des-ede3')
+    des.decrypt
+    des.key = key
+    result = des.update(str)
+    result << des.final
+  end
+end
+

data/lib/doh/mysql/current_date.rb

@@ -1,5 +1,6 @@
 require 'doh/util/current_date'
 require 'doh/mysql/db_date'
+require 'doh/mysql/parse'
 
 module DohDb
 
@@ -11,4 +12,11 @@ def self.current_datetime_db
   Doh::current_datetime(DohDb::now)
 end
 
+def self.server_datetime
+  retval = DohDb::select_field("SELECT #{DohDb::current_datetime_db.to_sql}")
+  # if there is a fake datetime right now, will need to parse it
+  retval = DohDb::parse_datetime(retval) if retval.is_a?(String)
+  retval
+end
+
 end

data/lib/doh/mysql/handle.rb

@@ -48,7 +48,7 @@ class Handle
 
   def update_hash(hash, table, primary_key_value, primary_key_name)
     items = hash.keys.collect {|key| key + ' = ' + hash[key].to_sql}
-    query("UPDATE #{table} SET #{items.join(', ')} WHERE #{primary_key_name} = #{primary_key_value}")
+    query("UPDATE #{table} SET #{items.join(', ')} WHERE #{primary_key_name} = #{primary_key_value.to_sql}")
   end
 
   def insert(statement)

data/lib/doh/util/doh_socket.rb

@@ -10,6 +10,7 @@ class DohSocket
   attr_accessor :timeout
 
   def initialize(server, port)
+    #note -- this may hang -- should change to nonblocking also if you're going to use this
     @sock = TCPSocket.new(server, port)
     @timeout = 300
   end

data/lib/doh/util/time_util.rb

@@ -6,4 +6,8 @@ def self.time_block
   return Time.now - start_time
 end
 
+def self.seconds_to_days(seconds)
+  seconds.to_f / DateTime::DOHRUBY_SECONDS_IN_DAY.to_f
+end
+
 end

data/test/core/tc_string.rb

@@ -106,6 +106,12 @@ class TC_core_string < Test::Unit::TestCase
     assert_equal("foo blah", " foo\t\t\t\tblah ".normalize_all_whitespace)
     assert_equal("foo blah", "\r\n\t\t\tfoo\t\r\n   \r\n\r\n\r\nblah\t\t\t\t".normalize_all_whitespace)
   end
+
+  def test_hex_encode
+    assert_equal("smoeblah", "smoeblah".hex_encode.hex_decode)
+    assert_equal("", "".hex_encode.hex_decode)
+  end
+
 end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dohruby
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Makani & Kem Mason
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +13:00
+date: 2010-12-29 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -79,6 +78,8 @@ files:
 - lib/doh/core/socket.rb
 - lib/doh/core/string.rb
 - lib/doh/core.rb
+- lib/doh/crypt/3des.rb
+- lib/doh/crypt.rb
 - lib/doh/data/basic.rb
 - lib/doh/data/bulk.rb
 - lib/doh/data/catalog.rb
@@ -233,7 +234,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -242,7 +242,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"