yaml_db 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a4e39c17d583195897d45248f0aca67b9cbdb31
-  data.tar.gz: fdcf74702568fb3fafe04cd4956a0c25cf9f4c48
+  metadata.gz: 97ea4b448b5e237251d13e2c8b5393a594105e56
+  data.tar.gz: 98c49ef9d688d45c18bc94cda62a8816969cc2b0
 SHA512:
-  metadata.gz: 228b520f88360a5fc698f5809bc0b917c6669d74156c7d0f174631c59c76d8bcb3b09e9eaa982cff136f5bf8a1e9ea59cc99391a6bc570d3548c2f39c998ea8b
-  data.tar.gz: 0e329ffcd25e425cd75da70cc8ebc51299c14308d3614169b6692f186c876c725ce3b6da9e63657a698655e5d3acfd0b649d029d0d677dc477f6dbea2e053f05
+  metadata.gz: ac7599aa51c7a3ee0237d849c008cb48abdb9d63fd3ff83ead8bf811fb06bf7e44ceb576a4beb4ff3635a0ac0b6fb4643f65a58d14cf6de4aff669e8c3a3984b
+  data.tar.gz: ed53717fa314f06618fd810f880ace40400b3be74a57d6814cfe7b9844d29c2288ee148232d2aca5bc200b329d68efedb1a9aa63963237376d1e94275dfe9e00

data/README.md

@@ -6,7 +6,7 @@ This can be used as a replacement for mysqldump or pg_dump, but only for the dat
 
 Any database that has an ActiveRecord adapter should work.
 
-This gem supports Rails 3.x, 4.x, and 5.0.
+This gem supports Rails versions 3.0 through 5.1.
 
 [![Build Status](https://travis-ci.org/yamldb/yaml_db.svg?branch=master)](https://travis-ci.org/yamldb/yaml_db)
 

data/lib/yaml_db.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'yaml'
 require 'active_record'
-require 'active_support/core_ext/kernel/reporting'
 require 'rails/railtie'
 require 'yaml_db/rake_tasks'
 require 'yaml_db/version'

data/lib/yaml_db/serialization_helper.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/kernel/reporting'
+
 module YamlDb
   module SerializationHelper
 
@@ -83,11 +85,10 @@ module YamlDb
         if column_names.nil?
           return
         end
-        columns = column_names.map{|cn| ActiveRecord::Base.connection.columns(table).detect{|c| c.name == cn}}
         quoted_column_names = column_names.map { |column| ActiveRecord::Base.connection.quote_column_name(column) }.join(',')
         quoted_table_name = Utils.quote_table(table)
         records.each do |record|
-          quoted_values = record.zip(columns).map{|c| ActiveRecord::Base.connection.quote(c.first, c.last)}.join(',')
+          quoted_values = record.map{|c| ActiveRecord::Base.connection.quote(c)}.join(',')
           ActiveRecord::Base.connection.execute("INSERT INTO #{quoted_table_name} (#{quoted_column_names}) VALUES (#{quoted_values})")
         end
       end
@@ -182,12 +183,12 @@ module YamlDb
       def self.each_table_page(table, records_per_page=1000)
         total_count = table_record_count(table)
         pages = (total_count.to_f / records_per_page).ceil - 1
-        key = sort_key(table)
+        keys = sort_keys(table)
         boolean_columns = Utils.boolean_columns(table)
         quoted_table_name = Utils.quote_table(table)
 
         (0..pages).to_a.each do |page|
-          query = Arel::Table.new(table).order(key).skip(records_per_page*page).take(records_per_page).project(Arel.sql('*'))
+          query = Arel::Table.new(table).order(*keys).skip(records_per_page*page).take(records_per_page).project(Arel.sql('*'))
           records = ActiveRecord::Base.connection.select_all(query.to_sql)
           records = Utils.convert_booleans(records, boolean_columns)
           yield records
@@ -198,15 +199,15 @@ module YamlDb
         ActiveRecord::Base.connection.select_one("SELECT COUNT(*) FROM #{Utils.quote_table(table)}").values.first.to_i
       end
 
-      # Just return the first column as sort key unless the table looks like a
-      # standard HABTM join table, in which case add the second "id column"
-      def self.sort_key(table)
+      # Return the first column as sort key unless the table looks like a
+      # standard has_and_belongs_to_many join table, in which case add the second "ID column"
+      def self.sort_keys(table)
         first_column, second_column = table_column_names(table)
 
         if [first_column, second_column].all? { |name| name =~ /_id$/ }
           [Utils.quote_column(first_column), Utils.quote_column(second_column)]
         else
-          Utils.quote_column(first_column)
+          [Utils.quote_column(first_column)]
         end
       end
     end

data/lib/yaml_db/version.rb

@@ -1,3 +1,3 @@
 module YamlDb
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml_db
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Wiggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +20,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: yaml_db allows export/import of database into/from yaml files