ydd 0.2.0 → 0.2.1

data/.rvmrc

@@ -1 +1 @@
-rvm --create use "@ydd"
+rvm --create use "ree@ydd"

data/Rakefile

@@ -15,6 +15,7 @@ and the like.
     gem.authors = ["Adam Wiggins","Orion Henry", "Darcy Laycock"]
     gem.add_dependency 'thor', '~> 0.14'
     gem.add_dependency 'activesupport'
+    gem.add_dependency 'rchardet'
     # We want it to work with Rails 3 etc, older versions of AR will fail though.
     gem.add_dependency 'activerecord', '>= 2.3'
   end

data/VERSION

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

data/lib/ydd.rb

@@ -3,11 +3,12 @@ require 'active_support'
 require 'active_support/all'
 require 'active_record'
 require 'fileutils'
+require 'iconv'
 require 'rchardet'
 
 module YDD
   class Error < StandardError; end
-  
+
   autoload :SchemaManager,       'ydd/schema_manager'
   autoload :DataManager,         'ydd/data_manager'
   autoload :YamlDB,              'ydd/yaml_db'
@@ -15,15 +16,15 @@ module YDD
   autoload :Application,         'ydd/application'
 
   mattr_accessor :skip_schema, :skip_data
-  
+
   def self.skip_schema?
     !!skip_schema
   end
-  
+
   def self.schema_tables
     [ 'schema_info', 'schema_migrations' ]
   end
-  
+
   def self.skip_data?
     !!skip_data
   end
@@ -31,7 +32,7 @@ module YDD
   def self.tables=(value)
     @@tables = value.blank? ? nil : Array(value).join(",").split(",")
   end
-  
+
   def self.tables
     @@tables ||= nil
   end
@@ -43,57 +44,57 @@ module YDD
       @@env = value
     end
   end
-  
+
   def self.env
     @@env ||= (ENV['YDD_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development')
   end
-  
+
   def self.connection
     ActiveRecord::Base.connection
   end
-  
+
   def self.configuration_from(file)
     require 'erb'
     parsed = ERB.new(File.read(file)).result
     YAML.load(parsed)[env]
   end
-  
+
   def self.connect_from(path)
     raise Error, "Invalid database config at #{path}" if !File.exists?(path)
     connect configuration_from(path)
   end
-  
+
   def self.connect(specification)
     ActiveRecord::Base.establish_connection(specification)
   end
-  
+
   def self.dump(directory)
     FileUtils.mkdir_p directory
     SchemaManager.dump File.join(directory, "schema.rb") unless skip_schema?
     DataManager.dump   File.join(directory, "data.yml")  unless skip_data?
   end
-  
+
   def self.load(directory)
     if !File.directory?(directory)
       raise Error, "Please provide a valid directory - #{directory} doesn't exist."
     end
-    
+
     unless skip_schema?
       check_files! directory, "schema.rb"
-      SchemaManager.load File.join(directory, "schema.rb") 
+      SchemaManager.load File.join(directory, "schema.rb")
     end
-    
+
     unless skip_data?
       check_files! directory, "data.yml"
       DataManager.load   File.join(directory, "data.yml")
     end
   end
-  
+
   def self.check_files!(dir, *files)
     files.each do |file|
       path = File.join(dir, file)
       raise Error, "#{file} doesn't exist in #{dir}" if !File.readable?(path)
     end
   end
-  
+
 end

data/lib/ydd/schema_manager.rb

@@ -1,15 +1,15 @@
 module YDD
   class SchemaManager
-    
+
     def self.dump(path)
       File.open(path, "w") do |file|
         ActiveRecord::SchemaDumper.dump(YDD.connection, file)
       end
     end
-    
+
     def self.load(path)
       Kernel.load path if File.exists?(path)
     end
-    
+
   end
 end

data/lib/ydd/serialization_helper.rb

@@ -31,19 +31,28 @@ module YDD
         ActiveRecord::Base.logger = @@old_logger
       end
     end
-  
+
+    class IdentityConvertor
+      def self.iconv(string)
+        string.to_s
+      end
+    end
+
+
     class Load
       def self.convert_from(char_enc)
         @converter ||= {}
-        
+
         return @converter[char_enc] if @converter[char_enc].present?
-        
+
         if YDD.connection.encoding.eql? "UTF8"
           puts "Creating a string converter from #{char_enc} that will ignore non-UTF8 characters."
           @converter[char_enc] = Iconv.new('UTF-8//TRANSLIT//IGNORE', char_enc)
         end
+
+        @converter.fetch(char_enc, IdentityConvertor)
       end
-      
+
       def self.load(io, truncate = true)
         YDD.connection.transaction do
           load_documents(io, truncate)
@@ -71,21 +80,21 @@ module YDD
         quoted_column_names = column_names.map { |column| YDD.connection.quote_column_name(column) }.join(',')
         quoted_table_name = SerializationHelper::Utils.quote_table(table)
         #records.sort_by! { |r| r['id'].to_i } if column_names.include? 'id'
-        # 
+        #
         records.each do |record|
           quoted_values = record.zip(columns).map { |value_column| clean_column_value(value_column) }.join(",")
-          
+
           YDD.connection.execute("INSERT INTO #{quoted_table_name} (#{quoted_column_names}) VALUES (#{quoted_values})")
         end
-        
+
       end
 
       def self.reset_pk_sequence!(table_name)
         if YDD.connection.respond_to?(:reset_pk_sequence!)
           YDD.connection.reset_pk_sequence!(table_name)
         end
-      end   
-      
+      end
+
       def self.clean_column_value(value_column)
         value, column = value_column[0], value_column[1]
 
@@ -98,9 +107,9 @@ module YDD
             value
           end
         end
-        
+
         YDD.connection.quote(value, column)
-      end 
+      end
 
     end
 
@@ -163,7 +172,7 @@ module YDD
         base_tables = YDD.connection.tables
         base_tables &= YDD.tables if YDD.tables.present?
         base_tables.reject! { |table| YDD.schema_tables.include?(table) } if YDD.skip_schema?
-        base_tables 
+        base_tables
       end
 
       def self.dump_table(io, table)
@@ -183,7 +192,7 @@ module YDD
         pages             = (total_count.to_f / records_per_page).ceil - 1
         id                = table_column_names(table).first
         boolean_columns   = SerializationHelper::Utils.boolean_columns(table)
-        quoted_table_name = SerializationHelper::Utils.quote_table(table)        
+        quoted_table_name = SerializationHelper::Utils.quote_table(table)
         base_query        = "SELECT * FROM #{quoted_table_name} ORDER BY #{id}"
         0.upto(pages) do |page|
           sql = YDD.connection.add_limit_offset! base_query.dup,

data/ydd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ydd}
-  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 = ["Adam Wiggins", "Orion Henry", "Darcy Laycock"]
-  s.date = %q{2011-05-25}
+  s.date = %q{2011-05-31}
   s.default_executable = %q{ydd}
   s.description = %q{
 YDD is a tool (a fork of yaml_db really) to make it generally easy
@@ -47,15 +47,18 @@ and the like.
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.14"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<rchardet>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3"])
     else
       s.add_dependency(%q<thor>, ["~> 0.14"])
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rchardet>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 2.3"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.14"])
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rchardet>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 2.3"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ydd
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +08:00
+date: 2011-05-31 00:00:00 +08:00
 default_executable: ydd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,23 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rchardet
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,7 +77,7 @@ dependencies:
         - 3
         version: "2.3"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 description: |
   
   YDD is a tool (a fork of yaml_db really) to make it generally easy