elibri_api_client 1.1.0 → 1.1.1

data/Gemfile

@@ -1,8 +1,9 @@
 source "http://rubygems.org"
 
-gem "httparty", "~> 0.7.8"
+gem "httparty", "= 0.8.1"
 gem "nokogiri", "~> 1.5.0"
-gem 'activesupport', '>= 3.1.0.rc1'
+gem 'activesupport', '>= 3.1.0'
+gem 'elibri_onix', '>= 0.1.3'
 
 group :development do
   gem "pry"

data/Gemfile.lock

@@ -1,13 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0.rc1)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
     coderay (0.9.8)
-    crack (0.1.8)
+    elibri_onix (0.1.3)
+      activesupport (>= 3.1.0)
+      i18n
+      roxml (= 3.1.6)
     git (1.2.5)
-    httparty (0.7.8)
-      crack (= 0.1.8)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    i18n (0.6.0)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -17,6 +22,7 @@ GEM
     minitest (2.2.2)
     mocha (0.9.12)
     multi_json (1.0.3)
+    multi_xml (0.4.1)
     nokogiri (1.5.0)
     pry (0.9.6)
       coderay (>= 0.9.8)
@@ -25,6 +31,9 @@ GEM
       slop (~> 2.1.0)
     rake (0.9.0)
     rcov (0.9.9)
+    roxml (3.1.6)
+      activesupport (>= 2.3.0)
+      nokogiri (>= 1.3.3)
     ruby_parser (2.3.0)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.6)
@@ -34,9 +43,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.1.0.rc1)
+  activesupport (>= 3.1.0)
   bundler (~> 1.0.0)
-  httparty (~> 0.7.8)
+  elibri_onix (>= 0.1.3)
+  httparty (= 0.8.1)
   jeweler (~> 1.6.2)
   minitest
   mocha

data/README.rdoc

@@ -4,7 +4,7 @@
   gem 'elibri_api_client'
 
 === 1. Tworzymy instancje klienta
-  elibri = Elibri::ApiClient.new(:login => '1b20fa9d72234423979c', :password => '2847cbf4f15a4057e2ab')
+  elibri = Elibri::ApiClient.new(:login => '1b20fa9d72234423979c', :password => '2847cbf4f15a4057e2ab', :api_version => 'v1', :onix_dialect => '3.0.1')
   
 === 2. Przegladanie dostepnych danych
 
@@ -24,16 +24,15 @@
 
   # Wypelnij wszystkie kolejki oczekujace, wszystkimi dostepnymi danymi.
   # Przydatne przy wykonywaniu pelnej synchronizacji pomiedzy nasza aplikacja a Elibri.
-  # Inna mozliwosc to iteracja elibri.publishers i sekwencyjne pobieranie danych kolejnych
-  # produktow (moze byc wolniejsze od kolejek zmian).
-  # elibri.refill_all_queues!
+  elibri.refill_all_queues!
 
   elibri.pending_queues.each do |pending_queue|
-    pending_queue.each_product do |product_xml|
-      # Otrzymujemy przeparsowany XML za pomoca Nokogiri
-      # product_xml.class => Nokogiri::XML::Element
-
-      puts product_xml.css('RecordReference').text
+    # Wykonuj blok, dopoki sa dane w kolejce
+    pending_queue.each_pop(:count => 10) do |pop|
+      puts pop.onix.release
+      pop.onix.products.each do |product|
+      	puts "#{product.record_reference} #{product.isbn13} #{product.publisher.name} #{product.full_title}"
+      end
     end
   end
 
@@ -42,12 +41,14 @@
   meta = elibri.pending_queues.find {|queue| queue.name == 'meta'}
 
   pop = meta.pop(:count => 5, :testing => true)
-  pop.each_product {|product_xml| puts product_xml.css('RecordReference').text }
+  pop.onix.products.each {|product| puts product.full_title }
+  puts pop.xml
 
   last_pop = meta.last_pop
 
 
 ==== 3c. Znadz ostatnio pobrane kolejki
+
   last_pop = elibri.last_pop_from_queue('meta')
 
 

