neo4apis-activerecord 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0706c9d104595af2a52ddbc315361902f558f0c9
-  data.tar.gz: 07ff2e98764387cb0e69fd2aed3c3c08dcbb3821
+  metadata.gz: 580b65a076134da3d58184846112a0f2c3691d62
+  data.tar.gz: 9cb375fca65896d8a0bd1a8f042cd7a98041bb8e
 SHA512:
-  metadata.gz: e1aa43e045756944de599cad3db6bac7f0b1c209ed12d6df6f33c743a7c068d5fbd9aca687603bf6394dbf7b946941f287c15d2c420ae11879aea6af0743c0d8
-  data.tar.gz: 87514ff0ad2d9cced4bf0272fba7524b8f0810fdc341c8b1dfa125e4eb14842e11460d0bd79fbda733ff74ba1b3c86987f8c84f4368b923217b8067b0c108db5
+  metadata.gz: fc590521e76c4310d35ad43f93d8e81c3dc8aca85312d823564c15595247a91654fff30e27712771975fb6fde8edad557393bd3ee1e2167364e1a0730cb93bc1
+  data.tar.gz: c868742cd693db9b2fe514209d995dcdf7bbfa295d1a78a25a82d7f778a6dc6868f7290e02a010b305578786d836ece668a6fddc0e83a4a7d47529c41571f60b

data/Gemfile

@@ -14,4 +14,5 @@ group :test do
 
   gem 'guard'
   gem 'guard-rspec'
+  gem 'guard-rubocop'
 end

data/lib/neo4apis/activerecord.rb

@@ -8,6 +8,7 @@ module Neo4Apis
     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
 
       importer model_class.name.to_sym do |object|
@@ -41,12 +42,25 @@ module Neo4Apis
     def add_model_node(model_class, object)
       object_data = OpenStruct.new
 
-      object.attributes.each do |column, value|
-        v = object.attributes_for_coder[column] || value
-        object_data.send("#{column}=", v)
+      object.class.column_names.each do |column_name|
+        object_data.send("#{column_name}=", attribute_for_coder(object, column_name))
       end
 
       add_node model_class.name.to_sym, object_data, model_class.column_names
     end
+
+    def attribute_for_coder(object, column_name)
+      column = object.class.columns_hash[column_name]
+      if column.respond_to?(:cast_type)
+        column.cast_type.type_cast_from_user(object.attributes[column_name])
+      else
+        value = object.attributes[column_name]
+        if coder = object.class.serialized_attributes[column_name]
+          coder.dump(value)
+        else
+          value
+        end
+      end
+    end
   end
 end

data/lib/neo4apis/cli/activerecord.rb

@@ -2,10 +2,14 @@ require 'active_record'
 require 'active_support/inflector'
 require 'thor'
 require 'colorize'
+require 'neo4apis/table_resolver'
+require 'neo4apis/cli/base'
 
 module Neo4Apis
   module CLI
-    class ActiveRecord < Thor
+    class ActiveRecord < CLI::Base
+      include TableResolver
+
       class_option :import_all_associations, type: :boolean, default: false, desc: 'Shortcut for --import-belongs-to --import-has-many --import-has-one'
       class_option :import_belongs_to, type: :boolean, default: nil
       class_option :import_has_one, type: :boolean, default: nil
@@ -61,7 +65,15 @@ module Neo4Apis
 
         neo4apis_client.batch do
           model_classes.each do |model_class|
-            model_class.find_each do |object|
+            query = model_class.all
+
+            # Eager load association for faster import
+            include_list = model_class.reflect_on_all_associations.map do |association_reflection|
+              association_reflection.name if import_association?(association_reflection.macro)
+            end.compact
+            query = query.includes(*include_list.map(&:to_sym)) if include_list.present?
+
+            query.find_each do |object|
               neo4apis_client.import model_class.name.to_sym, object
             end
           end
@@ -101,9 +113,9 @@ module Neo4Apis
       end
 
       def get_model_class(model_or_table_name)
-        return model_or_table_name if model_or_table_name.ancestors.include?(::ActiveRecord::Base)
+        return model_or_table_name if model_or_table_name.is_a?(Class) && model_or_table_name.ancestors.include?(::ActiveRecord::Base)
 
-        model_class = model_or_table_name
+        model_class = model_or_table_name.gsub(/\s+/, '_')
         model_class = model_or_table_name.classify unless model_or_table_name.match(/^[A-Z]/)
         model_class.constantize
       rescue NameError
@@ -116,24 +128,24 @@ module Neo4Apis
           next if not match
 
           begin
-            base = match[1].tableize
+            base = match[1].gsub(/ +/, '_').tableize
 
-            if identified_table_name(base.classify) && model_class.name != base.classify
+            if identify_table_name(tables, base.classify) && model_class.name != base.classify
               model_class.belongs_to base.singularize.to_sym, foreign_key: column.name, class_name: base.classify
             end
-          rescue NameError
+          rescue UnfoundTableError
+            nil
           end
         end
       end
 
       def apply_identified_table_name!(model_class)
-        identity = identified_table_name(model_class.name)
+        identity = identify_table_name(tables, model_class.name)
         model_class.table_name = identity if identity
       end
 
       def apply_identified_primary_key!(model_class)
-        name = model_class.name
-        identity = (model_class.column_names & ['id', name.foreign_key, name.foreign_key.classify, 'uuid']).first
+        identity = identify_primary_key(model_class.column_names, model_class.name)
         model_class.primary_key = identity if identity
       end
 
@@ -143,10 +155,8 @@ module Neo4Apis
         YAML.load(File.read(options[:active_record_config_path]))[options[:active_record_environment]]
       end
 
-      private
-
-      def identified_table_name(model_name)
-        (::ActiveRecord::Base.connection.tables & [model_name.tableize, model_name.classify, model_name.tableize.singularize, model_name.classify.pluralize]).first
+      def tables
+        ::ActiveRecord::Base.connection.tables
       end
     end
 

data/lib/neo4apis/table_resolver.rb

@@ -0,0 +1,39 @@
+
+module Neo4Apis
+  module TableResolver
+    class UnfoundTableError < StandardError
+    end
+
+    class UnfoundPrimaryKeyError < StandardError
+    end
+
+    def identify_table_name(tables, class_name)
+      potential_table_comparisons = [class_name.tableize, class_name.tableize.singularize].map(&method(:standardize))
+      tables.detect do |table_name|
+        potential_table_comparisons.include?(standardize(table_name))
+      end.tap do |found_name| # rubocop:disable Style/MultilineBlockChain
+        fail UnfoundTableError, "Could not find a table for #{class_name}." if found_name.nil?
+      end
+    end
+
+    def identify_primary_key(columns, class_name)
+      (columns & %w(id uuid)).first
+      columns.detect do |column|
+        case standardize(column)
+        when 'id', 'uuid'
+          true
+        when /#{standardize(class_name)}id/
+          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?
+      end
+    end
+
+    private
+
+    def standardize(string)
+      string.downcase.gsub(/[ _]+/, '')
+    end
+  end
+end

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.5.3'
+  s.version  = '0.6.0'
   s.required_ruby_version = '>= 1.9.1'
 
   s.authors  = 'Brian Underwood'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4apis-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4apis
@@ -50,6 +50,7 @@ files:
 - lib/neo4apis-activerecord.rb
 - lib/neo4apis/activerecord.rb
 - lib/neo4apis/cli/activerecord.rb
+- lib/neo4apis/table_resolver.rb
 - neo4apis-activerecord.gemspec
 homepage: https://github.com/neo4jrb/neo4apis-activerecord/
 licenses: