lightmodels 0.1.1-java → 0.1.2-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e868ed9d49df684c24f6d46cf9d35cfce53799f6
+  data.tar.gz: de01a21493b5d2086f6c8541b5d0332af366b769
+SHA512:
+  metadata.gz: 5107453b1cc675f8ddf165b09b27ece34c01c4f75d44a7379acbdc9f389047fe1e13c3e3897c7d8539492936bae32285e633cd55f781f17a89e98515929db447
+  data.tar.gz: 0fd9d3b21944811c6e73763c24b925b54e9b8edd5fd4879553489b5097592a77c71cb8304509e63c6ae3720890636ebfc6e1d9a0e6df715dccb62560e63ac5fd

data/lib/lightmodels/jsonser_nav.rb

@@ -3,29 +3,28 @@
 
 module LightModels
 
-module Json
-
 module Query
 
-	def rel_conts(root)
+	def self.rel_conts(root)
 		root.keys.select {|k| k.start_with? 'relcont_'}
 	end
 
-	def rel_non_conts(root)
+	def self.rel_non_conts(root)
 		root.keys.select {|k| k.start_with? 'relcont_'}
 	end
 
-	def attrs(root)
+	def self.attrs(root)
 		root.keys.select {|k| k.start_with? 'attr_'}
 	end
 
-	def values(root,feat)
+	def self.values(root,feat)
 		raw = root[feat]
+		return [] if raw==nil
 		return raw if raw.is_a? Array
 		return [raw]
 	end
 
-	def traverse(root,depth=0,&op)
+	def self.traverse(root,depth=0,&op)
 		return traverse(root['root'],depth,&op) if root and (root.key? 'root')
 		op.call(root,depth)
 		return unless root		
@@ -41,7 +40,7 @@ module Query
 		end
 	end
 
-	def print_tree(root,depth=0)
+	def self.print_tree(root,depth=0)
 		traverse(root) do |n,d|
 			s = ""
 			d.times { s = s + "  " }
@@ -53,6 +52,4 @@ module Query
 
 end
 
-end
-
 end

data/lib/lightmodels/model_building.rb

@@ -0,0 +1,52 @@
+require 'lightmodels/serialization'
+
+module LightModels
+
+module ModelBuilding
+
+class << self
+	attr_accessor :verbose
+end
+
+def self.generate_models_in_dir(src,dest,src_extension,dest_extension,max_nesting=500,error_handler=nil,&model_creator)
+	puts "== #{src} -> #{dest} ==" if LightModels::ModelBuilding.verbose
+	Dir["#{src}/*"].each do |fd|		
+		if File.directory? fd
+			basename = File.basename(fd)
+			generate_models_in_dir("#{src}/#{basename}","#{dest}/#{basename}",src_extension,dest_extension,max_nesting,error_handler,&model_creator)
+		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 LightModels::ModelBuilding.verbose
+				generate_model_per_file(fd,translated_name,max_nesting,error_handler,&model_creator)
+			end
+		end
+	end
+end
+
+def self.generate_model_per_file(src,dest,max_nesting=500,error_handler=nil,&models_generator)
+	if not File.exist? dest 
+		puts "<Model from #{src}>"
+		
+		if error_handler
+			begin
+				m = models_generator.call(src)
+				LightModels::Serialization.save_model(m,dest,max_nesting)
+			rescue Exception => e
+				error_handler.call(src,e)
+			rescue
+				error_handler.call(src,nil)
+			end
+		else
+			m = models_generator.call(src)
+			LightModels::Serialization.save_model(m,dest,max_nesting)
+		end
+	else
+		puts "skipping #{src} because #{dest} found" if LightModels::ModelBuilding.verbose 
+	end
+end
+
+end
+
+end

data/lib/lightmodels/query.rb

@@ -0,0 +1,36 @@
+require 'set'
+require 'lightmodels/jsonser_nav'
+
+module LightModels
+
+module Query
+
+# the set of values appearing in the object and its children
+def self.collect_values(el)
+	values = Set.new
+	rel_conts(el).each do |r|
+		values(el,r).each {|c| values.merge(collect_values(c))}
+	end
+	attrs(el).each do |a|
+		values(el,a).each {|v| values.add(v)}
+	end
+	values
+end
+
+# a counting map values appearing in the object and its children
+def self.collect_values_with_count(el)
+	values = Hash.new {|h,k| h[k]=0}
+	rel_conts(el).each do |r|
+		LightModels::Query.values(el,r).each do |ch| 
+			collect_values_with_count(ch).each {|v,count| values[v]+=count}
+		end
+	end
+	attrs(el).each do |a|
+		LightModels::Query.values(el,a).each {|v| values[v]+=1 }
+	end
+	values
+end
+
+end
+
+end

data/lib/lightmodels/serialization.rb

@@ -2,6 +2,7 @@
 # containing lists and single values
 
 require 'json'
+require 'fileutils'
 
 module LightModels
 
@@ -24,13 +25,21 @@ def self.serialization_id(obj)
 end
 
 def self.qname(e_object)
