neo4j 3.0.0.alpha.8 → 3.0.0.alpha.9

data/lib/neo4j/active_node/serialized_properties.rb

@@ -0,0 +1,21 @@
+module Neo4j::ActiveNode
+  module SerializedProperties
+    extend ActiveSupport::Concern
+
+    def serialized_properties
+      self.class.serialized_properties
+    end
+
+    module ClassMethods
+
+      def serialized_properties
+        @serialize || {}
+      end
+
+      def serialize(name, coder = JSON)
+        @serialize ||= {}
+        @serialize[name] = coder
+      end
+    end
+  end
+end

data/lib/neo4j/config.rb

@@ -0,0 +1,119 @@
+module Neo4j
+
+
+  # == Keeps configuration for neo4j
+  #
+  # == Configurations keys
+  #
+  class Config
+
+    DEFAULT_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "neo4j", "config.yml"))
+
+    class << self
+
+      # @return [Fixnum] The location of the default configuration file.
+      def default_file
+        @default_file ||= DEFAULT_FILE
+      end
+
+      # Sets the location of the configuration YAML file and old deletes configurations.
+      #
+      # @param [String] file_path represent the path to the file.
+      def default_file=(file_path)
+        delete_all
+        @defaults = nil
+        @default_file = File.expand_path(file_path)
+      end
+
+      # @return [Hash] the default file loaded by yaml
+      def defaults
+        require 'yaml'
+        @defaults ||= ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(default_file))
+      end
+
+      # Reads from the default_file if configuration is not set already
+      # @return [Hash] the configuration
+      def get_or_setup_configuration
+        @configuration ||= setup
+      end
+
+      # @return [Hash] the configuration
+      def configuration
+        @configuration || {}
+      end
+
+      # Yields the configuration
+      #
+      # @example
+      #   Neo4j::Config.use do |config|
+      #     config[:storage_path] = '/var/neo4j'
+      #   end
+      #
+      # @return nil
+      # @yield config
+      # @yieldparam [Neo4j::Config] config - this configuration class
+      def use
+        @configuration ||= ActiveSupport::HashWithIndifferentAccess.new
+        yield @configuration
+        nil
+      end
+
+
+      # Sets the value of a config entry.
+      #
+      # @param [Symbol] key the key to set the parameter for
+      # @param val the value of the parameter.
+      def []=(key, val)
+        get_or_setup_configuration[key.to_s] = val
+      end
+
+
+      # @param [Symbol] key The key of the config entry value we want
+      # @return the the value of a config entry
+      def [](key)
+        get_or_setup_configuration[key.to_s]
+      end
+
+
+      # Remove the value of a config entry.
+      #
+      # @param [Symbol] key the key of the configuration entry to delete
+      # @return The value of the removed entry.
+      def delete(key)
+        get_or_setup_configuration.delete(key)
+      end
+
+
+      # Remove all configuration. This can be useful for testing purpose.
+      #
+      # @return nil
+      def delete_all
+        @configuration = nil
+      end
+
+
+      # @return [Hash] The config as a hash.
+      def to_hash
+        get_or_setup_configuration.to_hash
+      end
+
+      # @return [String] The config as a YAML
+      def to_yaml
+        get_or_setup_configuration.to_yaml
+      end
+
+      # @return The a new configuration using default values as a hash.
+      def setup
+        @configuration = ActiveSupport::HashWithIndifferentAccess.new
+        @configuration.merge!(defaults)
+        @configuration
+      end
+
+      def class_name_property
+        Neo4j::Config[:class_name_property] || :_classname
+      end
+
+    end
+  end
+
+end

data/lib/neo4j/paginated.rb

@@ -0,0 +1,19 @@
+module Neo4j
+  class Paginated
+    include Enumerable
+    attr_reader :items, :total, :current_page
+
+    def initialize(items, total, current_page)
+      @items, @total, @current_page = items, total, current_page
+    end
+
+    def self.create_from(source, page, per_page)
+      #partial = source.drop((page-1) * per_page).first(per_page)
+      partial = source.skip(page-1).limit(per_page)
+      Paginated.new(partial, source.count, page)
+    end
+
+    delegate :each, :to => :items
+    delegate :size, :[], :to => :items
+  end
+end

