codemodels-ruby 0.1.5-java → 0.1.6-java

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 (27) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +2 -1
  3. data/codemodels-ruby.gemspec +7 -8
  4. data/lib/codemodels/ruby/info_extraction.rb +1 -1
  5. data/lib/codemodels/ruby/language.rb +1 -1
  6. data/lib/codemodels/ruby/metamodel.rb +3 -3
  7. data/lib/codemodels/ruby/model_building.rb +1 -1
  8. data/lib/codemodels/ruby/parser.rb +9 -2
  9. data/lib/codemodels/ruby/version.rb +6 -0
  10. data/test/helper.rb +2 -2
  11. data/test/test_assignments.rb +1 -1
  12. data/test/test_blocks.rb +1 -1
  13. data/test/test_constants.rb +1 -1
  14. data/test/test_exception_handling.rb +1 -1
  15. data/test/test_info.rb +1 -1
  16. data/test/test_logic.rb +1 -1
  17. data/test/test_metamodel.rb +1 -1
  18. data/test/test_modules_and_classes.rb +1 -1
  19. data/test/test_not_variable_assignements.rb +1 -1
  20. data/test/test_operations.rb +2 -2
  21. data/test/test_parsing_complex.rb +2 -2
  22. data/test/test_parsing_literals.rb +1 -1
  23. data/test/test_statements.rb +1 -1
  24. data/test/test_terms_extraction.rb +3 -3
  25. data/test/test_values_extraction.rb +3 -3
  26. data/test/test_variables.rb +1 -1
  27. metadata +10 -59
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 18f53af5f3ea7268d3c47c22f220b6747128d861
4
+ data.tar.gz: c8cfd69bd52d57c9a7536f1ce768c3aad1b52f05
5
+ SHA512:
6
+ metadata.gz: 573a0eae098caba1aaae4f0625af2d2c05419876405270f78d2a2c10b94176750b99ff7af82a409c015386b3d9c9cfbf3e2aa2b673a3519c02da045628ab0169
7
+ data.tar.gz: f06cbb15dcc57ea69060c785bab388bb865d8ada20888f6df3b4370e0901129cf74115bfa484bcd6b7ad7f7dbedf4b2f94fcd44a2c49865d962398947faf9df8
data/.gitignore CHANGED
@@ -1,3 +1,4 @@
1
1
  Gemfile.lock
2
+ .bundle
2
3
  pkg
3
- coverage
4
+ coverage
data/codemodels-ruby.gemspec CHANGED
@@ -1,17 +1,18 @@
1
1
  # coding: utf-8
2
2
  lib = File.expand_path('../lib', __FILE__)
3
3
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
+ require 'codemodels/ruby/version'
4
5
 
5
6
  Gem::Specification.new do |s|
6
7
  s.platform = 'java'
7
8
  s.name = 'codemodels-ruby'
8
- s.version = '0.1.5'
9
- s.date = '2013-09-03'
9
+ s.version = CodeModels::Ruby::VERSION
10
+ s.date = '2013-12-31'
10
11
  s.summary = "Plugin of codemodels to build models from Ruby code."
11
12
  s.description = "Plugin of codemodels to build models from Ruby code. See http://github.com/ftomassetti/codemodels."
12
13
  s.authors = ["Federico Tomassetti"]
13
14
  s.email = 'f.tomassetti@gmail.com'
14
- s.homepage = 'http://federico-tomassetti.it'
15
+ s.homepage = 'https://github.com/ftomassetti/codemodels-ruby'
15
16
  s.license = "APACHE 2"
16
17
 
17
18
  s.files = `git ls-files`.split($/)
@@ -20,14 +21,12 @@ Gem::Specification.new do |s|
20
21
  s.require_paths = ["lib"]
21
22
 
22
23
  s.add_dependency('json')
23
- s.add_dependency('emf_jruby')
24
- s.add_dependency('jruby-parser', '=0.5.0')
24
+ s.add_dependency('jruby-parser', '=0.5.1')
25
25
  s.add_dependency('codemodels')
26
26
  s.add_dependency('codemodels-java')
27
- s.add_dependency('rgen')
28
27
 
29
- s.add_development_dependency "bundler", "~> 1.3"
28
+ s.add_development_dependency "bundler"
30
29
  s.add_development_dependency "rake"
31
30
  s.add_development_dependency "rubygems-tasks"
32
31
  s.add_development_dependency "simplecov"
33
- end
32
+ end
data/lib/codemodels/ruby/info_extraction.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'codemodels-java'
1
+ require 'codemodels/java'
2
2
 
3
3
  module CodeModels
4
4
  module Ruby
data/lib/codemodels/ruby/language.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'CodeModels'
1
+ require 'codemodels'
2
2
 
3
3
  module CodeModels
4
4
  module Ruby
data/lib/codemodels/ruby/metamodel.rb CHANGED
@@ -1,10 +1,10 @@
1
- require 'rgen/metamodel_builder'
1
+ require 'codemodels'
2
2
 
3
3
  module CodeModels
4
4
 
5
5
  module Ruby
6
6
 
7
- class RubyNode < RGen::MetamodelBuilder::MMBase
7
+ class RubyNode < CodeModelsAstNode
8
8
  end
9
9
 
10
10
  class Value < RubyNode
@@ -450,7 +450,7 @@ module Ruby
450
450
  end
451
451
 
452
452
  class MultipleAssignment < Value
453
- contains_many_uni 'assignments',VarAssignment
453
+ contains_many_uni 'assignments',Assignment
454
454
  contains_many_uni 'values',Value
455
455
  end
456
456
 
data/lib/codemodels/ruby/model_building.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'CodeModels'
1
+ require 'codemodels'
2
2
 
3
3
  module CodeModels
4
4
 
data/lib/codemodels/ruby/parser.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'jruby-parser'
2
- require 'emf_jruby'
2
+ require 'codemodels'
3
3
  require 'codemodels/ruby/metamodel'
4
4
 
5
5
  java_import org.jrubyparser.ast.Node
@@ -374,7 +374,14 @@ def self.node_to_model(node,parent_model=nil)
374
374
  model = Ruby::MultipleAssignment.new
375
375
  if node.pre
376
376
  for i in 0..(node.pre.count-1)
377
- model.addAssignments( node_to_model(node.pre.get(i)) )
377
+ begin
378
+ child = node.pre.get(i)
379
+ rescue
380
+ # sometimes it is not accessible... DON'T ASK!
381
+ # maybe I should use childNodes instead of get...
382
+ child = nil
383
+ end
384
+ model.addAssignments( node_to_model(child) ) if child
378
385
  end
379
386
  end
380
387
  values_model = node_to_model(node.value)
data/lib/codemodels/ruby/version.rb ADDED
@@ -0,0 +1,6 @@
1
+ # encoding: UTF-8
2
+ module CodeModels
3
+ module Ruby
4
+ VERSION = "0.1.6"
5
+ end
6
+ end
data/test/helper.rb CHANGED
@@ -4,11 +4,11 @@ SimpleCov.start do
4
4
  end
5
5
 
6
6
  require 'test/unit'
7
- require 'ruby-lightmodels'
7
+ require 'codemodels/ruby'
8
8
 
9
9
  module TestHelper
10
10
 
11
- include LightModels
11
+ include CodeModels
12
12
 
13
13
  def assert_is_int(node,value)
14
14
  assert node.is_a? Ruby::IntLiteral
data/test/test_assignments.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestAssignments < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_op_assignement
9
9
  r = Ruby.parse("a.el ||= 2")
data/test/test_blocks.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestBlocks < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_passing_block_do
9
9
  root = Ruby.parse("[].select do |x|\nx\nend")
data/test/test_constants.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestConstants < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_const_decl
9
9
  root = Ruby.parse("MODULE_NAME = 'test'")
data/test/test_exception_handling.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestExceptionHandling < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_rescue_empty
9
9
  root = Ruby.parse('begin;rescue;end')
data/test/test_info.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestInfoExtraction < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_id_to_words_empty
9
9
  assert_equal [''],Ruby::InfoExtraction.id_to_words('')
data/test/test_logic.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestLogic < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_and_symbol
9
9
  root = Ruby.parse('1 && 2')
data/test/test_metamodel.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestOperations < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_constant_top_container_single
9
9
  a = Ruby.constant('a')
data/test/test_modules_and_classes.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestOperations < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_class_decl_ext_class_in_module
9
9
  root = Ruby.parse("class TestOperations < Test::Unit::TestCase\nend")
data/test/test_not_variable_assignements.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestNotVariableAssignment < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_element_assignment
9
9
  root = Ruby.parse('models[1] = 2')
data/test/test_operations.rb CHANGED
@@ -3,8 +3,8 @@ require 'helper'
3
3
  class TestOperations < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
7
- include LightModels::Ruby
6
+ include CodeModels
7
+ include CodeModels::Ruby
8
8
 
9
9
  def test_sum
10
10
  root = Ruby.parse('3+40')
data/test/test_parsing_complex.rb CHANGED
@@ -3,8 +3,8 @@ require 'helper'
3
3
  class TestOperations < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
7
- include LightModels::Ruby
6
+ include CodeModels
7
+ include CodeModels::Ruby
8
8
 
9
9
  def test_load_complex_file
10
10
 
data/test/test_parsing_literals.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestOperations < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_symbol
9
9
  root = Ruby.parse(':a')
data/test/test_statements.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestOperations < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_alias
9
9
  root = Ruby.parse("alias pippo display")
data/test/test_terms_extraction.rb CHANGED
@@ -2,8 +2,8 @@ require 'helper'
2
2
 
3
3
  class TestTermsExtraction < Test::Unit::TestCase
4
4
 
5
- include LightModels
6
- include LightModels::Ruby
5
+ include CodeModels
6
+ include CodeModels::Ruby
7
7
  include TestHelper
8
8
 
9
9
  def setup
@@ -54,7 +54,7 @@ class TestTermsExtraction < Test::Unit::TestCase
54
54
  def test_info_extraction_statusTest_method_1
55
55
  m = @statusTest_model_node.contents[1].contents[1]
56
56
  assert_node m,Def,{name: 'test_state_conditional'}
