mappum 0.2.3 → 0.2.4

data/lib/mappum/xml_transform.rb

@@ -54,6 +54,12 @@ class XSD::Mapping::Mapper
     return ret_qname
   
   end
+  def self.get_class_from_qname(qname)
+    mapper = find_mapper_for_type(qname)
+    return nil if mapper.nil?
+    sch =  mapper.registry.schema_definition_from_elename(qname)
+    return sch.class_for
+  end
   def self.find_mapper_for_type(qname)
     ret_maper=nil
     #FIXME add cache
@@ -126,18 +132,20 @@ module Mappum
       
             
       from_mapper = XSD::Mapping::Mapper.find_mapper_for_type(from_qname)
+      
       if from_mapper.nil?
          from_mapper = @default_mapper
       end
      
+      from_clazz = XSD::Mapping::Mapper.get_class_from_qname(from_qname) unless from_qname.nil?
       begin
-        parsed =SOAP::Mapping.soap2obj(preparsed, from_mapper.registry, nil)
+        parsed =SOAP::Mapping.soap2obj(preparsed, from_mapper.registry, from_clazz)
       rescue NoMethodError => e
         raise ParsingFailedException.new("Parsing failed for xml with root element: #{from_qname}")
       end
 
       map ||= @ruby_transform.map_catalogue[from_qname]
-      map ||= @ruby_transform.map_catalogue[from_qname.name.to_sym]
+      map ||= @ruby_transform.map_catalogue[from_qname.name.to_sym] unless from_qname.name.nil?
       if not map.nil? and not map.kind_of?(Map)
         map = @ruby_transform.map_catalogue[map.to_sym]
       end
@@ -162,7 +170,7 @@ module Mappum
           raise e
       end
       
-	  return to_xml_string(transformed, map, to_qname, soap)
+    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)
@@ -190,12 +198,12 @@ module Mappum
     def initialize(*args)
       super(*args)
     end
-    def get(object, field, parent_field=nil)
+    def get(object, field, parent_field=nil, options={})
       begin
-        super(object, field, parent_field)
+        super(object, field, parent_field, options)
       rescue NoMethodError
         begin
-          super(object, XSD::CodeGen::GenSupport.safemethodname(field.name.to_s).to_sym, parent_field)
+          super(object, XSD::CodeGen::GenSupport.safemethodname(field.name.to_s).to_sym, parent_field, options)
         rescue NoMethodError
           #for dynamic xml nil value == no methond
           if object.kind_of?(SOAP::Mapping::Object)
@@ -208,6 +216,11 @@ module Mappum
     end
   end
   class TreeElement < Struct.new(:name, :elements, :is_array, :clazz)
+    include Comparable
+    def <=>(anOther)
+      return name <=> null if anOther.nil?
+      name <=> anOther.name
+    end
   end
   # Class supporting loading working directory of the layout:
   #
@@ -303,15 +316,28 @@ module Mappum
       name ||= schema_definition.class_for
       is_array = false
       is_array = schema_definition.as_array? if schema_definition.respond_to?(:as_array?)
+
+      subelems = nil
+      mapped_class = schema_definition.mapped_class if schema_definition.respond_to?(:mapped_class)
+
       if schema_definition.respond_to?(:elements) and not schema_definition.elements.nil?
-        subelems = []
+        subelems ||= []
         schema_definition.elements.each do |element|
           subelems << defined_element_trees(element)
         end
-        return TreeElement.new(name, subelems, is_array, nil)
+        mapped_class = nil
       end
-
-      return TreeElement.new(name, nil,is_array,schema_definition.mapped_class)
+      if schema_definition.respond_to?(:attributes) and not schema_definition.attributes.nil?
+            
+        subelems ||= []
+        schema_definition.attributes.each do |qname, type|
+          subelems << TreeElement.new("xmlattr_#{qname.name}", nil,false,type)
+        end
+      end
+      
+      subelems.sort! unless subelems.nil?
+      
+      return TreeElement.new(name, subelems,is_array,mapped_class)
     end
     #
     # Remove tmpdir

data/mappum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mappum}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   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-16}
+  s.date = %q{2009-12-15}
   s.default_executable = %q{mapserver.rb}
   s.description = %q{}
   s.email = %q{jtopinski@chatka.org}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/mapserver.rb",
      "java-api/pom.xml",
+     "java-api/src/main/java/pl/ivmx/mappum/JavaMappumException.java",
      "java-api/src/main/java/pl/ivmx/mappum/JavaTransform.java",
      "java-api/src/main/java/pl/ivmx/mappum/MappumApi.java",
      "java-api/src/main/java/pl/ivmx/mappum/TreeElement.java",
