diff --git a/h-ety-h/boot.rb b/h-ety-h/boot.rb index 65b8cb2..83e31b4 100644 --- a/h-ety-h/boot.rb +++ b/h-ety-h/boot.rb @@ -1,4 +1,3 @@ -require 'ftools' require 'hpricot' module ::HH end diff --git a/h-ety-h/init.rb b/h-ety-h/init.rb index bfcac20..707685d 100644 --- a/h-ety-h/init.rb +++ b/h-ety-h/init.rb @@ -28,7 +28,7 @@ end HH::DOWNLOADS = File.join(HH::USER, 'Downloads') -File.makedirs(HH::DOWNLOADS) +FileUtils.makedirs(HH::DOWNLOADS) HH::DB = HH::Sequel::SQLite::Database.new(:database => File.join(HH::USER, "+TABLES")) HH::DB.extend HH::DbMixin HH::DB.init diff --git a/h-ety-h/sequel/database.rb b/h-ety-h/sequel/database.rb index f286138..fb6ba01 100644 --- a/h-ety-h/sequel/database.rb +++ b/h-ety-h/sequel/database.rb @@ -40,7 +40,7 @@ def <<(sql) # overriden in database adapters. def literal(v) case v - when String: "'%s'" % v + when String then "'%s'" % v else v.to_s end end diff --git a/h-ety-h/sequel/dataset.rb b/h-ety-h/sequel/dataset.rb index 6992ec1..ca653ab 100644 --- a/h-ety-h/sequel/dataset.rb +++ b/h-ety-h/sequel/dataset.rb @@ -73,13 +73,13 @@ def qualified_field_name(field, table) # Converts a field list into a comma seperated string of field names. def field_list(fields) case fields - when Array: + when Array then if fields.empty? WILDCARD else fields.map {|i| field_name(i)}.join(COMMA_SEPARATOR) end - when Symbol: + when Symbol then fields.to_field_name else fields @@ -89,7 +89,7 @@ def field_list(fields) # Converts an array of sources into a comma separated list. def source_list(source) case source - when Array: source.join(COMMA_SEPARATOR) + when Array then source.join(COMMA_SEPARATOR) else source end end @@ -111,9 +111,9 @@ def where_equal_condition(left, right) # Formats a where clause. def where_list(where) case where - when Hash: + when Hash then where.map {|kv| where_equal_condition(kv[0], kv[1])}.join(AND_SEPARATOR) - when Array: + when Array then fmt = where.shift fmt.gsub('?') {|i| literal(where.shift)} else diff --git a/h-ety-h/sequel/schema.rb b/h-ety-h/sequel/schema.rb index c2e6ad3..88b8288 100644 --- a/h-ety-h/sequel/schema.rb +++ b/h-ety-h/sequel/schema.rb @@ -21,10 +21,10 @@ class Schema def self.on_delete_action(action) case action - when :restrict: RESTRICT - when :cascade: CASCADE - when :set_null: SET_NULL - when :set_default: SET_DEFAULT + when restrict then RESTRICT + when cascade then CASCADE + when set_null then SET_NULL + when set_default then SET_DEFAULT else NO_ACTION end end