fixie 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af6e750ed73e3bb2d5a4e36b8a22bb45d4e06af
-  data.tar.gz: 2f7ee65828e9b1995f8b8a124f26cce0b5f3add6
+  metadata.gz: cf8ccf1b8d2425c0d7c0f5ff010bc855b543660f
+  data.tar.gz: 79b5f737d75f04e4ded85b6edbf2e7b8f5f62d76
 SHA512:
-  metadata.gz: 68114ab1a2a4a8734e41c6ff891107c04825acd8029aee7ef2b0019d0d3251062d0ff5677759b03a28c3b56afb098d0d0dc5022b8c0f48fe5e95db9059cb1c06
-  data.tar.gz: d855fe7758e8d058f827ba8178a97481bf7c3cd07827b54b1b4856dd7fb68b2100dccf846ad45a2e4853f0d06de174f9fd629d31c231d629e15192eaf14f274b
+  metadata.gz: 152e1c87de693a844abb68a44a0bb261293c801caa42ee54d96b3f3cb56a3152b45cdc5cfc5f6743bd463e862b01dedcacc6cbcd0fd1a1a9edb0141371a554c8
+  data.tar.gz: fcc429a2648ea9bcd11d4df13a56607dc441ed747c14ae634af599ae18fefb94ad566af0d48b8ff028b76dc8bdade174dfec35b04c168f8ce5e7077f1c257bc5

data/fixie.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fixie"
-  gem.version       = "0.4.0"
+  gem.version       = "0.5.0"
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{A standalone library for managing test fixture data}

data/lib/fixie.rb

@@ -3,6 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'erb'
 require 'sequel'
+require 'set'
 require 'yaml'
 require 'zlib'
 
@@ -64,33 +65,43 @@ module Fixie
         end
 
         # Do a second pass to resolve associations and load data in DB
-        all_fixtures[db_name].each do |table_name, fixtures|
-          table = db[table_name]
-          table.truncate(cascade: true, restart: true)
-          table_has_created_at = table.columns.include?(:created_at)
-          table_has_updated_at = table.columns.include?(:updated_at)
+        db.transaction(deferrable: true) do
+          all_fixtures[db_name].each do |table_name, fixtures|
+            table = db[table_name]
+            table.truncate(cascade: true, restart: true)
+            table_has_created_at = table.columns.include?(:created_at)
+            table_has_updated_at = table.columns.include?(:updated_at)
+
+            json_columns = Set.new
+            db.schema(table_name).each do |column,metadata|
+              json_columns << column if metadata[:db_type] == 'json'
+            end
 
-          fixtures.each do |name, data|
+            fixtures.each do |name, data|
+
+              # Change attributes like city: baltimore to city_id: baltimore.id
+              data.keys.each do |attr|
+                associated_fixtures = all_fixtures[db_name][attr.to_s.pluralize.to_sym]
+                if associated_fixtures && table.columns.include?("#{attr}_id".to_sym)
+                  associated_fixture = associated_fixtures[data[attr].to_sym]
+                  if associated_fixture
+                    data["#{attr}_id".to_sym] = associated_fixture[:id]
+                    data.delete(attr)
+                  end
+                end
 
-            # Change attributes like city: baltimore to city_id: baltimore.id
-            data.keys.each do |attr|
-              associated_fixtures = all_fixtures[db_name][attr.to_s.pluralize.to_sym]
-              if associated_fixtures && table.columns.include?("#{attr}_id".to_sym)
-                associated_fixture = associated_fixtures[data[attr].to_sym]
-                if associated_fixture
-                  data["#{attr}_id".to_sym] = associated_fixture[:id]
-                  data.delete(attr)
+                if db.database_type == :postgres && json_columns.include?(attr)
+                  data[attr] = Sequel.pg_json(data[attr])
                 end
               end
 
+              # Set created_at/updated_at if they exist
               data[:created_at] = now if table_has_created_at && !data.key?(:created_at)
               data[:updated_at] = now if table_has_updated_at && !data.key?(:updated_at)
-            end
-
-            # Set created_at/updated_at if they exist
 
-            # Finally, replace the data in the DB
-            table.insert(data)
+              # Finally, replace the data in the DB
+              table.insert(data)
+            end
           end
         end
       end

data/lib/fixie/version.rb

@@ -1,3 +1,3 @@
 module Fixie
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixie
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport