elibri_api_client 1.0.5 → 1.1.0

data/Gemfile

@@ -5,7 +5,7 @@ gem "nokogiri", "~> 1.5.0"
 gem 'activesupport', '>= 3.1.0.rc1'
 
 group :development do
-  gem "ruby-debug"
+  gem "pry"
   gem "mocha"
   gem "minitest", ">= 0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     activesupport (3.1.0.rc1)
       multi_json (~> 1.0)
-    columnize (0.3.3)
+    coderay (0.9.8)
     crack (0.1.8)
     git (1.2.5)
     httparty (0.7.8)
@@ -12,20 +12,23 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    method_source (0.6.5)
+      ruby_parser (>= 2.0.5)
     minitest (2.2.2)
     mocha (0.9.12)
     multi_json (1.0.3)
     nokogiri (1.5.0)
+    pry (0.9.6)
+      coderay (>= 0.9.8)
+      method_source (>= 0.6.5)
+      ruby_parser (>= 2.0.5)
+      slop (~> 2.1.0)
     rake (0.9.0)
-    rbx-require-relative (0.0.5)
     rcov (0.9.9)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.6)
+    slop (2.1.0)
 
 PLATFORMS
   ruby
@@ -38,5 +41,5 @@ DEPENDENCIES
   minitest
   mocha
   nokogiri (~> 1.5.0)
+  pry
   rcov
-  ruby-debug

data/README.rdoc

@@ -29,21 +29,26 @@
   # elibri.refill_all_queues!
 
   elibri.pending_queues.each do |pending_queue|
-    # Aby moc pobierac dane, musimy kolejke oczekujaca przekonwertowac na kolejke nazwana.
-    # Taka kolejke identyfikujemy po ID i jej tresc pozniej nie ulega zmianie.
-    named_queue = pending_queue.pick_up!
-
-    # Majac kolejke nazwana, mozemy iterowac po jej produktach (ONIX):
-    named_queue.each_product_onix do |product_xml, product_no|
+    pending_queue.each_product do |product_xml|
       # Otrzymujemy przeparsowany XML za pomoca Nokogiri
       # product_xml.class => Nokogiri::XML::Element
 
-      puts product.xml.css('RecordReference')
+      puts product_xml.css('RecordReference').text
     end
   end
 
-==== 3b. Znadz ostatnio pobrane kolejki
-  named_queue = elibri.last_pickups.first
+==== 3b. Pobieranie danych z konkretnej kolejki
+
+  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 }
+
+  last_pop = meta.last_pop
+
+
+==== 3c. Znadz ostatnio pobrane kolejki
+  last_pop = elibri.last_pop_from_queue('meta')
 
 
 == Copyright

data/elibri_api_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elibri_api_client}
-  s.version = "1.0.5"
+  s.version = "1.1.0"
 
   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-07-17}
+  s.date = %q{2011-09-30}
   s.description = %q{API client for elibri.com.pl publishing system}
   s.email = %q{marcin@urbanski.vdl.pl}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "test/elibri_api_client_test.rb",
     "test/elibri_api_v1_adapter_product_test.rb",
     "test/elibri_api_v1_adapter_publisher_test.rb",
+    "test/elibri_api_v1_adapter_queue_pop_test.rb",
     "test/elibri_api_v1_adapter_queue_test.rb",
     "test/elibri_api_v1_adapter_test.rb",
     "test/helper.rb"
