ydd 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/ydd.rb

@@ -3,6 +3,7 @@ require 'active_support'
 require 'active_support/all'
 require 'active_record'
 require 'fileutils'
+require 'rchardet'
 
 module YDD
   class Error < StandardError; end

data/lib/ydd/serialization_helper.rb

@@ -33,6 +33,17 @@ module YDD
     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
+      end
+      
       def self.load(io, truncate = true)
         YDD.connection.transaction do
           load_documents(io, truncate)
@@ -60,17 +71,36 @@ 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{|c| YDD.connection.quote(c.first, c.last)}.join(',')
+          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]
+
+        if value.present?
+          value = case column.type
+          when :string, :text
+            character_encoding = CharDet.detect(value)["encoding"]
+            convert_from(character_encoding).iconv(value + ' ')[0..-2]
+          else
+            value
+          end
+        end
+        
+        YDD.connection.quote(value, column)
+      end 
 
     end
 

data/ydd.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ydd}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   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-01-16}
+  s.date = %q{2011-05-25}
   s.default_executable = %q{ydd}
   s.description = %q{
 YDD is a tool (a fork of yaml_db really) to make it generally easy
@@ -23,27 +23,25 @@ and the like.
   ]
   s.files = [
     ".rvmrc",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bin/ydd",
-     "lib/ydd.rb",
-     "lib/ydd/application.rb",
-     "lib/ydd/data_manager.rb",
-     "lib/ydd/schema_manager.rb",
-     "lib/ydd/serialization_helper.rb",
-     "lib/ydd/yaml_db.rb",
-     "tasks/yaml_db_tasks.rake",
-     "ydd.gemspec"
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "bin/ydd",
+    "lib/ydd.rb",
+    "lib/ydd/application.rb",
+    "lib/ydd/data_manager.rb",
+    "lib/ydd/schema_manager.rb",
+    "lib/ydd/serialization_helper.rb",
+    "lib/ydd/yaml_db.rb",
+    "tasks/yaml_db_tasks.rake",
+    "ydd.gemspec"
   ]
   s.homepage = %q{http://github.com/YouthTree/ydd}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{ydd dumps / loads rails app databases for backup purposes.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ydd
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +08:00
+date: 2011-05-25 00:00:00 +08:00
 default_executable: ydd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,8 +96,8 @@ homepage: http://github.com/YouthTree/ydd
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ydd dumps / loads rails app databases for backup purposes.