web-connect 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8852960947e0101b9aed18431e816918a725f40
-  data.tar.gz: fc021a0da52de9ad21c1711954bb7c6eb38e46bb
+  metadata.gz: b297a57d736e3dc2860b710c3fb2d53f9e962841
+  data.tar.gz: 20e06cbe434da29e8cba8171fd7a018f1e3c7f64
 SHA512:
-  metadata.gz: bac7b2e4a6e609c2b5a606c37ce47deb406b6316a44205a0afde70294d811f58b83f70ae9a3984b028cccec476dbf28099f2393358472db91135f04a235c149c
-  data.tar.gz: 4e787404157caaaa09e3d57807b9760b03fed6fa58d5fb6901ae20546e17b3bd0e39f37622d0ab21f1ec80da7de9e4c9f691381e6e5a717732004c35e9895cb8
+  metadata.gz: 323eb6b99f136b4530bf1804879339a8909b642bf96f06f097231afabcec247c18a2cefe02718a0cc24080d365bf520a5f2d0454dc0a71a4ce64aab0d023d51e
+  data.tar.gz: f054a41d4dc3b02f4a22a8447320c3d111e83274172671c6e0d918c149e479af78ea9ac7f14f478c65c29ec49e59de09dfaaa03154b8b1140cea3d5afe74642d

data/lib/netfira/web_connect/migration/base_methods.rb

@@ -33,6 +33,14 @@ module Netfira::WebConnect
       [name, ActiveRecord::Base.method(name)]
     end.to_h
 
+    # Save the original schema migration table
+    migration_table = ActiveRecord::SchemaMigration.all.table
+    original_migration_table = [migration_table.name, migration_table.engine]
+
+    # Sub in our own migration table details
+    migration_table.name = Netfira::WebConnect.schema_migrations_table_name
+    migration_table.engine = Model
+
     # Add some new methods
     class << ActiveRecord::Base
       def connection_pool
@@ -49,6 +57,9 @@ module Netfira::WebConnect
     # Run the given block
     result = yield
 
+    # Restore the original migration table name
+    migration_table.name, migration_table.engine = original_migration_table
+
     # Restore the original methods
     originals.each { |name, method| ActiveRecord::Base.define_singleton_method name, method }
 

data/lib/netfira/web_connect/rack_app/actions/version_8/commit/relations.rb

@@ -35,7 +35,7 @@ class Netfira::WebConnect::RackApp
 
       def unrelate_records(origin_ids)
         records = origin_ids.map{ |k, id| k.find_by_origin_id shop, id }.reject(&:nil?)
-        records[0].delete records[1] if records.size == 2
+        records[0].unrelate records[1] if records.size == 2
       end
 
       def complete_relation(class_name, relation)

data/lib/netfira/web_connect/schema.rb

@@ -9,7 +9,7 @@ module Netfira::WebConnect
       merge! classes.map{ |klass| [klass, Table.new(klass)] }.to_h
     end
 
-    def as_json(options)
+    def as_json(options = nil)
       map do |klass, table|
         [klass.name.demodulize.pluralize, table.as_json(options)]
       end.to_h

data/lib/netfira/web_connect/version.rb

@@ -1,5 +1,5 @@
 module Netfira
   module WebConnect
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord