java_model_jrb 0.1.1-java → 0.1.2-java

data/lib/java_model/generate.rb

@@ -1,65 +1,63 @@
-require 'java'
-require 'rubygems'
-require 'emf_jruby'
-require 'json'
-require 'zip/zipfilesystem'
-require 'java_to_json_lib'
-
-$PWD = File.dirname(__FILE__)
-
-raise "Usage: java_to_json <sources> <models>" unless ARGV.count==2
-
-sources_path = ARGV[0]
-models_path = ARGV[1]
-raise "Path to sources does not exist or it is not a dir: #{sources_path}" unless File.exist?(sources_path) and File.directory?(sources_path)
-raise "Path to models does not exist or it is not a dir: #{models_path}" unless File.exist?(models_path) and File.directory?(models_path)
-
-EObject = org.eclipse.emf.ecore.EObject
-JavaResource = org.emftext.language.java.resource.java.mopp.JavaResource
-JavaResourceUtil = org.emftext.language.java.resource.java.util.JavaResourceUtil
-EcoreUtil = org.eclipse.emf.ecore.util.EcoreUtil
-
-$SRC  = sources_path
-$DEST = models_path
-$VERBOSE = false
-
-def translate_dir(src,dest,src_extension,dest_extension,&translate_file)
-	puts "== #{src} -> #{dest} ==" if $VERBOSE
-	Dir["#{src}/*"].each do |fd|		
-		if File.directory? fd
-			basename = File.basename(fd)
-			translate_dir("#{src}/#{basename}","#{dest}/#{basename}",src_extension,dest_extension,&translate_file)
-		else
-			if File.extname(fd)==".#{src_extension}"
-				translated_simple_name = "#{File.basename(fd, ".#{src_extension}")}.#{dest_extension}"
-				translated_name = "#{dest}/#{translated_simple_name}"
-				puts "* #{fd} --> #{translated_name}" if $VERBOSE
-				translate_file.call(fd,translated_name)
-			end
-		end
-	end
-end
-
-$resource_set = create_resource_set()
-
-translate_dir($SRC,$DEST,'java','json') do |src,dest|
-	if not File.exist? dest 
-		puts "<Model from #{src}>"
-	
-		#file = java.io.File.new src
-		# java_resource = JavaResourceUtil.getResource file
-		java_resource = get_resource($resource_set, src)
-
-		raise "wrong number of roots" unless java_resource.contents.size == 1
-		root = java_resource.contents.get(0)
-
-		$nextId = 1
-		res = jsonize_java_obj(root)
-
-		dest_dir = File.dirname(dest)
-		FileUtils.mkdir_p(dest_dir) 
-		File.open(dest, 'w') do |file| 		
-			file.write(JSON.pretty_generate(res,:max_nesting => 500))
-		end
-	end
-end
+require 'emf_jruby'
+require 'json'
+require 'zip/zipfilesystem'
+require 'java_to_json_lib'
+
+$PWD = File.dirname(__FILE__)
+
+raise "Usage: java_to_json <sources> <models>" unless ARGV.count==2
+
+sources_path = ARGV[0]
+models_path = ARGV[1]
+raise "Path to sources does not exist or it is not a dir: #{sources_path}" unless File.exist?(sources_path) and File.directory?(sources_path)
+raise "Path to models does not exist or it is not a dir: #{models_path}" unless File.exist?(models_path) and File.directory?(models_path)
+
+EObject = org.eclipse.emf.ecore.EObject
+JavaResource = org.emftext.language.java.resource.java.mopp.JavaResource
+JavaResourceUtil = org.emftext.language.java.resource.java.util.JavaResourceUtil
+EcoreUtil = org.eclipse.emf.ecore.util.EcoreUtil
+
+$SRC  = sources_path
+$DEST = models_path
+$VERBOSE = false
+
+def translate_dir(src,dest,src_extension,dest_extension,&translate_file)
+	puts "== #{src} -> #{dest} ==" if $VERBOSE
+	Dir["#{src}/*"].each do |fd|		
+		if File.directory? fd
+			basename = File.basename(fd)
+			translate_dir("#{src}/#{basename}","#{dest}/#{basename}",src_extension,dest_extension,&translate_file)
+		else
+			if File.extname(fd)==".#{src_extension}"
+				translated_simple_name = "#{File.basename(fd, ".#{src_extension}")}.#{dest_extension}"
+				translated_name = "#{dest}/#{translated_simple_name}"
+				puts "* #{fd} --> #{translated_name}" if $VERBOSE
+				translate_file.call(fd,translated_name)
+			end
+		end
+	end
+end
+
+$resource_set = create_resource_set()
+
+translate_dir($SRC,$DEST,'java','json') do |src,dest|
+	if not File.exist? dest 
+		puts "<Model from #{src}>"
+	
+		#file = java.io.File.new src
+		# java_resource = JavaResourceUtil.getResource file
+		java_resource = get_resource($resource_set, src)
+
+		raise "wrong number of roots" unless java_resource.contents.size == 1
+		root = java_resource.contents.get(0)
+
+		$nextId = 1
+		res = jsonize_java_obj(root)
+
+		dest_dir = File.dirname(dest)
+		FileUtils.mkdir_p(dest_dir) 
+		File.open(dest, 'w') do |file| 		
+			file.write(JSON.pretty_generate(res,:max_nesting => 500))
+		end
+	end
+end

