codemodels-java 0.2.0-java → 0.2.1-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b06ac029279927c74e5175f4f4b668a5fdb8134a
+  data.tar.gz: 0bab5abbae5b8f7a930485abbcd98f780a66fd7a
+SHA512:
+  metadata.gz: f2d88bbe3cdf97388ce6fff2cb470a56f8b76ec1027e2a5218888b2bb92e1f826882d16a7766adf7cf34b2b9fcc4bb3e22ff96af442eb15445557df1f594afae
+  data.tar.gz: 4574567f38bdd8d620e7802b16eb5239bd2f13224d031d5c3df008038c3454bd86a4ade0c7a6ba3a4f50ac24d5c6e5a951051fdb4607c897b0c1eca7ca4202a0

data/codemodels-java.gemspec

@@ -1,7 +1,12 @@
+# encoding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'codemodels/java/version'
+
 Gem::Specification.new do |s|
   s.platform    = 'java'
   s.name        = 'codemodels-java'
-  s.version     = '0.2.0'
+  s.version     = CodeModels::Java::VERSION
   s.date        = '2013-09-11'
   s.summary     = "Plugin of codemodels to build models from Ruby code."
   s.description = "Plugin of codemodels to build models from Ruby code. See http://github.com/ftomassetti/codemodels."
@@ -15,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"] + Dir['./lib/jars/*.jar']
 
   s.add_runtime_dependency 'codemodels'
+  s.add_runtime_dependency 'codemodels-javaparserwrapper'
   s.add_runtime_dependency 'json'
 
   s.add_development_dependency "bundler", "~> 1.3"

data/lib/codemodels/java/metamodel.rb

@@ -1,11 +1,12 @@
 require 'rgen/metamodel_builder'
 require 'java'
 require 'codemodels'
+require 'codemodels/javaparserwrapper'
 
 module CodeModels
 module Java
 
-	class JavaNode < RGen::MetamodelBuilder::MMBase
+	class JavaNode < CodeModelsAstNode
 	end
 
 	JavaString  = ::Java::JavaClass.for_name("java.lang.String")
@@ -34,7 +35,7 @@ module Java
 			c = Class.new(super_class)
 			raise "Already mapped! #{ast_name}" if MappedAstClasses[java_class]
 			MappedAstClasses[java_class] = c
-			Java.const_set simple_java_class_name(ast_class), c
+			Java.const_set CodeModels::Javaparserwrapper::Utils.simple_java_class_name(ast_class), c
 		end
 
 		# then add all the properties and attributes
@@ -81,25 +82,6 @@ module Java
 		end
 	end
 
-	def self.get_corresponding_metaclass(node)
-		node_class = node.class
-		name = simple_java_class_name(node_class)
-		name = "#{(node.operator.name).proper_capitalize}BinaryExpr" if name=='BinaryExpr'
-		#puts "node.class: #{node.class}"
-		if node.class.to_s=='Java::JapaParserAstBody::MethodDeclaration'
-			if node.parent.class.to_s=='Java::JapaParserAstExpr::ObjectCreationExpr'
-				# ObjectCreationExpr has not interface? but it is always a method definition
-				name = 'ClassMethodDeclaration'
-			elsif node.parent.class.to_s=='Java::JapaParserAstBody::EnumDeclaration'
-				name = 'ClassMethodDeclaration' 
-			elsif node.parent.interface?				
-				name = 'InterfaceMethodDeclaration'
-			else
-				name = 'ClassMethodDeclaration'
-			end
-		end
-		return Java.const_get(name)
-	end
 
 	PROP_ADAPTERS = Hash.new {|h,k| h[k] = {} }
 
@@ -110,12 +92,6 @@ module Java
 		return java_method.name.remove_prefix('is').proper_uncapitalize if java_method.name.start_with?('is')
 	end
 
-	def self.simple_java_class_name(java_class)
-		name = java_class.name
-    	if (i = (r = name).rindex(':')) then r[0..i] = '' end
-    	r
-  	end
-
   	def self.get_generic_param(generic_str)
   		return generic_str.remove_prefix('public java.util.List<') if generic_str.start_with?('public java.util.List<')
   		return generic_str.remove_prefix('public final java.util.List<') if generic_str.start_with?('public final java.util.List<')

data/lib/codemodels/java/parser.rb

@@ -1,82 +1,121 @@
 require 'codemodels'
+require 'codemodels/javaparserwrapper'
 
 module CodeModels
 module Java
 
-class << self
-	include ParserWrapper
-end
+class Parser < CodeModels::Javaparserwrapper::ParserJavaWrapper
+
+	class MyBasicTransformationFactory < CodeModels::Javaparserwrapper::BasicTransformationFactory
+
+		def get_corresponding_class(node)
+			node_class = node.class
+			name = CodeModels::Javaparserwrapper::Utils.simple_java_class_name(node_class)
+			name = "#{(node.operator.name).proper_capitalize}BinaryExpr" if name=='BinaryExpr'
+			if node.class.to_s=='Java::JapaParserAstBody::MethodDeclaration'
+				if node.parent.class.to_s=='Java::JapaParserAstExpr::ObjectCreationExpr'
+					name = 'ClassMethodDeclaration'
+				elsif node.parent.class.to_s=='Java::JapaParserAstBody::EnumDeclaration'
+					name = 'ClassMethodDeclaration' 
+				elsif node.parent.interface?				
+					name = 'InterfaceMethodDeclaration'
+				else
+					name = 'ClassMethodDeclaration'
+				end
+			end
+			return Java.const_get(name)			
+		end
+
+	end
 
-java_import 'japa.parser.JavaParser'
-java_import 'java.io.FileInputStream'
-java_import 'java.io.ByteArrayInputStream'
+	java_import 'japa.parser.JavaParser'
+	java_import 'java.io.FileInputStream'
+	java_import 'java.io.ByteArrayInputStream'
 
-def self.containment_pos(node)
-	container = node.eContainer
-	children  = node.eContainer.send(node.eContainingFeature)
-	if children.respond_to?(:each)
-		children.each_with_index do |c,i|
-			return i if c==node
-		end
-		raise "Not found"
-	else
-		raise "Not found" unless children==node
-		0
+	def initialize()
+		super
+		@transformer.factory = MyBasicTransformationFactory.new
+		@transformer.factory.target_module = CodeModels::Java
 	end
-end
 
-# node tree contains the original 
-def self.corresponding_node(model_element,node_tree)
-	return node_tree unless model_element.eContainer
-	corresponding_parent_node = corresponding_node(model_element.eContainer,node_tree)
-	containment_pos = containment_pos(model_element)
-	containing_feat = model_element.eContainingFeature
-
-	children = corresponding_parent_node.send(containing_feat)
-	if children.respond_to?(:each)
-		children[containment_pos]
-	else
-		children
+	def containment_pos(node)
+		container = node.eContainer
+		children  = node.eContainer.send(node.eContainingFeature)
+		if children.respond_to?(:each)
+			children.each_with_index do |c,i|
+				return i if c==node
+			end
+			raise "Not found"
+		else
+			raise "Not found" unless children==node
+			0
+		end
 	end
-end
 
-def self.node_tree_from_code(code)
-	sis = ByteArrayInputStream.new(code.to_java_bytes)
-	node_tree = JavaParser.parse(sis)
-	sis.close
-	node_tree
-end
+	# node tree contains the original 
+	def corresponding_node(model_element,node_tree)
+		return node_tree unless model_element.eContainer
+		corresponding_parent_node = corresponding_node(model_element.eContainer,node_tree)
+		containment_pos = containment_pos(model_element)
+		containing_feat = model_element.eContainingFeature
+
+		children = corresponding_parent_node.send(containing_feat)
+		if children.respond_to?(:each)
+			children[containment_pos]
+		else
+			children
+		end
+	end
 
-def self.corresponding_node_from_code(model_element,code)
-	sis = ByteArrayInputStream.new(code.to_java_bytes)
-	node_tree = JavaParser.parse(sis)
-	sis.close
-	corresponding_node(model_element,node_tree)
-end
+	def node_tree_from_code(code)
+		sis = ByteArrayInputStream.new(code.to_java_bytes)
+		node_tree = JavaParser.parse(sis)
+		sis.close
+		node_tree
+	end
 
-def self.parse_code(code)	
-	node_to_model(node_tree_from_code(code))
-end
+	def corresponding_node_from_code(model_element,code)
+		sis = ByteArrayInputStream.new(code.to_java_bytes)
+		node_tree = JavaParser.parse(sis)
+		sis.close
+		corresponding_node(model_element,node_tree)
+	end
 
-class Parser < CodeModels::Parser
+	def parse_code(code)	
+		node_to_model(node_tree_from_code(code))
+	end
 
-	def parse_code(code)
-		CodeModels::Java.parse_code(code)
+	def get_corresponding_metaclass(node)
+		node_class = node.class
+		name = CodeModels::Javaparserwrapper::Utils.simple_java_class_name(node_class)
+		name = "#{(node.operator.name).proper_capitalize}BinaryExpr" if name=='BinaryExpr'
+		if node.class.to_s=='Java::JapaParserAstBody::MethodDeclaration'
+			if node.parent.class.to_s=='Java::JapaParserAstExpr::ObjectCreationExpr'
+				name = 'ClassMethodDeclaration'
+			elsif node.parent.class.to_s=='Java::JapaParserAstBody::EnumDeclaration'
+				name = 'ClassMethodDeclaration' 
+			elsif node.parent.interface?				
+				name = 'InterfaceMethodDeclaration'
+			else
+				name = 'ClassMethodDeclaration'
+			end
+		end
+		return Java.const_get(name)
 	end
 
-end
+private
 
-DefaultParser = Parser.new
+	def adapter_specific_class(model_class,ref)
+		return nil unless CodeModels::Java::PROP_ADAPTERS[model_class]
+		CodeModels::Java::PROP_ADAPTERS[model_class][ref.name]
+	end
 
-def self.parse_file(path)	
-	DefaultParser.parse_file(path)
 end
 
-private
+DefaultParser = Parser.new
 
-def self.adapter_specific_class(model_class,ref)
-	return nil unless CodeModels::Java::PROP_ADAPTERS[model_class]
-	CodeModels::Java::PROP_ADAPTERS[model_class][ref.name]
+def self.parse_code(code)
+	DefaultParser.parse_code(code)
 end
 
 end

data/test/test_correspondences.rb

@@ -10,22 +10,22 @@ class TestCorrespondences < Test::Unit::TestCase
 
   def test_correspondance_of_field
     code = "class A extends B { int fieldB; int getB(){ return fieldB; } }"
-    nt = J.node_tree_from_code(code)
+    nt = J::DefaultParser.node_tree_from_code(code)
     mt = J.parse_code(code)
     model_field = mt.types[0].members[0]
     node_field  = nt.types[0].members[0]
-    assert_equal node_field, J.corresponding_node(model_field,nt)
-    assert_equal "int fieldB;", J.corresponding_node(model_field,nt).to_s 
+    assert_equal node_field, J::DefaultParser.corresponding_node(model_field,nt)
+    assert_equal "int fieldB;", J::DefaultParser.corresponding_node(model_field,nt).to_s 
   end
 
   def test_corresponding_node_from_code
     code = "class A extends B { int fieldB; int getB(){ return fieldB; } }"
-    nt = J.node_tree_from_code(code)
+    nt = J::DefaultParser.node_tree_from_code(code)
     mt = J.parse_code(code)
     model_field = mt.types[0].members[0]
     node_field  = nt.types[0].members[0]
-    assert_equal node_field, J.corresponding_node_from_code(model_field,code)
-    assert_equal "int fieldB;", J.corresponding_node_from_code(model_field,code).to_s
+    assert_equal node_field, J::DefaultParser.corresponding_node_from_code(model_field,code)
+    assert_equal "int fieldB;", J::DefaultParser.corresponding_node_from_code(model_field,code).to_s
   end
 
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codemodels-java
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.2.0
+  version: 0.2.1
 platform: java
 authors:
 - Federico Tomassetti
@@ -18,13 +17,25 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: codemodels-javaparserwrapper
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -34,13 +45,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -50,13 +59,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -66,13 +73,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -82,13 +87,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -98,13 +101,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 description: Plugin of codemodels to build models from Ruby code. See http://github.com/ftomassetti/codemodels.
@@ -143,6 +144,7 @@ files:
 homepage: https://github.com/ftomassetti/java-lightmodels
 licenses:
 - APACHE2
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -152,25 +154,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Plugin of codemodels to build models from Ruby code.
 test_files:
 - test/data/ActionButtonsColumnTag.java