dohruby 0.1.6 → 0.1.7

data/CHANGELOG

@@ -14,6 +14,12 @@
  * override Test::Unit::TestCase::run to add setup & teardown hooks (util/testcase_with_hooks)
  * use this new hook ability to add a teardown hook that calls Doh::clear_current_date (util/test_case)
  * add util/test_case to the doh/unit_test "include" file
+*0.1.7* (April 7th, 2008)
+ * added flush_always to iostreamacceptor
+ * make BigDecimal.to_s default behavior be more human readable
+ * implement db hash util: insert_hash, update_hash, select_as_hash
+ * add logger util: default_logfile_name
+ * add set_source_ip function, change default source_ip to 'unknown'
 
 
 

data/lib/doh/core/bigdecimal.rb

@@ -0,0 +1,8 @@
+require 'bigdecimal'
+
+class BigDecimal
+  alias :_original_to_s :to_s
+  def to_s(format = 'F')
+    _original_to_s(format)
+  end
+end

data/lib/doh/core.rb

@@ -1,2 +1,4 @@
+require 'doh/core/bigdecimal'
+require 'doh/core/date'
 require 'doh/core/dir'
 require 'doh/core/string'

data/lib/doh/logger/iostream_acceptor.rb

@@ -9,6 +9,10 @@ class IOStreamAcceptor
     @error_formatter = Formatter.new(error_format || format || "%datetime [%severity] : %msg\nexception: %exception\nstack:\n%call_stack")
   end
 
+  def flush_always(flag = true)
+    @flush = flag
+  end
+
   def log(event)
     if event.severity >= ERROR
       curr_formatter = @error_formatter
@@ -16,6 +20,7 @@ class IOStreamAcceptor
       curr_formatter = @standard_formatter
     end
     @ios.puts(curr_formatter.replace(event))
+    @ios.fsync if @flush
   end
 end
 

data/lib/doh/logger/util.rb

@@ -0,0 +1,7 @@
+module DohLogger
+
+def self.default_logfile_name
+  File.basename($0, '.rb') + '.log'
+end
+
+end

data/lib/doh/mysql/hash_util.rb

@@ -0,0 +1,40 @@
+module DohDb
+
+class Handle
+  def insert_hash(hash, table)
+    names = []
+    values = []
+    hash.each_pair do |key, value|
+      next if value.nil?
+      names.push(key)
+      values.push(value.to_sql)
+    end
+    insert("INSERT INTO #{table} (#{names.join(',')}) VALUES (#{values.join(',')})")
+  end
+
+  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}")
+  end
+
+  def select_as_hash(statement, row_builder = nil)
+    select(statement, row_builder).inject(Hash.new) do |hash, row|
+      hash[row.at(0)] = row.at(1)
+      hash
+    end
+  end
+end
+
+def self.insert_hash(hash, table)
+  request_handle.insert_hash(hash, table)
+end
+
+def self.update_hash(hash, table, primary_key_value, primary_key_name)
+  request_handle.update_hash(hash, table, primary_key_value, primary_key_name)
+end
+
+def self.select_as_hash(statement, row_builder = nil)
+  request_handle.select_as_hash(statement, row_builder)
+end
+
+end

data/lib/doh/mysql/to_sql.rb

@@ -1,3 +1,4 @@
+require 'bigdecimal'
 require 'date'
 require 'mysql'
 

data/lib/doh/unit_test.rb

@@ -1,2 +1,2 @@
 require 'doh/util/unit_test_logging'
-require 'doh/util/test_case'
+require 'test/unit'

data/lib/doh/util/source_ip.rb

@@ -4,7 +4,11 @@ module Doh
 
 @@source_ip = nil
 def self.source_ip
-  @@source_ip ||= Socket.getaddrinfo(Socket.gethostname, Socket::AF_INET).find {|elem| elem[0] == 'AF_INET'}[3]
+  @@source_ip ||= 'unknown'
+end
+
+def self.set_source_ip(source_ip)
+  @@source_ip = source_ip
 end
 
 end

data/lib/doh/util/unit_test_logging.rb

@@ -9,10 +9,10 @@ end
 
 require 'doh/logger_app'
 require 'doh/logger/memory_acceptor'
+require 'doh/logger/util'
 
 scheduler = DohLogger::DirectScheduler.new
