neo4apis-activerecord 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e872c76387db29333b1d6b009ea65045888f2fa2
-  data.tar.gz: 938e81267ab658e6857050cb20ee204127ae87a4
+  metadata.gz: 5888c986c00ef46a8de1156aac64c7544fa75001
+  data.tar.gz: 2a1c749c2e53a56e5ea4043ae520b884b2ccfda9
 SHA512:
-  metadata.gz: dca90c53f4e3cb387333e67ffbd2c0b2ebbf2a7ab088e04e3508507909d0a104340e991c381dda82c4311117f43d34d403d3cba1d65511da6d6337bd342b9c4b
-  data.tar.gz: 8c6f51d5a96207ab8e69f8679cd7c5e29a044ba860896f5de19fb564769f3309ce494971bbe6aed7fd815b8e8515e79149346bd7b3e5ddc300f4ff2ae586daa7
+  metadata.gz: e4f60e464ba903af191bb11d813d398632813daccdc66561801f2d0bdbb2665713975f8f1a621401469fc274b58c549ad049592aae570fe935529b85cd80d06c
+  data.tar.gz: 9c2730fabc4c485fa84225a625a28a8a45496ccd1bf493849017a4b01aef071a705047a29fb7c683412db56d71b0e14fb84535842f01be719b29ddeda4130c48

data/lib/neo4apis/activerecord.rb

@@ -18,12 +18,12 @@ module Neo4Apis
           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
+              add_model_relationship association_reflection.name, node, referenced_object if referenced_object
             end
           when :has_many
             if options[:import_has_many]
               object.send(association_reflection.name).each do |referenced_object|
-                add_model_relationship association_reflection.name, node, referenced_object
+                add_model_relationship association_reflection.name, node, referenced_object if referenced_object
               end
             end
           end

data/lib/neo4apis/cli/activerecord.rb

@@ -13,7 +13,7 @@ module Neo4Apis
       class_option :import_has_one, type: :boolean, default: nil
       class_option :import_has_many, type: :boolean, default: nil
 
-      class_option :guess_associations, type: :boolean, default: false
+      class_option :guess_model, type: :boolean, default: false
 
       class_option :active_record_config_path, type: :string, default: './config/database.yml'
       class_option :active_record_environment, type: :string, default: 'development'
@@ -63,33 +63,61 @@ module Neo4Apis
         options[:"import_#{type}"].nil? ? options[:import_associations] : options[:"import_#{type}"]
       end
 
+
       def get_model(model_or_table_name)
+        get_model_class(model_or_table_name).tap do |model_class|
+          if options[:guess_model]
+            apply_guessed_table_name!(model_class)
+            apply_guessed_primary_key!(model_class)
+            apply_guessed_model_associations!(model_class)
+          end
+        end
+      end
+
+      def get_model_class(model_or_table_name)
         model_class = model_or_table_name
         model_class = model_or_table_name.classify unless model_or_table_name.match(/^[A-Z]/)
         model_class.constantize
       rescue NameError
-        Object.const_set(model_class, Class.new(::ActiveRecord::Base)).tap do |model_class|
-          apply_guessed_model_associations!(model_class) if options[:guess_associations]
-        end
+        Object.const_set(model_class, Class.new(::ActiveRecord::Base))
       end
 
       def apply_guessed_model_associations!(model_class)
         model_class.columns.each do |column|
-          next if not column.name.match(/_id$/)
+          match = column.name.match(/^(.*)(_id|Id)$/)
+          next if not match
 
           begin
-            base = column.name.humanize.tableize.split(' ').join('_')
+            base = match[1].tableize
 
-            model_class.belongs_to base.singularize.to_sym
+            model_class.belongs_to base.singularize.to_sym, foreign_key: column.name, class_name: base.classify if guessed_table_name(base.classify)
           rescue NameError
           end
         end
       end
 
+      def apply_guessed_table_name!(model_class)
+        guess = guessed_table_name(model_class.name)
+        model_class.table_name = guess if guess
+      end
+
+      def apply_guessed_primary_key!(model_class)
+        name = model_class.name
+        guess = (model_class.column_names & ['id', name.foreign_key, name.foreign_key.classify, 'uuid']).first
+        model_class.primary_key = guess if guess
+      end
+
+
       def active_record_config
         require 'yaml'
         YAML.load(File.read(options[:active_record_config_path]))[options[:active_record_environment]]
       end
+
+      private
+
+      def guessed_table_name(model_name)
+        (::ActiveRecord::Base.connection.tables & [model_name.tableize, model_name.classify, model_name.tableize.singularize, model_name.classify.pluralize]).first
+      end
     end
 
     class Base < Thor

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4apis-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Underwood