data/elibri_api_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elibri_api_client}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Urba\305\204ski"]
-  s.date = %q{2011-09-30}
+  s.date = %q{2011-10-09}
   s.description = %q{API client for elibri.com.pl publishing system}
   s.email = %q{marcin@urbanski.vdl.pl}
   s.extra_rdoc_files = [
@@ -48,9 +48,10 @@ 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<httparty>, ["~> 0.7.8"])
+      s.add_runtime_dependency(%q<httparty>, ["= 0.8.1"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0.rc1"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<elibri_onix>, [">= 0.1.3"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
@@ -58,9 +59,10 @@ 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<httparty>, ["~> 0.7.8"])
+      s.add_dependency(%q<httparty>, ["= 0.8.1"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.1.0.rc1"])
+      s.add_dependency(%q<activesupport>, [">= 3.1.0"])
+      s.add_dependency(%q<elibri_onix>, [">= 0.1.3"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
@@ -69,9 +71,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<httparty>, ["~> 0.7.8"])
+    s.add_dependency(%q<httparty>, ["= 0.8.1"])
     s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.1.0.rc1"])
+    s.add_dependency(%q<activesupport>, [">= 3.1.0"])
+    s.add_dependency(%q<elibri_onix>, [">= 0.1.3"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])

data/lib/elibri_api_client.rb

@@ -2,9 +2,11 @@
 require 'time'
 require 'httparty'
 require 'nokogiri'
+require 'elibri_onix'
 require 'forwardable'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/string/strip'
 require 'elibri_api_client/core_extensions'
 require 'elibri_api_client/version'
 require 'elibri_api_client/api_adapters'
@@ -27,15 +29,17 @@ module Elibri
     # Opcjonalnie mozna podac adres servera API:
     #  cli = Elibri::ApiClient.new(:host_uri => 'http://localhost:3010', :login => '1b20fa9d72234423979c', :password => '2847cbf4f15a4057e2ab')
     def initialize(options = {})
-      options.assert_valid_keys(:login, :password, :host_uri, :api_version)
+      options.assert_valid_keys(:login, :password, :host_uri, :api_version, :onix_dialect)
       @login = options[:login]
       @password = options[:password]
       @host_uri = options[:host_uri] || DEFAULT_API_HOST_URI
+      @onix_dialect = options[:onix_dialect]
+      raise 'Please specify :onix_dialect' unless @onix_dialect.present?
 
       # W przyszlosci moga byc nowe wersje API, wiec zostawiamy sobie furtke w postaci adapterow:
       api_version_str = options[:api_version] || 'v1'
       adapter_class = Elibri::ApiClient::ApiAdapters.const_get(api_version_str.upcase) # Elibri::ApiClient::ApiAdapters::V1
-      @api_adapter = adapter_class.new(@host_uri, @login, @password)
+      @api_adapter = adapter_class.new(@host_uri, @login, @password, @onix_dialect)
     end
 
 

data/lib/elibri_api_client/api_adapters/v1.rb

@@ -14,8 +14,9 @@ module Elibri
         # debug_output $stderr
         #++
 
-        def initialize(host_uri, login, password) #:nodoc:
+        def initialize(host_uri, login, password, onix_dialect) #:nodoc:
           @host_uri = host_uri
+          @onix_dialect = onix_dialect
           @auth = {:username => login, :password => password}
         end
 
@@ -73,20 +74,30 @@ module Elibri
         end
 
 
-        # Options moze przyjac {:testing => 1, :count => 100}
-        def pop_from_queue(queue_name, options = {})
-          options[:testing] = 1 if options[:testing]
-          options = ' ' if options.empty?
-          response = post "/queues/#{queue_name}/pop", :body => options
-          pop_xml = response.parsed_response.css('pop').first
-          Elibri::ApiClient::ApiAdapters::V1::QueuePop.build_from_xml(pop_xml)
+        # params moze przyjac {:testing => 1, :count => 100}
+        def pop_from_queue(queue_name, params = {})
+          params[:testing] = 1 if params[:testing]
+          params = ' ' if params.empty?
+          response = post "/queues/#{queue_name}/pop", :body => params, :headers => {"X-eLibri-API-ONIX-dialect" => @onix_dialect}
+
+          return nil unless response.headers["x-elibri-api-pop-products-count"].to_i > 0
+          Elibri::ApiClient::ApiAdapters::V1::QueuePop.new(
+            :queue_name => response.headers["x-elibri-api-pop-queue-name"],
+            :popped_products_count => response.headers["x-elibri-api-pop-products-count"],
+            :created_at => response.headers["x-elibri-api-pop-created-at"],
+            :xml => response.body
+          )
         end
 
 
         def last_pop_from_queue(queue_name)
-          response = get "/queues/#{queue_name}/last_pop"
-          pop_xml = response.parsed_response.css('pop').first
-          Elibri::ApiClient::ApiAdapters::V1::QueuePop.build_from_xml(pop_xml)
+          response = get "/queues/#{queue_name}/last_pop", :headers => {"X-eLibri-API-ONIX-dialect" => @onix_dialect}
+          Elibri::ApiClient::ApiAdapters::V1::QueuePop.new(
+            :queue_name => response.headers["x-elibri-api-pop-queue-name"],
+            :popped_products_count => response.headers["x-elibri-api-pop-products-count"],
+            :created_at => response.headers["x-elibri-api-pop-created-at"],
+            :xml => response.body
+          )
         rescue Exceptions::NoRecentlyPoppedData # Ignoruj bledy o braku ostatnich POPow.
           return nil
         end
@@ -109,7 +120,7 @@ module Elibri
         # Zwroc ONIX dla konkretnego produktu.
         def onix_xml_for_product(product) #:nodoc:
           raise 'Need a Elibri::ApiClient::ApiAdapters::V1::Product instance' unless product.kind_of? Elibri::ApiClient::ApiAdapters::V1::Product
-          resp = get "/products/#{product.record_reference}"
+          resp = get "/products/#{product.record_reference}", :headers => {"X-eLibri-API-ONIX-dialect" => @onix_dialect}
           resp.parsed_response.css('Product').first
         end
 

data/lib/elibri_api_client/api_adapters/v1_helpers.rb

@@ -15,6 +15,7 @@ module Elibri #:nodoc:
           class ServerError < RuntimeError; end
           class QueueDoesNotExists < RuntimeError; end
           class NoRecentlyPoppedData < RuntimeError; end
+          class InvalidOnixDialect < RuntimeError; end
         end
 
         # Klasy wyjatkow rzucanych, gdy elibri zwroci okreslony blad. Np. gdy dostaniemy:
@@ -28,6 +29,7 @@ module Elibri #:nodoc:
           '500' =>  Exceptions::ServerError,
           '1001' => Exceptions::QueueDoesNotExists,
           '1002' => Exceptions::NoRecentlyPoppedData,
+          '1003' => Exceptions::InvalidOnixDialect,
         }.freeze
 
 
@@ -62,10 +64,10 @@ module Elibri #:nodoc:
           end
 
 
-          # Iteruj po kolejnych rekordach ONIX w nazwanej kolejce.
-          def each_product(&block) #:yields: product_xml
-            while (_pop = pop).popped_products_count > 0
-              _pop.each_product(&block)
+          # Iteruj po kolejnych POP`ach w nazwanej kolejce.
+          def each_pop(options = {}, &block) #:yields: QueuePop
+            while _pop = pop(options)
+              yield _pop
             end
           end
 
@@ -90,33 +92,19 @@ module Elibri #:nodoc:
           attr_reader :popped_products_count
           # Kiedy POP zostal wykonany?
           attr_reader :created_at
-          # ONIX pobranych produktow
-          attr_reader :products_xmls
+          # Pelna tresc ONIX - lacznie z naglowkiem
+          attr_reader :xml
+          # ONIX przeparsowany za pomoca gemu elibri_onix
+          attr_reader :onix
 
 
           def initialize(attributes = {}) #:nodoc:
-            attributes.assert_valid_keys(:queue_name, :popped_products_count, :created_at, :products_xmls)
+            attributes.assert_valid_keys(:queue_name, :popped_products_count, :created_at, :xml)
             @queue_name = attributes[:queue_name]
             @popped_products_count = attributes[:popped_products_count].to_i
-            @products_xmls = attributes[:products_xmls]
-            @created_at = Time.parse(attributes[:created_at])
-          end
-
-
-          def each_product(&block)
-            @products_xmls.each(&block)
-          end
-
-
-          # Zbuduj instancje na podstawie XML`a.
-          def self.build_from_xml(pop_xml) #:nodoc:
-            pop_xml = Nokogiri::XML(pop_xml).css('pop').first if pop_xml.is_a? String
-            QueuePop.new(
-              :queue_name => pop_xml['queue_name'],
-              :popped_products_count => pop_xml['popped_products_count'].to_i,
-              :created_at => pop_xml['created_at'],
-              :products_xmls => pop_xml.css('Product')
-            )
+            @xml = attributes[:xml]
+            @created_at = Time.parse(attributes[:created_at]) rescue nil
+            @onix = Elibri::ONIX::Release_3_0::ONIXMessage.from_xml(@xml) if @xml.present?
           end
 
         end

data/lib/elibri_api_client/version.rb

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

data/test/elibri_api_client_test.rb

@@ -7,7 +7,7 @@ module Elibri
     module ApiAdapters
       # Testowy adapter.
       class V999
-        def initialize(host_uri, login, password)
+        def initialize(host_uri, login, password, onix_dialect)
         end
       end
     end
@@ -23,22 +23,29 @@ describe Elibri::ApiClient do
 
 
   it "should take some defaults in constructor" do
-    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass')
+    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass', :onix_dialect => '3.0.1')
     assert_equal Elibri::ApiClient::DEFAULT_API_HOST_URI, client.host_uri
 
-    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass', :host_uri => 'http://localhost:3000')
+    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass', :host_uri => 'http://localhost:3000', :onix_dialect => '3.0.1')
     assert_equal 'http://localhost:3000', client.host_uri
   end
 
 
+  it "should force user to specify ONIX dialect" do
+    assert_raises RuntimeError do
+      Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass')
+    end
+  end
+
+
   it "should enable user to pick a version of API" do
-    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass', :api_version => 'v999')
+    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass', :api_version => 'v999', :onix_dialect => '3.0.1')
     assert_kind_of Elibri::ApiClient::ApiAdapters::V999, client.instance_variable_get('@api_adapter')
   end
   
   
   it "should delegate several methods to apropriate API adapter" do
-    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass')
+    client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass', :onix_dialect => '3.0.1')
 
     delegated_methods = %w{refill_all_queues! pending_data? pending_queues publishers}
     delegated_methods.each {|method_name| client.instance_variable_get('@api_adapter').expects(method_name) }

data/test/elibri_api_v1_adapter_queue_pop_test.rb

@@ -5,15 +5,22 @@ require 'helper'
 describe Elibri::ApiClient::ApiAdapters::V1::QueuePop do
 
   before do
-    @products_xmls = Nokogiri::XML(<<-XML).css('Product')
-      <root>
+    @xml = <<-XML.strip_heredoc
+      <?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">
+        <elibri:Dialect>3.0.1</elibri:Dialect>
+        <Header>
+          <Sender>
+            <SenderName>Elibri.com.pl</SenderName>
+            <ContactName>Tomasz Meka</ContactName>
+            <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
+          </Sender>
+          <SentDateTime>20111009</SentDateTime>
+        </Header>
         <Product>
-          <RecordReference>123</RecordReference>
+          <RecordReference>fdb8fa072be774d97a97</RecordReference>
         </Product>
-        <Product>
-          <RecordReference>456</RecordReference>
-        </Product>
-      </root>
+      </ONIXMessage>
     XML
   end
 
@@ -24,42 +31,15 @@ describe Elibri::ApiClient::ApiAdapters::V1::QueuePop do
       :queue_name => 'meta',
       :popped_products_count => 120,
       :created_at => time.to_s,
-      :products_xmls => @products_xmls
+      :xml => @xml
     )
 
     assert_equal 'meta', queue_pop.queue_name 
     assert_equal 120, queue_pop.popped_products_count 
     assert_equal time.to_i, queue_pop.created_at.to_i
-    assert_equal @products_xmls, queue_pop.products_xmls
-  end
-  
-
-  it "should be able to build itself from provided XML" do
-    xml = <<-XML
-      <pop queue_name="meta" popped_products_count="1500" created_at="2011-02-05 21:02:22 UTC">
-        #{@products_xmls.to_s}
-      </pop>
-    XML
-
-    queue_pop = Elibri::ApiClient::ApiAdapters::V1::QueuePop.build_from_xml(xml)
-    assert_equal 'meta', queue_pop.queue_name 
-    assert_equal 1500, queue_pop.popped_products_count
-    assert_equal Time.parse("2011-02-05 21:02:22 UTC"), queue_pop.created_at 
-    assert_equal 2, queue_pop.products_xmls.size
-  end
-  
-
-  it "should provide iterator for traversing products list" do
-    xml = <<-XML
-      <pop queue_name="meta" popped_products_count="1500" created_at="2011-02-05 21:02:22 UTC">
-        #{@products_xmls.to_s}
-      </pop>
-    XML
-
-    queue_pop = Elibri::ApiClient::ApiAdapters::V1::QueuePop.build_from_xml(xml)
-    record_references = []
-    queue_pop.each_product {|product_xml| record_references << product_xml.css('RecordReference').text  }
-    assert_equal ['123', '456'], record_references
+    assert_equal @xml, queue_pop.xml
+    assert_kind_of Elibri::ONIX::Release_3_0::ONIXMessage, queue_pop.onix
+    assert_equal 'fdb8fa072be774d97a97', queue_pop.onix.products.first.record_reference
   end
   
 

data/test/elibri_api_v1_adapter_queue_test.rb

@@ -46,16 +46,15 @@ describe Elibri::ApiClient::ApiAdapters::V1::Queue do
   end
   
 
-  it "should provide iterator for traversing products list" do
+  it "should provide iterator for traversing through each pop" do
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'meta')
-    pop_with_products = mock('QueuePop', :popped_products_count => 10)
-    pop_with_products.expects(:each_product)
+    pop_with_products = stub('QueuePop', :popped_products_count => 5)
+    pop_with_products2 = stub('QueuePop', :popped_products_count => 3)
+    queue.expects(:pop).with(:count => 5).returns(pop_with_products).then.returns(pop_with_products2).then.returns(nil).times(3)
 
-    pop_without_products = mock('QueuePop', :popped_products_count => 0)
-    pop_without_products.expects(:each_product).never
-    queue.expects(:pop).returns(pop_with_products).then.returns(pop_without_products).twice
-
-    queue.each_product {|product_xml| product_xml.css('RecordReference')  }
+    pops = []
+    queue.each_pop(:count => 5) {|pop| pops << pop  }
+    assert_equal [pop_with_products, pop_with_products2], pops
   end
   
 

data/test/elibri_api_v1_adapter_test.rb

@@ -5,30 +5,31 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
 
   FAKE_API_HOST = 'http://localhost:5000'
 
-  def get_request_expected(request_uri)
+  def get_request_expected(request_uri, options = {})
     Elibri::ApiClient::ApiAdapters::V1.expects(:get).with(
       request_uri,
-      {:digest_auth => {:username => 'login', :password => 'password'}}
+      {:digest_auth => {:username => 'login', :password => 'password'}}.merge(options)
     )
   end
 
 
   def post_request_expected(request_uri, options = {})
-    options = ' ' if options.empty?
+    options[:body] = ' ' unless options[:body]
+
     Elibri::ApiClient::ApiAdapters::V1.expects(:post).with(
       request_uri,
-      {:body => options, :digest_auth => {:username => 'login', :password => 'password'}}
+      {:digest_auth => {:username => 'login', :password => 'password'}}.merge(options)
     )
   end
 
 
   before do
-    @adapter = Elibri::ApiClient::ApiAdapters::V1.new(FAKE_API_HOST, 'login', 'password')
+    @adapter = Elibri::ApiClient::ApiAdapters::V1.new(FAKE_API_HOST, 'login', 'password', '3.0.1')
   end
 
 
   it "should define several exception classes" do
-    exception_classes = %w{Unauthorized NotFound Forbidden ServerError QueueDoesNotExists NoRecentlyPoppedData}
+    exception_classes = %w{Unauthorized NotFound Forbidden ServerError QueueDoesNotExists NoRecentlyPoppedData InvalidOnixDialect}
     exception_classes.each do |exception_class|
       assert(Elibri::ApiClient::ApiAdapters::V1::Exceptions.const_get(exception_class) < RuntimeError)
     end  
@@ -121,6 +122,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
         '500' =>  Elibri::ApiClient::ApiAdapters::V1::Exceptions::ServerError,
         '1001' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::QueueDoesNotExists,
         '1002' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::NoRecentlyPoppedData,
+        '1003' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::InvalidOnixDialect,
       }
     end
 
