neo4j 3.0.0.alpha.3 → 3.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3c1c35ef38235d2f240757530f1fec08473cc8
-  data.tar.gz: a0e24982bc743984f10a702d8933be694c9c2adf
+  metadata.gz: d529b0a277c85beffcb02008e9a16911edd26e0b
+  data.tar.gz: 34d8210e6ca0f7808051743e7177dec65a20e92e
 SHA512:
-  metadata.gz: ee0818fd0db7f265ab529f0bf8792c862cec09daa137aa340f3b0f009d419e664c53c21541775be7c883dc66e29b016a360949a45eadffefce7966d54a9153d0
-  data.tar.gz: f37ed9996c2d068663e574887bf29828a29d9b9250144006701d14e4bc17b64259be36bf96c0ec4ca6046a52ed81d577b2300bdfc7f46629e73825bfec28af1b
+  metadata.gz: 1b3347a88211c4555f69bcbd2471fb41ac7353b5e831487546d7b42f3b3d79fbb75b7626ce683ef931bf9d8d0946a64ec0fe2a817f1cb3d5798cc00545ea31a5
+  data.tar.gz: c9c875a7c36e75f9cddcc204cc0fc83114319105dfca22f8f4e76cacd45b905081f6bbaca765e143e457aba888a594323ef42b886cdb8ba483599bb1d39e5449

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 3.0.0.alpha.4
+* Implemented validates_uniqueness_of (#311)
+* Using neo4j-core version 3.0.0.alpha.11
+
 == 3.0.0.alpha.3
 * Support for rails scaffolds
 * Support for created_at and updated_at (#305)

data/README.md

@@ -1,21 +1,21 @@
 # Welcome to Neo4j.rb [![Build Status](https://secure.travis-ci.org/andreasronge/neo4j.png?branch=master)](http://travis-ci.org/andreasronge/neo4j) [![Coverage Status](https://coveralls.io/repos/andreasronge/neo4j/badge.png)](https://coveralls.io/r/andreasronge/neo4j) [![Code Climate](https://codeclimate.com/github/andreasronge/neo4j.png)](https://codeclimate.com/github/andreasronge/neo4j)
 
-Neo4j.rb is a graph database for Ruby (and JRuby)
+Neo4j.rb is an Active Model compliant Ruby/JRuby wrapper for [the Neo4j graph database](http://www.neo4j.org/). It uses the [neo4j-core](https://github.com/andreasronge/neo4j-core) and [active_attr](https://github.com/cgriego/active_attr) gems.
 
-## Version 3.0
+## Version 3.0.0.alpha.X
 
 Unstable !
 
-* Wiki: https://github.com/andreasronge/neo4j/wiki/Neo4j-v3
-* Example: https://github.com/andreasronge/neo4j/tree/3.0/example/blog
+* [Wiki](https://github.com/andreasronge/neo4j/wiki/Neo4j-v3)
+* [Basic Rails 4 Example](https://github.com/andreasronge/neo4j/blob/master/example/blog/README.md)
 
 ## Version 2.x
 
-This is the stable version, see https://github.com/andreasronge/neo4j/tree/2.x
+For the stable 2.x version, see [here](https://github.com/andreasronge/neo4j/tree/2.x)
 
 ## Contributing
 
-* Have you found a bug, need help or have a patch ?
+* Have you found a bug, need help, or have a patch ?
 * Just clone neo4j.rb and send me a pull request or email me.
 * Do you need help - send me an email (andreas.ronge at gmail dot com).
 
@@ -23,6 +23,6 @@ This is the stable version, see https://github.com/andreasronge/neo4j/tree/2.x
 
 * Neo4j.rb - MIT, see the [LICENSE](http://github.com/andreasronge/neo4j/tree/master/LICENSE).
 * Lucene -  Apache, see the [Lucene Documentation](http://lucene.apache.org/java/docs/features.html).
-* Neo4j - Dual free software/commercial license, see [Lisencing Guide](http://www.neo4j.org/learn/licensing).
+* Neo4j - Dual free software/commercial license, see [Licensing Guide](http://www.neo4j.org/learn/licensing).
 
-**Notice:** there are different license for the `neo4j-community`, `neo4j-advanced`, and `neo4j-enterprise` jar gems. Only the `neo4j-community` gem is by default required.
+**Notice:** There are different licenses for the `neo4j-community`, `neo4j-advanced`, and `neo4j-enterprise` jar gems. Only the `neo4j-community` gem is required by default.

data/lib/neo4j/active_node/has_n/nodes.rb

@@ -55,7 +55,7 @@ module Neo4j
 
         # Creates a relationship instance between this and the other node.
         # Returns the relationship object
-        def create(other, relationship_props)
+        def create(other, relationship_props = {})
           @decl_rel.create_relationship_to(@node, other, relationship_props)
         end
 

data/lib/neo4j/active_node/validations.rb

@@ -6,6 +6,11 @@ module Neo4j
 
       include ActiveModel::Validations
 
+      module ClassMethods
+        def validates_uniqueness_of(*attr_names)
+          validates_with UniquenessValidator, _merge_attributes(attr_names)
+        end
+      end
 
       # Implements the ActiveModel::Validation hook method.
       # @see http://rubydoc.info/docs/rails/ActiveModel/Validations:read_attribute_for_validation
@@ -33,6 +38,48 @@ module Neo4j
         errors.empty?
       end
 
+      class UniquenessValidator < ::ActiveModel::EachValidator
+        def initialize(options)
+          super(options.reverse_merge(:case_sensitive => true))
+        end
+
+        def setup(klass)
+          @klass = klass
+        end
+
+        def validate_each(record, attribute, value)
+          conditions = scope_conditions(record)
+
+          # TODO: Added as find(:name => nil) throws error
+          value = "" if value == nil
+
+          if options[:case_sensitive]
+            conditions[attribute] = value
+          else
+            conditions[attribute] = /^#{Regexp.escape(value.to_s)}$/i
+          end
+
+          # prevent that same object is returned 
+          # TODO: add negative condtion to not return current record
+          found = @klass.all(conditions).to_a
+          found.delete(record)
+
+          if found.count > 0
+            record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+          end
+        end
+
+        def message(instance)
+          super || "has already been taken"
+        end
+
+        def scope_conditions(instance)
+          Array(options[:scope] || []).inject({}) do |conditions, key|
+            conditions.merge(key => instance[key])
+          end
+        end
+      end      
+
       private
       def perform_validations(options={})
         perform_validation = case options

data/lib/neo4j/railtie.rb

@@ -1,5 +1,5 @@
 module Neo4j
-  class Railtie < ::Rails::Railtie
+    class Railtie < ::Rails::Railtie
     config.neo4j = ActiveSupport::OrderedOptions.new
 
     # Add ActiveModel translations to the I18n load_path
@@ -7,46 +7,58 @@ module Neo4j
     	config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'locales', '*.{rb,yml}')]
     end
 
-    # Starting Neo after :load_config_initializers allows apps to
-    # register migrations in config/initializers
-    initializer "neo4j.start", :after => :load_config_initializers do |app|
-      cfg = app.config.neo4j
-      # Set Rails specific defaults
+    class << self
+      def java_platform?
+        RUBY_PLATFORM =~ /java/
+      end
 
-      cfg.session_type ||= :server_db
-      cfg.session_path ||= "http://localhost:7474"
-      cfg.sessions ||= []
+      def set_default_session(cfg)
+        cfg.session_type ||= :server_db
+        cfg.session_path ||= "http://localhost:7474"
+        cfg.sessions ||= []
 
-      if cfg.sessions.empty?
-        cfg.sessions << {type: cfg.session_type, path: cfg.session_path}
+        if cfg.sessions.empty?
+          cfg.sessions << {type: cfg.session_type, path: cfg.session_path}
+        end
       end
 
-      cfg.sessions.each do |session_opts|
-        if !(RUBY_PLATFORM =~ /java/) && session_opts[:type] == :embedded_db
+
+      def start_embedded_session(session)
+        # See https://github.com/jruby/jruby/wiki/UnlimitedStrengthCrypto
+        security_class = java.lang.Class.for_name('javax.crypto.JceSecurity')
+        restricted_field = security_class.get_declared_field('isRestricted')
+        restricted_field.accessible = true
+        restricted_field.set nil, false
+        session.start
+      end
+
+      def open_neo4j_session(session_opts)
+        if !java_platform? && session_opts[:type] == :embedded_db
           raise "Tried to start embedded Neo4j db without using JRuby (got #{RUBY_PLATFORM}), please run `rvm jruby`"
         end
 
-        puts "Create Neo4j Session #{session_opts[:type]}, path: #{session_opts[:path]}"
         if (session_opts.key? :name)
           session = Neo4j::Session.open_named(session_opts[:type], session_opts[:name], session_opts[:default], session_opts[:path])
         else
           session = Neo4j::Session.open(session_opts[:type], session_opts[:path])
         end
 
-        if session_opts[:type] == :embedded_db
+        start_embedded_session(session) if session_opts[:type] == :embedded_db
+      end
 
-          # See https://github.com/jruby/jruby/wiki/UnlimitedStrengthCrypto
-          security_class = java.lang.Class.for_name('javax.crypto.JceSecurity')
-          restricted_field = security_class.get_declared_field('isRestricted')
-          restricted_field.accessible = true
-          restricted_field.set nil, false
+    end
 
-          session.start
-        end
-      end
 
-      #cfg.storage_path = "#{app.config.root}/db/neo4j-#{::Rails.env}" unless cfg.storage_path
-      #Neo4j::Config.setup.merge!(cfg.to_hash)
+    # Starting Neo after :load_config_initializers allows apps to
+    # register migrations in config/initializers
+    initializer "neo4j.start", :after => :load_config_initializers do |app|
+      cfg = app.config.neo4j
+      # Set Rails specific defaults
+      Neo4j::Railtie.set_default_session(cfg)
+
+      cfg.sessions.each do |session_opts|
+        Neo4j::Railtie.open_neo4j_session(session_opts)
+      end
     end
   end
 end

data/lib/neo4j/version.rb

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

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

@@ -31,8 +31,7 @@ class Neo4j::Generators::ModelGenerator < Neo4j::Generators::Base #:nodoc:
   def has_n_statements
     txt = ""
     options[:has_n].each do |key|
-      to, from = key.split(':')
-      txt << (from ? "\n  has_n(:#{to}).from(:#{from})\n" : "\n  has_n :#{to}")
+      txt << has_x('has_n', key)
     end
     txt
   end
@@ -41,11 +40,15 @@ class Neo4j::Generators::ModelGenerator < Neo4j::Generators::Base #:nodoc:
     options[:has_one]
   end
 
+  def has_x(method, key)
+    to, from = key.split(':')
+    (from ? "\n  #{method}(:#{to}).from(:#{from})\n" : "\n  #{method} :#{to}")
+  end
+
   def has_one_statements
     txt = ""
     options[:has_one].each do |key|
-      to, from = key.split(':')
-      txt << (from ? "\n  has_one(:#{to}).from(:#{from})\n" : "\n  has_one :#{to}")
+      txt << has_x('has_one', key)
     end
     txt
   end

data/neo4j.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/andreasronge/neo4j/tree"
   s.rubyforge_project = 'neo4j'
   s.summary = "A graph database for Ruby"
+  s.license = 'MIT'
   s.description = <<-EOF
 You can think of Neo4j as a high-performance graph engine with all the features of a mature and robust database.
 The programmer works with an object-oriented, flexible network structure rather than with strict and static tables 
@@ -32,7 +33,7 @@ It comes included with the Apache Lucene document database.
   s.add_dependency("activemodel", "~> 4.0.0")
   s.add_dependency("railties", "~> 4.0.0")
   s.add_dependency('active_attr', "~> 0.8")
-  s.add_dependency("neo4j-core", "= 3.0.0.alpha.8")
+  s.add_dependency("neo4j-core", "= 3.0.0.alpha.11")
 
   if RUBY_PLATFORM =~ /java/
     s.add_dependency("neo4j-community", '~> 2.0.0')

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.3
+  version: 3.0.0.alpha.4
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.8
+        version: 3.0.0.alpha.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha.8
+        version: 3.0.0.alpha.11
 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
@@ -92,11 +92,19 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG
+- CONTRIBUTORS
+- Gemfile
+- README.md
 - bin/neo4j-jars
+- config/locales/en.yml
+- config/neo4j/config.yml
+- 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/nodes.rb
-- lib/neo4j/active_node/has_n.rb
 - lib/neo4j/active_node/identity.rb
 - lib/neo4j/active_node/initialize.rb
 - lib/neo4j/active_node/labels.rb
@@ -104,50 +112,42 @@ files:
 - lib/neo4j/active_node/property.rb
 - lib/neo4j/active_node/rels.rb
 - lib/neo4j/active_node/validations.rb
-- lib/neo4j/active_node.rb
 - lib/neo4j/railtie.rb
 - lib/neo4j/type_converters.rb
 - lib/neo4j/version.rb
 - lib/neo4j/wrapper.rb
-- lib/neo4j.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
-- config/locales/en.yml
-- config/neo4j/config.yml
-- README.md
-- CHANGELOG
-- CONTRIBUTORS
-- Gemfile
 - neo4j.gemspec
 homepage: http://github.com/andreasronge/neo4j/tree
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --title
+- "--quiet"
+- "--title"
 - Neo4j.rb
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.rdoc
-- --inline-source
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby

data/lib/test.rb

@@ -1,16 +0,0 @@
-require 'neo4j'
-
-class Person
-  include Neo4j::ActiveNode
-  property :born, type: Date
-  property :since
-
-end
-
-#Neo4j::Session.open(:server_db, 'http://localhost:7474')
-
-puts "Type #{Person._attribute_type(:born)}, class #{Person._attribute_type(:born).class}"
-puts "Type since #{Person._attribute_type(:since)}"
-p = Person.new(born: Date.today)
-#p.save
-puts "BORN #{p.born} type: #{p.born.class}"