neo4apis-activerecord 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b53fa80a0d3d755b2a75ef5eae630959abcbe30d
-  data.tar.gz: 23bb41f32bcb6a0dcaeaf0175d5346c232fb1f09
+  metadata.gz: a3ab07342eda78cdb202597bf1fcbe5a924ecb1a
+  data.tar.gz: 1cdd5de52c0fe390cadd3683b1ad874c33009de8
 SHA512:
-  metadata.gz: 6fb8cf560adb2bb673391278770368ff33b6485b28d12a8c7ee55b6cd98d517de9bbf44caf50ee1408bc0360cf8eb605fbda938d100adac1595f96677fd73df2
-  data.tar.gz: ad7443131b73bf5cbfc47a727cd0faa34da0d2129a248fa21eb8e067e9ee7ac239c257dc5572ec1f21e0a0db16f0eaa0109e76646c1c4a37204245625a034582
+  metadata.gz: d4aca961167f3389348d9c9d9aacd323e1023efe5c8decbe2699bfcaf392f7b6afbb93175ecacddd0c9c0ec104408b5096f2f7690c7362088ee168a849b2e7ea
+  data.tar.gz: b32d89846180162ab0b5dcfc43d8fc1e0224c8b55f958e800acfc4f7ef8776533f6f206953273e8d9afab5f9f9fce6e66f876fd5a36b60efab485c9295cfc922

data/lib/neo4apis/activerecord.rb

@@ -1,29 +1,45 @@
 require 'neo4apis'
 require 'ostruct'
+require 'composite_primary_keys'
 
 module Neo4Apis
   class ActiveRecord < Base
     batch_size 1000
 
     def self.model_importer(model_class)
-      return if model_class.primary_key.nil?
-      uuid model_class.name.to_sym, model_class.primary_key
+      if model_class.primary_key.is_a?(Array)
+        relationship_name = model_class.table_name
+        associations = model_class.reflect_on_all_associations
 
-      importer model_class.name.to_sym do |object|
-        node = add_model_node model_class, object
+        importer model_class.name.to_sym do |object|
+          from_node = object.send(associations[0].name)
+          from_node = add_model_node from_node.class, from_node
 
-        model_class.reflect_on_all_associations.each do |association_reflection|
-          case association_reflection.macro
-          when :belongs_to, :has_one
-            if options[:"import_#{association_reflection.macro}"]
-              referenced_object = object.send(association_reflection.name)
-              add_model_relationship association_reflection.name, node, referenced_object if referenced_object
-            end
-          when :has_many, :has_and_belongs_to_many
-            if options[:"import_#{association_reflection.macro}"]
-              object.send(association_reflection.name).each do |referenced_object|
+          to_node = object.send(associations[1].name)
+
+          puts 'add_model_relationship...'
+          add_model_relationship relationship_name, from_node, to_node
+        end
+      else
+        return if model_class.primary_key.nil?
+        uuid model_class.name.to_sym, model_class.primary_key
+
+        importer model_class.name.to_sym do |object|
+          node = add_model_node model_class, object
+
+          model_class.reflect_on_all_associations.each do |association_reflection|
+            case association_reflection.macro
+            when :belongs_to, :has_one
+              if options[:"import_#{association_reflection.macro}"]
+                referenced_object = object.send(association_reflection.name)
                 add_model_relationship association_reflection.name, node, referenced_object if referenced_object
               end
+            when :has_many, :has_and_belongs_to_many
+              if options[:"import_#{association_reflection.macro}"]
+                object.send(association_reflection.name).each do |referenced_object|
+                  add_model_relationship association_reflection.name, node, referenced_object if referenced_object
+                end
+              end
             end
           end
         end
@@ -34,7 +50,8 @@ module Neo4Apis
       referenced_class = referenced_object.class
       referenced_node = add_model_node referenced_class, referenced_object
 
-      add_relationship relationship_name, node, referenced_node
+      require 'pry'
+      add_relationship relationship_name, node, referenced_node rescue binding.pry
     end
 
     def add_model_node(model_class, object)

data/lib/neo4apis/cli/activerecord.rb

@@ -68,7 +68,7 @@ module Neo4Apis
         puts 'Importing tables: ' + model_classes.map(&:table_name).join(', ')
 
         model_classes.each do |model_class|
-          ::Neo4Apis::ActiveRecord.model_importer(model_class)
+          NEO4APIS_CLIENT_CLASS.model_importer(model_class)
         end
 
         neo4apis_client.batch do

data/lib/neo4apis/model_resolver.rb

@@ -53,8 +53,13 @@ module Neo4Apis
     end
 
     def apply_identified_primary_key!(model_class)
-      identity = ::ActiveRecord::Base.connection.primary_key(model_class.table_name)
+      identity = if model_class.columns.map(&:type) == [:integer, :integer]
+        model_class.columns.map(&:name)
+      else
+        ::ActiveRecord::Base.connection.primary_key(model_class.table_name)
+      end
       identity ||= identify_primary_key(model_class.column_names, model_class.name)
+
       model_class.primary_key = identity if identity
     end
   end

data/lib/neo4apis/table_resolver.rb

@@ -22,8 +22,6 @@ module Neo4Apis
         case standardize(column)
         when 'id', 'uuid', /#{standardize(class_name.singularize)}id/, /#{standardize(class_name.pluralize)}id/
           true
-        when
-          true
         end
       end.tap do |found_key| # rubocop:disable Style/MultilineBlockChain
         fail UnfoundPrimaryKeyError, "Could not find a primary key for #{class_name}." if found_key.nil?

data/neo4apis-activerecord.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name     = 'neo4apis-activerecord'
-  s.version  = '0.8.0'
+  s.version  = '0.9.0'
   s.required_ruby_version = '>= 1.9.1'
 
   s.authors  = 'Brian Underwood'
@@ -20,4 +20,5 @@ A ruby gem using neo4apis to make importing SQL data to neo4j easy
 
   s.add_dependency('neo4apis', '>= 0.8.1')
   s.add_dependency('activerecord', '~> 4.0')
+  s.add_dependency('composite_primary_keys', '~> 8.0')
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: neo4apis-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4apis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: composite_primary_keys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 description: |
   A ruby gem using neo4apis to make importing SQL data to neo4j easy
 email: public@brian-underwood.codes
@@ -63,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An ruby gem to import SQL data to neo4j using activerecord