neo4j 1.0.0.beta.6 → 1.0.0.beta.7

data/lib/neo4j.rb

@@ -6,10 +6,9 @@ require 'time'
 require 'date'
 
 require 'neo4j/jars/neo4j-kernel-1.1.1.jar'
-#require 'neo4j/jars/neo4j-kernel-1.2-20100916.085228-39.jar'
 require 'neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/lucene-core-3.0.1.jar'
-require 'neo4j/jars/neo4j-lucene-index-0.1-20100916.085626-67.jar'
+require 'neo4j/jars/neo4j-lucene-index-0.1-20101002.153213-102.jar'
 require 'neo4j/to_java'
 require 'neo4j/version'
 require 'neo4j/equal'
@@ -39,6 +38,7 @@ require 'rails/railtie'
 require 'active_model'
 require 'neo4j/rails/transaction'
 require 'neo4j/rails/railtie'
+require 'neo4j/rails/validations/uniqueness'
 require 'neo4j/rails/model'
 require 'neo4j/rails/value'
 require 'neo4j/rails/lucene_connection_closer'

data/lib/neo4j/index.rb

@@ -12,7 +12,7 @@ module Neo4j
     module ClassMethods
       extend Forwardable
 
-      def_delegators :@indexer, :index, :find, :index?, :index_type?, :clear_index_type, :rm_index_type, :add_index, :rm_index
+      def_delegators :@indexer, :index, :find, :index?, :index_type?, :clear_index_type, :rm_index_type, :add_index, :rm_index, :index_type_for
 
       # Sets which indexer should be used for the given class.
       # Returns the old one if there was an old indexer.
@@ -103,6 +103,11 @@ module Neo4j
         @field_types.include?(field.to_s)
       end
 
+      def index_type_for(field)
+        return nil unless index?(field)
+        @field_types[field.to_s]
+      end
+
       def index_type?(type)
         @field_types.values.include?(type)
       end

data/lib/neo4j/mapping/class_methods/rule.rb

@@ -5,6 +5,11 @@ module Neo4j::Mapping
         def add(clazz, field, props, &block)
           clazz = clazz.to_s
           @rules ||= {}
+          # was there no ruls for this class AND is neo4j running ?
+          if !@rules.include?(clazz) && Neo4j.running?
+            # maybe Neo4j was started first and the rules was added later. Create rule nodes now
+            create_rule_node_for(clazz)
+          end
           @rules[clazz] ||= {}
           filter = block.nil? ? Proc.new { |*| true } : block
           @rules[clazz][field] = filter
@@ -38,23 +43,19 @@ module Neo4j::Mapping
         end
 
         def on_neo4j_started(*)
-          create_rules if @rules
+          @rules.each_key { |clazz| create_rule_node_for(clazz) } if @rules
         end
 
-        def create_rules
-          @rules.each_key do |clazz|
-            # check if rule nodes exist, if not create them
-            if !Neo4j.ref_node.rel?(clazz)
-              Neo4j::Transaction.run do
-                node = Neo4j::Node.new
-                Neo4j.ref_node.outgoing(clazz) << node
-                node
-              end
+        def create_rule_node_for(clazz)
+          if !Neo4j.ref_node.rel?(clazz)
+            Neo4j::Transaction.run do
+              node = Neo4j::Node.new
+              Neo4j.ref_node.outgoing(clazz) << node
+              node
             end
           end
         end
 
-
         def trigger?(node)
           @rules && node.property?(:_classname) && @rules.include?(node[:_classname])
         end

data/lib/neo4j/rails/model.rb

@@ -3,10 +3,15 @@ class Neo4j::Model
   include ActiveModel::Validations
   include ActiveModel::Dirty
   include ActiveModel::MassAssignmentSecurity
+
   extend ActiveModel::Naming
   extend ActiveModel::Callbacks
+  extend Neo4j::Validations::ClassMethods
   define_model_callbacks :create, :save, :update, :destroy
 
+
+  UniquenessValidator = Neo4j::Validations::UniquenessValidator
+
   class RecordInvalidError < RuntimeError
     attr_reader :record
 

data/lib/neo4j/rails/validations/uniqueness.rb

@@ -0,0 +1,29 @@
+module Neo4j
+  module Validations
+    class UniquenessValidator < ActiveModel::EachValidator
+      def initialize(options)
+        super(options.reverse_merge(:case_sensitive => true))
+      end
+
+      def validate_each(record, attribute, value)
+        clazz = record.class
+
+        # TODO is it possible to move this to setup instead so that we don't have to do this always ?
+        if clazz.index_type_for(attribute) != :exact
+          raise "Can't validate property #{attribute} on class #{clazz} since there is no :exact lucene index on that property"
+        end
+
+        query = "#{attribute}: #{value}"
+        if !clazz.find(query).empty?
+          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+        end
+      end
+    end
+
+    module ClassMethods
+      def validates_uniqueness_of(*attr_names)
+        validates_with UniquenessValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.6"
+  VERSION = "1.0.0.beta.7"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 6
-  version: 1.0.0.beta.6
+    - 7
+  version: 1.0.0.beta.7
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -178,13 +178,11 @@ files:
   - lib/neo4j/rails/lucene_connection_closer.rb
   - lib/neo4j/rails/transaction.rb
   - lib/neo4j/rails/value.rb
-  - lib/neo4j/jars/neo4j-lucene-index-0.1-20100916.085626-67.jar
-  - lib/neo4j/jars/lucene-core-2.9.2.jar
-  - lib/neo4j/jars/neo4j-kernel-1.1.jar
+  - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/jars/lucene-core-3.0.1.jar
   - lib/neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar
   - lib/neo4j/jars/neo4j-kernel-1.1.1.jar
-  - lib/neo4j/jars/neo4j-index-1.1.jar
+  - lib/neo4j/jars/neo4j-lucene-index-0.1-20101002.153213-102.jar
   - lib/neo4j/mapping/decl_relationship_dsl.rb
   - lib/neo4j/mapping/node_mixin.rb
   - lib/neo4j/mapping/has_n.rb