elibri_onix 0.1.0 → 0.1.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'roxml', '>= 3.1.5'
+gem 'roxml', '= 3.1.6'
 gem 'i18n'
 gem 'activesupport', '>= 3.1.0'
 

data/Gemfile.lock

@@ -45,4 +45,4 @@ DEPENDENCIES
   mocha
   pry
   rcov
-  roxml (>= 3.1.5)
+  roxml (= 3.1.6)

data/elibri_onix.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elibri_onix}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Urbanski"]
-  s.date = %q{2011-10-06}
+  s.date = %q{2011-10-07}
   s.description = %q{EDItEUR ONIX format subset implementation used in Elibri publication system}
   s.email = %q{marcin@urbanski.vdl.pl}
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "test/elibri_onix_release_3_0_onix_message_test.rb",
     "test/elibri_onix_test.rb",
     "test/fixtures/all_possible_tags.xml",
+    "test/fixtures/old_dialect.xml",
     "test/helper.rb"
   ]
   s.homepage = %q{http://github.com/elibri/elibri_onix}
@@ -69,7 +70,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<roxml>, [">= 3.1.5"])
+      s.add_runtime_dependency(%q<roxml>, ["= 3.1.6"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
@@ -79,7 +80,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<roxml>, [">= 3.1.5"])
+      s.add_dependency(%q<roxml>, ["= 3.1.6"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 3.1.0"])
       s.add_dependency(%q<pry>, [">= 0"])
@@ -90,7 +91,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<roxml>, [">= 3.1.5"])
+    s.add_dependency(%q<roxml>, ["= 3.1.6"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 3.1.0"])
     s.add_dependency(%q<pry>, [">= 0"])

data/lib/elibri_onix.rb

@@ -1,5 +1,6 @@
 
 require 'active_support/core_ext/object/with_options'
+require 'active_support/core_ext/module/aliasing'
 require 'bigdecimal'
 require 'roxml'
 require 'elibri_onix/version'

data/lib/elibri_onix/onix_3_0/onix_message.rb

@@ -8,9 +8,37 @@ module Elibri
         
         xml_name 'ONIXMessage'
         xml_accessor :release, :from => "@release"
+        xml_accessor :elibri_dialect, :from => "@elibri:dialect"
 
         xml_accessor :products, :as => [Product]
         xml_accessor :header, :as => Header
+
+
+
+        def self.from_xml(data, *initialization_args)
+          xml = XML::Node.from(data)
+
+          new(*initialization_args).tap do |inst|
+            inst.roxml_references = roxml_attrs.map {|attr| attr.to_ref(inst) }
+
+            inst.roxml_references.each do |ref|
+              value = ref.value_in(xml)
+              if ref.is_a? ROXML::XMLObjectRef
+                Array(value).each do |obj|
+                  obj.instance_variable_set(:@elibri_dialect, inst.elibri_dialect)
+                end  
+              end
+              inst.respond_to?(ref.opts.setter) \
+                ? inst.send(ref.opts.setter, value) \
+                : inst.instance_variable_set(ref.opts.instance_variable_name, value)
+            end
+            inst.send(:after_parse) if inst.respond_to?(:after_parse, true)
+          end
+        rescue ArgumentError => e
+          raise e, e.message + " for class #{self}"
+        end
+
+
       end
 
     end

data/lib/elibri_onix/onix_3_0/product.rb

@@ -5,16 +5,33 @@ module Elibri
 
       class Product
         include ROXML
+        attr_accessor :elibri_dialect
 
         xml_name 'Product'
         xml_accessor :record_reference, :from => 'RecordReference'
         xml_accessor :notification_type, :from => 'NotificationType', :as => Fixnum
         xml_accessor :deletion_text, :from => 'DeletionText'
 
-        xml_accessor :cover_type, :from => 'elibri:CoverType'
-        xml_accessor :cover_price, :from => 'elibri:CoverPrice', :as => BigDecimal
-        xml_accessor :vat, :from => 'elibri:Vat', :as => Fixnum
-        xml_accessor :pkwiu, :from => 'elibri:PKWiU'
+        # Load attributes specific for dialect 3.0.1
+        xml_accessor :cover_type_from_3_0_1, :from => 'elibri:CoverType'
+        xml_accessor :cover_price_from_3_0_1, :from => 'elibri:CoverPrice', :as => BigDecimal
+        xml_accessor :vat_from_3_0_1, :from => 'elibri:Vat', :as => Fixnum
+        xml_accessor :pkwiu_from_3_0_1, :from => 'elibri:PKWiU'
+
+        # Attributes in namespace elibri:* are specific for dialect >= 3.0.1.
+        # If dialect is less than 3.0.1, returns nil.
+        %w{cover_type cover_price vat pkwiu}.each do |method_name|
+          module_eval(<<-EVAL_END, __FILE__, __LINE__ + 1)
+            def #{method_name}                                      # def vat
+              if @elibri_dialect.to_s >= '3.0.1'                    #   if @elibri_dialect.to_s >= '3.0.1'
+                #{method_name}_from_3_0_1                           #     vat_from_3_0_1
+              else                                                  #   else
+                nil                                                 #     nil
+              end                                                   #   end
+            end                                                     # end
+          EVAL_END
+        end  
+
 
         xml_accessor :identifiers, :as => [ProductIdentifier]
         xml_accessor :related_products, :as => [RelatedProduct], :in => 'RelatedMaterial'

data/lib/elibri_onix/version.rb

@@ -4,7 +4,7 @@ module Elibri
     module Version
       MAJOR = 0
       MINOR = 1
-      PATCH = 0
+      PATCH = 1
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/test/elibri_onix_release_3_0_onix_message_test.rb

@@ -1,6 +1,7 @@
 require 'helper'
 
 
+
 describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
 
@@ -8,6 +9,8 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     xml_string = File.read File.join(File.dirname(__FILE__), "..", "test", "fixtures", "all_possible_tags.xml")
     
     onix = Elibri::ONIX::Release_3_0::ONIXMessage.from_xml(xml_string)
+    assert_equal '3.0', onix.release
+    assert_equal '3.0.1', onix.elibri_dialect
     assert_equal 'Elibri.com.pl', onix.header.sender.sender_name
     assert_equal 'Tomasz Meka', onix.header.sender.contact_name
     assert_equal 'kontakt@elibri.com.pl', onix.header.sender.email_address
@@ -16,6 +19,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 1, onix.products.size 
 
     product = onix.products.first
+    assert_equal '3.0.1', product.elibri_dialect
 
     assert_equal 'miękka', product.cover_type 
     assert_equal 12.99, product.cover_price
@@ -171,8 +175,22 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     product.supply_details[1].tap do |supply_detail|
       assert_equal 'very few', supply_detail.quantity_code
     end
-
   end
 
 
+  it "should consider elibri_dialect attribute and ignore attributes unrecognized in specified dialect" do
+    xml_string = File.read File.join(File.dirname(__FILE__), "..", "test", "fixtures", "old_dialect.xml")
+    
+    onix = Elibri::ONIX::Release_3_0::ONIXMessage.from_xml(xml_string)
+    assert_equal '3.0', onix.release
+    assert_equal '3.0.0', onix.elibri_dialect
+
+    product = onix.products.first
+    assert_equal '3.0.0', product.elibri_dialect
+    assert_nil product.cover_type 
+    assert_nil product.cover_price
+    assert_nil product.vat
+    assert_nil product.pkwiu
+  end
+
 end

data/test/fixtures/all_possible_tags.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ONIXMessage release="3.0" xmlns:elibri="http://elibri.com.pl/ns/extensions" xmlns="http://www.editeur.org/onix/3.0/reference">
+<ONIXMessage release="3.0" elibri:dialect="3.0.1" xmlns:elibri="http://elibri.com.pl/ns/extensions" xmlns="http://www.editeur.org/onix/3.0/reference">
   <Header>
     <Sender>
       <SenderName>Elibri.com.pl</SenderName>

data/test/fixtures/old_dialect.xml

@@ -0,0 +1,19 @@
+
+<?xml version="1.0" encoding="UTF-8"?>
+<ONIXMessage release="3.0" elibri:dialect="3.0.0" xmlns:elibri="http://elibri.com.pl/ns/extensions" xmlns="http://www.editeur.org/onix/3.0/reference">
+  <Header>
+    <Sender>
+      <SenderName>Elibri.com.pl</SenderName>
+      <ContactName>Tomasz Meka</ContactName>
+      <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
+    </Sender>
+    <SentDateTime>20111005</SentDateTime>
+  </Header>
+  <Product>
+    <RecordReference>fdb8fa072be774d97a97</RecordReference>
+    <elibri:CoverType>miękka</elibri:CoverType>
+    <elibri:CoverPrice>12.99</elibri:CoverPrice>
+    <elibri:Vat>5</elibri:Vat>
+    <elibri:PKWiU>58.11.1</elibri:PKWiU>
+  </Product>
+</ONIXMessage>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_onix
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marcin Urbanski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +02:00
+date: 2011-10-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 3
         - 1
-        - 5
-        version: 3.1.5
+        - 6
+        version: 3.1.6
   name: roxml
   version_requirements: *id001
   prerelease: false
@@ -202,6 +202,7 @@ files:
 - test/elibri_onix_release_3_0_onix_message_test.rb
 - test/elibri_onix_test.rb
 - test/fixtures/all_possible_tags.xml
+- test/fixtures/old_dialect.xml
 - test/helper.rb
 has_rdoc: true
 homepage: http://github.com/elibri/elibri_onix