data/lib/neo4j/railtie.rb

@@ -65,6 +65,7 @@ module Neo4j
       cfg.sessions.each do |session_opts|
         Neo4j::Railtie.open_neo4j_session(session_opts)
       end
+      Neo4j::Config.setup.merge!(cfg.to_hash)
     end
   end
 end

data/lib/neo4j/type_converters.rb

@@ -2,7 +2,6 @@ module Neo4j
 
   module TypeConverters
 
-
     # Converts Date objects to Java long types. Must be timezone UTC.
     class DateConverter
       class << self
@@ -79,13 +78,60 @@ module Neo4j
       end
     end
 
+    # Converts hash to/from YAML
+    class YAMLConverter
+      class << self
+
+        def convert_type
+          Hash
+        end
+
+        def to_db(value)
+          return nil if value.nil?
+          Psych.dump(value)
+        end
+
+        def to_ruby(value)
+          return nil if value.nil?
+          Psych.load(value)
+        end
+      end
+    end
+
+    # Converts hash to/from JSON
+    class JSONConverter
+      class << self
+
+        def convert_type
+          JSON
+        end
+
+        def to_db(value)
+          return nil if value.nil?
+          value.to_json
+        end
+
+        def to_ruby(value)
+          return nil if value.nil?
+          JSON.parse(value, quirks_mode: true)
+        end
+      end
+    end
+
+
+
     def convert_properties_to(medium, properties)
       # Perform type conversion
+      serialize = self.respond_to?(:serialized_properties) ? self.serialized_properties : {}
       properties = properties.inject({}) do |new_attributes, key_value_pair|
         attr, value = key_value_pair
-        type = self.class._attribute_type(attr)
+
+        # skip "secret" undeclared attributes such as uuid
+        next new_attributes unless self.class.attributes[attr]
+
+        type = serialize.has_key?(attr.to_sym) ? serialize[attr.to_sym] : self.class._attribute_type(attr)
         new_attributes[attr] = if TypeConverters.converters[type].nil?
-                                   value
+                                  value
                                 else
                                   TypeConverters.send "to_#{medium}", value, type
                                 end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "3.0.0.alpha.8"
+  VERSION = "3.0.0.alpha.9"
 end

data/lib/neo4j/wrapper.rb

@@ -4,16 +4,10 @@ class Neo4j::Node
 
     # this is a plugin in the neo4j-core so that the Ruby wrapper will be wrapped around the Neo4j::Node objects
     def wrapper
-      wrappers = _class_wrappers
-      if wrappers.empty?
-        self
-      else
-        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
+      most_concrete_class = sorted_wrapper_classes
+      wrapped_node = most_concrete_class.new
+      wrapped_node.init_on_load(self, self.props)
+      wrapped_node
     end
 
     def checked_labels_set
@@ -28,6 +22,17 @@ class Neo4j::Node
       end
     end
 
+    def sorted_wrapper_classes
+      if self.props.is_a?(Hash) && self.props.has_key?(Neo4j::Config.class_name_property)
+        self.props[Neo4j::Config.class_name_property].constantize
+      else
+        wrappers = _class_wrappers
+        return self if wrappers.nil?
+        wrapper_classes = wrappers.map{|w| Neo4j::ActiveNode::Labels._wrapped_labels[w]}
+        wrapper_classes.sort.first
+      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) }

data/lib/person.rb~

@@ -0,0 +1,9 @@
+require 'neo4j'
+
+Neo4j::Session.open
+
+class Person
+  include Neo4j::ActiveNode
+  property :name
+
+end

data/lib/rails/generators/neo4j_generator.rb