-	e_class = e_object.eClass
-	e_package = e_class.ePackage
-	"#{e_package.nsURI}##{e_class.name}"
+	if e_object.respond_to? :eClass 
+		e_class = e_object.eClass
+		e_package = e_class.ePackage
+		"#{e_package.nsURI}##{e_class.name}"
+	else
+		e_object.class.to_s
+	end
 end
 
 def self.jsonize_attr_value(map,e_object,e_attr)
-	value = e_object.eGet e_attr
+	if e_object.respond_to? :eGet
+		value = e_object.eGet e_attr
+	else
+		value = e_object.send e_attr.name.to_sym
+	end
 	if e_attr.upperBound==1
 		map["attr_#{e_attr.name}"] = value
 	else
@@ -51,7 +60,11 @@ def self.jsonize_ref_single_el(single_value,containment,adapters)
 end
 
 def self.jsonize_ref_value(map,e_object,e_ref,adapters)
-	value = e_object.eGet e_ref
+	if e_object.respond_to? :eGet
+		value = e_object.eGet e_ref
+	else
+		value = e_object.send e_ref.name.to_sym
+	end
 
 	propname = "relcont_#{e_ref.name}" if e_ref.containment
 	propname = "relnoncont_#{e_ref.name}" if not e_ref.containment
@@ -61,7 +74,11 @@ def self.jsonize_ref_value(map,e_object,e_ref,adapters)
 	else
 		l = []
 		(0..(value.size-1)).each do |i|
-			l << jsonize_ref_single_el(value.get(i),e_ref.containment,adapters)
+			if value.is_a? Array
+				l << jsonize_ref_single_el(value.at(i),e_ref.containment,adapters)
+			else
+				l << jsonize_ref_single_el(value.get(i),e_ref.containment,adapters)
+			end
 		end
 		map[propname] = l
 	end
@@ -72,7 +89,11 @@ def self.jsonize_obj(e_object, adapters={})
 		nil
 	else 
 		map = { 'type' => qname(e_object), 'id' => serialization_id(e_object) }
-		e_class = e_object.eClass
+		if e_object.respond_to? :eClass
+			e_class = e_object.eClass			
+		else
+			e_class = e_object.class.ecore
+		end
 		e_class.eAllAttributes.each do |a|		
 			jsonize_attr_value(map,e_object,a)
 		end
@@ -87,8 +108,8 @@ def self.jsonize_obj(e_object, adapters={})
 	end
 end
 
-def self.load_file(path,max_nesting=100)
-	parse(File.read(path),{max_nesting: max_nesting})
+def self.load_file(path,max_nesting=500)
+	JSON.parse(File.read(path),{max_nesting: max_nesting})
 end
 
 def self.load_models_from_dir(dir,verbose=false,max=-1)
@@ -118,7 +139,10 @@ def self.load_models_from_dir(dir,verbose=false,max=-1)
 	per_type_values_map
 end
 
-def self.to_model(root)
+def self.eobject_to_model(root,adapters={})
+	@serialization_ids = {}
+	@next_serialization_id = 1
+
 	model = {}
 	external_elements = if root.eResource
 		root.eResource.contents.select {|e| e!=root}
@@ -126,7 +150,22 @@ def self.to_model(root)
 		[]
 	end
 
-	model['root'] = jsonize_obj(root)
+	model['root'] = jsonize_obj(root,adapters)
+	model['external_elements'] = []
+	external_elements.each do |ee|
+		model['external_elements'] << jsonize_obj(ee)
+	end
+	model
+end
+
+def self.rgenobject_to_model(root,adapters={})
+	@serialization_ids = {}
+	@next_serialization_id = 1
+
+	model = {}
+	external_elements = []
+
+	model['root'] = jsonize_obj(root,adapters)
 	model['external_elements'] = []
 	external_elements.each do |ee|
 		model['external_elements'] << jsonize_obj(ee)
@@ -136,11 +175,15 @@ end
 
 def self.save_as_model(root,model_path)
 	model = to_model(root)
+	save_model(model,model_path)
+end
+
+def self.save_model(model,model_path, max_nesting=500)
 	dir = File.dirname(model_path)
 	FileUtils.mkdir_p(dir) 
 
 	File.open(model_path, 'w') do |file| 		
-		file.write(JSON.pretty_generate(model))
+		file.write(JSON.pretty_generate(model, :max_nesting => max_nesting))
 	end
 end
 

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: lightmodels
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease:
+  version: 0.1.2
 platform: java
 authors:
 - Federico Tomassetti
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emf_jruby
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 description: Light format to store models. Mostly they are stored in Hash and Array.
 email: f.tomassetti@gmail.com
 executables: []
@@ -50,13 +45,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/lightmodels.rb
-- ./lib/lightmodels/serialization.rb
-- ./lib/lightmodels/model.rb
 - ./lib/lightmodels/jsonser_nav.rb
+- ./lib/lightmodels/model.rb
+- ./lib/lightmodels/model_building.rb
+- ./lib/lightmodels/query.rb
+- ./lib/lightmodels/serialization.rb
 - ./lib/lightmodels/stats.rb
 homepage: http://federico-tomassetti.it
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -65,17 +63,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
 summary: Light format to store models
 test_files: []