@@ -50,7 +51,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, ["~> 0.7.8"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0.rc1"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -60,7 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, ["~> 0.7.8"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
       s.add_dependency(%q<activesupport>, [">= 3.1.0.rc1"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -71,7 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, ["~> 0.7.8"])
     s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
     s.add_dependency(%q<activesupport>, [">= 3.1.0.rc1"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/elibri_api_client/api_adapters/v1.rb

@@ -11,7 +11,7 @@ module Elibri
 
         include HTTParty
         #--
-        #debug_output $stderr
+        # debug_output $stderr
         #++
 
         def initialize(host_uri, login, password) #:nodoc:
@@ -37,7 +37,7 @@ module Elibri
         #   pending_queues -> array
         #
         def pending_queues
-          resp = get '/queues/pending_data'
+          resp = get '/queues'
 
           Array.new.tap do |pending_queues|
             resp.parsed_response.css('queue').each do |queue_xml|
@@ -57,25 +57,6 @@ module Elibri
         end
 
 
-        # Ostatnio utworzone nazwane kolejki. Gdy wysypie nam sie aplikacja, mozna przegladac ostatnie pickupy
-        # i ponownie pobierac z nich dane. Zwraca instance Elibri::ApiClient::ApiAdapters::V1::Queue
-        # call-seq:
-        #   last_pickups -> array
-        #
-        def last_pickups
-          Array.new.tap do |last_pickups|
-            %w{meta stocks}.each do |queue_name|
-              begin
-                response = get "/queues/#{queue_name}/last_pick_up"
-                queue_xml = response.parsed_response.css('queue').first
-                last_pickups << Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(self, queue_xml)
-              rescue Exceptions::NoRecentlyPickedUpQueues # Ignoruj bledy o braku ostatnich pickupow.
-              end
-            end  
-          end
-        end
-
-
         # Zwroc liste dostepnych wydawnictw - instancje Elibri::ApiClient::ApiAdapters::V1::Publisher
         # call-seq:
         #   publishers -> array
@@ -92,51 +73,22 @@ module Elibri
         end
 
 
-        # Utworz z danych oczekujacych w kolejce np. 'pending_meta', kolejke nazwana.
-        # Tylko z kolejek nazwanych mozna pobierac dane. Jako argument przyjmuje nazwe kolejki (np. 'pending_meta')
-        # lub odpowiednia instancje Elibri::ApiClient::ApiAdapters::V1::Queue.
-        def pick_up_queue!(queue) #:nodoc:
-          case queue
-            when Elibri::ApiClient::ApiAdapters::V1::Queue
-              queue_name = queue.name
-            when String
-              queue_name = queue
-            else
-              raise 'Specify queue as name or Elibri::ApiClient::ApiAdapters::V1::Queue instance'
-          end
-
-          response = post "/queues/#{queue_name}/pick_up", :body => ' '
-          picked_up_queue_xml = response.parsed_response.css('pick_up queue').first
-          Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(self, picked_up_queue_xml)
-        end
-
-
-        def each_page_in_queue(queue, &block) #:nodoc:
-          raise 'Need a Elibri::ApiClient::ApiAdapters::V1::Queue instance' unless queue.kind_of? Elibri::ApiClient::ApiAdapters::V1::Queue
-          
-          page_no = 1
-          response = get "/queues/#{queue.name}/#{queue.queue_id}"
-          yield response.parsed_response.css('current_page content'), page_no
-          while next_page = response.parsed_response.css('next_page').first
-            response = get next_page['url']
-            page_no += 1
-            yield response.parsed_response.css('current_page content').first, page_no
-          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)
         end
 
 
-        # Trawersuj kolekcje produktow w nazwanej kolejce. Instancje nazwanej kolejki nalezy przekazac
-        # jako argument metody.
-        def each_product_onix_in_queue(queue, &block) #:nodoc:
-          raise 'Need a Elibri::ApiClient::ApiAdapters::V1::Queue instance' unless queue.kind_of? Elibri::ApiClient::ApiAdapters::V1::Queue
-
-          product_no = 1
-          each_page_in_queue(queue) do |products_page_xml, page_no|
-            products_page_xml.css('Product').each do |product_xml|
-              block.call(product_xml, product_no)
-              product_no += 1
-            end  
-          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)
+        rescue Exceptions::NoRecentlyPoppedData # Ignoruj bledy o braku ostatnich POPow.
+          return nil
         end
 
 
@@ -164,7 +116,7 @@ module Elibri
 
         private
 
-          # http://api.elibri.com.pl:80/api/v1
+          # http://www.elibri.com.pl:80/api/v1
           def full_api_uri
             @host_uri + URI_PREFIX 
           end

data/lib/elibri_api_client/api_adapters/v1_helpers.rb

@@ -13,10 +13,8 @@ module Elibri #:nodoc:
           class NotFound < RuntimeError; end
           class Forbidden < RuntimeError; end
           class ServerError < RuntimeError; end
-          class NoPendingData < RuntimeError; end
-          class NoRecentlyPickedUpQueues < RuntimeError; end
           class QueueDoesNotExists < RuntimeError; end
-          class InvalidPageNumber < RuntimeError; end
+          class NoRecentlyPoppedData < RuntimeError; end
         end
 
         # Klasy wyjatkow rzucanych, gdy elibri zwroci okreslony blad. Np. gdy dostaniemy:
@@ -29,9 +27,7 @@ module Elibri #:nodoc:
           '403' =>  Exceptions::Forbidden,
           '500' =>  Exceptions::ServerError,
           '1001' => Exceptions::QueueDoesNotExists,
-          '1002' => Exceptions::NoPendingData,
-          '1003' => Exceptions::NoRecentlyPickedUpQueues,
-          '1004' => Exceptions::InvalidPageNumber
+          '1002' => Exceptions::NoRecentlyPoppedData,
         }.freeze
 
 
@@ -41,52 +37,36 @@ module Elibri #:nodoc:
           attr_reader :name
           # Ilosc produktow znajdujacych sie w kolejce
           attr_reader :products_count
-          # Kiedy kolejka zostala przekonwertowana na nazwana? (otrzymala ID w bazie)
-          attr_reader :picked_up_at
           # Kiedy ostatnio umieszczono jakis produkt w kolejce?
           attr_reader :last_insert_at
-          # Unikalny identyfikator kolejki w bazie
-          attr_reader :queue_id
-          # Entrypoint API, pod ktorym mozna zobaczyc zawartosc kolejki
-          attr_reader :url
 
 
           def initialize(api_adapter, attributes = {}) #:nodoc:
-            attributes.assert_valid_keys(:name, :products_count, :queue_id, :url, :last_insert_at, :picked_up_at)
+            attributes.assert_valid_keys(:name, :products_count, :last_insert_at)
             @api_adapter = api_adapter
             @name = attributes[:name]
             @products_count = attributes[:products_count].to_i
-            @queue_id = attributes[:queue_id]
-            @url = attributes[:url]
-
             @last_insert_at = Time.parse(attributes[:last_insert_at]) if attributes[:last_insert_at].present?
-            @picked_up_at = Time.parse(attributes[:picked_up_at]) if attributes[:picked_up_at].present?
           end
 
 
-          # Przekonwertuj kolejke z danymi oczekujacymi (np. 'pending_meta') na kolejke nazwana.
-          # call-seq:
-          #   pick_up! -> named_queue_instance
-          #
-          def pick_up!
-            @api_adapter.pick_up_queue!(self) unless picked_up?
+          # Pobierz dane z kolejki
+          def pop(options = {})
+            @api_adapter.pop_from_queue(self.name, options)
           end
 
 
-          # Iteruj po kolejnych rekordach ONIX w nazwanej kolejce.
-          def each_product_onix(&block) #:yields: product_xml
-            raise 'Cannot iterate unpicked queue products! Try named = queue.pick_up! and then named.each_product_onix' unless self.picked_up?
-            @api_adapter.each_product_onix_in_queue(self, &block)
+          # Zwroc ostatnio pobrane dane z tej kolejki
+          def last_pop
+            @api_adapter.last_pop_from_queue(self.name)
           end
 
 
-          # Czy to jest kolejka nazwana, czy oczekujaca? Wszystkie kolejki z danymi oczekujacymi maja w nazwie
-          # przedrostek 'pending_'. Np. 'pending_meta', 'pending_stocks'.
-          # call-seq:
-          #   picked_up? -> true or false
-          #
-          def picked_up?
-            !self.name.start_with?('pending_')
+          # 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)
+            end
           end
 
 
@@ -96,16 +76,53 @@ module Elibri #:nodoc:
             Queue.new(api_adapter,
               :name => queue_xml['name'],
               :products_count => queue_xml['products_count'].to_i,
-              :last_insert_at => queue_xml['last_insert_at'],
-              :url => queue_xml['url'],
-              :queue_id => queue_xml['id'],
-              :picked_up_at => queue_xml['picked_up_at']
+              :last_insert_at => queue_xml['last_insert_at']
             )
           end
         end
 
 
 
+        class QueuePop
+          # Nazwa kolejki ktorej dotyczyl POP
+          attr_reader :queue_name
+          # Ilosc produktow pobranych w tym POPie
+          attr_reader :popped_products_count
+          # Kiedy POP zostal wykonany?
+          attr_reader :created_at
+          # ONIX pobranych produktow
+          attr_reader :products_xmls
+
+
+          def initialize(attributes = {}) #:nodoc:
+            attributes.assert_valid_keys(:queue_name, :popped_products_count, :created_at, :products_xmls)
+            @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')
+            )
+          end
+
+        end
+
+
+
         class Publisher
           # Identyfikator wydawnictwa w bazie
           attr_reader :publisher_id
@@ -188,6 +205,7 @@ module Elibri #:nodoc:
         end
 
 
+
         class Product
           # Wydawnictwo, ktore opublikowalo produkt - instancja Elibri::ApiClient::ApiAdapters::V1::Publisher
           attr_reader :publisher

data/lib/elibri_api_client/version.rb

@@ -3,8 +3,8 @@ module Elibri
   class ApiClient
     module Version
       MAJOR = 1
-      MINOR = 0
-      PATCH = 5
+      MINOR = 1
+      PATCH = 0
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/lib/elibri_api_client.rb

@@ -17,7 +17,7 @@ module Elibri
     extend Forwardable
 
     # Domyslny adres serwera API
-    DEFAULT_API_HOST_URI = 'http://api.elibri.com.pl:80'
+    DEFAULT_API_HOST_URI = 'http://www.elibri.com.pl:80'
     # Adres hosta, pod ktorym figuruje serwer API - domyslnie to DEFAULT_API_HOST_URI
     attr_reader :host_uri
 
@@ -40,7 +40,7 @@ module Elibri
 
 
     # Metody API delegujemy do odpowiedniego adaptera:
-    def_delegators :@api_adapter, :refill_all_queues!, :pending_data?, :pending_queues, :last_pickups, :publishers
+    def_delegators :@api_adapter, :refill_all_queues!, :pending_data?, :pending_queues, :publishers, :last_pop_from_queue
 
   end
 end

data/test/elibri_api_client_test.rb

@@ -40,7 +40,7 @@ describe Elibri::ApiClient do
   it "should delegate several methods to apropriate API adapter" do
     client = Elibri::ApiClient.new(:login => 'elibri_login', :password => 'pass')
 
-    delegated_methods = %w{refill_all_queues! pending_data? pending_queues last_pickups publishers}
+    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) }
     delegated_methods.each {|method_name| client.send(method_name) }
   end

data/test/elibri_api_v1_adapter_product_test.rb

@@ -13,7 +13,7 @@ describe Elibri::ApiClient::ApiAdapters::V1::Product do
     product = Elibri::ApiClient::ApiAdapters::V1::Product.new(@api_adapter, @publisher,
       :record_reference => 'AAAAAAAAAAAAAAA',
       :title => 'Erlang Programming',
-      :url => 'http://api.elibri.com.pl/api/v1/products/AAAAAAAAAAAAAAA'
+      :url => 'http://www.elibri.com.pl/api/v1/products/AAAAAAAAAAAAAAA'
     )
 
     assert_equal 'Erlang Programming', product.title 
@@ -25,13 +25,13 @@ describe Elibri::ApiClient::ApiAdapters::V1::Product do
 
   it "should be able to build itself from provided XML" do
     xml = %Q{
-      <product record_reference="04325b31fdece145d22e" title="Erlang Programming"  url="http://api.elibri.com.pl/api/v1/products/04325b31fdece145d22e"/>
+      <product record_reference="04325b31fdece145d22e" title="Erlang Programming"  url="http://www.elibri.com.pl/api/v1/products/04325b31fdece145d22e"/>
     }
 
     product = Elibri::ApiClient::ApiAdapters::V1::Product.build_from_xml(@api_adapter, @publisher, xml)
     assert_equal 'Erlang Programming', product.title
     assert_equal '04325b31fdece145d22e', product.record_reference
-    assert_equal "http://api.elibri.com.pl/api/v1/products/04325b31fdece145d22e", product.url
+    assert_equal "http://www.elibri.com.pl/api/v1/products/04325b31fdece145d22e", product.url
   end
 
 

data/test/elibri_api_v1_adapter_publisher_test.rb

@@ -13,13 +13,13 @@ describe Elibri::ApiClient::ApiAdapters::V1::Publisher do
       :name => 'Wydawnicta Naukowo-Techniczne',
       :publisher_id => '1020',
       :products_count => 1503,
-      :products_url => 'http://api.elibri.com.pl/api/v1/publishers/1020/products'
+      :products_url => 'http://www.elibri.com.pl/api/v1/publishers/1020/products'
     )
 
     assert_equal 'Wydawnicta Naukowo-Techniczne', publisher.name 
     assert_equal 1020, publisher.publisher_id
     assert_equal 1503, publisher.products_count
-    assert_equal 'http://api.elibri.com.pl/api/v1/publishers/1020/products', publisher.products_url
+    assert_equal 'http://www.elibri.com.pl/api/v1/publishers/1020/products', publisher.products_url
   end
   
 
@@ -28,7 +28,7 @@ describe Elibri::ApiClient::ApiAdapters::V1::Publisher do
     xml = %Q{
       <publishers>
         <publisher name="Wydawnicta Naukowo-Techniczne" city="Kraków" company_name="WNT Polska Sp. z o.o." zip_code="30-417" id="1" street="Łagiewnicka 33a" phone1="(12) 252-85-92" phone2="(12) 252-85-80" nip="679-284-08-64" www="http://www.wnt.com" email="sprzedaz@wnt.com">
-          <products url="http://api.elibri.com.pl/api/v1/publishers/1/products" count="350"/>
+          <products url="http://www.elibri.com.pl/api/v1/publishers/1/products" count="350"/>
         </publisher>
       </publishers>
     }
@@ -47,7 +47,7 @@ describe Elibri::ApiClient::ApiAdapters::V1::Publisher do
     assert_equal "679-284-08-64", publisher.nip
     assert_equal "http://www.wnt.com", publisher.www
     assert_equal "sprzedaz@wnt.com", publisher.email
-    assert_equal 'http://api.elibri.com.pl/api/v1/publishers/1/products', publisher.products_url
+    assert_equal 'http://www.elibri.com.pl/api/v1/publishers/1/products', publisher.products_url
   end
 
 

data/test/elibri_api_v1_adapter_queue_pop_test.rb

@@ -0,0 +1,66 @@
+
+require 'helper'
+
+
+describe Elibri::ApiClient::ApiAdapters::V1::QueuePop do
+
+  before do
+    @products_xmls = Nokogiri::XML(<<-XML).css('Product')
+      <root>
+        <Product>
+          <RecordReference>123</RecordReference>
+        </Product>
+        <Product>
+          <RecordReference>456</RecordReference>
+        </Product>
+      </root>
+    XML
+  end
+
+
+  it "should have several attributes" do
+    time = Time.now
+    queue_pop = Elibri::ApiClient::ApiAdapters::V1::QueuePop.new(
+      :queue_name => 'meta',
+      :popped_products_count => 120,
+      :created_at => time.to_s,
+      :products_xmls => @products_xmls
+    )
+
+    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
+  end
+  
+
+end

data/test/elibri_api_v1_adapter_queue_test.rb

@@ -13,74 +13,50 @@ describe Elibri::ApiClient::ApiAdapters::V1::Queue do
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter,
       :name => 'meta',
       :products_count => 120,
-      :queue_id => '192f134e666df34464bcc14d0413',
-      :url => 'http://api.elibri.com.pl/api/v1/queues/meta/192f134e666df34464bcc14d0413',
-      :last_insert_at => time.to_s,
-      :picked_up_at => time.to_s
+      :last_insert_at => time.to_s
     )
 
     assert_equal 'meta', queue.name 
     assert_equal 120, queue.products_count
-    assert_equal '192f134e666df34464bcc14d0413', queue.queue_id
-    assert_equal 'http://api.elibri.com.pl/api/v1/queues/meta/192f134e666df34464bcc14d0413', queue.url
     assert_equal time.to_i, queue.last_insert_at.to_i
-    assert_equal time.to_i, queue.picked_up_at.to_i
   end
   
 
-
   it "should be able to build itself from provided XML" do
-    xml = %Q{<queue name="stocks" id="192f134e666df34464bcc14d04135cda2bd13a0c" url="http://api.elibri.com.pl/api/v1/queues/stocks/192f134e666df34464bcc14d04135cda2bd13a0c" products_count="1500" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 22:02:22 UTC"/>}
+    xml = %Q{<queue name="stocks" products_count="1500" last_insert_at="2011-02-05 21:02:22 UTC" />}
 
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(@api_adapter, xml)
     assert_equal 'stocks', queue.name 
     assert_equal 1500, queue.products_count
-    assert_equal '192f134e666df34464bcc14d04135cda2bd13a0c', queue.queue_id
-    assert_equal 'http://api.elibri.com.pl/api/v1/queues/stocks/192f134e666df34464bcc14d04135cda2bd13a0c', queue.url
     assert_equal Time.parse("2011-02-05 21:02:22 UTC"), queue.last_insert_at 
-    assert_equal Time.parse("2011-02-05 22:02:22 UTC"), queue.picked_up_at
-
-    xml = %Q{<queue name="pending_stocks" products_count="1500" last_insert_at="2011-02-05 21:02:22 UTC"/>}
-    queue = Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(@api_adapter, xml)
-    assert_nil queue.queue_id
-    assert_nil queue.picked_up_at
-    assert_nil queue.url
   end
   
 
-  it "should be able to establish if its a picked up queue" do
-    queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'pending_meta')
-    assert !queue.picked_up?
-
+  it "should be able to pop data from itself" do
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'meta')
-    assert queue.picked_up?
+    @api_adapter.expects(:pop_from_queue).with(queue.name, {:testing => 1, :count => 20})
+    queue.pop(:testing => 1, :count => 20)
   end
   
-  
-  
-  
-  it "should be able to pick up itself when its a pending queue" do
-    queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'pending_meta')
-    @api_adapter.expects(:pick_up_queue!).with(queue)
-    queue.pick_up!
-    
+
+  it "should be able to establish last pop from itself" do
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'meta')
-    @api_adapter.expects(:pick_up_queue!).with(queue).never
-    queue.pick_up!
+    @api_adapter.expects(:last_pop_from_queue).with('meta')
+    queue.last_pop
   end
   
-  
 
   it "should provide iterator for traversing products list" do
-    block = lambda {|product_xml| product_xml.css('RecordReference')  }
-
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'meta')
-    @api_adapter.expects(:each_product_onix_in_queue).with(queue)
-    queue.each_product_onix(&block)
-  end
-  
-  
+    pop_with_products = mock('QueuePop', :popped_products_count => 10)
+    pop_with_products.expects(:each_product)
 
+    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')  }
+  end
+  
 
 end

data/test/elibri_api_v1_adapter_test.rb

@@ -13,10 +13,11 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   end
 
 
-  def post_request_expected(request_uri)
+  def post_request_expected(request_uri, options = {})
+    options = ' ' if options.empty?
     Elibri::ApiClient::ApiAdapters::V1.expects(:post).with(
       request_uri,
-      {:body => ' ', :digest_auth => {:username => 'login', :password => 'password'}}
+      {:body => options, :digest_auth => {:username => 'login', :password => 'password'}}
     )
   end
 
@@ -27,7 +28,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
 
 
   it "should define several exception classes" do
-    exception_classes = %w{Unauthorized NotFound Forbidden ServerError NoPendingData NoRecentlyPickedUpQueues QueueDoesNotExists InvalidPageNumber}
+    exception_classes = %w{Unauthorized NotFound Forbidden ServerError QueueDoesNotExists NoRecentlyPoppedData}
     exception_classes.each do |exception_class|
       assert(Elibri::ApiClient::ApiAdapters::V1::Exceptions.const_get(exception_class) < RuntimeError)
     end  
@@ -44,11 +45,11 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   it "should normalise request URI before performing real request" do
     response_stub = stub('response_stub', :code => 200, :parsed_response => nil)
 
-    get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/192f134e666df34464bcc14d0413").once.returns(response_stub)
-    @adapter.send(:get, "#{FAKE_API_HOST}/api/v1/queues/meta/192f134e666df34464bcc14d0413")
-
     get_request_expected("#{FAKE_API_HOST}/api/v1/api_entrypoint").once.returns(response_stub)
-    @adapter.send(:get, '/api_entrypoint')
+    @adapter.send(:get, "#{FAKE_API_HOST}/api/v1/api_entrypoint")
+
+    get_request_expected("#{FAKE_API_HOST}/api/v1/api_entrypoint?param1=value1").once.returns(response_stub)
+    @adapter.send(:get, '/api_entrypoint?param1=value1')
 
     get_request_expected("#{FAKE_API_HOST}/api/v1/api_entrypoint_without_leading_slash").once.returns(response_stub)
     @adapter.send(:get, 'api_entrypoint_without_leading_slash')
@@ -58,17 +59,17 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
 
   describe "when asked to establish pending queues list" do
 
-    describe "and there is pending data awaiting for pull" do
+    describe "and there is pending data awaiting for pop" do
       before do
         xml = <<-XML
-          <pending_data>
-            <queue name="pending_meta" products_count="24" last_insert_at="2011-02-05 21:02:22 UTC"/>      
-            <queue name="pending_stocks" products_count="1500" last_insert_at="2011-02-05 21:02:22 UTC"/>         
-          </pending_data>
+          <queues>
+            <queue name="meta" products_count="24" last_insert_at="2011-02-05 21:02:22 UTC"/>      
+            <queue name="stocks" products_count="1500" last_insert_at="2011-02-05 21:02:22 UTC"/>         
+          </queues>
         XML
 
         response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_data").at_least_once.returns(response_stub)
+        get_request_expected("#{FAKE_API_HOST}/api/v1/queues").at_least_once.returns(response_stub)
       end
 
 
@@ -77,14 +78,14 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
         pending_queues = @adapter.pending_queues
         assert_equal 2, pending_queues.size
 
-        pending_meta = pending_queues.find {|queue| queue.name == 'pending_meta' }
-        pending_stocks = pending_queues.find {|queue| queue.name == 'pending_stocks' }
+        meta = pending_queues.find {|queue| queue.name == 'meta' }
+        stocks = pending_queues.find {|queue| queue.name == 'stocks' }
 
-        assert_equal 24, pending_meta.products_count
-        assert_kind_of Time, pending_meta.last_insert_at 
+        assert_equal 24, meta.products_count
+        assert_kind_of Time, meta.last_insert_at 
 
-        assert_equal 1500, pending_stocks.products_count
-        assert_kind_of Time, pending_stocks.last_insert_at 
+        assert_equal 1500, stocks.products_count
+        assert_kind_of Time, stocks.last_insert_at 
       end
     end
 
@@ -92,14 +93,14 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     describe "and there is no pending data awaiting for pull" do
       before do
         xml = <<-XML
-          <pending_data>
-            <queue name="pending_meta" products_count="0" />      
-            <queue name="pending_stocks" products_count="0" />         
-          </pending_data>
+          <queues>
+            <queue name="meta" products_count="0" />      
+            <queue name="stocks" products_count="0" />         
+          </queues>
         XML
 
         response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_data").at_least_once.returns(response_stub)
+        get_request_expected("#{FAKE_API_HOST}/api/v1/queues").at_least_once.returns(response_stub)
       end
 
 
@@ -110,47 +111,6 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     end
   end
   
-  
-
-  describe "when asked to pick up queue" do
-    before do
-      xml = <<-XML
-        <pick_up>
-          <queue name="meta" id="192f134e666df34464bcc14d04135cda2bd13a0c" url="#{FAKE_API_HOST}/api/v1/queues/meta/192f134e666df34464bcc14d04135cda2bd13a0c" products_count="24" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 21:02:22 UTC"/>      
-        </pick_up>
-      XML
-
-      @response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
-    end
-
-
-    it "should be able to pick it up by name" do
-      post_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_meta/pick_up").at_least_once.returns(@response_stub)
-      picked_up_queue = @adapter.pick_up_queue!('pending_meta')
-      assert_equal 24, picked_up_queue.products_count
-      assert_kind_of Time, picked_up_queue.picked_up_at
-    end
-    
-    
-    it "should be able to pick it up by Queue instance" do
-      post_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_meta/pick_up").at_least_once.returns(@response_stub)
-      queue_to_pick_up = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter, :name => 'pending_meta')
-      picked_up_queue = @adapter.pick_up_queue!(queue_to_pick_up)
-      assert_equal 24, picked_up_queue.products_count
-      assert_kind_of Time, picked_up_queue.picked_up_at
-    end
-
-
-    it "should raise error when cannot infer queue name from argument" do
-      post_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_meta/pick_up").never
-      post_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_stocks/pick_up").never
-
-      assert_raises(RuntimeError) { @adapter.pick_up_queue!(12345) }
-      assert_raises(RuntimeError) { @adapter.pick_up_queue!(Array.new) }
-    end
-  end
-  
-
 
   describe "when there was error reported" do
     before do
