elibri_onix 0.1.9 → 0.1.10

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'activesupport', '>= 2.3.5'
 gem 'roxml', '= 3.1.3'
 gem 'i18n'
-gem 'elibri_onix_dict', '0.0.5'
+gem 'elibri_onix_dict', '>= 0.0.5'
 
 group :development do
   gem "pry"

data/Gemfile.lock

@@ -38,7 +38,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 2.3.5)
   bundler (>= 1.0.0)
-  elibri_onix_dict (= 0.0.5)
+  elibri_onix_dict (>= 0.0.5)
   i18n
   jeweler (~> 1.6.2)
   minitest

data/elibri_onix.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elibri_onix}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Urbanski"]
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "elibri_onix.gemspec",
     "lib/elibri_onix.rb",
+    "lib/elibri_onix/external_id.rb",
+    "lib/elibri_onix/external_timestamp.rb",
     "lib/elibri_onix/inspector.rb",
     "lib/elibri_onix/onix_3_0/audience_range.rb",
     "lib/elibri_onix/onix_3_0/collection.rb",
@@ -113,7 +115,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<roxml>, ["= 3.1.3"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<elibri_onix_dict>, ["= 0.0.5"])
+      s.add_runtime_dependency(%q<elibri_onix_dict>, [">= 0.0.5"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
@@ -124,7 +126,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<roxml>, ["= 3.1.3"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<elibri_onix_dict>, ["= 0.0.5"])
+      s.add_dependency(%q<elibri_onix_dict>, [">= 0.0.5"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
@@ -136,7 +138,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     s.add_dependency(%q<roxml>, ["= 3.1.3"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<elibri_onix_dict>, ["= 0.0.5"])
+    s.add_dependency(%q<elibri_onix_dict>, [">= 0.0.5"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])

data/lib/elibri_onix/external_id.rb

@@ -0,0 +1,11 @@
+module ExternalId
+ 
+  def self.included(base)
+    base.xml_accessor :id_before_type_cast, :from => "@sourcename"
+  end
+
+  def id
+    id_before_type_cast.split(":")[1].to_i
+  end
+
+end

data/lib/elibri_onix/external_timestamp.rb

@@ -0,0 +1,17 @@
+module ExternalTimestamp
+
+  def self.included(base)
+    base.xml_accessor :datestamp_before_type_cast, :from => "@datestamp"
+  end
+
+  def datestamp
+    year = datestamp_before_type_cast[0...4].to_i
+    month = datestamp_before_type_cast[4...6].to_i
+    day = datestamp_before_type_cast[6...8].to_i
+    h = datestamp_before_type_cast[9...11].to_i
+    m = datestamp_before_type_cast[11...13].to_i
+
+    Date.new(year, month, day) + h.hours + m.minutes
+  end
+
+end

data/lib/elibri_onix/onix_3_0/contributor.rb

@@ -6,6 +6,8 @@ module Elibri
       class Contributor
         include ROXML
         include Inspector
+        include ExternalId
+        include ExternalTimestamp
 
         xml_name 'Contributor'
 

data/lib/elibri_onix/onix_3_0/product.rb

@@ -96,7 +96,7 @@ module Elibri
 
 
         def front_cover
-          supporting_resources.find { |resource| resource.content_type_name == "front_cover" }.try(:link)
+          supporting_resources.find { |resource| resource.content_type_name == "front_cover" }
         end
 
         def series_names
@@ -170,10 +170,10 @@ module Elibri
 
           @reading_age_from = audience_ranges.find {|ar| (ar.qualifier == "18") && (ar.precision == "03")}.try(:value)
           @reading_age_to = audience_ranges.find {|ar| (ar.qualifier == "18") && (ar.precision == "04")}.try(:value)
-          @table_of_contents = text_contents.find { |t| t.type_name == "table_of_contents" }.try(:text)
-          @description = text_contents.find { |t| t.type_name == "main_description" }.try(:text)
-          @reviews = text_contents.find_all { |t| t.type_name == "review" }.map { |t| [t.text, t.author] }
-          @excerpts = text_contents.find_all { |t| t.type_name == "excerpt" }.map { |t| t.text }
+          @table_of_contents = text_contents.find { |t| t.type_name == "table_of_contents" }
+          @description = text_contents.find { |t| t.type_name == "main_description" }
+          @reviews = text_contents.find_all { |t| t.type_name == "review" }
+          @excerpts = text_contents.find_all { |t| t.type_name == "excerpt" }
           @series = collections.map { |c| [c.title_detail.elements[0].title,  c.title_detail.elements[0].part_number] }
           distinctive_title = find_title(Elibri::ONIX::Dict::Release_3_0::TitleType::DISTINCTIVE_TITLE)
           if distinctive_title

data/lib/elibri_onix/onix_3_0/supporting_resource.rb

@@ -7,6 +7,9 @@ module Elibri
       class SupportingResource
         include ROXML
         include Inspector
+        include ExternalId
+        include ExternalTimestamp
+
 
         xml_name 'SupportingResource'
 

data/lib/elibri_onix/onix_3_0/text_content.rb

@@ -6,6 +6,8 @@ module Elibri
       class TextContent
         include ROXML
         include Inspector
+        include ExternalId
+        include ExternalTimestamp
 
         xml_name 'TextContent'
 

data/lib/elibri_onix/version.rb

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

data/lib/elibri_onix.rb

@@ -7,7 +7,10 @@ require 'active_support/core_ext'
 require 'roxml'
 require 'elibri_onix/version'
 require 'elibri_onix/inspector'
+require 'elibri_onix/external_id'
+require 'elibri_onix/external_timestamp'
 require 'elibri_onix/releases'
+
 require 'elibri_onix_dict'
 
 $KCODE = "UTF-8"

data/test/elibri_contributors_test.rb

@@ -11,6 +11,11 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     cont1 = product.contributors[0]
     cont2 = product.contributors[1]
 
+    assert_equal "contributorid:255", cont1.id_before_type_cast
+    assert_equal 255, cont1.id
+    assert_equal "20111104T0905", cont1.datestamp_before_type_cast
+    assert_equal Date.new(2011, 11, 04).to_time + 9.hours + 5.minutes, cont1.datestamp
+
     assert_equal "author", cont1.role_name
     assert_equal "Św. Tomasz z Akwinu", cont1.person_name
     assert_equal ["Św. Tomasz z Akwinu"], product.authors

data/test/elibri_supporting_resources_test.rb

@@ -6,7 +6,20 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     product = load_fixture("onix_supporting_resources_example.xml")
     
     assert_equal 2, product.supporting_resources.size
-    assert_equal "http://elibri.com.pl/sciezka/do/pliku.png", product.front_cover
+
+    assert_equal product.supporting_resources.first, product.front_cover
+
+    assert_equal "front_cover", product.supporting_resources.first.content_type_name
+    assert_equal "image", product.supporting_resources.first.mode_name
+    assert_equal "downloadable_file", product.supporting_resources.first.form_name
+
+    assert_equal "http://elibri.com.pl/sciezka/do/pliku.png", product.front_cover.link
+    assert_equal Date.new(2011, 12, 1) + 18.hours + 5.minutes, product.front_cover.datestamp
+    assert_equal 667, product.front_cover.id
+
+    assert_equal "sample_content", product.supporting_resources[1].content_type_name
+    assert_equal "text", product.supporting_resources[1].mode_name
+    assert_equal "downloadable_file", product.supporting_resources[1].form_name
   end
 
 end

data/test/elibri_texts_test.rb

@@ -6,11 +6,26 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     product = load_fixture("onix_texts_example.xml")
 
     assert_equal 4, product.text_contents.size
+    
+    assert_equal "1. Wprowadzenie<br />2. Rozdział pierwszy<br />[...]", product.table_of_contents.text
+    assert_equal Date.new(2011, 12, 04) + 12.hours + 15.minutes, product.table_of_contents.datestamp
+    assert_equal 133, product.table_of_contents.id
 
-    assert_equal "1. Wprowadzenie<br/>2. Rozdział pierwszy<br/>[...]", product.table_of_contents
-    assert_equal [["Recenzja książki<br/>[...]", "Jan Kowalski"]], product.reviews
-    assert_equal "Opis książki<br/>[...]", product.description
-    assert_equal ["Fragment książki<br/>[...]"], product.excerpts
-  end
+    assert_equal 1, product.reviews.size
+    review = product.reviews.first
+    assert_equal "Recenzja książki<br />[...]", review.text
+    assert_equal "Jan Kowalski", review.author
+    assert_equal Date.new(2011, 12, 4) + 12.hours + 18.minutes, review.datestamp
+    assert_equal 134, review.id
+
+    assert_equal "Opis książki<br />[...]", product.description.text
+    assert_equal Date.new(2011, 12, 4) + 12.hours + 25.minutes, product.description.datestamp
+    assert_equal 135, product.description.id
 
+    assert_equal 1, product.excerpts.size
+    excerpt = product.excerpts.first
+    assert_equal "Fragment książki<br />[...]", excerpt.text
+    assert_equal Date.new(2011, 12, 4) + 12.hours + 35.minutes, excerpt.datestamp
+    assert_equal 136, excerpt.id
+  end
 end

data/test/fixtures/onix_contributors_example.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ONIXMessage xmlns:elibri="http://elibri.com.pl/ns/extensions" release="3.0" xmlns="http://www.editeur.org/onix/3.0/reference">
+<ONIXMessage xmlns="http://www.editeur.org/onix/3.0/reference" release="3.0" xmlns:elibri="http://elibri.com.pl/ns/extensions">
   <elibri:Dialect>3.0.1</elibri:Dialect>
   <Header>
     <Sender>
@@ -7,7 +7,7 @@
       <ContactName>Tomasz Meka</ContactName>
       <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
     </Sender>
-    <SentDateTime>20111111</SentDateTime>
+    <SentDateTime>20111204</SentDateTime>
   </Header>
   <Product>
     <RecordReference>fdb8fa072be774d97a97</RecordReference>
@@ -26,7 +26,7 @@
           <TitleText>Taka jest nasza wiara</TitleText>
         </TitleElement>
       </TitleDetail>
-      <Contributor>
+      <Contributor datestamp="20111104T0905" sourcename="contributorid:255">
         <SequenceNumber>1</SequenceNumber>
         <ContributorRole>A01</ContributorRole>
         <PersonName>Św. Tomasz z Akwinu</PersonName>
@@ -34,7 +34,7 @@
         <KeyNames>Tomasz z Akwinu</KeyNames>
         <BiographicalNote>Tomasz z Akwinu, Akwinata, łac. Thoma de Aquino (ur. 1225, zm. 7 marca 1274) – filozof scholastyczny, teolog, członek zakonu dominikanów. Był jednym z najwybitniejszych myślicieli w dziejach chrześcijaństwa. Święty Kościoła katolickiego, jeden z doktorów Kościoła, który nauczając przekazywał owoce swej kontemplacji (łac. contemplata aliis tradere).</BiographicalNote>
       </Contributor>
-      <Contributor>
+      <Contributor datestamp="20111104T0905" sourcename="contributorid:256">
         <SequenceNumber>2</SequenceNumber>
         <ContributorRole>B06</ContributorRole>
         <FromLanguage>lat</FromLanguage>

data/test/fixtures/onix_supporting_resources_example.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ONIXMessage xmlns:elibri="http://elibri.com.pl/ns/extensions" release="3.0" xmlns="http://www.editeur.org/onix/3.0/reference">
+<ONIXMessage xmlns="http://www.editeur.org/onix/3.0/reference" release="3.0" xmlns:elibri="http://elibri.com.pl/ns/extensions">
   <elibri:Dialect>3.0.1</elibri:Dialect>
   <Header>
     <Sender>
@@ -7,7 +7,7 @@
       <ContactName>Tomasz Meka</ContactName>
       <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
     </Sender>
-    <SentDateTime>20111111</SentDateTime>
+    <SentDateTime>20111204</SentDateTime>
   </Header>
   <Product>
     <RecordReference>fdb8fa072be774d97a97</RecordReference>
@@ -28,7 +28,7 @@
       </TitleDetail>
     </DescriptiveDetail>
     <CollateralDetail>
-      <SupportingResource>
+      <SupportingResource datestamp="20111201T1805" sourcename="resourceid:667">
         <ResourceContentType>01</ResourceContentType>
         <ContentAudience>00</ContentAudience>
         <ResourceMode>03</ResourceMode>
@@ -37,7 +37,7 @@
           <ResourceLink>http://elibri.com.pl/sciezka/do/pliku.png</ResourceLink>
         </ResourceVersion>
       </SupportingResource>
-      <SupportingResource>
+      <SupportingResource datestamp="20111201T1809" sourcename="resourceid:668">
         <ResourceContentType>15</ResourceContentType>
         <ContentAudience>00</ContentAudience>
         <ResourceMode>04</ResourceMode>

data/test/fixtures/onix_texts_example.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 xmlns="http://www.editeur.org/onix/3.0/reference" release="3.0" xmlns:elibri="http://elibri.com.pl/ns/extensions">
   <elibri:Dialect>3.0.1</elibri:Dialect>
   <Header>
     <Sender>
@@ -7,7 +7,7 @@
       <ContactName>Tomasz Meka</ContactName>
       <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
     </Sender>
-    <SentDateTime>20111112</SentDateTime>
+    <SentDateTime>20111204</SentDateTime>
   </Header>
   <Product>
     <RecordReference>fdb8fa072be774d97a97</RecordReference>
@@ -28,33 +28,33 @@
       </TitleDetail>
     </DescriptiveDetail>
     <CollateralDetail>
-      <TextContent>
+      <TextContent datestamp="20111204T1215" sourcename="textid:133">
         <TextType>04</TextType>
         <ContentAudience>00</ContentAudience>
         <Text>
-          <![CDATA[1. Wprowadzenie<br/>2. Rozdział pierwszy<br/>[...]]]>
+          <![CDATA[1. Wprowadzenie<br />2. Rozdział pierwszy<br />[...]]]>
         </Text>
       </TextContent>
-      <TextContent>
+      <TextContent datestamp="20111204T1218" sourcename="textid:134">
         <TextType>07</TextType>
         <ContentAudience>00</ContentAudience>
         <Text>
-          <![CDATA[Recenzja książki<br/>[...]]]>
+          <![CDATA[Recenzja książki<br />[...]]]>
         </Text>
         <TextAuthor>Jan Kowalski</TextAuthor>
       </TextContent>
-      <TextContent>
+      <TextContent datestamp="20111204T1225" sourcename="textid:135">
         <TextType>03</TextType>
         <ContentAudience>00</ContentAudience>
         <Text>
-          <![CDATA[Opis książki<br/>[...]]]>
+          <![CDATA[Opis książki<br />[...]]]>
         </Text>
       </TextContent>
-      <TextContent>
+      <TextContent datestamp="20111204T1235" sourcename="textid:136">
         <TextType>14</TextType>
         <ContentAudience>00</ContentAudience>
         <Text>
-          <![CDATA[Fragment książki<br/>[...]]]>
+          <![CDATA[Fragment książki<br />[...]]]>
         </Text>
       </TextContent>
     </CollateralDetail>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_onix
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Marcin Urbanski
@@ -69,7 +69,7 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -187,6 +187,8 @@ files:
 - VERSION
 - elibri_onix.gemspec
 - lib/elibri_onix.rb
+- lib/elibri_onix/external_id.rb
+- lib/elibri_onix/external_timestamp.rb
 - lib/elibri_onix/inspector.rb
 - lib/elibri_onix/onix_3_0/audience_range.rb
 - lib/elibri_onix/onix_3_0/collection.rb