@@ -220,7 +222,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
       @product = Elibri::ApiClient::ApiAdapters::V1::Product.new(@adapter, stub('publisher'), :record_reference => '076eb83a5f01cb03a217')
       xml = %Q{<Product><RecordReference>076eb83a5f01cb03a217</RecordReference></Product>}
       response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
-      get_request_expected("#{FAKE_API_HOST}/api/v1/products/076eb83a5f01cb03a217").at_least_once.returns(response_stub)
+      get_request_expected("#{FAKE_API_HOST}/api/v1/products/076eb83a5f01cb03a217", :headers => {'X-eLibri-API-ONIX-dialect' => '3.0.1'}).at_least_once.returns(response_stub)
     end
 
 
@@ -237,47 +239,87 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   describe "when asked to pop data from specified queue name" do
 
     before do
-      xml = <<-XML
-        <pop created_at="2011-09-06 13:58:21 UTC" queue_name="meta" popped_products_count="2">
-          <ONIXMessage release="3.0">
-            <Header>
-              <Sender>
-                <SenderName>Elibri.com.pl</SenderName>
-                <ContactName>Tomasz Meka</ContactName>
-                <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
-              </Sender>
-              <SentDateTime>20110906</SentDateTime>
-            </Header>
-
-            <Product>
-            </Product>
-            <Product>
-            </Product>
-          </ONIXMessage>
-        </pop>
+      @xml = <<-XML
+        <?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">
+          <elibri:Dialect>3.0.1</elibri:Dialect>
+          <Header>
+            <Sender>
+              <SenderName>Elibri.com.pl</SenderName>
+              <ContactName>Tomasz Meka</ContactName>
+              <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
+            </Sender>
+            <SentDateTime>20111009</SentDateTime>
+          </Header>
+          <Product>
+            <RecordReference>fdb8fa072be774d97a97</RecordReference>
+          </Product>
+          <Product>
+            <RecordReference>6de1bed2f70a8cdae200</RecordReference>
+          </Product>
+        </ONIXMessage>
       XML
