dohruby 0.3.7 → 0.3.8

data/lib/doh/app/activate_database.rb

@@ -6,6 +6,11 @@ def self.activate_database
   root_cfg = DohApp::config
   return unless root_cfg.fetch('enable_database', true)
   return unless root_cfg.key?('database')
+  begin
+    require 'mysql'
+  rescue LoadError => e
+    return
+  end
   db_cfg = root_cfg['database']
   require 'doh/mysql'
   require 'doh/mysql/require_dbtypes'

data/lib/doh/app/init_runnable.rb

@@ -66,9 +66,7 @@ def self.init_runnable(file_or_directory, block = nil)
   end
   block.call(DohApp::config) if block
   DohApp::activate_logger
-  unless DohApp::config['dont_activate_database']
-    DohApp::activate_database
-  end
+  DohApp::activate_database
 end
 
 def self.init_runnable_dir(file_or_directory, &block)

data/lib/doh/app/init_script.rb

@@ -1,5 +1,5 @@
-#this is for non-database applications that want logging
-#in order to enable database, call DohApp::activate_database
+# this is for non-database applications that want logging
+# in order to enable database, call DohApp::activate_database
 
 require 'doh/app/init_runnable'
 require 'doh/app/options'
@@ -15,5 +15,5 @@ end
 
 DohApp::init_runnable_dir(home) do |config|
   config['logger']['file_acceptor']['log_directory'] = logdir
-  config['dont_activate_database'] = true
+  config['enable_database'] = false
 end

data/lib/doh/mysql/to_sql.rb

@@ -1,10 +1,24 @@
 require 'bigdecimal'
 require 'date'
-require 'mysql'
+begin
+  require 'mysql'
+  $mysql_loaded = true
+rescue
+  $mysql_loaded = false
+end
 
 class Object
   def to_sql
-    '"' + Mysql.escape_string(to_s) + '"'
+    if $mysql_loaded
+      str = Mysql.escape_string(to_s)
+    else
+      str = non_mysql_escape_string
+    end
+    '"' + str + '"'
+  end
+private
+  def non_mysql_escape_string
+    str.gsub('\\', '\\\\').gsub('\'', '\\\'').gsub('"', '\\"')
   end
 end
 

metadata

@@ -3,224 +3,224 @@ name: dohruby
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 3
-  - 7
-  version: 0.3.7
+    - 0
+    - 3
+    - 8
+  version: 0.3.8
 platform: ruby
 authors: 
-- Makani & Kem Mason
+  - Makani & Kem Mason
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +13:00
+date: 2011-06-04 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
 description: 
 email: makani.and.kem.mason@gmail.com
 executables: 
-- check_syntax.rb
-- config.rb
-- create_database.rb
-- create_skeleton_dohruby_project.rb
-- gendata.rb
-- migrate.rb
-- rcov_preprocess_files.rb
-- run_tests.rb
-- update_rdoc.rb
+  - check_syntax.rb
+  - config.rb
+  - create_database.rb
+  - create_skeleton_dohruby_project.rb
+  - gendata.rb
+  - migrate.rb
+  - rcov_preprocess_files.rb
+  - run_tests.rb
+  - update_rdoc.rb
 extensions: []
 
 extra_rdoc_files: 
-- MIT-LICENSE
-- CHANGELOG
+  - MIT-LICENSE
+  - CHANGELOG
 files: 
-- bin/check_syntax.rb
-- bin/config.rb
-- bin/create_database.rb
-- bin/create_skeleton_dohruby_project.rb
-- bin/gendata.rb
-- bin/migrate.rb
-- bin/rcov_preprocess_files.rb
-- bin/run_tests.rb
-- bin/update_rdoc.rb
-- lib/doh/app/activate_database.rb
-- lib/doh/app/activate_logger.rb
-- lib/doh/app/config.rb
-- lib/doh/app/home.rb
-- lib/doh/app/init.rb
-- lib/doh/app/init_runnable.rb
-- lib/doh/app/init_script.rb
-- lib/doh/app/init_unit_test.rb
-- lib/doh/app/options.rb
-- lib/doh/app.rb
-- lib/doh/app_no_stdio.rb
-- lib/doh/app_pwd.rb
-- lib/doh/app_util.rb
-- lib/doh/boot/app.rb
-- lib/doh/boot/app_no_stdio.rb
-- lib/doh/boot/app_pwd.rb
-- lib/doh/boot/find_dohruby.rb
-- lib/doh/boot/find_dohruby_18.rb
-- lib/doh/boot/find_dohruby_19.rb
-- lib/doh/boot/init_runnable.rb
-- lib/doh/boot/options.rb
-- lib/doh/core/array.rb
-- lib/doh/core/bigdecimal.rb
-- lib/doh/core/date.rb
-- lib/doh/core/deep_dup.rb
-- lib/doh/core/dir.rb
-- lib/doh/core/fixnum.rb
-- lib/doh/core/hash.rb
-- lib/doh/core/object.rb
-- lib/doh/core/require_local.rb
-- 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
-- lib/doh/data/human.rb
-- lib/doh/data/make_global.rb
-- lib/doh/data/require_datagen.rb
-- lib/doh/data.rb
-- lib/doh/home.rb
-- lib/doh/logger/direct_scheduler.rb
-- lib/doh/logger/email_acceptor.rb
-- lib/doh/logger/event.rb
-- lib/doh/logger/formatter.rb
-- lib/doh/logger/interface.rb
-- lib/doh/logger/iostream_acceptor.rb
-- lib/doh/logger/memory_acceptor.rb
-- lib/doh/logger/null_interface.rb
-- lib/doh/logger/proxy.rb
-- lib/doh/logger/severity.rb
-- lib/doh/logger/socket_acceptor.rb
-- lib/doh/logger/socket_viewer.rb
-- lib/doh/logger/standard_interface.rb
-- lib/doh/logger/util.rb
-- lib/doh/logger.rb
-- lib/doh/logger_configure.rb
-- lib/doh/merb/db_session.rb
-- lib/doh/merb/form_helpers.rb
-- lib/doh/merb/login.rb
-- lib/doh/merb/merb_dohsession.rb
-- lib/doh/merb/notify_on_exception.rb
-- lib/doh/merb/session.rb
-- lib/doh/merb/source_ip.rb
-- lib/doh/merb.rb
-- lib/doh/mysql/abstract_row.rb
-- lib/doh/mysql/cache_connector.rb
-- lib/doh/mysql/connector_instance.rb
-- lib/doh/mysql/connector_util.rb
-- lib/doh/mysql/convert.rb
-- lib/doh/mysql/current_date.rb
-- lib/doh/mysql/database_creator.rb
-- lib/doh/mysql/db_date.rb
-- lib/doh/mysql/default_type_guesser.rb
-- lib/doh/mysql/error.rb
-- lib/doh/mysql/handle.rb
-- lib/doh/mysql/hash_row.rb
-- lib/doh/mysql/load_sql.rb
-- lib/doh/mysql/metadata_util.rb
-- lib/doh/mysql/migrate.rb
-- lib/doh/mysql/migrate_check.rb
-- lib/doh/mysql/parse.rb
-- lib/doh/mysql/raw_row_builder.rb
-- lib/doh/mysql/readonly_row.rb
-- lib/doh/mysql/require_dbtypes.rb
-- lib/doh/mysql/smart_row.rb
-- lib/doh/mysql/to_sql.rb
-- lib/doh/mysql/typed_row_builder.rb
-- lib/doh/mysql/types.rb
-- lib/doh/mysql/unquoted.rb
-- lib/doh/mysql/version.rb
-- lib/doh/mysql/virtual.rb
-- lib/doh/mysql/writable_row.rb
-- lib/doh/mysql.rb
-- lib/doh/paypal/paypal.rb
-- lib/doh/paypal/pdt.rb
-- lib/doh/paypal.rb
-- lib/doh/rails/form_helpers.rb
-- lib/doh/rails/login.rb
-- lib/doh/test/clear_on_teardown.rb
-- lib/doh/test/configure_logging.rb
-- lib/doh/test/error_acceptor.rb
-- lib/doh/test/run_tests.rb
-- lib/doh/test/setup_once.rb
-- lib/doh/test/test_result.rb
-- lib/doh/test/use_test_database.rb
-- lib/doh/unit_test.rb
-- lib/doh/util/banking_workday.rb
-- lib/doh/util/blank_slate.rb
-- lib/doh/util/class_basename.rb
-- lib/doh/util/current_date.rb
-- lib/doh/util/doh_socket.rb
-- lib/doh/util/email.rb
-- lib/doh/util/file_edit.rb
-- lib/doh/util/http_helper.rb
-- lib/doh/util/internal_ip.rb
-- lib/doh/util/jsval.rb
-- lib/doh/util/num_or_self.rb
-- lib/doh/util/post_hash.rb
-- lib/doh/util/source_ip.rb
-- lib/doh/util/time_util.rb
-- lib/doh/util/to_display.rb
-- lib/doh/util/xml_util.rb
-- lib/doh.rb
-- test/core/tc_array.rb
-- test/core/tc_bigdecimal.rb
-- test/core/tc_date.rb
-- test/core/tc_deep_dup.rb
-- test/core/tc_fixnum.rb
-- test/core/tc_hash.rb
-- test/core/tc_socket.rb
-- test/core/tc_string.rb
-- test/crypt/tc_3des.rb
-- test/local_tests.rb
-- test/local_tests_including_slow.rb
-- test/logger/sample.rb
-- test/logger/tc_acceptor.rb
-- test/logger/tc_event.rb
-- test/logger/tc_formatter.rb
-- test/logger/tc_interface.rb
-- test/logger/tc_socket_viewer_acceptor.rb
-- test/mysql/001_down.sql
-- test/mysql/001_up.sql
-- test/mysql/002_down.sql
-- test/mysql/002_up.sql
-- test/mysql/connector.yml
-- test/mysql/connector.yml.tmpl
-- test/mysql/db_unit_test.rb
-- test/mysql/tc_cache_connector.rb
-- test/mysql/tc_connector_instance.rb
-- test/mysql/tc_convert.rb
-- test/mysql/tc_handle.rb
-- test/mysql/tc_metadata_util.rb
-- test/mysql/tc_migrate.rb
-- test/mysql/tc_parse.rb
-- test/mysql/tc_readonly_row.rb
-- test/mysql/tc_smart_row.rb
-- test/mysql/tc_to_sql.rb
-- test/mysql/tc_types.rb
-- test/mysql/tc_unquoted.rb
-- test/mysql/tc_writable_row.rb
-- test/ts_core.rb
-- test/ts_logger.rb
-- test/ts_mysql.rb
-- test/ts_util.rb
-- test/util/slow_doh_socket.rb
-- test/util/tc_banking_workday.rb
-- test/util/tc_file_edit.rb
-- test/util/tc_jsval.rb
-- test/util/tc_to_display.rb
-- test/util/tc_xml_util.rb
-- dohapp_home
-- MIT-LICENSE
-- CHANGELOG
+  - bin/check_syntax.rb
+  - bin/config.rb
+  - bin/create_database.rb
+  - bin/create_skeleton_dohruby_project.rb
+  - bin/gendata.rb
+  - bin/migrate.rb
+  - bin/rcov_preprocess_files.rb
+  - bin/run_tests.rb
+  - bin/update_rdoc.rb
+  - lib/doh.rb
+  - lib/doh/app.rb
+  - lib/doh/app_no_stdio.rb
+  - lib/doh/app_pwd.rb
+  - lib/doh/app_util.rb
+  - lib/doh/core.rb
+  - lib/doh/crypt.rb
+  - lib/doh/data.rb
+  - lib/doh/home.rb
+  - lib/doh/logger.rb
+  - lib/doh/logger_configure.rb
+  - lib/doh/merb.rb
+  - lib/doh/mysql.rb
+  - lib/doh/paypal.rb
+  - lib/doh/unit_test.rb
+  - lib/doh/app/activate_database.rb
+  - lib/doh/app/activate_logger.rb
+  - lib/doh/app/config.rb
+  - lib/doh/app/home.rb
+  - lib/doh/app/init.rb
+  - lib/doh/app/init_runnable.rb
+  - lib/doh/app/init_script.rb
+  - lib/doh/app/init_unit_test.rb
+  - lib/doh/app/options.rb
+  - lib/doh/boot/app.rb
+  - lib/doh/boot/app_no_stdio.rb
+  - lib/doh/boot/app_pwd.rb
+  - lib/doh/boot/find_dohruby.rb
+  - lib/doh/boot/find_dohruby_18.rb
+  - lib/doh/boot/find_dohruby_19.rb
+  - lib/doh/boot/init_runnable.rb
+  - lib/doh/boot/options.rb
+  - lib/doh/core/array.rb
+  - lib/doh/core/bigdecimal.rb
+  - lib/doh/core/date.rb
+  - lib/doh/core/deep_dup.rb
+  - lib/doh/core/dir.rb
+  - lib/doh/core/fixnum.rb
+  - lib/doh/core/hash.rb
+  - lib/doh/core/object.rb
+  - lib/doh/core/require_local.rb
+  - lib/doh/core/socket.rb
+  - lib/doh/core/string.rb
+  - lib/doh/crypt/3des.rb
+  - lib/doh/data/basic.rb
+  - lib/doh/data/bulk.rb
+  - lib/doh/data/catalog.rb
+  - lib/doh/data/human.rb
+  - lib/doh/data/make_global.rb
+  - lib/doh/data/require_datagen.rb
+  - lib/doh/logger/direct_scheduler.rb
+  - lib/doh/logger/email_acceptor.rb
+  - lib/doh/logger/event.rb
+  - lib/doh/logger/formatter.rb
+  - lib/doh/logger/interface.rb
+  - lib/doh/logger/iostream_acceptor.rb
+  - lib/doh/logger/memory_acceptor.rb
+  - lib/doh/logger/null_interface.rb
+  - lib/doh/logger/proxy.rb
+  - lib/doh/logger/severity.rb
+  - lib/doh/logger/socket_acceptor.rb
+  - lib/doh/logger/socket_viewer.rb
+  - lib/doh/logger/standard_interface.rb
+  - lib/doh/logger/util.rb
+  - lib/doh/merb/db_session.rb
+  - lib/doh/merb/form_helpers.rb
+  - lib/doh/merb/login.rb
+  - lib/doh/merb/merb_dohsession.rb
+  - lib/doh/merb/notify_on_exception.rb
+  - lib/doh/merb/session.rb
+  - lib/doh/merb/source_ip.rb
+  - lib/doh/mysql/abstract_row.rb
+  - lib/doh/mysql/cache_connector.rb
+  - lib/doh/mysql/connector_instance.rb
+  - lib/doh/mysql/connector_util.rb
+  - lib/doh/mysql/convert.rb
+  - lib/doh/mysql/current_date.rb
+  - lib/doh/mysql/database_creator.rb
+  - lib/doh/mysql/db_date.rb
+  - lib/doh/mysql/default_type_guesser.rb
+  - lib/doh/mysql/error.rb
+  - lib/doh/mysql/handle.rb
+  - lib/doh/mysql/hash_row.rb
+  - lib/doh/mysql/load_sql.rb
+  - lib/doh/mysql/metadata_util.rb
+  - lib/doh/mysql/migrate.rb
+  - lib/doh/mysql/migrate_check.rb
+  - lib/doh/mysql/parse.rb
+  - lib/doh/mysql/raw_row_builder.rb
+  - lib/doh/mysql/readonly_row.rb
+  - lib/doh/mysql/require_dbtypes.rb
+  - lib/doh/mysql/smart_row.rb
+  - lib/doh/mysql/to_sql.rb
+  - lib/doh/mysql/typed_row_builder.rb
+  - lib/doh/mysql/types.rb
+  - lib/doh/mysql/unquoted.rb
+  - lib/doh/mysql/version.rb
+  - lib/doh/mysql/virtual.rb
+  - lib/doh/mysql/writable_row.rb
+  - lib/doh/paypal/paypal.rb
+  - lib/doh/paypal/pdt.rb
+  - lib/doh/rails/form_helpers.rb
+  - lib/doh/rails/login.rb
+  - lib/doh/test/clear_on_teardown.rb
+  - lib/doh/test/configure_logging.rb
+  - lib/doh/test/error_acceptor.rb
+  - lib/doh/test/run_tests.rb
+  - lib/doh/test/setup_once.rb
+  - lib/doh/test/test_result.rb
+  - lib/doh/test/use_test_database.rb
+  - lib/doh/util/banking_workday.rb
+  - lib/doh/util/blank_slate.rb
+  - lib/doh/util/class_basename.rb
+  - lib/doh/util/current_date.rb
+  - lib/doh/util/doh_socket.rb
+  - lib/doh/util/email.rb
+  - lib/doh/util/file_edit.rb
+  - lib/doh/util/http_helper.rb
+  - lib/doh/util/internal_ip.rb
+  - lib/doh/util/jsval.rb
+  - lib/doh/util/num_or_self.rb
+  - lib/doh/util/post_hash.rb
+  - lib/doh/util/source_ip.rb
+  - lib/doh/util/time_util.rb
+  - lib/doh/util/to_display.rb
+  - lib/doh/util/xml_util.rb
+  - test/local_tests.rb
+  - test/local_tests_including_slow.rb
+  - test/ts_core.rb
+  - test/ts_logger.rb
+  - test/ts_mysql.rb
+  - test/ts_util.rb
+  - test/core/tc_array.rb
+  - test/core/tc_bigdecimal.rb
+  - test/core/tc_date.rb
+  - test/core/tc_deep_dup.rb
+  - test/core/tc_fixnum.rb
+  - test/core/tc_hash.rb
+  - test/core/tc_socket.rb
+  - test/core/tc_string.rb
+  - test/crypt/tc_3des.rb
+  - test/logger/sample.rb
+  - test/logger/tc_acceptor.rb
+  - test/logger/tc_event.rb
+  - test/logger/tc_formatter.rb
+  - test/logger/tc_interface.rb
+  - test/logger/tc_socket_viewer_acceptor.rb
+  - test/mysql/001_down.sql
+  - test/mysql/001_up.sql
+  - test/mysql/002_down.sql
+  - test/mysql/002_up.sql
+  - test/mysql/connector.yml
+  - test/mysql/connector.yml.tmpl
+  - test/mysql/db_unit_test.rb
+  - test/mysql/tc_cache_connector.rb
+  - test/mysql/tc_connector_instance.rb
+  - test/mysql/tc_convert.rb
+  - test/mysql/tc_handle.rb
+  - test/mysql/tc_metadata_util.rb
+  - test/mysql/tc_migrate.rb
+  - test/mysql/tc_parse.rb
+  - test/mysql/tc_readonly_row.rb
+  - test/mysql/tc_smart_row.rb
+  - test/mysql/tc_to_sql.rb
+  - test/mysql/tc_types.rb
+  - test/mysql/tc_unquoted.rb
+  - test/mysql/tc_writable_row.rb
+  - test/util/slow_doh_socket.rb
+  - test/util/tc_banking_workday.rb
+  - test/util/tc_file_edit.rb
+  - test/util/tc_jsval.rb
+  - test/util/tc_to_display.rb
+  - test/util/tc_xml_util.rb
+  - dohapp_home
+  - MIT-LICENSE
+  - CHANGELOG
 has_rdoc: true
 homepage: http://dohruby.rubyforge.org/
 licenses: []
@@ -229,69 +229,67 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: dohruby
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DohRuby's purpose is to make your life as a developer easier & make you more efficient in your programming.
 test_files: 
-- test/core/tc_array.rb
-- test/core/tc_bigdecimal.rb
-- test/core/tc_date.rb
-- test/core/tc_deep_dup.rb
-- test/core/tc_fixnum.rb
-- test/core/tc_hash.rb
-- test/core/tc_socket.rb
-- test/core/tc_string.rb
-- test/crypt/tc_3des.rb
-- test/local_tests.rb
-- test/local_tests_including_slow.rb
-- test/logger/sample.rb
-- test/logger/tc_acceptor.rb
-- test/logger/tc_event.rb
-- test/logger/tc_formatter.rb
-- test/logger/tc_interface.rb
-- test/logger/tc_socket_viewer_acceptor.rb
-- test/mysql/db_unit_test.rb
-- test/mysql/tc_cache_connector.rb
-- test/mysql/tc_connector_instance.rb
-- test/mysql/tc_convert.rb
-- test/mysql/tc_handle.rb
-- test/mysql/tc_metadata_util.rb
-- test/mysql/tc_migrate.rb
-- test/mysql/tc_parse.rb
-- test/mysql/tc_readonly_row.rb
-- test/mysql/tc_smart_row.rb
-- test/mysql/tc_to_sql.rb
-- test/mysql/tc_types.rb
-- test/mysql/tc_unquoted.rb
-- test/mysql/tc_writable_row.rb
-- test/ts_core.rb
-- test/ts_logger.rb
-- test/ts_mysql.rb
-- test/ts_util.rb
-- test/util/slow_doh_socket.rb
-- test/util/tc_banking_workday.rb
-- test/util/tc_file_edit.rb
-- test/util/tc_jsval.rb
-- test/util/tc_to_display.rb
-- test/util/tc_xml_util.rb
+  - test/local_tests.rb
+  - test/local_tests_including_slow.rb
+  - test/ts_core.rb
+  - test/ts_logger.rb
+  - test/ts_mysql.rb
+  - test/ts_util.rb
+  - test/core/tc_array.rb
+  - test/core/tc_bigdecimal.rb
+  - test/core/tc_date.rb
+  - test/core/tc_deep_dup.rb
+  - test/core/tc_fixnum.rb
+  - test/core/tc_hash.rb
+  - test/core/tc_socket.rb
+  - test/core/tc_string.rb
+  - test/crypt/tc_3des.rb
+  - test/logger/sample.rb
+  - test/logger/tc_acceptor.rb
+  - test/logger/tc_event.rb
+  - test/logger/tc_formatter.rb
+  - test/logger/tc_interface.rb
+  - test/logger/tc_socket_viewer_acceptor.rb
+  - test/mysql/db_unit_test.rb
+  - test/mysql/tc_cache_connector.rb
+  - test/mysql/tc_connector_instance.rb
+  - test/mysql/tc_convert.rb
+  - test/mysql/tc_handle.rb
+  - test/mysql/tc_metadata_util.rb
+  - test/mysql/tc_migrate.rb
+  - test/mysql/tc_parse.rb
+  - test/mysql/tc_readonly_row.rb
+  - test/mysql/tc_smart_row.rb
+  - test/mysql/tc_to_sql.rb
+  - test/mysql/tc_types.rb
+  - test/mysql/tc_unquoted.rb
+  - test/mysql/tc_writable_row.rb
+  - test/util/slow_doh_socket.rb
+  - test/util/tc_banking_workday.rb
+  - test/util/tc_file_edit.rb
+  - test/util/tc_jsval.rb
+  - test/util/tc_to_display.rb
+  - test/util/tc_xml_util.rb