geoff 0.1.1 → 0.1.2

data/.rspec

@@ -0,0 +1,6 @@
+--tty
+--color
+--tag ~sanity
+--tag ~benchmark
+--tag ~ci_only
+--profile

data/.rvmrc

@@ -1 +1,54 @@
-rvm use jruby
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use jruby" > .rvmrc
+environment_id="jruby-1.7.0@geoff"
+export JRUBY_OPTS='-J-Xms1024m -J-Xmx1024m -J-XX:+UseConcMarkSweepGC -J-XX:MaxPermSize=512m -J-Djruby.thread.pooling=true'
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.14.2 ()" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# Uncomment following line if you want options to be set only for given project.
+# PROJECT_JRUBY_OPTS=( --1.9 )
+# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
+#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geoff (0.1.1)
+    geoff (0.1.2)
       activesupport (~> 3.2.3)
       json
       neo4j
@@ -41,16 +41,18 @@ GEM
       rbx-require-relative (> 0.0.4)
     method_source (0.8)
     multi_json (1.3.6)
-    neo4j (2.0.1-java)
+    neo4j (2.2.0-java)
       activemodel (>= 3.0.0, < 3.3)
-      neo4j-wrapper (= 2.0.1)
+      neo4j-wrapper (= 2.2.0)
       orm_adapter (>= 0.0.3)
       railties (>= 3.0.0, < 3.3)
-    neo4j-community (1.7.1-java)
-    neo4j-core (2.0.1-java)
-      neo4j-community (>= 1.7.0)
-    neo4j-wrapper (2.0.1-java)
-      neo4j-core (= 2.0.1)
+    neo4j-community (1.8.RC1-java)
+    neo4j-core (2.2.0-java)
+      neo4j-community (>= 1.8.M05, < 1.9)
+      neo4j-cypher (~> 1.0.0)
+    neo4j-cypher (1.0.0)
+    neo4j-wrapper (2.2.0-java)
+      neo4j-core (= 2.2.0)
     orm_adapter (0.4.0)
     pry (0.9.10)
       coderay (~> 1.0.5)

data/lib/geoff/children_dsl.rb

@@ -15,7 +15,7 @@ class ChildrenDsl
     @parent_rel_type  = options[:type]
     @target           = options[:target]
     @outer_geoff      = options[:geoff]
-
+    @direction        = options[:direction]
     @write_mode = false
 
     @node_dsls = {}
@@ -57,11 +57,13 @@ class ChildrenDsl
   end
 
   def rel_geoff node_dsl, properties
+    directions_ascii = ["<-", "-", "->"]
+    direction_array = @direction == :incoming ? directions_ascii.first(2) : directions_ascii.last(2)
     properties = properties.dup
     type       = properties.delete :type
     properties.delete(:clone)
 
-    "(#{parent_node_name})-[:#{type}]->(#{node_dsl.node_name})".tap do |r|
+    "(#{parent_node_name})#{direction_array.first}[:#{type}]#{direction_array.last}(#{node_dsl.node_name})".tap do |r|
       r << " #{properties.to_json}" if properties.any?
     end
   end

data/lib/geoff/node_dsl.rb

@@ -111,6 +111,16 @@ class NodeDsl
 
   private
 
+  def incoming type=nil, options={}, &block
+    options.merge!(direction: :incoming)
+    children type, options, &block
+  end
+
+  def outgoing type=nil, options={}, &block
+    options.merge!(direction: :outgoing)
+    children type, options, &block
+  end
+
   def children type=nil, options={}, &block
     options.merge!({
       parent_node_dsl: self,
@@ -118,7 +128,7 @@ class NodeDsl
       container:       @container,
       target:          @target
     })
-
+    options.merge!(direction: :outgoing) unless options.has_key? :direction
     @children_dsls << ChildrenDsl.new(options, &block)
   end
 end

data/lib/geoff/version.rb

@@ -1,3 +1,3 @@
 class Geoff
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/integration/geoff_spec.rb

@@ -9,6 +9,42 @@ describe Geoff do
   class Table;         include Neo4j::NodeMixin; end
 
   describe 'injecting builders' do
+    context 'using direction macros' do
+      before { stub_node_dsl_object_id }
+      let(:builder) do
+        Geoff(Branch) do
+          branch 'banana' do
+            incoming :inverts do
+              branch 'egg'
+            end
+            outgoing :reverts do
+              branch 'reverted_banana'
+            end
+            
+          end
+        end
+      end
+
+      let(:expected_geoff) do
+        strip_whitespace <<-EOS
+          (ROOT)-[:Branch]->(Branch)
+          (banana) {"_classname":"Branch"}
+          (Branch)-[:all]->(banana)
+          (egg) {"_classname":"Branch"}
+          (Branch)-[:all]->(egg)
+          (banana)<-[:inverts]-(egg)
+          (reverted_banana) {"_classname":"Branch"}
+          (Branch)-[:all]->(reverted_banana)
+          (banana)-[:reverts]->(reverted_banana)
+        EOS
+      end
+      specify do
+        geoff = builder.to_geoff
+        geoff.should == expected_geoff
+      end
+  
+    end
+
     context 'with object_id ignored' do
       before { stub_node_dsl_object_id }
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: geoff
 version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease:
-  version: 0.1.1
 platform: ruby
 authors:
 - David Rouchy
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j
@@ -21,13 +21,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :runtime
@@ -37,13 +39,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -69,13 +73,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :runtime
@@ -101,13 +107,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -117,13 +125,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -140,6 +150,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -192,8 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
+      version: !binary |-
+        MA==
       hash: 2
-      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -201,8 +213,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
+      version: !binary |-
+        MA==
       hash: 2
-      version: '0'
   none: false
 requirements: []
 rubyforge_project:
@@ -219,4 +232,3 @@ test_files:
 - spec/node_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/support/geof_matchers.rb
-...