-
-      @response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
     end
 
 
     it "should send params when they are specified and return QueuePop instance" do
-      post_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/pop", :testing => 1, :count => 5).at_least_once.returns(@response_stub)
+      @response_stub = stub('response_stub',
+        :code => 200,
+        :body => @xml,
+        :parsed_response => Nokogiri::XML(@xml),
+        :headers => {"x-elibri-api-pop-products-count" => 2, "x-elibri-api-pop-queue-name" => "meta", "x-elibri-api-pop-created-at" => "2011-09-06 13:58:21 UTC"}
+      )
+
+      post_request_expected(
+        "#{FAKE_API_HOST}/api/v1/queues/meta/pop",
+        :body => {:testing => 1, :count => 5},
+        :headers => {'X-eLibri-API-ONIX-dialect' => '3.0.1'}
+      ).at_least_once.returns(@response_stub)
 
       pop = @adapter.pop_from_queue('meta', :testing => true, :count => 5)
       assert_kind_of Elibri::ApiClient::ApiAdapters::V1::QueuePop, pop
       assert_equal 2, pop.popped_products_count
+      assert_equal 'fdb8fa072be774d97a97', pop.onix.products.first.record_reference
     end
 
 
     it "should send empty request body when no params are specified" do
-      post_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/pop").at_least_once.returns(@response_stub)
+      @response_stub = stub('response_stub',
+        :code => 200,
+        :body => @xml,
+        :parsed_response => Nokogiri::XML(@xml),
+        :headers => {"x-elibri-api-pop-products-count" => 2, "x-elibri-api-pop-queue-name" => "meta", "x-elibri-api-pop-created-at" => "2011-09-06 13:58:21 UTC"}
+      )
+
+      post_request_expected(
+        "#{FAKE_API_HOST}/api/v1/queues/meta/pop",
+        :body => ' ',
+        :headers => {'X-eLibri-API-ONIX-dialect' => '3.0.1'}
+      ).at_least_once.returns(@response_stub)
 
       pop = @adapter.pop_from_queue('meta')
       assert_kind_of Elibri::ApiClient::ApiAdapters::V1::QueuePop, pop
       assert_equal 2, pop.popped_products_count
     end
 
