neo4j 5.1.0.rc.2 → 5.1.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2fc8fdc0533ca1dfbfa9253ecae0ed833267048
-  data.tar.gz: 58295ba854140ebddaaf04974d848de2d25e7caa
+  metadata.gz: a5b693806fc0a4e354afd855697d172f97446895
+  data.tar.gz: 4816d6e5f1a882160788ccfa26d161250166a9b9
 SHA512:
-  metadata.gz: 04b3b4a9e03d657b0d83c08a15a63c55cf7f2b8c97f2d08c12ad692d7fa653becca7768402caa2791e5899b999cd6c24be1409d383a49e0673557d330ed6d097
-  data.tar.gz: a234fb10c17b6c5d7aafa092d09c0b80edea0a5332506ec466e8ae44960bd4aef93953733d4bf6bdb1dc2fdac37fc0d82419a3c78a3a07bcbb8f074ca9c787be
+  metadata.gz: 86232eb72791621cf0562dc36c56cbc052a0cf292d609bce5ebcf3a19d0cce02af8b76b44fe47ded24c85eed87e8be9d437cff90802738ba12e133a675023038
+  data.tar.gz: cec8b73a35e405d68df9cddf46732b41ff26b94d42d39412a8a50343aaa22204778769ef36d4186658338e2326ef90bc30fbe09ad1310589084c5b404e5f24c3

data/CHANGELOG.md

@@ -5,6 +5,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [5.1.0.rc.3] - 08-17-2015
+
+### Fixed
+- Associations defined in ActiveNode models will delegate `unique?` to the model set in `rel_class`. This makes it easier for the rel class to act as the single source of truth for relationship behavior.
+
+### Added
+- ActiveRel: `#{related_node}_neo_id` instance methods to match CypherRelationship. Works with start/from and end/to.
+- ActiveRel: `type` now has a new alias, `rel_type`. You might recognize this from the `(Cypher|Embedded)Relationship` class and ActiveNode association option.
+- Contributing to the gem? Rejoice, for it now supports [Dotenv](https://github.com/bkeepers/dotenv).
+
+## [5.1.0.rc.2] - 08-16-2015
+
+### Added
+- Ability to use `#where_not` method on `ActiveNode` / `QueryProxy`
+
 ## [5.1.0.rc.1] - 08-14-2015
 
 ### Fixed

data/Gemfile

@@ -18,4 +18,5 @@ group 'test' do
   gem 'test-unit'
   gem 'overcommit'
   gem 'colored'
+  gem 'dotenv'
 end

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

@@ -135,6 +135,7 @@ module Neo4j
         end
 
         def unique?
+          return relationship_class.unique? if rel_class?
           @origin ? origin_association.unique? : !!@unique
         end
 
@@ -142,6 +143,11 @@ module Neo4j
           unique? ? :create_unique : :create
         end
 
+        def relationship_class?
+          !!relationship_class
+        end
+        alias_method :rel_class?, :relationship_class?
+
         private
 
         def association_model_namespace

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -138,7 +138,7 @@ module Neo4j
           @model.current_scope = previous
         end
 
-        METHODS = %w(where rel_where order skip limit)
+        METHODS = %w(where where_not rel_where order skip limit)
 
         METHODS.each do |method|
           define_method(method) { |*args| build_deeper_query_proxy(method.to_sym, args) }

data/lib/neo4j/active_node/query/query_proxy_link.rb

@@ -41,6 +41,12 @@ module Neo4j
             end
             alias_method :for_node_where_clause, :for_where_clause
 
+            def for_where_not_clause(*args)
+              for_where_clause(*args).each do |link|
+                link.instance_variable_set('@clause', :where_not)
+              end
+            end
+
             def new_for_key_and_value(model, key, value)
               key = (key.to_sym == :id ? model.id_property_name : key)
 
@@ -77,8 +83,8 @@ module Neo4j
             end
 
             def for_args(model, clause, args)
-              if clause == :where && args[0].is_a?(String) # Better way?
-                [for_arg(model, :where, args[0], *args[1..-1])]
+              if [:where, :where_not].include?(clause) && args[0].is_a?(String) # Better way?
+                [for_arg(model, clause, args[0], *args[1..-1])]
               else
                 args.map { |arg| for_arg(model, clause, arg) }
               end

data/lib/neo4j/active_rel/persistence.rb

@@ -56,6 +56,10 @@ module Neo4j::ActiveRel
           obj.save!
         end
       end
+
+      def create_method
+        creates_unique? ? :create_unique : :create
+      end
     end
 
     private
@@ -96,7 +100,7 @@ module Neo4j::ActiveRel
     end
 
     def create_method
-      self.class.creates_unique? ? :create_unique : :create
+      self.class.create_method
     end
   end
 end

data/lib/neo4j/active_rel/property.rb

@@ -14,10 +14,17 @@ module Neo4j::ActiveRel
     alias_method :start_node, :from_node
     alias_method :end_node,   :to_node
 
+    %w(start_node end_node).each do |direction|
+      define_method("#{direction}_neo_id") { send(direction).neo_id if direction }
+    end
+    alias_method :from_node_neo_id, :start_node_neo_id
+    alias_method :to_node_neo_id,   :end_node_neo_id
+
     # @return [String] a string representing the relationship type that will be created
     def type
-      self.class._type
+      self.class.type
     end
+    alias_method :rel_type, :type
 
     def initialize(attributes = nil)
       super(attributes)
@@ -74,6 +81,7 @@ WARNING
       def creates_unique?
         !!@creates_unique
       end
+      alias_method :unique?, :creates_unique?
     end
 
     private

data/lib/neo4j/active_rel/types.rb

@@ -31,15 +31,22 @@ module Neo4j
           subclass.type subclass.namespaced_model_name, true
         end
 
+        # When called without arguments, it will return the current setting or supply a default.
+        # When called with arguments, it will change the current setting.
         # @param [String] given_type sets the relationship type when creating relationships via this class
         # @param [Boolean] auto Should the given_type be changed in compliance with the gem's rel decorator setting?
-        # This option is used internally, users will usually ignore it.
         def type(given_type = nil, auto = false)
-          return rel_type if given_type.nil?
-          @rel_type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
-            add_wrapped_class(type) unless uses_classname?
+          case
+          when !given_type && rel_type?
+            @rel_type
+          when given_type
+            assign_type!(given_type, auto)
+          else
+            assign_type!(namespaced_model_name, true)
           end
         end
+        alias_method :rel_type, :type
+        alias_method :_type, :type # should be deprecated
 
         def namespaced_model_name
           case Neo4j::Config[:module_handling]
@@ -52,13 +59,6 @@ module Neo4j
           end
         end
 
-        def rel_type
-          @rel_type || type(namespaced_model_name, true)
-        end
-
-        # @return [String] a string representing the relationship type that will be created
-        alias_method :_type, :rel_type # Should be deprecated
-
         def add_wrapped_class(type)
           # _wrapped_classes[type.to_sym.downcase] = self.name
           _wrapped_classes[type.to_sym] = self.name
@@ -67,6 +67,18 @@ module Neo4j
         def _wrapped_classes
           Neo4j::ActiveRel::Types::WRAPPED_CLASSES
         end
+
+        def rel_type?
+          !!@rel_type
+        end
+
+        private
+
+        def assign_type!(given_type, auto)
+          @rel_type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
+            add_wrapped_class(type) unless uses_classname?
+          end
+        end
       end
     end
   end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.1.0.rc.2'
+  VERSION = '5.1.0.rc.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 5.1.0.rc.2
+  version: 5.1.0.rc.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -322,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby