lib/neoid/model_additions.rb in neoid-0.1.2 vs lib/neoid/model_additions.rb in neoid-0.2.0

@@ -1,43 +1,43 @@
 module Neoid
   module ModelAdditions
     module ClassMethods
       attr_reader :neoid_config
-      
+
       def neoid_config
         @neoid_config ||= Neoid::ModelConfig.new(self)
       end
-      
+
       def neoidable(options = {})
         # defaults
         neoid_config.auto_index = true
         neoid_config.enable_model_index = true # but the Neoid.enable_per_model_indexes is false by default. all models will be true only if the primary option is turned on.
 
         yield(neoid_config) if block_given?
 
         options.each do |key, value|
-          raise "Neoid #{self.name} model options: No such option #{key}" unless neoid_config.respond_to?("#{key}=")
+          raise "Neoid #{name} model options: No such option #{key}" unless neoid_config.respond_to?("#{key}=")
           neoid_config.send("#{key}=", value)
         end
       end
 
       def neo_model_index_name
-        raise "Per Model index is not enabled. Nodes/Relationships are auto indexed with node_auto_index/relationship_auto_index" unless Neoid.config.enable_per_model_indexes || neoid_config.enable_model_index
-        @index_name ||= "#{self.name.tableize}_index"
+        raise 'Per Model index is not enabled. Nodes/Relationships are auto indexed with node_auto_index/relationship_auto_index' unless Neoid.config.enable_per_model_indexes || neoid_config.enable_model_index
+        @index_name ||= "#{name.tableize}_index"
       end
     end
-  
+
     module InstanceMethods
       def to_neo
         if self.class.neoid_config.stored_fields
           hash = self.class.neoid_config.stored_fields.inject({}) do |all, (field, block)|
             all[field] = if block
               instance_eval(&block)
             else
-              self.send(field) rescue (raise "No field #{field} for #{self.class.name}")
+              send(field) rescue (raise "No field #{field} for #{self.class.name}")
             end
-            
+
             all
           end
 
           hash.reject { |k, v| v.nil? }
         else
@@ -67,11 +67,11 @@
         return unless neo_representation
 
         begin
           neo_representation.del
         rescue Neography::NodeNotFoundException => e
-          Neoid::logger.info "Neoid#neo_destroy entity not found #{self.class.name} #{self.id}"
+          Neoid::logger.info "Neoid#neo_destroy entity not found #{self.class.name} #{id}"
         end
 
         # Not working yet because Neography can't delete a node and all of its realtionships in a batch, and deleting a node with relationships results an error
         # if Neoid::Batch.current_batch
         #   Neoid::Batch.current_batch << [self.class.delete_command, neo_representation.neo_id]
@@ -87,21 +87,23 @@
 
         true
       end
 
       def neo_unique_id
-        "#{self.class.name}:#{self.id}"
+        "#{self.class.name}:#{id}"
       end
 
       protected
+
       def neo_properties_to_hash(*attribute_list)
         attribute_list.flatten.inject({}) { |all, property|
-          all[property] = self.send(property)
+          all[property] = send(property)
           all
         }
       end
 
       private
+
       def _neo_representation
         @_neo_representation ||= neo_find_by_id || neo_save
       end
 
       def _reset_neo_representation