@@ -160,9 +120,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
         '403' =>  Elibri::ApiClient::ApiAdapters::V1::Exceptions::Forbidden,
         '500' =>  Elibri::ApiClient::ApiAdapters::V1::Exceptions::ServerError,
         '1001' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::QueueDoesNotExists,
-        '1002' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::NoPendingData,
-        '1003' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::NoRecentlyPickedUpQueues,
-        '1004' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::InvalidPageNumber
+        '1002' => Elibri::ApiClient::ApiAdapters::V1::Exceptions::NoRecentlyPoppedData,
       }
     end
 
@@ -170,7 +128,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     it "should raise proper exception class" do
       @exception_classes.each do |error_code, exception_class|
         response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML( @xml.gsub('ERROR_CODE', error_code) ))
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_data").once.returns(response_stub)
+        get_request_expected("#{FAKE_API_HOST}/api/v1/queues").once.returns(response_stub)
         assert_raises(exception_class) { @adapter.pending_queues }
       end  
     end
@@ -178,137 +136,20 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
 
     it "should raise Unauthorized, when there is 401 response code" do
       response_stub = stub('response_stub', :code => 401, :parsed_response => nil)
-      get_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_data").once.returns(response_stub)
+      get_request_expected("#{FAKE_API_HOST}/api/v1/queues").once.returns(response_stub)
       assert_raises(Elibri::ApiClient::ApiAdapters::V1::Exceptions::Unauthorized) { @adapter.pending_queues }
     end
 
 
     it "should raise RuntimeError on unknown error code" do
       response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML( @xml.gsub('ERROR_CODE', 'UNKNOWN_ERROR_CODE') ))
-      get_request_expected("#{FAKE_API_HOST}/api/v1/queues/pending_data").once.returns(response_stub)
+      get_request_expected("#{FAKE_API_HOST}/api/v1/queues").once.returns(response_stub)
       assert_raises(Elibri::ApiClient::ApiAdapters::V1::Exceptions::UnknownError) { @adapter.pending_queues }
     end
     
   end
 
 