@@ -33,12 +34,14 @@ Gem::Specification.new do |s|
      "java-api/src/test/java/iv/Client.java",
      "java-api/src/test/java/iv/Person.java",
      "java-api/src/test/java/pl/ivmx/mappum/MappumTest.java",
+     "java-api/src/test/resources/map/error_map.rb",
      "java-api/src/test/resources/map/example_map.rb",
      "lib/mappum.rb",
      "lib/mappum/autoconv_catalogue.rb",
      "lib/mappum/dsl.rb",
      "lib/mappum/java_transform.rb",
      "lib/mappum/map.rb",
+     "lib/mappum/map_space.rb",
      "lib/mappum/mappum_exception.rb",
      "lib/mappum/mapserver/mapgraph.rb",
      "lib/mappum/mapserver/mapserver.rb",
@@ -59,6 +62,7 @@ Gem::Specification.new do |s|
      "sample/crm_client.xsd",
      "sample/erp.rb",
      "sample/erp_person.xsd",
+     "sample/example_context.rb",
      "sample/example_conversions.rb",
      "sample/example_map.rb",
      "sample/example_notypes.rb",
@@ -70,6 +74,7 @@ Gem::Specification.new do |s|
      "sample/server/mapserver.sh",
      "sample/server/schema/crm_client.xsd",
      "sample/server/schema/erp/erp_person.xsd",
+     "test/test_context.rb",
      "test/test_conversions.rb",
      "test/test_example.rb",
      "test/test_openstruct.rb",
@@ -88,7 +93,8 @@ Gem::Specification.new do |s|
      "test/test_when.rb",
      "test/test_conversions.rb",
      "test/test_xml_any.rb",
-     "test/test_soap4r.rb"
+     "test/test_soap4r.rb",
+     "test/test_context.rb"
   ]
 
   if s.respond_to? :specification_version then

data/sample/crm.rb

@@ -1,7 +1,7 @@
 module CRM
   class Client
     attr_accessor :title, :id,  :key, :first_name, :surname, :address,
-      :sex_id, :phones, :emails, :main_phone, :main_phone_type, :company, :company_suffix, :order_by, :updated, :partners
+      :sex_id, :phones, :emails, :main_phone, :main_phone_type, :company, :company_suffix, :order_by, :updated, :partners, :country
   end
   class Address
     attr_accessor :street

data/sample/crm_client.xsd

@@ -22,6 +22,7 @@
         </xsd:complexType>
         </xsd:element> 
       </xsd:sequence> 
+      <xsd:attribute name="key" type="xsd:long"/>
     </xsd:complexType>
   </xsd:element> 
 </xsd:schema>

data/sample/erp.rb

@@ -1,6 +1,6 @@
 module ERP
   Person = Struct.new(:title, :type,:date_updated, :person_id,  :id2, :name, :address, :sex,
-      :phones, :email1, :email2, :email3, :main_phone, :corporation, :spouse)
+      :phones, :email1, :email2, :email3, :main_phone, :corporation, :spouse, :properties)
   Address = Struct.new(:street)
   Phone = Struct.new(:number, :extension, :type)
 

data/sample/example_context.rb

@@ -0,0 +1,89 @@
+# Example of map for given object domains CRM and ERP
+require 'mappum'
+require 'sample/erp'
+require 'sample/crm'
+require 'date'
+
+Mappum.catalogue_add "Context" do
+
+  map ERP::Person, CRM::Client do |p, c|
+
+    `simple mapping`
+    map context.properties[:title] <=> c.title
+    map p.title <=>  context.properties[:title]
+
+    map p.title >> context.properties[:new_title]
+    `map with simple function call`
+    map p.person_id << context.properties[:id].downcase
+    map context.properties[:id].upcase >> c.id
+    
+    `dictionary use`
+    map p.sex <=> c.sex_id, :dict => {"F" => "1", "M" => "2"}
+
+    `submaps`
+    map p.address(ERP::Address) <=> c.address(CRM::Address) do |a, b|
+      map a.street <=> b.street
+      #etc.
+    end
+
+    `compicated finc call`
+    map p.name >> c.surname do |name|
+      name + "ski"
+    end
+    map p.name << c.surname do |name|
+      if name =~ /ski/
+        name[0..-4]
+      else
+        name
+      end
+    end
+    `field to array and array to field`
+    map p.email1 <=> c.emails[0]
+    map p.email2 <=> c.emails[1]
+    map p.email3 <=> c.emails[2]
+    
+    map p.spouse(ERP::Person) <=> c.partners.find{|cp|cp.type == "Wife"} do |ps,cp|
+      map ps.name <=> cp.name
+      map "Wife" >> cp.type
+    end
+    map p.spouse(ERP::Person) <=> c.partners.find{|cp|cp.type == "Friend"} do |ps,cp|
+      map ps.name <=> cp.name
+      map "Friend" >> cp.type
+    end   
+    map p.phones(ERP::Phone)[] <=> c.phones[] do |a, b|
+      map a.number <=> b.self
+    end
+
+    `subobject to fields`
+    map p.main_phone(ERP::Phone) <=> c.self do |a, b|
+      map a.number <=> b.main_phone
+      map a.type <=> b.main_phone_type
+    end
+
+    #TODO one to many
+    #map p.name << [c.first_name, c.surname] do |fname, surname|
+    #  fname + " " + surname
+    #end
+    #map p.name.split >> [c.first_name, c.surname]
+    map p.corporation << c.self do |client|
+      "#{client.company} #{client.company_suffix}" unless client.company.nil?
+    end
+    map p.corporation >> c.company do |corpo|
+      corpo.split(" ")[0]
+    end
+    map p.corporation >> c.company_suffix do |corpo|
+      corpo.split(" ")[1]
+    end
+    `constants` 
+    map p.type << "NaN"
+    map "Last" >> c.order_by
+    
+    `func` 
+    map p.date_updated << func do
+      Date.today
+    end
+    map func >> c.updated do 
+      Time.now
+    end
+  end
+end