data/lib/java_model/java_to_json.rb

@@ -1,138 +1,145 @@
-require 'java'
-require 'rubygems'
-require 'emf_jruby'
-
-IJavaOptions = org.emftext.language.java.resource.java.IJavaOptions
-
-def create_resource_set()
-	resource_set = org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.new
-	resource_set.getLoadOptions.put(IJavaOptions.DISABLE_LAYOUT_INFORMATION_RECORDING,true)
-	rf = org.emftext.language.java.resource.java.mopp.JavaResourceFactory.new
-	resource_set.getResourceFactoryRegistry.getExtensionToFactoryMap.put('java',rf)
-	resource_set
-end
-
-def get_resource(resource_set,path)
-	resource_set.getResource(org.eclipse.emf.common.util.URI.createFileURI(path),true)
-end
-
-def eobject_class_qname(clazz)
-	raise "not implemented (ParentConcreteClassifier: #{clazz.getParentConcreteClassifier}" if clazz.getParentConcreteClassifier!=clazz
-	clazz.getContainingPackageName.join('.')+"."+clazz.name
-end
-
-def all_direct_content(root)
-	contents = []
-	root.keys.each do |k|
-		if k.start_with? 'relcont_' and root[k]
-			#puts "Considering rel #{k} = #{root[k]}"
-			if root[k].is_a? Array 
-				root[k].each do |c|
-					contents << c
-				end
-			else
-				contents << root[k]
-			end
-		end
-	end
-	contents
-end
-
-def all_deep_content(root)
-	contents = []
-	all_direct_content(root).each do |c|
-		contents << c
-		contents.concat(all_deep_content(c))
-	end
-	contents
-end
-
-def get_deep_content_of_type(root,type)
-	all_deep_content(root).select {|o| o['type']==type}
-end
-
-def get_specific_deep_content(root,type,&block)
-	get_deep_content_of_type(root,type).find &block
-end
-
-class EClassClassAdapter
-
-	def adapt(eobject,map)
-		map['attr_fullname'] = eobject_class_qname(eobject)
-	end
-
-end
-
-def getter(field)
-	getter_nb_name = 'get' + field.name.slice(0,1).capitalize + field.name.slice(1..-1)
-	getter_b_name  = 'is' + field.name.slice(0,1).capitalize + field.name.slice(1..-1)
-	methods = field.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.ClassMethod}
-	getter = methods.find {|m| m.name==getter_b_name or m.name==getter_nb_name}
-	getter
-end
-
-def setter(field)
-	setter_name = 'set' + field.name.slice(0,1).capitalize + field.name.slice(1..-1)
-	methods = field.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.ClassMethod}
-	setter = methods.find {|m| m.name==setter_name}
-	setter
-end
-
-def field_from_getter(getter)
-	if (getter.name.start_with? 'get' and getter.name.length>3) or (getter.name.start_with? 'is' and getter.name.length>2)
-		field_name = getter.name.slice(3,1).downcase + getter.name.slice(4..-1) if getter.name.start_with? 'get'
-		field_name = getter.name.slice(2,1).downcase + getter.name.slice(3..-1) if getter.name.start_with? 'is'
-		#puts "Field name for getter #{getter.name} #{field_name}"
-		fields = getter.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.Field}
-		field = fields.find {|f| f.name==field_name}
-		return field
-	else
-		return nil
-	end	
-end
-
-def field_from_setter(setter)
-	if setter.name.start_with? 'set' and setter.name.length>3
-		field_name = setter.name.slice(3,1).downcase + setter.name.slice(4..-1) if setter.name.start_with? 'set'
-		#field_name = getter.name.slice(2,1).downcase + getter.name.slice(3..-1) if getter.name.start_with? 'is'
-		#puts "Field name for getter #{getter.name} #{field_name}"
-		fields = setter.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.Field}
-		field = fields.find {|f| f.name==field_name}
-		return field
-	else
-		return nil
-	end	
-end
-
-class EClassClassMethodAdapter
-
-	def adapt(eobject,map)
-		field = field_from_getter(eobject)
-		map['attr_getter'] = field!=nil
-		map['relnoncont_getterFor'] = serialization_id(field) if field
-		map['relnoncont_getterFor'] = nil unless field
-
-		field = field_from_setter(eobject)
-		map['attr_setter'] = field!=nil
-		map['relnoncont_setterFor'] = serialization_id(field) if field
-		map['relnoncont_setterFor'] = nil unless field
-	end
-
-end
-
-class EClassFieldAdapter
-
-	def adapt(eobject,map)
-		getter = getter(eobject)
-		map['relnoncont_getter'] = serialization_id(getter) if getter
-		map['relnoncont_getter'] = nil unless getter
-	end
-
-end
-
-def jsonize_java_obj(root)
-	jsonize_obj(root,{
-		'http://www.emftext.org/java/classifiers#Class'=> EClassClassAdapter.new,
-		'http://www.emftext.org/java/members#ClassMethod'=> EClassClassMethodAdapter.new,
-		'http://www.emftext.org/java/members#Field'=> EClassFieldAdapter.new})
+require 'java'
+require 'rubygems'
+require 'emf_jruby'
+require 'lightmodels'
+
+# TODO put in modules...
+
+module JavaModel
+
+IJavaOptions = org.emftext.language.java.resource.java.IJavaOptions
+
+def self.create_resource_set()
+	resource_set = org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.new
+	resource_set.getLoadOptions.put(IJavaOptions.DISABLE_LAYOUT_INFORMATION_RECORDING,true)
+	rf = org.emftext.language.java.resource.java.mopp.JavaResourceFactory.new
+	resource_set.getResourceFactoryRegistry.getExtensionToFactoryMap.put('java',rf)
+	resource_set
+end
+
+def self.get_resource(resource_set,path)
+	resource_set.getResource(org.eclipse.emf.common.util.URI.createFileURI(path),true)
+end
+
+def self.eobject_class_qname(clazz)
+	raise "not implemented (ParentConcreteClassifier: #{clazz.getParentConcreteClassifier}" if clazz.getParentConcreteClassifier!=clazz
+	clazz.getContainingPackageName.join('.')+"."+clazz.name
+end
+
+def self.all_direct_content(root)
+	contents = []
+	root.keys.each do |k|
+		if k.start_with? 'relcont_' and root[k]
+			#puts "Considering rel #{k} = #{root[k]}"
+			if root[k].is_a? Array 
+				root[k].each do |c|
+					contents << c
+				end
+			else
+				contents << root[k]
+			end
+		end
+	end
+	contents
+end
+
+def self.all_deep_content(root)
+	contents = []
+	all_direct_content(root).each do |c|
+		contents << c
+		contents.concat(all_deep_content(c))
+	end
+	contents
+end
+
+def self.get_deep_content_of_type(root,type)
+	all_deep_content(root).select {|o| o['type']==type}
+end
+
+def self.get_specific_deep_content(root,type,&block)
+	get_deep_content_of_type(root,type).find &block
+end
+
+class EClassClassAdapter
+
+	def adapt(eobject,map)
+		map['attr_fullname'] = JavaModel.eobject_class_qname(eobject)
+	end
+
+end
+
+def self.getter(field)
+	getter_nb_name = 'get' + field.name.slice(0,1).capitalize + field.name.slice(1..-1)
+	getter_b_name  = 'is' + field.name.slice(0,1).capitalize + field.name.slice(1..-1)
+	methods = field.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.ClassMethod}
+	getter = methods.find {|m| m.name==getter_b_name or m.name==getter_nb_name}
+	getter
+end
+
+def self.setter(field)
+	setter_name = 'set' + field.name.slice(0,1).capitalize + field.name.slice(1..-1)
+	methods = field.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.ClassMethod}
+	setter = methods.find {|m| m.name==setter_name}
+	setter
+end
+
+def self.field_from_getter(getter)
+	if (getter.name.start_with? 'get' and getter.name.length>3) or (getter.name.start_with? 'is' and getter.name.length>2)
+		field_name = getter.name.slice(3,1).downcase + getter.name.slice(4..-1) if getter.name.start_with? 'get'
+		field_name = getter.name.slice(2,1).downcase + getter.name.slice(3..-1) if getter.name.start_with? 'is'
+		#puts "Field name for getter #{getter.name} #{field_name}"
+		fields = getter.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.Field}
+		field = fields.find {|f| f.name==field_name}
+		return field
+	else
+		return nil
+	end	
+end
+
+def self.field_from_setter(setter)
+	if setter.name.start_with? 'set' and setter.name.length>3
+		field_name = setter.name.slice(3,1).downcase + setter.name.slice(4..-1) if setter.name.start_with? 'set'
+		#field_name = getter.name.slice(2,1).downcase + getter.name.slice(3..-1) if getter.name.start_with? 'is'
+		#puts "Field name for getter #{getter.name} #{field_name}"
+		fields = setter.eContainer.members.select {|m| m.java_kind_of? org.emftext.language.java.members.Field}
+		field = fields.find {|f| f.name==field_name}
+		return field
+	else
+		return nil
+	end	
+end
+
+class EClassClassMethodAdapter
+
+	def adapt(eobject,map)
+		field = JavaModel.field_from_getter(eobject)
+		map['attr_getter'] = field!=nil
+		map['relnoncont_getterFor'] = LightModels::Serialization::serialization_id(field) if field
+		map['relnoncont_getterFor'] = nil unless field
+
+		field = JavaModel.field_from_setter(eobject)
+		map['attr_setter'] = field!=nil
+		map['relnoncont_setterFor'] = LightModels::Serialization::serialization_id(field) if field
+		map['relnoncont_setterFor'] = nil unless field
+	end
+
+end
+
+class EClassFieldAdapter
+
+	def adapt(eobject,map)
+		getter = JavaModel.getter(eobject)
+		map['relnoncont_getter'] = LightModels::Serialization::serialization_id(getter) if getter
+		map['relnoncont_getter'] = nil unless getter
+	end
+
+end
+
+def self.jsonize_java_obj(root)
+	LightModels::Serialization::jsonize_obj(root,{
+		'http://www.emftext.org/java/classifiers#Class'=> EClassClassAdapter.new,
+		'http://www.emftext.org/java/members#ClassMethod'=> EClassClassMethodAdapter.new,
+		'http://www.emftext.org/java/members#Field'=> EClassFieldAdapter.new})
+end
+
 end

data/lib/java_model_jrb.rb

@@ -1,14 +1,6 @@
-lib = $:.select{|e| e.gsub('java_model_jrb').count>0}
-if lib.count==1
-	lib_path = lib[0]
-elsif File.exist?('./lib')
-	lib_path = './lib'
-else
-	raise 'library java_model_jrb not in $: and neither in local lib dir'
-end
-
-Dir[lib_path+"/jars/*.jar"].each do |jar|
-	require jar
-end
-
+curr_dir = File.dirname(__FILE__)
+Dir[curr_dir+"/jars/*.jar"].each do |jar|
+	require jar
+end
+
 require 'java_model/java_to_json'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: java_model_jrb
 version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease:
-  version: 0.1.1
 platform: java
 authors:
 - Federico Tomassetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emf_jruby
@@ -27,6 +27,22 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: lightmodels
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !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
 description: Create EMF models of Java code and serialize them in JSON
 email: f.tomassetti@gmail.com
 executables: []