+
+    it "should return nil when there is no data to pop" do
+      @response_stub = stub('response_stub',
+        :code => 200,
+        :body => nil,
+        :parsed_response => nil,
+        :headers => {"x-elibri-api-pop-products-count" => 0}
+      )
+
+      post_request_expected(
+        "#{FAKE_API_HOST}/api/v1/queues/meta/pop",
+        :body => ' ',
+        :headers => {'X-eLibri-API-ONIX-dialect' => '3.0.1'}
+      ).at_least_once.returns(@response_stub)
+
+      assert_nil @adapter.pop_from_queue('meta')
+    end
+
   end
 
 
@@ -287,7 +329,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
       before do
         xml = %q{<error id='1002'> <message>There is no recently popped data</message> </error>}
         response_stub = stub('response_stub', :code => 412, :parsed_response => Nokogiri::XML(xml))
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/last_pop").once.returns(response_stub)
+        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/last_pop", :headers => {'X-eLibri-API-ONIX-dialect' => '3.0.1'}).once.returns(response_stub)
       end
 
       it "should return nil, ignoring NoRecentlyPoppedData exception" do
@@ -299,36 +341,42 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     describe "and there was a pop" do
 
       before do
-        xml = <<-XML
-          <pop created_at="2011-09-06 13:58:21 UTC" queue_name="meta" popped_products_count="2">
-            <ONIXMessage release="3.0">
-              <Header>
-                <Sender>
-                  <SenderName>Elibri.com.pl</SenderName>
-                  <ContactName>Tomasz Meka</ContactName>
-                  <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
-                </Sender>
-                <SentDateTime>20110906</SentDateTime>
-              </Header>
-
-              <Product>
-              </Product>
-              <Product>
-              </Product>
-            </ONIXMessage>
-          </pop>
+        @xml = <<-XML
+          <?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">
+            <elibri:Dialect>3.0.1</elibri:Dialect>
+            <Header>
+              <Sender>
+                <SenderName>Elibri.com.pl</SenderName>
+                <ContactName>Tomasz Meka</ContactName>
+                <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
+              </Sender>
+              <SentDateTime>20111009</SentDateTime>
+            </Header>
+            <Product>
+              <RecordReference>fdb8fa072be774d97a97</RecordReference>
+            </Product>
+            <Product>
+              <RecordReference>6de1bed2f70a8cdae200</RecordReference>
+            </Product>
+          </ONIXMessage>
         XML