data/sample/example_map.rb

@@ -35,7 +35,7 @@ Mappum.catalogue_add "CRM-ERP" do
         name
       end
     end
-    `field to array and array to field`
+    `field to hash and hash to field`
     map p.email1 <=> c.emails[0]
     map p.email2 <=> c.emails[1]
     map p.email3 <=> c.emails[2]
@@ -52,6 +52,9 @@ Mappum.catalogue_add "CRM-ERP" do
       map a.number <=> b.self
     end
 
+    `Hash to field`
+    map p.properties[:country] <=> c.country
+
     `subobject to fields`
     map p.main_phone(ERP::Phone) <=> c.self do |a, b|
       map a.number <=> b.main_phone

data/sample/server/schema/crm_client.xsd

@@ -23,6 +23,7 @@
         </xsd:complexType>
         </xsd:element> 
       </xsd:sequence> 
+      <xsd:attribute name="key" type="xsd:long"/>
     </xsd:complexType>
   </xsd:element> 
 </xsd:schema>

data/test/test_context.rb

@@ -0,0 +1,58 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+require 'mappum/ruby_transform'
+require 'test/unit'
+require 'sample/example_context'
+
+class Context < Struct.new(:properties, :session)
+end
+
+class TestExample < Test::Unit::TestCase
+  def test_transform
+    catalogue = Mappum.catalogue("Context")
+    rt = Mappum::RubyTransform.new(catalogue)
+    
+    per = ERP::Person.new
+    per.title = "sir"
+    per.type = "NaN"
+    per.person_id = "asddsa"
+    per.sex = "M"
+    per.name = "Skory"
+    per.address = ERP::Address.new
+    per.address.street = "Victoria"
+    per.email1 = "j@j.com"
+    per.email2 = "k@k.com"
+    per.email3 = "l@l.com"
+    per.phones = [ERP::Phone.new("21311231"), ERP::Phone.new("21311232")]
+    per.main_phone = ERP::Phone.new
+    per.main_phone.number ="09876567"
+    per.main_phone.type = :mobile
+    per.corporation = "Corporation l.t.d."
+    per.date_updated = Date.today
+    per.spouse = ERP::Person.new
+    per.spouse.name = "Linda"
+    ctx = Context.new
+    ctx.properties={:title => "sir", :id => "asDDsa"}
+    
+    cli = rt.transform(per,nil,nil,{:context => ctx})
+    
+    assert_equal("sir", ctx.properties[:new_title])
+    assert_equal("sir", cli.title)
+    assert_equal("ASDDSA", cli.id)
+    assert_equal("2", cli.sex_id)
+    assert_equal("Skoryski", cli.surname)
+    assert_equal(CRM::Address, cli.address.class)
+    assert_equal("Victoria", cli.address.street)
+    assert_equal({0=>"j@j.com", 1=>"k@k.com", 2=>"l@l.com"}, cli.emails)
+    assert_equal(["21311231", "21311232"], cli.phones)
+    assert_equal("09876567", cli.main_phone)
+    assert_equal("Last", cli.order_by)
+    assert_equal("Linda", cli.partners[0].name)
+    assert_equal("Wife", cli.partners[0].type)
+    assert_equal("Linda", cli.partners[1].name)
+    assert_equal("Friend", cli.partners[1].type)
+    assert(cli.updated.kind_of?(Time))
+    
+    per2 = rt.transform(cli,nil,nil,{:context => ctx})
+    assert_equal(per, per2)
+  end
+end

