geoff 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. data/Gemfile.lock +5 -1
  2. data/bin/coderay +1 -1
  3. data/bin/erubis +1 -1
  4. data/bin/htmldiff +1 -1
  5. data/bin/ldiff +1 -1
  6. data/bin/neo4j-jars +1 -1
  7. data/bin/neo4j-shell +1 -1
  8. data/bin/neo4j-upgrade +1 -1
  9. data/bin/rackup +1 -1
  10. data/bin/rails +1 -1
  11. data/bin/rake +1 -1
  12. data/bin/rake2thor +1 -1
  13. data/bin/ri +1 -1
  14. data/bin/thor +1 -1
  15. data/bin/tilt +1 -1
  16. data/geoff.gemspec +1 -0
  17. data/lib/geoff/container.rb +4 -1
  18. data/lib/geoff/version.rb +1 -1
  19. data/spec/integration/geoff_spec.rb +2 -2
  20. metadata +20 -4
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- geoff (0.1.0)
4
+ geoff (0.1.1)
5
5
  activesupport (~> 3.2.3)
6
6
  json
7
7
  neo4j
@@ -25,6 +25,7 @@ GEM
25
25
  activesupport (3.2.8)
26
26
  i18n (~> 0.6)
27
27
  multi_json (~> 1.0)
28
+ bouncy-castle-java (1.5.0146.1)
28
29
  builder (3.0.0)
29
30
  coderay (1.0.7)
30
31
  columnize (0.3.6)
@@ -33,6 +34,8 @@ GEM
33
34
  hike (1.2.1)
34
35
  i18n (0.6.1)
35
36
  journey (1.0.4)
37
+ jruby-openssl (0.7.7)
38
+ bouncy-castle-java (>= 1.5.0146.1)
36
39
  json (1.7.5-java)
37
40
  linecache (0.46)
38
41
  rbx-require-relative (> 0.0.4)
@@ -105,6 +108,7 @@ PLATFORMS
105
108
 
106
109
  DEPENDENCIES
107
110
  geoff!
111
+ jruby-openssl
108
112
  pry
109
113
  rspec (~> 2.11.0)
110
114
  ruby-debug
data/bin/coderay CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'coderay')
16
+ load Gem.bin_path('coderay', 'coderay')
data/bin/erubis CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'erubis')
16
+ load Gem.bin_path('erubis', 'erubis')
data/bin/htmldiff CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'htmldiff')
16
+ load Gem.bin_path('diff-lcs', 'htmldiff')
data/bin/ldiff CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'ldiff')
16
+ load Gem.bin_path('diff-lcs', 'ldiff')
data/bin/neo4j-jars CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'neo4j-jars')
16
+ load Gem.bin_path('neo4j', 'neo4j-jars')
data/bin/neo4j-shell CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'neo4j-shell')
16
+ load Gem.bin_path('neo4j', 'neo4j-shell')
data/bin/neo4j-upgrade CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'neo4j-upgrade')
16
+ load Gem.bin_path('neo4j', 'neo4j-upgrade')
data/bin/rackup CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'rackup')
16
+ load Gem.bin_path('rack', 'rackup')
data/bin/rails CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'rails')
16
+ load Gem.bin_path('railties', 'rails')
data/bin/rake CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'rake')
16
+ load Gem.bin_path('rake', 'rake')
data/bin/rake2thor CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'rake2thor')
16
+ load Gem.bin_path('thor', 'rake2thor')
data/bin/ri CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'ri')
16
+ load Gem.bin_path('rdoc', 'ri')
data/bin/thor CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'thor')
16
+ load Gem.bin_path('thor', 'thor')
data/bin/tilt CHANGED
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
13
13
  require 'rubygems'
14
14
  require 'bundler/setup'
15
15
 
16
- load Gem.bin_path('geoff', 'tilt')
16
+ load Gem.bin_path('tilt', 'tilt')
data/geoff.gemspec CHANGED
@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
21
21
 
22
22
  if RUBY_PLATFORM=="java"
23
23
  gem.add_dependency 'neo4j'
24
+ gem.add_development_dependency 'jruby-openssl'
24
25
  end
25
26
  gem.add_dependency 'activesupport', '~> 3.2.3'
26
27
  gem.add_dependency 'json'
data/lib/geoff/container.rb CHANGED
@@ -58,8 +58,11 @@ class Container
58
58
  children_dsl = @children_dsls[m]
59
59
  rel_properties_override = args.first || {}
60
60
 
61
+ clone = rel_properties_override.delete :clone
62
+
61
63
  children_dsl.node_dsls.each do |node_dsl, rel_properties|
62
- @recipient.add_node_dsl node_dsl.clone, rel_properties.merge(rel_properties_override)
64
+ node_dsl = node_dsl.clone if clone
65
+ @recipient.add_node_dsl node_dsl, rel_properties.merge(rel_properties_override)
63
66
  end
64
67
 
65
68
  children_dsl
data/lib/geoff/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Geoff
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
data/spec/integration/geoff_spec.rb CHANGED
@@ -23,7 +23,7 @@ describe Geoff do
23
23
 
24
24
  children do
25
25
  b.small_coffee_machines type: 'uses', lease: '3 years'
26
- b.tables type: 'has'
26
+ b.tables type: 'has', clone: true
27
27
  end
28
28
  end
29
29
 
@@ -32,7 +32,7 @@ describe Geoff do
32
32
 
33
33
  children do
34
34
  b.large_coffee_machines type: 'uses', lease: '3 years'
35
- b.tables type: 'has'
35
+ b.tables type: 'has', clone: true
36
36
  table 'octagonal_table', type: 'has' do
37
37
  capacity 8
38
38
  end
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geoff
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
5
4
  prerelease:
5
+ version: 0.1.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - David Rouchy
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2012-10-04 00:00:00.000000000 Z
16
+ date: 2012-10-30 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: neo4j
@@ -31,6 +31,22 @@ dependencies:
31
31
  none: false
32
32
  prerelease: false
33
33
  type: :runtime
34
+ - !ruby/object:Gem::Dependency
35
+ name: jruby-openssl
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ! '>='
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
41
+ none: false
42
+ requirement: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
47
+ none: false
48
+ prerelease: false
49
+ type: :development
34
50
  - !ruby/object:Gem::Dependency
35
51
  name: activesupport
36
52
  version_requirements: !ruby/object:Gem::Requirement
@@ -176,8 +192,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
176
192
  - !ruby/object:Gem::Version
177
193
  segments:
178
194
  - 0
179
- version: '0'
180
195
  hash: 2
196
+ version: '0'
181
197
  none: false
182
198
  required_rubygems_version: !ruby/object:Gem::Requirement
183
199
  requirements:
@@ -185,8 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
185
201
  - !ruby/object:Gem::Version
186
202
  segments:
187
203
  - 0
188
- version: '0'
189
204
  hash: 2
205
+ version: '0'
190
206
  none: false
191
207
  requirements: []
192
208
  rubyforge_project: