neo4j 3.0.0.alpha.6 → 3.0.0.alpha.7

data/lib/neo4j/active_node/orm_adapter.rb

@@ -0,0 +1,88 @@
+require 'orm_adapter'
+
+module Neo4j
+  module ActiveNode
+    module ClassMethods
+      include OrmAdapter::ToAdapter
+    end
+
+    class OrmAdapter < ::OrmAdapter::Base
+      module ClassMethods
+        include ActiveModel::Callbacks
+      end
+
+      def column_names
+        klass._decl_props.keys
+      end
+
+      def i18n_scope
+        :neo4j
+      end
+
+      # Get an instance by id of the model
+      def get!(id)
+        klass.find(wrap_key(id)).tap do |node|
+          raise "No record found" if node.nil?
+        end
+      end
+
+      # Get an instance by id of the model
+      def get(id)
+        klass.find(wrap_key(id))
+      end
+
+      # Find the first instance matching conditions
+      def find_first(options = {})
+        conditions, order = extract_conditions!(options)
+        extract_id!(conditions)
+        order = hasherize_order(order)
+
+        if !order.empty?
+          klass.find(conditions: conditions, order: order)
+        else
+          result = klass.find(conditions: conditions)
+          result
+        end
+      end
+
+      # Find all models matching conditions
+      def find_all(options = {})
+        conditions, order, limit, offset = extract_conditions!(options)
+        extract_id!(conditions)
+        order = hasherize_order(order)
+
+        result = if !order.empty?
+          klass.all(conditions: conditions, order: order, limit: limit, skip: offset)
+        else
+          klass.all(conditions: conditions)
+        end
+
+        result.to_a
+      end
+
+      # Create a model using attributes
+      def create!(attributes = {})
+        klass.create!(attributes)
+      end
+
+      # @see OrmAdapter::Base#destroy
+      def destroy(object)
+        object.destroy && true if valid_object?(object)
+      end
+
+      private
+
+      def hasherize_order(order)
+        (order || []).map {|clause| Hash[*clause] }
+      end
+
+      def extract_id!(conditions)
+        if id = conditions.delete(:id)
+          conditions['id(n)'] = id.to_i
+        end
+      end
+
+    end
+  end
+end
+

data/lib/neo4j/active_node/persistence.rb

@@ -25,7 +25,7 @@ module Neo4j::ActiveNode
     end
 
     def update_magic_properties
-      self.updated_at = DateTime.now if respond_to?(:updated_at=)
+      self.updated_at = DateTime.now if respond_to?(:updated_at=) && changed?
     end
 
     # Creates a model with values matching those of the instance attributes and returns its id.
@@ -57,6 +57,29 @@ module Neo4j::ActiveNode
       end
     end
 
+    # Convenience method to set attribute and #save at the same time
+    # @param [Symbol, String] attribute of the attribute to update
+    # @param [Object] value to set
+    def update_attribute(attribute, value)
+      send("#{attribute}=", value)
+      self.save
+    end
+
+    # Convenience method to set attribute and #save! at the same time
+    # @param [Symbol, String] attribute of the attribute to update
+    # @param [Object] value to set
+    def update_attribute!(attribute, value)
+      send("#{attribute}=", value)
+      self.save!
+    end
+
+    # Convenience method to set multiple attributes and #save at the same time
+    # @param [Hash] attributes of names and values of attributes to set
+    def update_attributes(attributes)
+      assign_attributes(attributes)
+      self.save
+    end
+
     def create_or_update
       # since the same model can be created or updated twice from a relationship we have to have this guard
       @_create_or_updating = true
@@ -101,11 +124,11 @@ module Neo4j::ActiveNode
     end
 
     def update_model
-      if @changed_attributes && !@changed_attributes.empty?
-        changed_props = attributes.select{|k,v| @changed_attributes.include?(k)}
+      if changed_attributes && !changed_attributes.empty?
+        changed_props = attributes.select{|k,v| changed_attributes.include?(k)}
         changed_props = convert_properties_to :db, changed_props
         _persisted_node.update_props(changed_props)
-        @changed_attributes.clear
+        changed_attributes.clear
       end
     end
 
@@ -144,7 +167,7 @@ module Neo4j::ActiveNode
 
     def reload
       return self if new_record?
-      @changed_attributes && @changed_attributes.clear
+      changed_attributes && changed_attributes.clear
       unless reload_from_database
         @_deleted = true
         freeze
@@ -179,16 +202,27 @@ module Neo4j::ActiveNode
       # Creates a saves a new node
       # @param [Hash] props the properties the new node should have
       def create(props = {})
+        relationship_props = extract_relationship_attributes!(props)
+
         new(props).tap do |obj|
           obj.save
+          relationship_props.each do |prop, value|
+            obj.send("#{prop}=", value)
+          end
         end
       end
 
       # Same as #create, but raises an error if there is a problem during save.
       def create!(*args)
+        props = args[0] || {}
+        relationship_props = extract_relationship_attributes!(props)
+
         new(*args).tap do |o|
           yield o if block_given?
           o.save!
+          relationship_props.each do |prop, value|
+            o.send("#{prop}=", value)
+          end
         end
       end
 
@@ -198,6 +232,14 @@ module Neo4j::ActiveNode
 
     end
 
+    private
+
+    def assign_attributes(attributes)
+      attributes.each do |attribute, value|
+        send("#{attribute}=", value)
+      end
+    end
+
   end
 
 end

data/lib/neo4j/active_node/property.rb

@@ -6,19 +6,55 @@ module Neo4j::ActiveNode
     include ActiveAttr::MassAssignment
     include ActiveAttr::TypecastedAttributes
     include ActiveAttr::AttributeDefaults
+    include ActiveAttr::QueryAttributes
     include ActiveModel::Dirty
 
+    class UndefinedPropertyError < RuntimeError
+    end
 
     def initialize(attributes={}, options={})
+      relationship_props = self.class.extract_relationship_attributes!(attributes)
+      writer_method_props = extract_writer_methods!(attributes)
+
+      validate_attributes!(attributes)
+
+      writer_method_props.each do |key, value|
+        self.send("#{key}=", value)
+      end
+
       super(attributes, options)
-      (@changed_attributes || {}).clear
     end
 
     def save_properties
       @previously_changed = changes
-      @changed_attributes.clear
+      changed_attributes.clear
+    end
+
+
+    # Returning nil when we get ActiveAttr::UnknownAttributeError from ActiveAttr
+    def read_attribute(name)
+      super(name)
+    rescue ActiveAttr::UnknownAttributeError
+      nil
+    end
+    alias_method :[], :read_attribute
+
+    private
+
+    # Changes attributes hash to remove relationship keys
+    # Raises an error if there are any keys left which haven't been defined as properties on the model
+    def validate_attributes!(attributes)
+      invalid_properties = attributes.keys.map(&:to_s) - self.attributes.keys
+      raise UndefinedPropertyError, "Undefined properties: #{invalid_properties.join(',')}" if invalid_properties.size > 0
     end
 
+    def extract_writer_methods!(attributes)
+      attributes.keys.inject({}) do |writer_method_props, key|
+        writer_method_props[key] = attributes.delete(key) if self.respond_to?("#{key}=")
+
+        writer_method_props
+      end
+    end
 
     module ClassMethods
 
@@ -37,6 +73,16 @@ module Neo4j::ActiveNode
         end
       end
 
+      # Extracts keys from attributes hash which are relationships of the model
+      # TODO: Validate separately that relationships are getting the right values?  Perhaps also store the values and persist relationships on save?
+      def extract_relationship_attributes!(attributes)
+        attributes.keys.inject({}) do |relationship_props, key|
+          relationship_props[key] = attributes.delete(key) if self.has_relationship?(key)
+
+          relationship_props
+        end
+      end
+
     end
   end
 

data/lib/neo4j/active_node/rels.rb

@@ -4,8 +4,8 @@ module Neo4j::ActiveNode
     def_delegators :_rels_delegator, :rel?, :rel, :rels, :node, :nodes, :create_rel
 
     def _rels_delegator