-
-        @response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
       end
 
 
       it "should return QueuePop instance" do
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/last_pop").at_least_once.returns(@response_stub)
+        response_stub = stub('response_stub',
+          :code => 200,
+          :body => @xml,
+          :parsed_response => Nokogiri::XML(@xml),
+          :headers => {"x-elibri-api-pop-products-count" => 2, "x-elibri-api-pop-queue-name" => "meta", "x-elibri-api-pop-created-at" => "2011-09-06 13:58:21 UTC"}
+        )
+        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/last_pop", :headers => {'X-eLibri-API-ONIX-dialect' => '3.0.1'}).at_least_once.returns(response_stub)
 
         pop = @adapter.last_pop_from_queue('meta')
         assert_kind_of Elibri::ApiClient::ApiAdapters::V1::QueuePop, pop
         assert_equal 2, pop.popped_products_count
+        assert_equal 'fdb8fa072be774d97a97', pop.onix.products.first.record_reference
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_api_client
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - "Marcin Urba\xC5\x84ski"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 +02:00
+date: 2011-10-09 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: 19
+        hash: 61
         segments: 
         - 0
-        - 7
         - 8
-        version: 0.7.8
+        - 1
+        version: 0.8.1
   name: httparty
   version_requirements: *id001
   prerelease: false
@@ -57,29 +57,29 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424103
+        hash: 3
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 1
-        version: 3.1.0.rc1
+        version: 3.1.0
   name: activesupport
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
         - 0
-        version: "0"
-  name: pry
+        - 1
+        - 3
+        version: 0.1.3
+  name: elibri_onix
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mocha
+  name: pry
   version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -107,12 +107,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: minitest
+  name: mocha
   version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: minitest
+  version_requirements: *id007
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,11 +138,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id007
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -140,11 +154,11 @@ dependencies:
         - 2
         version: 1.6.2
   name: jeweler
-  version_requirements: *id008
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,7 +168,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id009
+  version_requirements: *id010
   prerelease: false
 description: API client for elibri.com.pl publishing system
 email: marcin@urbanski.vdl.pl