57
- #puts "#{LightModels::Serialization.jsonize_obj(m)}"
57
+ #puts "#{CodeModels::Serialization.jsonize_obj(m)}"
58
58
  assert_map_equal(
59
59
  {'test'=>1,'state_conditional'=>1,
60
60
  'assert'=>5,'result'=>5,
data/test/test_values_extraction.rb CHANGED
@@ -2,8 +2,8 @@ require 'helper'
2
2
 
3
3
  class TestValuesExtraction < Test::Unit::TestCase
4
4
 
5
- include LightModels
6
- include LightModels::Ruby
5
+ include CodeModels
6
+ include CodeModels::Ruby
7
7
  include TestHelper
8
8
 
9
9
  def setup
@@ -74,7 +74,7 @@ class TestValuesExtraction < Test::Unit::TestCase
74
74
  def comments_sorting; self[:comments_sorting] end
75
75
  }
76
76
  m = Ruby.parse_code(code)
77
- #puts "Ser: #{JSON.pretty_generate(LightModels::Serialization.jsonize_obj(m))}"
77
+ #puts "Ser: #{JSON.pretty_generate(CodeModels::Serialization.jsonize_obj(m))}"
78
78
  assert_node m,Def,{name: 'comments_sorting'}
79
79
  assert_map_equal(
80
80
  {
data/test/test_variables.rb CHANGED
@@ -3,7 +3,7 @@ require 'helper'
3
3
  class TestVariables < Test::Unit::TestCase
4
4
 
5
5
  include TestHelper
6
- include LightModels
6
+ include CodeModels
7
7
 
8
8
  def test_inst_var_access
9
9
  root = Ruby.parse('@v')
metadata CHANGED
@@ -1,15 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: codemodels-ruby
3
3
  version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 0.1.5
4
+ version: 0.1.6
6
5
  platform: java
7
6
  authors:
8
7
  - Federico Tomassetti
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-09-03 00:00:00.000000000 Z
11
+ date: 2013-12-31 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: json
@@ -18,29 +17,11 @@ dependencies:
18
17
  - - '>='
19
18
  - !ruby/object:Gem::Version
20
19
  version: '0'
21
- none: false
22
20
  requirement: !ruby/object:Gem::Requirement
23
21
  requirements:
24
22
  - - '>='
25
23
  - !ruby/object:Gem::Version
26
24
  version: '0'
27
- none: false
28
- prerelease: false
29
- type: :runtime
30
- - !ruby/object:Gem::Dependency
31
- name: emf_jruby
32
- version_requirements: !ruby/object:Gem::Requirement
33
- requirements:
34
- - - '>='
35
- - !ruby/object:Gem::Version
36
- version: '0'
37
- none: false
38
- requirement: !ruby/object:Gem::Requirement
39
- requirements:
40
- - - '>='
41
- - !ruby/object:Gem::Version
42
- version: '0'
43
- none: false
44
25
  prerelease: false
45
26
  type: :runtime
46
27
  - !ruby/object:Gem::Dependency
@@ -49,14 +30,12 @@ dependencies:
49
30
  requirements:
50
31
  - - '='
51
32
  - !ruby/object:Gem::Version
52
- version: 0.5.0
53
- none: false
33
+ version: 0.5.1
54
34
  requirement: !ruby/object:Gem::Requirement
55
35
  requirements:
56
36
  - - '='
57
37
  - !ruby/object:Gem::Version
58
- version: 0.5.0
59
- none: false
38
+ version: 0.5.1
60
39
  prerelease: false
61
40
  type: :runtime
62
41
  - !ruby/object:Gem::Dependency
@@ -66,13 +45,11 @@ dependencies:
66
45
  - - '>='
67
46
  - !ruby/object:Gem::Version
68
47
  version: '0'
69
- none: false
70
48
  requirement: !ruby/object:Gem::Requirement
71
49
  requirements:
72
50
  - - '>='
73
51
  - !ruby/object:Gem::Version
74
52
  version: '0'
75
- none: false
76
53
  prerelease: false
77
54
  type: :runtime
78
55
  - !ruby/object:Gem::Dependency
@@ -82,45 +59,25 @@ dependencies:
82
59
  - - '>='
83
60
  - !ruby/object:Gem::Version
84
61
  version: '0'
85
- none: false
86
62
  requirement: !ruby/object:Gem::Requirement
87
63
  requirements:
88
64
  - - '>='
89
65
  - !ruby/object:Gem::Version
90
66
  version: '0'
91
- none: false
92
67
  prerelease: false
93
68
  type: :runtime
94
69
  - !ruby/object:Gem::Dependency
95
- name: rgen
70
+ name: bundler
96
71
  version_requirements: !ruby/object:Gem::Requirement
97
72
  requirements:
98
73
  - - '>='
99
74
  - !ruby/object:Gem::Version
100
75
  version: '0'
101
- none: false
102
76
  requirement: !ruby/object:Gem::Requirement
103
77
  requirements:
104
78
  - - '>='
105
79
  - !ruby/object:Gem::Version
106
80
  version: '0'
107
- none: false
108
- prerelease: false
109
- type: :runtime
110
- - !ruby/object:Gem::Dependency
111
- name: bundler
112
- version_requirements: !ruby/object:Gem::Requirement
113
- requirements:
114
- - - ~>
115
- - !ruby/object:Gem::Version
116
- version: '1.3'
117
- none: false
118
- requirement: !ruby/object:Gem::Requirement
119
- requirements:
120
- - - ~>
121
- - !ruby/object:Gem::Version
122
- version: '1.3'
123
- none: false
124
81
  prerelease: false
125
82
  type: :development
126
83
  - !ruby/object:Gem::Dependency
@@ -130,13 +87,11 @@ dependencies:
130
87
  - - '>='
131
88
  - !ruby/object:Gem::Version
132
89
  version: '0'
133
- none: false
134
90
  requirement: !ruby/object:Gem::Requirement
135
91
  requirements:
136
92
  - - '>='
137
93
  - !ruby/object:Gem::Version
138
94
  version: '0'
139
- none: false
140
95
  prerelease: false
141
96
  type: :development
142
97
  - !ruby/object:Gem::Dependency
@@ -146,13 +101,11 @@ dependencies:
146
101
  - - '>='
147
102
  - !ruby/object:Gem::Version
148
103
  version: '0'
149
- none: false
150
104
  requirement: !ruby/object:Gem::Requirement
151
105
  requirements:
152
106
  - - '>='
153
107
  - !ruby/object:Gem::Version
154
108
  version: '0'
155
- none: false
156
109
  prerelease: false
157
110
  type: :development
158
111
  - !ruby/object:Gem::Dependency
@@ -162,13 +115,11 @@ dependencies:
162
115
  - - '>='
163
116
  - !ruby/object:Gem::Version
164
117
  version: '0'
165
- none: false
166
118
  requirement: !ruby/object:Gem::Requirement
167
119
  requirements:
168
120
  - - '>='
169
121
  - !ruby/object:Gem::Version
170
122
  version: '0'
171
- none: false
172
123
  prerelease: false
173
124
  type: :development
174
125
  description: Plugin of codemodels to build models from Ruby code. See http://github.com/ftomassetti/codemodels.
@@ -190,6 +141,7 @@ files:
190
141
  - lib/codemodels/ruby/model_building.rb
191
142
  - lib/codemodels/ruby/parser.rb
192
143
  - lib/codemodels/ruby/query.rb
144
+ - lib/codemodels/ruby/version.rb
193
145
  - lib/jars/com.google.collect_1.0.0.v201105210816.jar
194
146
  - lib/jars/com.google.inject_2.0.0.v201105231817.jar
195
147
  - lib/jars/com.ibm.icu_4.4.2.v20110208.jar
@@ -221,9 +173,10 @@ files:
221
173
  - test/test_terms_extraction.rb
222
174
  - test/test_values_extraction.rb
223
175
  - test/test_variables.rb
224
- homepage: http://federico-tomassetti.it
176
+ homepage: https://github.com/ftomassetti/codemodels-ruby
225
177
  licenses:
226
178
  - APACHE 2
179
+ metadata: {}
227
180
  post_install_message:
228
181
  rdoc_options: []
229
182
  require_paths:
@@ -233,18 +186,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
233
186
  - - '>='
234
187
  - !ruby/object:Gem::Version
235
188
  version: '0'
236
- none: false
237
189
  required_rubygems_version: !ruby/object:Gem::Requirement
238
190
  requirements:
239
191
  - - '>='
240
192
  - !ruby/object:Gem::Version
241
193
  version: '0'
242
- none: false
243
194
  requirements: []
244
195
  rubyforge_project:
245
- rubygems_version: 1.8.24
196
+ rubygems_version: 2.2.0
246
197
  signing_key:
247
- specification_version: 3
198
+ specification_version: 4
248
199
  summary: Plugin of codemodels to build models from Ruby code.
249
200
  test_files:
250
201
  - test/data/012_add_comments_permissions.rb