-      raise "Can't access relationship on a none persisted node" unless _persisted_node
+      raise "Can't access relationship on a non persisted node" unless _persisted_node
       _persisted_node
     end
   end
-end
+end

data/lib/neo4j/active_node/validations.rb

@@ -41,7 +41,6 @@ module Neo4j
       class UniquenessValidator < ::ActiveModel::EachValidator
         def initialize(options)
           super(options.reverse_merge(:case_sensitive => true))
-          @klass = options[:class]
         end
 
         def validate_each(record, attribute, value)
@@ -56,9 +55,9 @@ module Neo4j
             conditions[attribute] = /^#{Regexp.escape(value.to_s)}$/i
           end
 
-          # prevent that same object is returned 
+          # prevent that same object is returned
           # TODO: add negative condtion to not return current record
-          found = @klass.all(conditions).to_a
+          found = record.class.all(conditions: conditions).to_a
           found.delete(record)
 
           if found.count > 0
@@ -75,7 +74,7 @@ module Neo4j
             conditions.merge(key => instance[key])
           end
         end
-      end      
+      end
 
       private
       def perform_validations(options={})

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "3.0.0.alpha.6"
+  VERSION = "3.0.0.alpha.7"
 end

data/lib/neo4j/wrapper.rb

@@ -8,15 +8,37 @@ class Neo4j::Node
       if wrappers.empty?
         self
       else
-        found = wrappers.sort.first
-        wrapped_node = Neo4j::ActiveNode::Labels._wrapped_labels[found].new
+        wrapper_classes = wrappers.map{|w| Neo4j::ActiveNode::Labels._wrapped_labels[w]}
+        most_concrete_class = wrapper_classes.sort.first
+        wrapped_node = most_concrete_class.new
         wrapped_node.init_on_load(self, self.props)
         wrapped_node
       end
     end
 
+    def checked_labels_set
+      @@_checked_labels_set ||= Set.new
+    end
+
+    def check_label(label_name)
+      unless checked_labels_set.include?(label_name)
+        load_class_from_label(label_name)
+        # do this only once
+        checked_labels_set.add(label_name)
+      end
+    end
+
+    def load_class_from_label(label_name)
+      begin
+        label_name.to_s.split("::").inject(Kernel) {|container, name| container.const_get(name.to_s) }
+      rescue NameError
+        nil
+      end
+    end
+
     def _class_wrappers
       labels.find_all do |label_name|
+        check_label(label_name)
         Neo4j::ActiveNode::Labels._wrapped_labels[label_name].class == Class
       end
     end

data/lib/rails/generators/neo4j/model/model_generator.rb

@@ -70,11 +70,11 @@ class Neo4j::Generators::ModelGenerator < Neo4j::Generators::Base #:nodoc:
 
   def timestamp_statements
     %q{
-  property :created_at, :type => DateTime
-  # property :created_on, :type => Date
+  property :created_at, type: DateTime
+  # property :created_on, type: Date
 
-  property :updated_at, :type => DateTime
-  # property :updated_on, :type => Date
+  property :updated_at, type: DateTime
+  # property :updated_on, type: Date
 }
   end
 

data/lib/rails/generators/neo4j/model/templates/model.erb

@@ -1,7 +1,7 @@
 class <%= class_name %> <%= parent? ? "#{options[:parent].classify}" : "" %>
     include Neo4j::ActiveNode
 <% attributes.each do |attribute| -%>
-    property :<%= attribute.name %><%= ", :type => #{attribute.type_class}" unless attribute.type_class == 'any' %>
+    property :<%= attribute.name %><%= ", type: #{attribute.type_class}" unless attribute.type_class == 'any' %>
     <%= index_fragment(attribute.name) %>
 <% end -%>
 <%= has_n_statements if has_n? -%>

data/neo4j.gemspec

@@ -29,13 +29,13 @@ It comes included with the Apache Lucene document database.
   s.extra_rdoc_files = %w( README.md )
   s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
-  s.add_dependency('orm_adapter', "~> 0.4.0")
+  s.add_dependency('orm_adapter', "~> 0.5.0")
   s.add_dependency("activemodel", "~> 4")
   s.add_dependency("railties", "~> 4")
   s.add_dependency('active_attr', "~> 0.8")