-logfile_name = File.basename($0, '.rb') + '.log'
-file_acceptor = DohLogger::IOStreamAcceptor.new(File.new(logfile_name, "wb"))
+file_acceptor = DohLogger::IOStreamAcceptor.new(File.new(DohLogger::default_logfile_name, "wb"))
 $doh_unit_test_error_acceptor = DohLogger::MemoryAcceptor.new
 intrfc = DohLogger::StandardInterface.new(scheduler)
 intrfc.add_acceptor(DohLogger::DEBUG, file_acceptor)

data/test/logger/tc_event.rb

@@ -7,13 +7,13 @@ class TC_Event < Test::Unit::TestCase
   def test_call_stack
     event = DohLogger::Event.new(1, '')
     stack = event.call_stack
-    assert_equal('tc_event', stack[0].before('.rb:').rafter('/'))
+    assert_match(/tc_event\.rb/,  stack[0])
     begin
       raise Exception.new('smoe')
     rescue Exception => e
       event = DohLogger::Event.new(1, '', e)
       stack = event.call_stack
-      assert_equal('tc_event', stack[0].before('.rb:').rafter('/'))
+      assert_match(/tc_event\.rb/,  stack[0])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dohruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Makani & Kem Mason
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-02 00:00:00 -06:00
+date: 2008-04-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ files:
 - bin/run_tests.rb
 - lib/doh
 - lib/doh/core
+- lib/doh/core/bigdecimal.rb
 - lib/doh/core/date.rb
 - lib/doh/core/dir.rb
 - lib/doh/core/string.rb
@@ -52,6 +53,7 @@ files:
 - lib/doh/logger/null_interface.rb
 - lib/doh/logger/severity.rb
 - lib/doh/logger/standard_interface.rb
+- lib/doh/logger/util.rb
 - lib/doh/logger.rb
 - lib/doh/logger_app.rb
 - lib/doh/mysql
@@ -62,6 +64,7 @@ files:
 - lib/doh/mysql/default_type_guesser.rb
 - lib/doh/mysql/error.rb
 - lib/doh/mysql/handle.rb
+- lib/doh/mysql/hash_util.rb
 - lib/doh/mysql/parse.rb
 - lib/doh/mysql/raw_row_builder.rb
 - lib/doh/mysql/readonly_row.rb
@@ -76,8 +79,6 @@ files:
 - lib/doh/util/options.rb
 - lib/doh/util/run_tests.rb
 - lib/doh/util/source_ip.rb
-- lib/doh/util/test_case.rb
-- lib/doh/util/testcase_with_hooks.rb
 - lib/doh/util/unit_test_logging.rb
 - lib/doh.rb
 - test/core

data/lib/doh/util/test_case.rb

@@ -1,13 +0,0 @@
-require 'doh/util/testcase_with_hooks'
-require 'doh/util/current_date'
-Test::Unit::TestCase.add_teardown_hook("doh_teardown")
-
-module Test
-  module Unit
-    class TestCase
-      def doh_teardown
-        Doh::clear_current_date
-      end
-    end
-  end
-end

data/lib/doh/util/testcase_with_hooks.rb

@@ -1,55 +0,0 @@
-require 'test/unit'
-
-module Test
-  module Unit
-    class TestCase
-      @@setup_hooks = []
-      @@teardown_hooks = []
-
-      def self.add_setup_hook(method_name)
-        @@setup_hooks.push(method_name)
-      end
-
-      def self.add_teardown_hook(method_name)
-        @@teardown_hooks.push(method_name)
-      end
-
-      # NOTE: this is an exact copy from the original implementation, it will (of course) need to be kept up-to-date
-      # except the call of "setup" has been replaced with "setup_with_hooks" and "teardown" with "teardown_with_hooks"
-      def run(result)
-        yield(STARTED, name)
-        @_result = result
-        begin
-          setup_with_hooks
-          __send__(@method_name)
-        rescue AssertionFailedError => e
-          add_failure(e.message, e.backtrace)
-        rescue Exception
-          raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
-          add_error($!)
-        ensure
-          begin
-            teardown_with_hooks
-          rescue AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue Exception
-            raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
-            add_error($!)
-          end
-        end
-        result.add_run
-        yield(FINISHED, name)
-      end
-
-      def setup_with_hooks
-        @@setup_hooks.each {|elem| __send__(elem)}
-        setup
-      end
-
-      def teardown_with_hooks
-        teardown
-        @@teardown_hooks.each {|elem| __send__(elem)}
-      end
-    end
-  end
-end