data/test/test_example.rb

@@ -70,6 +70,7 @@ class TestExample < Test::Unit::TestCase
     per.date_updated = Date.today
     per.spouse = ERP::Person.new
     per.spouse.name = "Linda"
+    per.properties = {:country => "Poland"}
     
     cli = rt.transform(per)
     
@@ -79,7 +80,7 @@ class TestExample < Test::Unit::TestCase
     assert_equal("Skoryski", cli.surname)
     assert_equal(CRM::Address, cli.address.class)
     assert_equal("Victoria", cli.address.street)
-    assert_equal(["j@j.com", "k@k.com", "l@l.com"], cli.emails)
+    assert_equal({ 0 => "j@j.com", 1 => "k@k.com", 2 => "l@l.com"}, cli.emails)
     assert_equal(["21311231", "21311232"], cli.phones)
     assert_equal("09876567", cli.main_phone)
     assert_equal("Last", cli.order_by)
@@ -87,8 +88,9 @@ class TestExample < Test::Unit::TestCase
     assert_equal("Wife", cli.partners[0].type)
     assert_equal("Linda", cli.partners[1].name)
     assert_equal("Friend", cli.partners[1].type)
+    assert_equal("Poland", cli.country)
     assert(cli.updated.kind_of?(Time))
-    
+
     per2 = rt.transform(cli)
     assert_equal(per, per2)
   end
@@ -105,6 +107,7 @@ class TestExample < Test::Unit::TestCase
     per.address = ERP::Address.new
     per.address.street = "Victoria"
     per.date_updated = Date.today
+    per.properties = {:country => "Poland"}
 
 
     cli = rt.transform(per)
@@ -130,10 +133,11 @@ class TestExample < Test::Unit::TestCase
     per.email2 = "l@l.com"
     per.main_phone = ERP::Phone.new("7869876")
     per.date_updated = Date.today
+    per.properties = {:country => "Poland"}
     
     cli = rt.transform(per)
     
-    assert_equal(["j@j.com", "l@l.com", nil], cli.emails)
+    assert_equal({0 => "j@j.com", 1 => "l@l.com", 2 => nil}, cli.emails)
 
     per2 = rt.transform(cli)
     assert_equal(per, per2)

data/test/test_openstruct.rb

@@ -75,7 +75,7 @@ class TestOpenStruct < Test::Unit::TestCase
     assert_equal("2", cli.sex_id)
     assert_equal("Skoryski", cli.surname)
     assert_equal("Victoria", cli.address.street)
-    assert_equal(["j@j.com", "k@k.com", "l@l.com"], cli.emails)
+    assert_equal({0 => "j@j.com", 1 => "k@k.com", 2 => "l@l.com"}, cli.emails)
     assert_equal(["21311231", "21311232"], cli.phones)
     assert_equal("09876567", cli.main_phone)
 
@@ -121,7 +121,7 @@ class TestOpenStruct < Test::Unit::TestCase
     per.main_phone.number ="09876567"
 
     cli = rt.transform(per,catalogue[:person])
-    assert_equal(["j@j.com", "l@l.com", nil], cli.emails)
+    assert_equal({0 => "j@j.com", 1 => "l@l.com", 2 =>  nil}, cli.emails)
 
     per2 = rt.transform(cli,catalogue[:client])
     assert_equal(per, per2)

data/test/test_soap4r.rb

@@ -8,8 +8,8 @@ gem 'facets'
 require 'facets/equatable'
 require 'soap/marshal'
 
-wl = Mappum::WorkdirLoader.new("sample/server/schema", "sample/server/map")
-wl.generate_and_require   
+$wl = Mappum::WorkdirLoader.new("sample/server/schema", "sample/server/map")
+$wl.generate_and_require   
 
 class Erp::Person
   include Equatable(:title, :person_id, :name, :surname, :sex, :email1, 
@@ -22,7 +22,7 @@ class Erp::Person::Address
   include Equatable(:city, :street)
 end
 
-class TestExample < Test::Unit::TestCase
+class TestSoap4r < Test::Unit::TestCase
    def initialize(*args)
      super(*args)
      @rt = Mappum::XmlTransform.new
@@ -105,4 +105,7 @@ class TestExample < Test::Unit::TestCase
     per2 = rt.transform(cli)
     assert_equal(per, per2)
   end
+  def test_tree
+    $wl.defined_element_trees
+  end
 end