-  s.add_dependency("neo4j-core", "= 3.0.0.alpha.12")
+  s.add_dependency("neo4j-core", "= 3.0.0.alpha.16")
 
   if RUBY_PLATFORM =~ /java/
-    s.add_dependency("neo4j-community", '~> 2.0.0')
+    s.add_dependency("neo4j-community", '~> 2.0')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.6
+  version: 3.0.0.alpha.7
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.12
+        version: 3.0.0.alpha.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.12
+        version: 3.0.0.alpha.16
 description: "You can think of Neo4j as a high-performance graph engine with all the
   features of a mature and robust database.\nThe programmer works with an object-oriented,
   flexible network structure rather than with strict and static tables \nyet enjoys
@@ -99,7 +99,51 @@ files:
 - bin/neo4j-jars
 - config/locales/en.yml
 - config/neo4j/config.yml
+- lib/mydb2/active_tx_log
+- lib/mydb2/index/lucene-store.db
+- lib/mydb2/index/lucene.log.1
+- lib/mydb2/index/lucene.log.active
+- lib/mydb2/index/lucene.log.v0
+- lib/mydb2/lock
+- lib/mydb2/messages.log
+- lib/mydb2/neostore
+- lib/mydb2/neostore.id
+- lib/mydb2/neostore.labeltokenstore.db
+- lib/mydb2/neostore.labeltokenstore.db.id
+- lib/mydb2/neostore.labeltokenstore.db.names
+- lib/mydb2/neostore.labeltokenstore.db.names.id
+- lib/mydb2/neostore.nodestore.db
+- lib/mydb2/neostore.nodestore.db.id
+- lib/mydb2/neostore.nodestore.db.labels
+- lib/mydb2/neostore.nodestore.db.labels.id
+- lib/mydb2/neostore.propertystore.db
+- lib/mydb2/neostore.propertystore.db.arrays
+- lib/mydb2/neostore.propertystore.db.arrays.id
+- lib/mydb2/neostore.propertystore.db.id
+- lib/mydb2/neostore.propertystore.db.index
+- lib/mydb2/neostore.propertystore.db.index.id
+- lib/mydb2/neostore.propertystore.db.index.keys
+- lib/mydb2/neostore.propertystore.db.index.keys.id
+- lib/mydb2/neostore.propertystore.db.strings
+- lib/mydb2/neostore.propertystore.db.strings.id
+- lib/mydb2/neostore.relationshipstore.db
+- lib/mydb2/neostore.relationshipstore.db.id
+- lib/mydb2/neostore.relationshiptypestore.db
+- lib/mydb2/neostore.relationshiptypestore.db.id
+- lib/mydb2/neostore.relationshiptypestore.db.names
+- lib/mydb2/neostore.relationshiptypestore.db.names.id
+- lib/mydb2/neostore.schemastore.db
+- lib/mydb2/neostore.schemastore.db.id
+- lib/mydb2/nioneo_logical.log.1
+- lib/mydb2/nioneo_logical.log.active
+- lib/mydb2/nioneo_logical.log.v0
+- lib/mydb2/schema/label/lucene/segments.gen
+- lib/mydb2/schema/label/lucene/segments_1
+- lib/mydb2/schema/label/lucene/write.lock
+- lib/mydb2/store_lock
+- lib/mydb2/tm_tx_log.1
 - lib/neo4j.rb
+- lib/neo4j.rb~
 - lib/neo4j/active_node.rb
 - lib/neo4j/active_node/callbacks.rb
 - lib/neo4j/active_node/has_n.rb
@@ -108,6 +152,7 @@ files:
 - lib/neo4j/active_node/identity.rb
 - lib/neo4j/active_node/initialize.rb
 - lib/neo4j/active_node/labels.rb
+- lib/neo4j/active_node/orm_adapter.rb
 - lib/neo4j/active_node/persistence.rb
 - lib/neo4j/active_node/property.rb
 - lib/neo4j/active_node/rels.rb