-
-  describe "when asked to get latest pickups" do
-    describe "and there is no recently picked up queues" do
-      before do
-        xml = %q{<error id='1003'> <message>There is no recently picked up queue</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_pick_up").once.returns(response_stub)
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/stocks/last_pick_up").once.returns(response_stub)
-      end
-
-      it "should return empty latest pickups list" do
-        assert @adapter.last_pickups.empty?
-      end
-    end
-
-
-    describe "and there were recently picked up queues" do
-      before do
-        meta_xml = <<-XML
-          <pick_up>
-            <queue name="meta" id="192f134e666df34464bcc14d04135cda2bd13a0c" url="#{FAKE_API_HOST}/api/v1/queues/meta/192f134e666df34464bcc14d04135cda2bd13a0c" products_count="24" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 21:02:22 UTC"/>      
-          </pick_up>
-        XML
-
-        stocks_xml = <<-XML
-          <pick_up>
-            <queue name="stocks" id="192f134e666df34464bcc14d04135cda2bd13a0d" url="#{FAKE_API_HOST}/api/v1/queues/stocks/192f134e666df34464bcc14d04135cda2bd13a0d" products_count="50" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 21:02:22 UTC"/>      
-          </pick_up>
-        XML
-
-        meta_response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(meta_xml))
-        stocks_response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(stocks_xml))
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/last_pick_up").once.returns(meta_response_stub)
-        get_request_expected("#{FAKE_API_HOST}/api/v1/queues/stocks/last_pick_up").once.returns(stocks_response_stub)
-      end
-
-
-      it "should return latest pickups as Queue instances" do
-        last_pickups = @adapter.last_pickups
-        assert_equal 2, last_pickups.size 
-        assert(last_pickups.all? { |pickup| pickup.is_a? Elibri::ApiClient::ApiAdapters::V1::Queue })
-      end
-    end
-  end
-
-
-
-  describe "when asked to iterate by products in a queue" do
-    before do
-      @queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@adapter, :name => 'meta', :queue_id => 'QUEUE_ID')
-      first_page_xml = <<-XML
-        <queue name="meta" id="QUEUE_ID" products_count="54" picked_up_at="2011-02-05 21:02:22 UTC">      
-          <items paginated="true">
-            <pages total="3" items_per_page="20" > 
-              <next_page page_no="2" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/2" />      
-              <current_page page_no="1" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID" >
-                <content><Product>PRODUCT_FROM_PAGE_1</Product></content>
-              </current_page>
-            </pages>
-          </items>
-        </queue>
-      XML
-      second_page_xml = <<-XML
-        <queue name="meta" id="QUEUE_ID" products_count="54" picked_up_at="2011-02-05 21:02:22 UTC">      
-          <items paginated="true">
-            <pages total="3" items_per_page="20" > 
-              <previous_page page_no="1" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID" />      
-              <next_page page_no="3" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/3" />      
-              <current_page page_no="2" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/2" >
-                <content><Product>PRODUCT_FROM_PAGE_2</Product></content>
-              </current_page>
-            </pages>
-          </items>
-        </queue>
-      XML
-      third_page_xml = <<-XML
-        <queue name="meta" id="QUEUE_ID" products_count="54" picked_up_at="2011-02-05 21:02:22 UTC">      
-          <items paginated="true">
-            <pages total="3" items_per_page="20" > 
-              <previous_page page_no="2" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/2" />      
-              <current_page page_no="3" url="#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/3" >
-                <content><Product>PRODUCT_FROM_PAGE_3</Product></content>
-              </current_page>
-            </pages>
-          </items>
-        </queue>
-      XML
-
-      first_page_response_stub = stub('response1_stub', :code => 200, :parsed_response => Nokogiri::XML(first_page_xml))
-      second_page_response_stub = stub('response2_stub', :code => 200, :parsed_response => Nokogiri::XML(second_page_xml))
-      third_page_response_stub = stub('response3_stub', :code => 200, :parsed_response => Nokogiri::XML(third_page_xml))
-
-      get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID").once.returns(first_page_response_stub)
-      get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/2").once.returns(second_page_response_stub)
-      get_request_expected("#{FAKE_API_HOST}/api/v1/queues/meta/QUEUE_ID/3").once.returns(third_page_response_stub)
-    end
-
-
-    it "should be able to iterate through products pages" do
-      expected_content = %w{<Product>PRODUCT_FROM_PAGE_1</Product> <Product>PRODUCT_FROM_PAGE_2</Product> <Product>PRODUCT_FROM_PAGE_3</Product>}
-      @adapter.each_page_in_queue(@queue) do |page_content, page_no|
-        assert_equal expected_content[page_no-1], page_content.children.to_s
-      end
-    end
-    
-
-    it "should be able to iterate through all product records" do
-      expected_records = %w{PRODUCT_FROM_PAGE_1 PRODUCT_FROM_PAGE_2 PRODUCT_FROM_PAGE_3}
-      @adapter.each_product_onix_in_queue(@queue) do |product_xml, product_no|
-        assert_kind_of Nokogiri::XML::Element, product_xml
-        assert_equal expected_records[product_no-1], product_xml.text
-      end
-    end
-  end
-
-
-
   describe "when asked to establish available publishers list" do
     before do
       xml = <<-XML
@@ -390,4 +231,109 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     end
 
   end
+
+
+
+  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
+
+      @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)
+
+      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
+    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)
+
+      pop = @adapter.pop_from_queue('meta')
+      assert_kind_of Elibri::ApiClient::ApiAdapters::V1::QueuePop, pop
+      assert_equal 2, pop.popped_products_count
+    end
+
+  end
+
+
+  describe "when asked to get last pop for specified queue name" do
+
+    describe "and there was no recent pop" 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)
+      end
+
+      it "should return nil, ignoring NoRecentlyPoppedData exception" do
+        assert_nil @adapter.last_pop_from_queue('meta')
+      end
+    end
+
+
+    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
+
+        @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)
+
+        pop = @adapter.last_pop_from_queue('meta')
+        assert_kind_of Elibri::ApiClient::ApiAdapters::V1::QueuePop, pop
+        assert_equal 2, pop.popped_products_count
+      end
+    end
+
+
+  end
+
+
 end

data/test/helper.rb

@@ -10,8 +10,7 @@ end
 require 'test/unit'
 require 'minitest/autorun'
 require 'mocha'
-require 'ruby-debug'
-Debugger.settings[:autoeval] = true rescue nil
+require 'pry'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_api_client
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 5
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Marcin Urba\xC5\x84ski"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 +02:00
+date: 2011-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
+  name: pry
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -182,6 +182,7 @@ files:
 - test/elibri_api_client_test.rb
 - test/elibri_api_v1_adapter_product_test.rb
 - test/elibri_api_v1_adapter_publisher_test.rb
+- test/elibri_api_v1_adapter_queue_pop_test.rb
 - test/elibri_api_v1_adapter_queue_test.rb
 - test/elibri_api_v1_adapter_test.rb
 - test/helper.rb