mappum 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/mappum/dsl.rb

@@ -7,6 +7,23 @@ class Object
 end
 module Mappum
   module DSL
+    def  self.get_src_ref
+       caller_arr = caller(2)
+      file = nil
+      begin
+        caller_line = caller_arr.shift
+        file = parse_caller(caller_line).first
+      end while file == __FILE__ and not caller_arr.empty?
+      return caller_line
+    end 
+    def self.parse_caller(at)
+      if /^(.+?):(\d+)(?::in `(.*)')?/ =~ at
+        file = Regexp.last_match[1]
+		line = Regexp.last_match[2].to_i
+		method = Regexp.last_match[3]
+		[file, line, method]
+	  end
+    end
     class Map
       attr_accessor :def
       def initialize
@@ -15,7 +32,7 @@ module Mappum
       def map(*attr, &block)
         mapa  = FieldMap.new(attr)
         mapa.def.source = @def.source
-
+        mapa.def.src_ref = DSL.get_src_ref
         mapa.def.desc = @comment
         @comment = nil
         
@@ -223,7 +240,7 @@ module Mappum
     end
     
     class Field < Mappet
-      def initialize(parent, name, clazz, placeholder = false)
+      def initialize(parent, name, clazz, placeholder = false, src_ref = nil)
         @def =  Mappum::Field.new
         @def.parent = parent
         @def.name = name
@@ -232,6 +249,7 @@ module Mappum
         @def.is_root = false
         @def.is_root = false
         @def.is_placeholder = placeholder
+        @def.src_ref = src_ref
       end
   
       def to_s
@@ -255,7 +273,7 @@ module Mappum
           if(symbol == :self)
             return Field.new(@def, nil, args[0], true)
           end
-          return Field.new(@def, symbol, args[0])
+          return Field.new(@def, symbol, args[0], false, DSL.get_src_ref)
         end
   
         if symbol == :[]

data/lib/mappum/map.rb

@@ -2,7 +2,7 @@ module Mappum
 # Base Map class representing mapping betwean two or more types, properties etc.
   class Map
     
-    attr_accessor :maps, :bidi_maps, :strip_empty, :source
+    attr_accessor :maps, :bidi_maps, :strip_empty, :source, :src_ref
     
     def initialize
       @maps = []
@@ -163,7 +163,7 @@ module Mappum
       return Field.new(@parent, symbol, args[0])
     end
   end
-  class Field < Struct.new(:name, :clazz, :parent, :func, :block, :is_root, :is_placeholder)
+  class Field < Struct.new(:name, :clazz, :parent, :func, :block, :is_root, :is_placeholder, :src_ref)
     #define is_array separetly to exclude it from equals
     attr_accessor :is_array
     def array?

data/lib/mappum/mappum_exception.rb

@@ -0,0 +1,38 @@
+module Mappum
+   class MappumException < RuntimeError
+     attr_accessor :from_name, :to_name, :from, :to, :from_root, :to_root, :mappum_backtrace 
+     def wrap(map, from, to)
+        
+        if map != nil and map != @map #don't store same maps twice
+          @map = map 
+          from_suffix, to_suffix = "",""
+          
+		  add_to_mappum_backtrace(map)
+		  from_suffix = "[]" if map.from.is_array
+		  add_from_name(map.from.name, from_suffix)
+		  to_suffix = "[]" if map.to.is_array
+		  add_to_name(map.to.name, to_suffix)
+	    end
+		@to = to if @to.nil?
+		@from = from if @from.nil?
+		@to_root = to
+		@from_root = from 
+	           
+     end
+     private
+     def add_from_name(name,sfx)
+       @from_name =  ["/", name.to_s+sfx, @from_name].join("")  unless name.nil?
+     end
+     def add_to_name(name,sfx)
+       @to_name =  ["/", name.to_s+sfx, @to_name].join("") unless name.nil?
+     end
+     def add_to_mappum_backtrace(map)
+       if @mappum_backtrace.nil?
+         @mappum_backtrace = []
+         @mappum_backtrace << map.from.src_ref
+         @mappum_backtrace << map.to.src_ref
+       end
+       @mappum_backtrace << map.src_ref
+     end
+   end
+end

data/lib/mappum/mapserver/mapserver.rb

@@ -12,17 +12,20 @@ module Mappum
   class Mapserver < Sinatra::Default
     set :views => File.join(File.dirname(__FILE__), 'views')
     set :public => File.join(File.dirname(__FILE__), 'public')
+    set :show_exceptions => false
+    set :raise_errors => false    
     configure do
       set :schema_dir => 'schema', :map_dir => 'map', :tmp_dir => nil
       set :catalogue => nil
       set :port => 9292      
 
-      # FIXME make configurable
-      #wl = Mappum::WorkdirLoader.new(options.schema_dir, options.tmp_dir, options.map_dir)
+      
       @wl = Mappum::WorkdirLoader.new('schema', 'map')
       @wl.generate_and_require
     end
     helpers do
+      alias_method :h, :escape_html
+
       def explain_func(element)
         name = element.name.to_s
         name ||= "self"    
@@ -196,6 +199,12 @@ module Mappum
 	  @maps_name_source = Mappum.catalogue(@catalogue).list_map_names.collect{|mn| [mn, Mappum.catalogue(@catalogue)[mn].source]}
 	  [200, {"Content-Type" => "text/html"}, [erb(:main)]]
     end
+    error do
+      @xml_convertor = Syntax::Convertors::HTML.for_syntax "xml"
+      @exception = request.env['sinatra.error']
+      erb(:error)
+    end
+
     def self.parseopt
       require 'optparse'
       OptionParser.new { |op|

data/lib/mappum/mapserver/views/error.erb

@@ -0,0 +1,61 @@
+<html>
+     <head>
+       <style type='text/css'>
+		 .normal {font-size: 14; font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Garuda'; }
+		 .namespace { color: #B66; font-weight: bold;}
+		 .tag { color: #660066; font-weight: bold;}
+		 .comment { color: #005; font-style: italic; }
+		 .punct { color: #000; font-weight: bold; }
+		 .string { color: #0033ff; }
+		 .number { color: #F99; }
+		 .attribute { color: #000; font-weight: bold; }
+       </style>
+      </head>
+	<body>
+<%begin%>	
+<%if @exception.kind_of?(Mappum::MappumException)%>
+	When mapping
+	 <h3>From: <%=h @exception.from_name%></h3> 
+	 <h3>To: <%=h @exception.to_name%></h3> 
+	 
+	Exception was thrown: 
+	<h3<strong><%=h  @exception.class %></strong></h3>
+	<h4><strong><%=h  @exception.message %></strong></h4>
+	Mapping from (for nil parent is displayed):<br/>
+	<span class="normal">
+		<%=  @xml_convertor.convert(@exception.from) %><br/>
+	</span>
+	Mapping to (for nil parent is displayed):<br/>
+	<span class="normal">
+		<%=  @xml_convertor.convert(@exception.to) %><br/>
+	</span>
+	<br/>
+	Mappum backtrace:<br/>
+	<%=  @exception.mappum_backtrace.join "<br/>" unless @exception.mappum_backtrace.nil? %><br/>
+	<br/>
+	Mapping from root:<br/>
+	<span class="normal">
+		<%= @xml_convertor.convert(@exception.from_root) %><br/>
+	</span>
+	Mapping to root:<br/>
+	<span class="normal">
+		<%= @xml_convertor.convert(@exception.to_root) %><br/>
+	</span>
+	<br/>
+<%end%>
+<%=h  @exception.class %> <br/>
+<%=h  @exception.message %> <br/>
+<%=  @exception.backtrace.join "<br/>" %>
+<%rescue => err%>
+<br/>
+Error when rendering this page:<br/>
+<%=h err.message unless err.nil?%>
+<%= err.backtrace.join("<br/>")  unless err.nil? or err.backtrace.nil?%>
+<br/>
+Orginal error:<br/>
+<%= sinatra_error = request.env['sinatra.error'] %>
+<%=h sinatra_error.message unless sinatra_error.nil?%>
+<%= sinatra_error.backtrace.join("<br/>")  unless sinatra_error.nil? or sinatra_error.backtrace.nil?%>
+<%end%>
+	</body>
+<html>

data/lib/mappum/ruby_transform.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'mappum'
 require 'ostruct'
 require 'mappum/autoconv_catalogue'
+require 'mappum/mappum_exception'
 
 module Mappum
   #
@@ -24,7 +25,7 @@ module Mappum
     # Method for transforming from object using map to "to" object.
     #
     def transform(from, map=nil, to=nil)
-      
+      begin
       raise RuntimeError.new("Map catalogue is empty!") if @map_catalogue.nil?
       
       map ||= @map_catalogue[from.class]
@@ -38,6 +39,7 @@ module Mappum
 
       all_nils = true
       map.maps.each do |sm|
+        begin
         from_value, to_value = nil, nil
         
         from_value = get(from, sm.from, map.from) 
@@ -165,12 +167,21 @@ module Mappum
             to.send("#{sm.to.name}=", convert_to(to_value, sm.to)) unless to_value.nil?
           end
         end
-        
+       rescue Exception => e
+        e = MappumException.new(e) unless e.kind_of?(MappumException)
+        e.wrap(sm, from_value, to_value)
+        raise e
+       end 
       end
       if all_nils and map.strip_empty?
         return nil
       end
-      return to
+        return to
+      rescue Exception => e
+        e = MappumException.new(e) unless e.kind_of?(MappumException)
+        e.wrap(map, from, to)
+        raise e
+      end
     end
     
     protected
@@ -230,7 +241,7 @@ module Mappum
       method_missing(:id, *attr)
     end
   end
-  class MapMissingException < RuntimeError
+  class MapMissingException < MappumException
     attr_accessor :from
     def initialize(from, msg=nil)
       msg ||= "Map for class \"#{from.class}\" not found!"

data/lib/mappum/xml_transform.rb

@@ -148,11 +148,24 @@ module Mappum
         if e.from == parsed
           raise MapMissingException.new(e.from,"Map for element \"#{from_qname}\" not found!")
         else
+          e.from = to_xml_string(e.from)
+          e.to = to_xml_string(e.to)
+          e.from_root = to_xml_string(e.from_root)
+          e.to_root = to_xml_string(e.to_root)
           raise e
         end
+      rescue MappumException => e
+          e.from = to_xml_string(e.from)
+          e.to = to_xml_string(e.to)
+          e.from_root = to_xml_string(e.from_root)
+          e.to_root = to_xml_string(e.to_root)
+          raise e
       end
       
-      to_mapper = XSD::Mapping::Mapper.find_mapper_for_class(transformed.class)
+	  return to_xml_string(transformed, map, to_qname, soap)
+    end
+    def to_xml_string(transformed, map=nil, to_qname=nil, soap=false)
+       to_mapper = XSD::Mapping::Mapper.find_mapper_for_class(transformed.class)
       if to_mapper.nil?
         to_mapper = @default_mapper
       end
@@ -170,8 +183,7 @@ module Mappum
         to_preparsed = SOAP::SOAPEnvelope.new(SOAP::SOAPHeader.new, SOAP::SOAPBody.new(to_preparsed))
       end
       generator = SOAP::Generator.new(XSD::Mapping::Mapper::MAPPING_OPT)
-      to_xml = generator.generate(to_preparsed, nil)
-      return to_xml
+      return generator.generate(to_preparsed, nil)
     end
   end
   class RubyXmlTransform < RubyTransform

data/mappum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mappum}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Topi\305\204ski"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-16}
   s.default_executable = %q{mapserver.rb}
   s.description = %q{}
   s.email = %q{jtopinski@chatka.org}
@@ -39,10 +39,12 @@ Gem::Specification.new do |s|
      "lib/mappum/dsl.rb",
      "lib/mappum/java_transform.rb",
      "lib/mappum/map.rb",
+     "lib/mappum/mappum_exception.rb",
      "lib/mappum/mapserver/mapgraph.rb",
      "lib/mappum/mapserver/mapserver.rb",
      "lib/mappum/mapserver/maptable.rb",
      "lib/mappum/mapserver/views/doc.erb",
+     "lib/mappum/mapserver/views/error.erb",
      "lib/mappum/mapserver/views/main.erb",
      "lib/mappum/mapserver/views/maptable.erb",
      "lib/mappum/mapserver/views/rubysource.erb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mappum
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Jan Topi\xC5\x84ski"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2009-11-16 00:00:00 +01:00
 default_executable: mapserver.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,10 +92,12 @@ files:
 - lib/mappum/dsl.rb
 - lib/mappum/java_transform.rb
 - lib/mappum/map.rb
+- lib/mappum/mappum_exception.rb
 - lib/mappum/mapserver/mapgraph.rb
 - lib/mappum/mapserver/mapserver.rb
 - lib/mappum/mapserver/maptable.rb
 - lib/mappum/mapserver/views/doc.erb
+- lib/mappum/mapserver/views/error.erb
 - lib/mappum/mapserver/views/main.erb
 - lib/mappum/mapserver/views/maptable.erb
 - lib/mappum/mapserver/views/rubysource.erb