architect4r 0.3.2 → 0.3.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    architect4r (0.3.2)
+    architect4r (0.3.3.1)
       activemodel (~> 3.0)
       json (~> 1.5)
       typhoeus (~> 0.2)
@@ -18,15 +18,15 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.3)
     growl (1.0.3)
-    guard (0.8.7)
+    guard (0.8.8)
       thor (~> 0.14.6)
     guard-rspec (0.5.0)
       guard (>= 0.8.4)
     i18n (0.6.0)
     json (1.6.1)
-    mime-types (1.17.1)
+    mime-types (1.17.2)
     multi_json (1.0.3)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rb-fsevent (0.4.3.1)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec' do
+guard 'rspec', :all_after_pass => false, :version => 2 do
   # Check for changes in classes
   watch(%r{^lib/architect4r/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   

data/README.md

@@ -3,7 +3,18 @@
 Architect4r is intended as an easy ruby wrapper for the neo4j graph db 
 REST API. There are other solutions such as neo4j.rb if you are working 
 in a java environment or neography which provides another working wrapper 
-for the REST API.
+for the REST API. Both solutions are far more feature complete and allow 
+you to do pretty advanced queries on the graph.
+
+Architect4r is trying to go another route. Instead of using the native 
+graph traversal engine it requires you to write your queries in recently 
+implemented cypher query language. The language is well documented at the 
+official neo4j documentation (http://docs.neo4j.org/chunked/milestone/). 
+Just that you know what you are dealing with… a little example:
+
+    start s=node(1) match s-[:friends]-d return d order by d.name skip 0 limit 20
+
+But please read the docs for more info.
 
 Requirements
 ------------
@@ -25,6 +36,7 @@ Quick Start
       # Properties
       property :name, :cast_to => String, :localize => true
       property :name, :cast_to => String, :localize => :de
+      timestamps!
       
       # Validations
       validates :name, :presence => true

data/ReleaseNotes.md

@@ -1,5 +1,16 @@
 # Release Notes
 
+## v0.3.3
+
+* Add magic timestamp! property for tracking timestamps
+
+  By putting timestamps! into your model, it tracks the creation date and 
+  time in created\_at and updates in updated\_at
+
+* Allow referencing model_roots in cypher queries.
+
+  If you have a model User the reference key would be :user_root
+
 ## v0.3.2
 
 * Support for carrierwave file upload mechanism

data/lib/architect4r/core/cypher_methods.rb

@@ -6,6 +6,9 @@ module Architect4r
       module InstanceMethods
         
         def execute_cypher(query)
+          
+          query = self.interpolate_node_model_root_references(query)
+          
           url = prepend_base_url("/ext/CypherPlugin/graphdb/execute_query")
           response = Typhoeus::Request.post(url, 
             :headers => { 'Accept' => 'application/json', 'Content-Type' => 'application/json' },
@@ -41,6 +44,21 @@ module Architect4r
           end
         end
         
+        def interpolate_node_model_root_references(query)
+          query.scan(/node\((:[^)]*_root)\)/i).flatten.uniq.each do |str|
+            model_name = str.match(/^:(.*)_root$/)[1].to_s.classify
+            if model_name.length > 0
+              # As const_defined? and const_get to not support namespaces, we have to use eval :(
+              begin
+                query.gsub!(str, eval("#{model_name}.model_root.id.to_s"))
+              rescue NoMethodError => ex
+                nil
+              end
+            end
+          end
+          query
+        end
+        
       end
     end
   end

data/lib/architect4r/model/properties.rb

@@ -54,6 +54,8 @@ module Architect4r
             value.to_i
           elsif cast_to == Float
             value.to_f
+          elsif cast_to == DateTime
+            value.to_datetime
           elsif cast_to == TrueClass or cast_to == FalseClass
             if value.kind_of?(Integer)
               value == 1
@@ -90,12 +92,15 @@ module Architect4r
         end
         
         def timestamps!
-          property(:updated_at, :cast_to => Time)
-          property(:created_at, :cast_to => Time)
+          property(:updated_at, :cast_to => DateTime)
+          property(:created_at, :cast_to => DateTime)
+          
+          set_callback :create, :before do |object|
+            write_attribute('created_at', DateTime.now)
+          end
           
           set_callback :save, :before do |object|
-            write_attribute('updated_at', Time.now)
-            write_attribute('created_at', Time.now) if object.new?
+            write_attribute('updated_at', DateTime.now)
           end
         end
         

data/lib/architect4r/version.rb

@@ -1,3 +1,3 @@
 module Architect4r
-  VERSION = "0.3.2"
+  VERSION = "0.3.3.1"
 end

data/spec/core/cypher_methods_spec.rb

@@ -26,4 +26,45 @@ describe Architect4r::Server do
     
   end
   
+  describe :interpolate_node_model_root_references do
+    
+    it "should return the original query if there is nothing to interpolate" do
+      result = subject.interpolate_node_model_root_references("start node(0) match something")
+      result.should == "start node(0) match something"
+    end
+    
+    it "should find and replace a single reference" do
+      Person.should_receive(:model_root).and_return(stub(:id => 1))
+      result = subject.interpolate_node_model_root_references("start node(:person_root) match something")
+      result.should == "start node(1) match something"
+    end
+    
+    it "should find and replace multiple references" do
+      Person.should_receive(:model_root).and_return(stub(:id => 1))
+      Ship.should_receive(:model_root).and_return(stub(:id => 2))
+      result = subject.interpolate_node_model_root_references("start p=node(:person_root), s=node(:ship_root) match something")
+      result.should == "start p=node(1), s=node(2) match something"
+    end
+    
+    it "should find and replace multiple references to the same root" do
+      Person.should_receive(:model_root).and_return(stub(:id => 1))
+      result = subject.interpolate_node_model_root_references("start p=node(:person_root), s=node(:person_root) match something")
+      result.should == "start p=node(1), s=node(1) match something"
+    end
+    
+    it "should support namespaced models" do
+      module MyNamespace; class UserNode; end; end
+      MyNamespace::UserNode.should_receive(:model_root).and_return(stub(:id => 11))
+      result = subject.interpolate_node_model_root_references("start s=node(:my_namespace/user_node_root) match something")
+      result.should == "start s=node(11) match something"
+    end
+    
+    it "should support camel case models" do
+      SomeDatabaseModelNode.should_receive(:model_root).and_return(stub(:id => 12))
+      result = subject.interpolate_node_model_root_references("start s=node(:some_database_model_node_root) match something")
+      result.should == "start s=node(12) match something"
+    end
+    
+  end
+  
 end

data/spec/model/properties_spec.rb

@@ -162,4 +162,39 @@ describe "Model properties based on test class Person" do
     
   end
   
+  describe "automatic tracking of create and update timestamps" do
+    
+    subject { Person.new(:name => 'Person with timestamps', :human => false) }
+    
+    it "should allow setting timestamps" do
+      subject.should respond_to(:created_at)
+      subject.should respond_to(:updated_at)
+    end
+    
+    it "should create the timestamps only after creation" do
+      subject.created_at.should be_nil
+      subject.updated_at.should be_nil
+      subject.save
+      subject.created_at.should be_a(DateTime)
+      subject.updated_at.should be_a(DateTime)
+    end
+    
+    it "should keep the created_at timestamp untouched after creation" do
+      subject.save
+      the_stamp = subject.created_at
+      subject.vita = "Some random info"
+      subject.save
+      subject.created_at.should == the_stamp
+    end
+    
+    it "should update the updated_at timestamp" do
+      subject.save
+      the_stamp = subject.updated_at
+      subject.vita = "Some random info"
+      subject.save
+      subject.updated_at.should > the_stamp
+    end
+    
+  end
+  
 end

data/spec/spec_helper.rb

@@ -41,6 +41,7 @@ class Person < Architect4r::Model::Node
   property :birthday, :cast_to => Date
   property :age_when_enlightend, :cast_to => Integer
   property :note, :cast_to => String, :localize => true
+  timestamps!
   
   # Validations
   validates :name, :presence => true, :length => { :minimum => 3, :allow_nil => true }

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: architect4r
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 89
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  - 1
+  version: 0.3.3.1
 platform: ruby
 authors: 
 - Maximilian Schulz