geoff 0.0.3.beta → 0.0.4

data/.rbenv-version

@@ -0,0 +1 @@
+jruby-1.6.7.2

data/README.md

@@ -1,25 +1,27 @@
 geoff
 =====
 
-Geoff is "a declarative notation for representing graph data within concise
-human-readable text, designed specifically with Neo4j in mind"
+Geoff is
+
+> a declarative notation for representing graph data within concise
+> human-readable text, designed specifically with Neo4j in mind
 
 http://geoff.nigelsmall.net/
 
 
 This gem is a Ruby DSL for
   * generating geoff syntax files
-  * batch inserting data into Neo4j
+  * batch inserting data into [http://neo4j.org/learn/](Neo4j)
 
 The reason for creating this gem is to:
   * easily build data sets for tests
   * that are readable and maintainable
   * quickly batch insert the whole data set in one transaction
 
-Prerequesites/ Caveats
+Prerequisites/ Caveats
 ---------------------
   * A ruby project
-  * Gemfile with `gem 'geoff', '0.0.2.beta'`
+  * Gemfile with `gem 'geoff', '0.0.3.beta'`
   * neo4j jar and geoff jar files in lib/jars (not included, but required!)
   * Current implementation assumes usage of the neo4j wrapper gem
   * Neo4j::Rails::Model classes or a class that includes the Neo4j::NodeMixin
@@ -29,18 +31,19 @@ Usage
 
 
 ```ruby
+#Gemfile
+gem 'geoff'
 
-#Basic tree like structure for DSL
-#the first line generates the class nodes used by Neo4jWrapper
 
-Geoff(Company, Person) do # NB 'Company' and 'Person' are classes with the Neo4j::NodeMixin
+# Basic tree like structure for DSL
+# the first line generates the class nodes used by Neo4jWrapper
+# NB 'Company' and 'Person' are classes with the Neo4j::NodeMixin
+Geoff(Company, Person) do
   company 'Acme' do
     address "13 Something Road"
 
     children :employees do
-      person 'Geoff' do
-        name 'Geoff'
-      end
+      person 'Geoff'
 
       person 'Nigel' do
         name 'Nigel Small'
@@ -60,16 +63,13 @@ end
 ```
 
 
-###Using a ramdisk see http://neo4j.rubyforge.org/guides/configuration.html
+#Configuration
 
-```sh
-diskutil erasevolume HFS+ "ramdisk" `hdiutil attach -nomount ram://1165430`
-```
 
 ```ruby
 
 #in spec helper
-Neo4j::Config[:storage_path] = '/Volumes/ramdisk'
+Neo4j::Config[:storage_path] = '/path/to/db'
 
 #in rspec
 before do
@@ -79,12 +79,18 @@ before do
     end
   end
 
-  #Don't display output, and delete existing database
-  Geoff::Importer.import geoff, silent: false, delete: true
+  #Silence output, and delete existing neo4j db
+  Geoff.import geoff, silent: false, delete: true
 end
+```
 
+###Using a ramdisk see http://neo4j.rubyforge.org/guides/configuration.html
 
+```sh
+diskutil erasevolume HFS+ "ramdisk" `hdiutil attach -nomount ram://1165430`
 ```
+
+```geoff
 (ROOT)-[:Company]->(Company)
 (ROOT)-[:Person]->(Person)
 (Acme) {"_classname":"Company","address":"13 Something Road"}
@@ -121,7 +127,7 @@ Geoff(Company, Person) do
 end
 ```
 
-```
+```geoff
 (ROOT)-[:Company]->(Company)
 (ROOT)-[:Person]->(Person)
 (Amazon) {"_classname":"Company"}
@@ -154,7 +160,7 @@ Geoff(Company, Person) do
 end
 ```
 
-```
+```geoff
 (ROOT)-[:Company]->(Company)
 (ROOT)-[:Person]->(Person)
 (Amazon) {"_classname":"Company"}
@@ -171,10 +177,10 @@ end
 #Using the outer scope
 ```ruby
 @hours = SomeFancyAttributeParser.parse <<-EOF
-Monday   09:00-15:00
-Tuesday  13:00-19:00
-Saturday 09:00-16:00
-Sunday   closed
+  Monday   09:00-15:00
+  Tuesday  13:00-19:00
+  Saturday 09:00-16:00
+  Sunday   closed
 EOF
 
 Geoff(Company, target: self) do

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/coderay

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'coderay')

data/bin/erubis

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'erubis')

data/bin/htmldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'htmldiff')

data/bin/ldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'ldiff')

data/bin/neo4j-jars

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'neo4j-jars' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'neo4j-jars')

data/bin/neo4j-shell

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'neo4j-shell' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'neo4j-shell')

data/bin/neo4j-upgrade

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'neo4j-upgrade' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'neo4j-upgrade')

data/bin/pry

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('pry', 'pry')

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'rackup')

data/bin/rails

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rails' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'rails')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'rake')

data/bin/rake2thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake2thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'rake2thor')

data/bin/rdebug

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rdebug' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('ruby-debug', 'rdebug')

data/bin/ri

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'ri')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'thor')

data/bin/tilt

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tilt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('geoff', 'tilt')

data/geoff.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "geoff"
   gem.require_paths = ["lib"]

data/lib/geoff/children_dsl.rb

@@ -1,3 +1,4 @@
+require 'geoff'
 require 'geoff/node_dsl'
 require 'geoff/container'
 require 'geoff/dsl_exception_handling'
@@ -6,8 +7,11 @@ require 'active_support/core_ext/string'
 class ChildrenDsl
   include DslExceptionHandling
 
+  attr_reader :node_dsls
+  attr_writer :parent_node_dsl
+
   def initialize options, &block
-    @parent_node_name = options[:parent_node_name]
+    @parent_node_dsl  = options[:parent_node_dsl]
     @parent_rel_type  = options[:type]
     @target           = options[:target]
     @outer_geoff      = options[:geoff]
@@ -20,6 +24,23 @@ class ChildrenDsl
     eval_with_exceptions(&block)
   end
 
+  # Node dsls of children dsl defined inside other children dsl
+  # are merged into outer children dsl.
+  def children &block
+    options = {
+      parent_node_dsl: @parent_node_dsl,
+      parent_rel_type: @type,
+      target:          @target,
+      outer_geoff:     @geoff,
+      container:       @container
+    }
+
+    children_dsl = ChildrenDsl.new(options, &block) if block_given?
+    @node_dsls.merge children_dsl.node_dsls
+
+    children_dsl
+  end
+
   def to_geoff
     "#{@outer_geoff}\n#{geoff_lines.join("\n")}".strip
   end
@@ -39,7 +60,7 @@ class ChildrenDsl
     properties = properties.dup
     type       = properties.delete :type
 
-    "(#{@parent_node_name})-[:#{type}]->(#{node_dsl.node_name})".tap do |r|
+    "(#{parent_node_name})-[:#{type}]->(#{node_dsl.node_name})".tap do |r|
       r << " #{properties.to_json}" if properties.any?
     end
   end
@@ -50,9 +71,31 @@ class ChildrenDsl
   end
 
   def add_node_dsl node_dsl, rel_properties
+    rel_properties ||= {}
+    rel_properties[:type] ||= @parent_rel_type
     @node_dsls[node_dsl] = rel_properties
   end
 
+  def clone
+    c = self.class.new(
+      parent_node_dsl: @parent_node_dsl,
+      parent_rel_type: @type,
+      target:          @target,
+      outer_geoff:     @geoff,
+      container:       @container
+    ) {}
+
+    node_dsls = {}
+    @node_dsls.each do |node_dsl, rel_properties|
+      node_dsls[node_dsl.clone] = rel_properties.dup
+    end
+
+    # sort it out, instance_variable_set is probably not the best way to clone object
+    c.instance_variable_set('@node_dsls', node_dsls)
+
+    c
+  end
+
   private
 
   # e.g.
@@ -101,6 +144,10 @@ class ChildrenDsl
   end
 
   def top_level_node?
-    @parent_node_name == "ROOT"
+    @parent_node_dsl.nil?
+  end
+
+  def parent_node_name
+    top_level_node? ? 'ROOT' : @parent_node_dsl.node_name
   end
 end

data/lib/geoff/container.rb

@@ -1,21 +1,61 @@
 class Container
-  def initialize validator=nil
-    @node_dsls = {}
-    @validator = validator || ->(_, _){}
+  attr_reader :node_dsls, :children_dsls
+
+  def initialize dsls = {}
+    @node_dsls     = dsls[:node_dsls    ] || {}
+    @children_dsls = dsls[:children_dsls] || {}
+  end
+
+  def merge other
+    @node_dsls    .merge! other.node_dsls
+    @children_dsls.merge! other.children_dsls
   end
 
   def method_missing m, *args, &blk
     if m.to_s.last == "=" # assignment
-      @node_dsls[m.to_s[0..-2]] = args.first
+      node_or_children_dsl = args.first
+
+      # We should only have one dsls hash storing both node dsls and children
+      # dsls and methods handle_node_dsl and handle_children_dsl should be
+      # moved to corresponding classes.
+      if node_or_children_dsl.is_a? NodeDsl
+        @node_dsls[m.to_s[0..-2].to_sym] = args.first
+      else
+        @children_dsls[m.to_s[0..-2].to_sym] = args.first
+      end
+
+    elsif @node_dsls.has_key?(m)
+      handle_node_dsl m, *args
+
+    elsif @children_dsls.has_key?(m)
+      handle_children_dsl m, *args
+
     else
-      node_dsl = @node_dsls[m.to_s]
-      rel_properties = args.first
-      @recipient.add_node_dsl node_dsl, rel_properties
-      node_dsl
+      raise Geoff::ContainerLabelMissing, "Container has no key #{m}"
     end
   end
 
   def set_recipient_of_node_dsl children_dsl
     @recipient = children_dsl
   end
+
+  private
+
+  def handle_node_dsl m, *args
+    node_dsl = @node_dsls[m]
+    rel_properties = args.first
+    @recipient.add_node_dsl node_dsl, rel_properties
+    node_dsl
+  end
+
+  def handle_children_dsl m, *args
+    children_dsl = @children_dsls[m]
+    rel_properties_override = args.first || {}
+
+    children_dsl.node_dsls.each do |node_dsl, rel_properties|
+      @recipient.add_node_dsl node_dsl.clone, rel_properties.merge(rel_properties_override)
+    end
+
+    children_dsl
+  end
 end

data/lib/geoff/importer.rb

@@ -2,7 +2,7 @@ require 'java'
 require 'fileutils'
 Dir["lib/jars/*"].each {|file| require file }
 
-module Geoff
+class Geoff
   class Error                  < StandardError ; end
   class MissingIndexedProperty < Geoff::Error  ; end
   class InvalidRules           < Geoff::Error  ; end