@@ -62,7 +62,7 @@ module Rails
           when 'text' then
             'String'
           when 'integer', 'number', 'fixnum' then
-            'Fixnum'
+            'Integer'
           when 'float' then
             'Float'
           else

data/lib/test.rb

@@ -0,0 +1,21 @@
+require 'neo4j'
+s = Neo4j::Session.open
+class Person
+  include Neo4j::ActiveNode
+  property :name
+  has_many :out, :friends, type: :friends, model_class: self
+end
+
+t = Neo4j::Transaction.new
+
+p = Person.new
+p.save
+p.friends << Person.create(name: 'a') << Person.create(name: 'b')
+id = p.id
+puts "ID #{id}"
+puts "FRIENDS #{p.friends.to_a.first.name}"
+t.fail
+t.close
+puts "DONE"
+
+puts "LOAD #{Neo4j::Node.load(id)}"

data/lib/test.rb~

@@ -0,0 +1,21 @@
+require 'neo4j'
+s = Neo4j::Session.open
+class Person
+  include Neo4j::ActiveNode
+  property :name
+  has_many :out, :friends
+end
+
+t = Neo4j::Transaction.new
+
+p = Person.new
+p.save
+p.friends << Person.create << Person.create
+id = p.id
+puts "ID #{id}"
+puts "FRIENDS #{p.friends.to_a.count}"
+t.fail
+t.close
+puts "DONE"
+
+puts "LOAD #{Neo4j::Node.load(id)}"

data/neo4j.gemspec

@@ -31,9 +31,10 @@ It comes included with the Apache Lucene document database.
 
   s.add_dependency('orm_adapter', "~> 0.5.0")
   s.add_dependency("activemodel", "~> 4")
+  s.add_dependency("activesupport", "~> 4")
   s.add_dependency("railties", "~> 4")
   s.add_dependency('active_attr', "~> 0.8")
-  s.add_dependency("neo4j-core", "= 3.0.0.alpha.17")
+  s.add_dependency("neo4j-core", "= 3.0.0.alpha.19")
 
   if RUBY_PLATFORM =~ /java/
     s.add_dependency("neo4j-community", '~> 2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.8
+  version: 3.0.0.alpha.9
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.17
+        version: 3.0.0.alpha.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.17
+        version: 3.0.0.alpha.19
 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
@@ -100,11 +114,13 @@ files:
 - config/locales/en.yml
 - config/neo4j/config.yml
 - lib/neo4j.rb
+- lib/neo4j.rb~
 - lib/neo4j/active_node.rb
 - lib/neo4j/active_node/callbacks.rb
 - lib/neo4j/active_node/has_n.rb
-- lib/neo4j/active_node/has_n/decl_rel.rb
+- lib/neo4j/active_node/has_n/association.rb
 - lib/neo4j/active_node/has_n/nodes.rb
+- lib/neo4j/active_node/id_property.rb
 - lib/neo4j/active_node/identity.rb
 - lib/neo4j/active_node/initialize.rb
 - lib/neo4j/active_node/labels.rb
@@ -115,14 +131,20 @@ files:
 - lib/neo4j/active_node/query/query_proxy.rb
 - lib/neo4j/active_node/quick_query.rb
 - lib/neo4j/active_node/rels.rb
+- lib/neo4j/active_node/serialized_properties.rb
 - lib/neo4j/active_node/validations.rb
+- lib/neo4j/config.rb
+- lib/neo4j/paginated.rb
 - lib/neo4j/railtie.rb
 - lib/neo4j/type_converters.rb
 - lib/neo4j/version.rb
 - lib/neo4j/wrapper.rb
+- lib/person.rb~
 - lib/rails/generators/neo4j/model/model_generator.rb
 - lib/rails/generators/neo4j/model/templates/model.erb
 - lib/rails/generators/neo4j_generator.rb
+- lib/test.rb
+- lib/test.rb~
 - neo4j.gemspec
 homepage: http://github.com/andreasronge/neo4j/tree
 licenses: