codemodels 0.2.5-java → 0.2.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db4711f37b0bf8dbdc6c9cc22e232312889dcd17
-  data.tar.gz: 55535f102297a1c548586fb5016f9b27abcb7198
+  metadata.gz: f078cf79663958cdc1389096405686a03dff12fc
+  data.tar.gz: e7890ba70b6e10f9167feecb8ac24e8f43f7c3a2
 SHA512:
-  metadata.gz: 60e734f24988aafcf5d07dc7524e74dfbc0010a37aab4ec32f38fa594afd4f60650eede7cd147c8bdede81e9dfb536ea4a5a00d81bd385950bd6a0b8216b9db4
-  data.tar.gz: 8bd823ea12998d2bfaa51da2352c256c29936c75349273b49d608c85c40a8f84efbdbf16824fe0e7154516321f616cb94c924f9e95358836bdaef8cfdd536f98
+  metadata.gz: bdc1e5a07416951f7c2b21467e1a4c0f5d0dd376492288204226dbe8ebea9d64bc86ed78cf270b9320d39965ba43c211294c41c037e86fc1309bcb71655d0b57
+  data.tar.gz: 0d70721939e39ea3be3d2a2be7b36a0c473e045c73798d213f75b9286bae3b69bae521b8f5fa096cffb6e55d6f4519324c43ce370874445e110185993671a03a

data/README.md

@@ -1,19 +1,21 @@
 codemodels
 ===========
 
-codemodels is a library to create and manipulate models. A serialization format (based on JSON) is defined.
+codemodels is a library to represent and manipulate homogeneously Abstract Syntax Trees of different languages models.
 
-It is based on [RGen](http://github.com/mthiede/rgen) and it supportes the conversion of EMF models through [emf_jruby](http://github.com/ftomassetti/emf_jruby).
+It is based on [RGen](http://github.com/mthiede/rgen) and [RGen-Ext](https://github.com/ftomassetti/rgen_ext). 
 
 There are different gems which transform source code in models of the code. Currently they are:
-* [html-lightmodels](http://github.com/ftomassetti/html-lightmodels)
+* [codemodels-html](http://github.com/ftomassetti/codemodels-html)
 * [codemodels-java](http://github.com/ftomassetti/codemodels-java)
-* [js-lightmodels](http://github.com/ftomassetti/js-lightmodels)
-* [properties-lightmodels](http://github.com/ftomassetti/properties-lightmodels)
+* [codemodels-js](http://github.com/ftomassetti/codemodels-js)
+* [codemodels-properties](http://github.com/ftomassetti/codemodels-properties)
 * [codemodels-ruby](http://github.com/ftomassetti/codemodels-ruby)
-* [xml-lightmodels](http://github.com/ftomassetti/xml-lightmodels)
+* [codemodels-xml](http://github.com/ftomassetti/codemodels-xml)
 
-Therefore it can be used to perform analysis on different languages.
+DSLs based on EMF are planned to by supported using [emf_jruby](http://github.com/ftomassetti/emf_jruby).
+
+Codemodels can be used to perform analysis on different languages.
 
 Features
 ========

data/Rakefile

@@ -1,9 +1,13 @@
-require "bundler/gem_tasks"
 require 'rake/testtask'
+require 'rubygems/tasks'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
 end
 
+Gem::Tasks.new do |tasks|
+  tasks.console.command = 'jruby'
+end
+
 desc "Run tests"
 task :default => :test

data/codemodels.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency('json')
   s.add_dependency('rgen')
-  s.add_dependency('rgen_ext')
+  s.add_dependency('rgen_ext','0.0.2')
 
-  s.add_development_dependency "bundler", "1.3.5"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"  
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "rubygems-tasks"  
 end

data/lib/codemodels/artifact.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'codemodels/position'
 
 module CodeModels
@@ -60,6 +61,10 @@ class EmbeddedArtifact < AbstractArtifact
 		@host_artifact.embedding_level+1
 	end	
 
+	def name
+		'<embedded>'
+	end
+
 end
 
 class FileArtifact < AbstractArtifact
@@ -102,6 +107,55 @@ class FileArtifact < AbstractArtifact
 	def ==(other)
 		self.eql?(other)
 	end
+
+	def name
+		filename
+	end
+	
+end
+
+class StringArtifact < AbstractArtifact
+	attr_reader :code
+
+	def initialize(code)
+		@code = code
+	end
+
+	def absolute_start
+		sp = SourcePoint.new
+		sp.line   = 1
+		sp.column = 1
+		sp
+	end
+
+	def to_s
+		"<StringArtifact>"
+	end
+
+	def final_host
+		self
+	end
+
+	def embedded?
+		false
+	end
+
+	def embedding_level
+		0
+	end
+
+	def eql?(other)
+		return false unless other.is_a?(StringArtifact)
+		self.code==other.code
+	end
+
+	def ==(other)
+		self.eql?(other)
+	end
+
+	def name
+		'<string>'
+	end
 	
 end
 

data/lib/codemodels/comparison.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module CodeModels
 
 module ComparisonModule

data/lib/codemodels/info_extraction.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rgen/metamodel_builder'
 
 module CodeModels

data/lib/codemodels/language.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module CodeModels
 
 @@languages = []

data/lib/codemodels/metamodel.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rgen/metamodel_builder'
 require 'rgen/ext'
 require 'codemodels/source_info'

data/lib/codemodels/model_building.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'codemodels/serialization'
 
 module CodeModels

data/lib/codemodels/monkey_patching.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class Module
 
   def simple_name

data/lib/codemodels/navigation.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module CodeModels
 
 module NavigationExtensions

data/lib/codemodels/parser.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+
+require 'codemodels/monkey_patching'
+
+module CodeModels
+
+class Parser
+
+	DEFAULT_INTERNAL_ENCODING = 'UTF-8'
+
+	attr_reader :internal_encoding
+
+	def initialize(internal_encoding=DEFAULT_INTERNAL_ENCODING)
+		@internal_encoding = internal_encoding
+		puts "WARN using an internal encoding different from the local encoding..." if "".encoding.name!=internal_encoding
+	end
+
+	def parse_artifact(artifact)
+		internal_parse_artifact(artifact)
+	end
+
+	def parse_file(path,file_encoding=nil)
+		file_encoding = internal_encoding unless file_encoding
+		code = IO.read(path,{ :encoding => file_encoding, :mode => 'rb'})
+		code = code.encode(internal_encoding)
+		artifact = FileArtifact.new(path,code)
+		internal_parse_artifact(artifact)
+	end
+
+	# Deprecated: use parse_string
+	def parse_code(code)
+		parse_string(code)
+	end
+
+	def parse_string(code)
+		raise "Wrong encoding: it is #{code.encoding.name}, internally expected #{internal_encoding}" unless code.encoding.name==internal_encoding
+		artifact = StringArtifact.new(code)
+		internal_parse_artifact(artifact)
+	end
+
+end
+
+class ParsingError < Exception
+ 	attr_reader :node
+ 	attr_reader :line
+
+ 	def initialize(node,msg,line=nil)
+ 		@node = node
+ 		@msg = msg
+ 		@line = line
+ 	end
+
+ 	def to_s
+ 		"#{@msg}, start line: #{@line}"
+ 	end
+
+end
+
+# Most CodeModels parser are actually
+# wrapping another parser and adapting it
+# to CodeModels. When they encounter a node type
+# they do not know how to wrap this error is thrown.
+# This is not just for java based parsers, so it should
+# be not moved to codemodels-javaparserwrapper
+class UnknownNodeType < ParsingError
+
+ 	def initialize(node,line=nil,node_type=nil,where=nil)
+ 		super(node,"UnknownNodeType: type=#{node_type} , where: #{where}")
+ 	end
+
+end
+
+end

data/lib/codemodels/position.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CodeModels
 
 class SourcePoint

data/lib/codemodels/serialization.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # This code permit to transform AstNode in Hash objects
 # containing lists and single values
 

data/lib/codemodels/source_info.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rgen/metamodel_builder'
 require 'codemodels/language'
 require 'codemodels/position'

data/lib/codemodels/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CodeModels
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/codemodels.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 curr_dir = File.dirname(__FILE__)
 
 Dir["#{curr_dir}/codemodels/*.rb"].each { |rb| require rb }

data/test/data/text_iso_8859_1

@@ -0,0 +1 @@
+F��e laiss� fen�tre

data/test/data/text_utf8

@@ -0,0 +1 @@
+Füße laissé fenêtre Miško Minár ă î Timișoara

data/test/test_parser.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+require 'test_helper'
+
+class TestParser < Test::Unit::TestCase
+
+	module Metamodel
+
+		class SimpleText < CodeModels::CodeModelsAstNode
+			has_attr 'text', String
+		end
+	end
+
+	class SimpleTextParser < CodeModels::Parser
+
+		def internal_parse_artifact(artifact)
+			Metamodel::SimpleText.build(artifact.code)
+		end
+
+	end
+
+	def test_encoding
+		text1 = "Füße laissé fenêtre Miško Minár ă î Timișoara"
+		# ISO 8859-1 does not support all characters, so it is shorter
+		# then other examples
+		text2 = "Füße laissé fenêtre"
+
+		text_utf8       = SimpleTextParser.new.parse_file('test/data/text_utf8','UTF-8').text
+		text_utf16le    = SimpleTextParser.new.parse_file('test/data/text_utf16LE','UTF-16LE').text
+		text_utf16be    = SimpleTextParser.new.parse_file('test/data/text_utf16BE','UTF-16BE').text
+		text_iso8859_1  = SimpleTextParser.new.parse_file('test/data/text_iso_8859_1', 'ISO-8859-1').text
+		
+		# ISO 8859 16 seems to be not fully supported in
+		# Ruby 1.9 and JRuby 1.7, while it is in Ruby 2.0
+		# This part of the test will be re-enabled later
+
+		#text_iso8859_16 = SimpleTextParser.new.parse_file('test/data/text_iso_8859_16','ISO-8859-16')
+	
+		assert_equal text1,text_utf8
+		assert_equal text1,text_utf16le
+		assert_equal text1,text_utf16be
+		assert_equal text2,text_iso8859_1
+		
+		#assert_equal text1,text_iso8859_16
+	end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codemodels
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: java
 authors:
 - Federico Tomassetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -42,28 +42,28 @@ dependencies:
   name: rgen_ext
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  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: :development
 description: Library to build models of code of different languages in a uniform way.
 email: f.tomassetti@gmail.com
 executables: []
@@ -115,12 +129,17 @@ files:
 - lib/codemodels/model_building.rb
 - lib/codemodels/monkey_patching.rb
 - lib/codemodels/navigation.rb
-- lib/codemodels/parsing.rb
+- lib/codemodels/parser.rb
 - lib/codemodels/position.rb
 - lib/codemodels/serialization.rb
 - lib/codemodels/source_info.rb
 - lib/codemodels/version.rb
 - test/data/node_setCompleted.json
+- test/data/text_iso_8859_1
+- test/data/text_iso_8859_16
+- test/data/text_utf16BE
+- test/data/text_utf16LE
+- test/data/text_utf8
 - test/test_foreign_navigation.rb
 - test/test_helper.rb
 - test/test_info_extraction.rb
@@ -128,6 +147,7 @@ files:
 - test/test_metamodel.rb
 - test/test_model_building.rb
 - test/test_monkey_patching.rb
+- test/test_parser.rb
 - test/test_rgen_ext.rb
 - test/test_serialization.rb
 - test/test_source_info.rb
@@ -151,12 +171,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.2.0
 signing_key:
 specification_version: 4
 summary: Library to build models of code
 test_files:
 - test/data/node_setCompleted.json
+- test/data/text_iso_8859_1
+- test/data/text_iso_8859_16
+- test/data/text_utf16BE
+- test/data/text_utf16LE
+- test/data/text_utf8
 - test/test_foreign_navigation.rb
 - test/test_helper.rb
 - test/test_info_extraction.rb
@@ -164,6 +189,7 @@ test_files:
 - test/test_metamodel.rb
 - test/test_model_building.rb
 - test/test_monkey_patching.rb
+- test/test_parser.rb
 - test/test_rgen_ext.rb
 - test/test_serialization.rb
 - test/test_source_info.rb

data/lib/codemodels/parsing.rb

@@ -1,37 +0,0 @@
-require 'codemodels/monkey_patching'
-
-module CodeModels
-
-class Parser
-
-	def parse_file(path)
-		parse_code(IO.read(path))
-	end
-
-end
-
-class ParsingError < Exception
- 	attr_reader :node
- 	attr_reader :line
-
- 	def initialize(node,msg,line=nil)
- 		@node = node
- 		@msg = msg
- 		@line = line
- 	end
-
- 	def to_s
- 		"#{@msg}, start line: #{@line}"
- 	end
-
-end
-
-class UnknownNodeType < ParsingError
-
- 	def initialize(node,line=nil,node_type=nil,where=nil)
- 		super(node,"UnknownNodeType: type=#{node_type} , where: #{where}")
- 	end
-
-end
-
-end