elibri_api_client 1.0.3 → 1.0.4

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "httparty", "~> 0.7.8"
 gem "nokogiri", "~> 1.5.0"
+gem 'activesupport', '>= 3.1.0.rc1'
 
 group :development do
   gem "ruby-debug"

data/Gemfile.lock

@@ -1,6 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.1.0.rc1)
+      multi_json (~> 1.0)
     columnize (0.3.3)
     crack (0.1.8)
     git (1.2.5)
@@ -14,6 +16,7 @@ GEM
       rbx-require-relative (> 0.0.4)
     minitest (2.2.2)
     mocha (0.9.12)
+    multi_json (1.0.3)
     nokogiri (1.5.0)
     rake (0.9.0)
     rbx-require-relative (0.0.5)
@@ -28,6 +31,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 3.1.0.rc1)
   bundler (~> 1.0.0)
   httparty (~> 0.7.8)
   jeweler (~> 1.6.2)

data/README.rdoc

@@ -1,20 +1,49 @@
-= elibri_api_client
+= Klient API serwisu elibri.com.pl
 
-  require 'elibri_api_client'
-  cli = Elibri::ApiClient.new(:host_uri => 'http://localhost:3010', :login => '1b20fa9d72234423979c', :password => '2847cbf4f15a4057e2ab')
+=== 0. Gemfile dla Bundlera
+  gem 'elibri_api_client'
+
+=== 1. Tworzymy instancje klienta
+  elibri = Elibri::ApiClient.new(:login => '1b20fa9d72234423979c', :password => '2847cbf4f15a4057e2ab')
   
-  cli.refill_all_queues!
-  cli.pending_data?
-  cli.last_pickups
+=== 2. Przegladanie dostepnych danych
+
+  elibri.publishers.each do |publisher|
+    puts "#{publisher.name}, #{publisher.city} (#{publisher.products_count} produktow)"
+    publisher.products.each_with_index do |product, product_no|
+      puts "\t#{product_no}. #{product.main_title}"
+      # puts product.onix_xml
+    end
+  end
+
 
-  cli.pending_queues.each do |pending_queue|
+
+=== 3. Operacje na kolejkach zmian
+
+==== 3a. Pobieranie ostatnio zmienionych produktow w Elibri
+
+  # 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.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!
 
-    named_queue.each_product do |product_xml, product_no|
-      # [...]
+    # Majac kolejke nazwana, mozemy iterowac po jej produktach (ONIX):
+    named_queue.each_product_onix do |product_xml, product_no|
+      # Otrzymujemy przeparsowany XML za pomoca Nokogiri
+      # product_xml.class => Nokogiri::XML::Element
+
+      puts product.xml.css('RecordReference')
     end
   end
 
+==== 3b. Znadz ostatnio pobrane kolejki
+  named_queue = elibri.last_pickups.first
 
 
 == 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.3"
+  s.version = "1.0.4"
 
   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-06}
+  s.date = %q{2011-07-13}
   s.description = %q{API client for elibri.com.pl publishing system}
   s.email = %q{marcin@urbanski.vdl.pl}
   s.extra_rdoc_files = [
@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
     "lib/elibri_api_client/core_extensions.rb",
     "lib/elibri_api_client/version.rb",
     "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_test.rb",
     "test/elibri_api_v1_adapter_test.rb",
     "test/helper.rb"
@@ -47,6 +49,7 @@ Gem::Specification.new do |s|
     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<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<mocha>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
@@ -56,6 +59,7 @@ Gem::Specification.new do |s|
     else
       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<mocha>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
@@ -66,6 +70,7 @@ Gem::Specification.new do |s|
   else
     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<mocha>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])

data/lib/elibri_api_client.rb

@@ -3,19 +3,31 @@ require 'time'
 require 'httparty'
 require 'nokogiri'
 require 'forwardable'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/keys'
 require 'elibri_api_client/core_extensions'
 require 'elibri_api_client/version'
 require 'elibri_api_client/api_adapters'
 
 module Elibri
+
+  # Klient API, hermetyzujacy magie polaczen i parsowania XML`a. Na jego instancji mozna wykonac wszystkie metody
+  # instancji Elibri::ApiClient::ApiAdapters::V1.
   class ApiClient
     extend Forwardable
 
+    # Domyslny adres serwera API
     DEFAULT_API_HOST_URI = 'http://api.elibri.com.pl:80'
+    # Adres hosta, pod ktorym figuruje serwer API - domyslnie to DEFAULT_API_HOST_URI
     attr_reader :host_uri
 
 
+    #  cli = Elibri::ApiClient.new(:login => '1b20fa9d72234423979c', :password => '2847cbf4f15a4057e2ab')
+    #
+    # 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)
       @login = options[:login]
       @password = options[:password]
       @host_uri = options[:host_uri] || DEFAULT_API_HOST_URI
@@ -28,8 +40,7 @@ module Elibri
 
 
     # Metody API delegujemy do odpowiedniego adaptera:
-    def_delegators :@api_adapter,
-      :refill_all_queues!, :pending_data?, :pending_queues, :pick_up_queue!, :last_pickups, :each_product, :each_page
+    def_delegators :@api_adapter, :refill_all_queues!, :pending_data?, :pending_queues, :last_pickups, :publishers
 
   end
 end

data/lib/elibri_api_client/api_adapters/v1.rb

@@ -10,9 +10,11 @@ module Elibri
         URI_PREFIX = '/api/v1'
 
         include HTTParty
+        #--
         #debug_output $stderr
+        #++
 
-        def initialize(host_uri, login, password)
+        def initialize(host_uri, login, password) #:nodoc:
           @host_uri = host_uri
           @auth = {:username => login, :password => password}
         end
@@ -20,35 +22,80 @@ module Elibri
 
         # Wypelnij wszystkie kolejki oczekujace, wszystkimi dostepnymi danymi. Przydatne przy wykonywaniu
         # pelnej synchronizacji pomiedzy nasza aplikacja a Elibri.
+        # call-seq:
+        #   refill_all_queues! -> true
+        #
         def refill_all_queues!
           # Dla POST musi byc jakies 'body' requestu, bo serwery czesto rzucaja wyjatkami (WEBrick w szczegolnosci).
           post '/queues/refill_all', :body => ' '
+          true
         end
 
 
-        # Zwroc liste kolejek z oczekujacymi danymi.
+        # Zwroc liste kolejek z oczekujacymi danymi - instancje Elibri::ApiClient::ApiAdapters::V1::Queue
+        # call-seq:
+        #   pending_queues -> array
+        #
         def pending_queues
           resp = get '/queues/pending_data'
 
-          pending_queues = []
-          resp.parsed_response.css('queue').each do |queue_xml|
-            queue = Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(self, queue_xml)
-            pending_queues << queue if queue.items_total.nonzero?
-          end  
-          pending_queues
+          Array.new.tap do |pending_queues|
+            resp.parsed_response.css('queue').each do |queue_xml|
+              queue = Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(self, queue_xml)
+              pending_queues << queue if queue.products_count.nonzero?
+            end  
+          end
         end
 
 
         # Czy sa jakies oczekujace dane w Elibri?
+        # call-seq:
+        #   pending_data? -> true or false
+        #
         def pending_data?
           !pending_queues.empty?
         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
+        #
+        def publishers
+          resp = get '/publishers'
+
+          Array.new.tap do |publishers|
+            resp.parsed_response.css('publisher').each do |publisher_xml|
+              publisher = Elibri::ApiClient::ApiAdapters::V1::Publisher.build_from_xml(self, publisher_xml)
+              publishers << publisher
+            end  
+          end
+        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)
+        def pick_up_queue!(queue) #:nodoc:
           case queue
             when Elibri::ApiClient::ApiAdapters::V1::Queue
               queue_name = queue.name
@@ -64,7 +111,7 @@ module Elibri
         end
 
 
-        def each_page(queue, &block)
+        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
@@ -80,11 +127,11 @@ module Elibri
 
         # Trawersuj kolekcje produktow w nazwanej kolejce. Instancje nazwanej kolejki nalezy przekazac
         # jako argument metody.
-        def each_product(queue, &block)
+        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(queue) do |products_page_xml, page_no|
+          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
@@ -93,20 +140,25 @@ module Elibri
         end
 
 
-        # Ostatnio utworzone nazwane kolejki. Gdy wysypie nam sie aplikacja, mozna przegladac ostatnie pickupy
-        # i ponownie pobierac z nich dane.
-        def last_pickups
-          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 NoRecentlyPickedUpQueues # Ignoruj bledy o braku ostatnich pickupow.
-            end
-          end  
-          
-          last_pickups
+        # Zwroc liste produktow dla podanego wydawnictwa.
+        def products_for_publisher(publisher) #:nodoc:
+          raise 'Need a Elibri::ApiClient::ApiAdapters::V1::Publisher instance' unless publisher.kind_of? Elibri::ApiClient::ApiAdapters::V1::Publisher
+          resp = get "/publishers/#{publisher.publisher_id}/products"
+
+          Array.new.tap do |products|
+            resp.parsed_response.css('product').each do |product_xml|
+              product = Elibri::ApiClient::ApiAdapters::V1::Product.build_from_xml(self, publisher, product_xml)
+              products << product
+            end  
+          end
+        end
+
+
+        # 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.parsed_response.css('Product').first
         end
 
 
@@ -151,7 +203,7 @@ module Elibri
 
           # Jesli Elibri zwoci jakis blad, to rzucamy odpowiednim wyjatkiem.
           def raise_if_error_present_in(response)
-            raise Unauthorized, 'Bad login or password' if response.code == 401
+            raise Exceptions::Unauthorized, 'Bad login or password' if response.code == 401
 
             response_xml = response.parsed_response
             if response_xml && !response_xml.css('error').empty?
@@ -163,7 +215,7 @@ module Elibri
                 raise exception_class, error_message
               else
                 # Jakis nieznany blad - rzucamy chociaz stringiem
-                raise UnknownError, "ELIBRI_API ERROR #{error_id}: #{error_message}"
+                raise Exceptions::UnknownError, "ELIBRI_API ERROR #{error_id}: #{error_message}"
               end
             end
           end

data/lib/elibri_api_client/api_adapters/v1_helpers.rb

@@ -1,46 +1,61 @@
 
 # Klasy pomocnicze dla API w wersji 1
-module Elibri
+module Elibri #:nodoc:
   class ApiClient
     module ApiAdapters
 
       # Adapter dla pierwszej wersji API.
       class V1
 
-        class UnknownError < RuntimeError; end
-        class Unauthorized < RuntimeError; end
-        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
-
-        # Klasy wyjatków rzucanych, gdy elibri zwróci określony blad. Np. gdy dostaniemy:
+        module Exceptions #:nodoc:all
+          class UnknownError < RuntimeError; end
+          class Unauthorized < RuntimeError; end
+          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
+        end
+
+        # Klasy wyjatkow rzucanych, gdy elibri zwroci okreslony blad. Np. gdy dostaniemy:
         #   <error id="1001">
         #     <message>Queue does not exist</message>
         #   </error>
-        # Biblioteka rzuca wyjatkiem QueueDoesNotExists.
+        # Biblioteka rzuca wyjatkiem Elibri::ApiClient::ApiAdapters::V1::Exceptions::QueueDoesNotExists.
         EXCEPTION_CLASSES = {
-          '404' => NotFound,
-          '403' => Forbidden,
-          '500' => ServerError,
-          '1001' => QueueDoesNotExists,
-          '1002' => NoPendingData,
-          '1003' => NoRecentlyPickedUpQueues,
-          '1004' => InvalidPageNumber
+          '404' =>  Exceptions::NotFound,
+          '403' =>  Exceptions::Forbidden,
+          '500' =>  Exceptions::ServerError,
+          '1001' => Exceptions::QueueDoesNotExists,
+          '1002' => Exceptions::NoPendingData,
+          '1003' => Exceptions::NoRecentlyPickedUpQueues,
+          '1004' => Exceptions::InvalidPageNumber
         }.freeze
 
 
         # Zamiast rzezbic ciagle w XML`u, tworzymy instancje kolejek.
         class Queue
-          attr_reader :name, :items_total, :picked_up_at, :last_insert_at, :queue_id, :url
-
-          def initialize(api_adapter, attributes = {})
+          # Nazwa kolejki - te z przedroskiem 'pending' sa oczekujace
+          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)
             @api_adapter = api_adapter
             @name = attributes[:name]
-            @items_total = attributes[:items_total].to_i
+            @products_count = attributes[:products_count].to_i
             @queue_id = attributes[:queue_id]
             @url = attributes[:url]
 
@@ -50,37 +65,167 @@ module Elibri
 
 
           # 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?
           end
 
 
-          # Hermetyzujemy stronicowanie danych. Programiste interesuja tylko kolejne rekordy <Product>
-          def each_product(&block)
-            @api_adapter.each_product(self, &block)
+          # 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)
           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_')
           end
 
 
           # Zbuduj instancje kolejki na podstawie XML`a.
-          def self.build_from_xml(api_adapter, queue_xml)
+          def self.build_from_xml(api_adapter, queue_xml) #:nodoc:
             queue_xml = Nokogiri::XML(queue_xml).css('queue').first if queue_xml.is_a? String
             Queue.new(api_adapter,
               :name => queue_xml['name'],
-              :items_total => queue_xml['items_total'].to_i,
+              :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']
             )
           end
-          
+        end
+
+
+
+        class Publisher
+          # Identyfikator wydawnictwa w bazie
+          attr_reader :publisher_id
+          # Nazwa wlasna wydawnictwa
+          attr_reader :name
+          # Ilosc wydanych produktow
+          attr_reader :products_count
+          # Entrypoint API, pod ktorym mozna zobaczyc liste produktow
+          attr_reader :products_url
+          # Nazwa wydawnictwa jako firmy
+          attr_reader :company_name
+          # NIP
+          attr_reader :nip
+          # Ulica
+          attr_reader :street
+          # Miasto
+          attr_reader :city
+          # Kod pocztowy
+          attr_reader :zip_code
+          # Telefon 1
+          attr_reader :phone1
+          # Telefon 2
+          attr_reader :phone2
+          # Adres WWW wydawnictwa
+          attr_reader :www
+          # E-mail kontaktowy
+          attr_reader :email
+
+
+          def initialize(api_adapter, attributes = {}) #:nodoc:
+            attributes.assert_valid_keys(
+              :publisher_id, :name, :products_count, :products_url, :company_name, :nip, :street, :city, :zip_code, :phone1, :phone2, :www, :email
+            )
+            @api_adapter = api_adapter
+            @publisher_id = attributes[:publisher_id].to_i
+            @name = attributes[:name]
+            @products_count = attributes[:products_count].to_i
+            @products_url = attributes[:products_url]
+            @company_name = attributes[:company_name]
+            @nip = attributes[:nip]
+            @street = attributes[:street]
+            @city = attributes[:city]
+            @zip_code = attributes[:zip_code]
+            @phone1 = attributes[:phone1]
+            @phone2 = attributes[:phone2]
+            @www = attributes[:www]
+            @email = attributes[:email]
+          end
+
+
+          # Zwroc liste produktow wydanych w wydawnictwie - instancji Elibri::ApiClient::ApiAdapters::V1::Product
+          # call-seq:
+          #   products -> array 
+          #
+          def products
+            @api_adapter.products_for_publisher(self)
+          end
+
+
+          # Zbuduj instancje wydawnictwa na podstawie XML`a.
+          def self.build_from_xml(api_adapter, publisher_xml) #:nodoc:
+            publisher_xml = Nokogiri::XML(publisher_xml).css('publisher').first if publisher_xml.is_a? String
+            Publisher.new(api_adapter,
+              :name => publisher_xml['name'],
+              :publisher_id => publisher_xml['id'].to_i,
+              :company_name => publisher_xml['company_name'],
+              :nip => publisher_xml['nip'],
+              :street => publisher_xml['street'],
+              :city => publisher_xml['city'],
+              :zip_code => publisher_xml['zip_code'],
+              :phone1 => publisher_xml['phone1'],
+              :phone2 => publisher_xml['phone2'],
+              :www => publisher_xml['www'],
+              :email => publisher_xml['email'],
+              :products_count => publisher_xml.css('products').first['count'].to_i,
+              :products_url => publisher_xml.css('products').first['url']
+            )
+          end
+
+        end
+
+
+        class Product
+          # Wydawnictwo, ktore opublikowalo produkt - instancja Elibri::ApiClient::ApiAdapters::V1::Publisher
+          attr_reader :publisher
+          # Unikalny identyfikator produktu w ONIX
+          attr_reader :record_reference
+          # Tytul produktu
+          attr_reader :main_title
+          # Entrypoint API, pod ktorym mozna pobrac ONIX produktu
+          attr_reader :url
+
+          def initialize(api_adapter, publisher, attributes = {}) #:nodoc:
+            attributes.assert_valid_keys(:record_reference, :main_title, :url)
+            @api_adapter = api_adapter
+            @publisher = publisher
+            @record_reference = attributes[:record_reference]
+            @main_title = attributes[:main_title]
+            @url = attributes[:url]
+          end
+
+
+          # Zwroc przeparsowany za pomoca Nokogiri ONIX produktu, pobrany z Elibri
+          # call-seq:
+          #   onix_xml -> nokogiri_parsed_xml
+          #
+          def onix_xml
+            @api_adapter.onix_xml_for_product(self)
+          end
+
+
+          # Zbuduj instancje produktu na podstawie XML`a.
+          def self.build_from_xml(api_adapter, publisher, product_xml) #:nodoc:
+            product_xml = Nokogiri::XML(product_xml).css('product').first if product_xml.is_a? String
+            Product.new(api_adapter, publisher,
+              :record_reference => product_xml['record_reference'],
+              :url => product_xml['url'],
+              :main_title => product_xml['main_title']
+            )
+          end
 
         end
 

data/lib/elibri_api_client/core_extensions.rb

@@ -1,7 +1,7 @@
 
 
 # HTTParty ma parsowac XML za pomoca Nokogiri. CRACK jest zbyt prosty do naszych zastosowan.
-module HTTParty
+module HTTParty #:nodoc:all
   class Parser
 
     def xml
@@ -12,49 +12,3 @@ module HTTParty
 end
 
 
-# Ukradzione z ActiveSupport:
-class Object
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-
-  def present?
-    !blank?
-  end
-
-  def presence
-    self if present?
-  end
-end
-
-class NilClass
-  def blank?
-    true
-  end
-end
-
-class FalseClass
-  def blank?
-    true
-  end
-end
-
-class TrueClass
-  def blank?
-    false
-  end
-end
-
-
-class String
-  def blank?
-    self !~ /\S/
-  end
-end
-
-
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end

data/lib/elibri_api_client/version.rb

@@ -4,7 +4,7 @@ module Elibri
     module Version
       MAJOR = 1
       MINOR = 0
-      PATCH = 3
+      PATCH = 4
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     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 pick_up_queue! last_pickups each_product each_page}
+    delegated_methods = %w{refill_all_queues! pending_data? pending_queues last_pickups 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

@@ -0,0 +1,44 @@
+require 'helper'
+
+
+describe Elibri::ApiClient::ApiAdapters::V1::Product do
+
+  before do
+    @api_adapter = mock('api_adapter')
+    @publisher = stub('publisher', :name => 'Wydawnictwo', :publisher_id => 1234)
+  end
+
+
+  it "should have several attributes" do
+    product = Elibri::ApiClient::ApiAdapters::V1::Product.new(@api_adapter, @publisher,
+      :record_reference => 'AAAAAAAAAAAAAAA',
+      :main_title => 'Erlang Programming',
+      :url => 'http://api.elibri.com.pl/api/v1/products/AAAAAAAAAAAAAAA'
+    )
+
+    assert_equal 'Erlang Programming', product.main_title 
+    assert_equal 'AAAAAAAAAAAAAAA', product.record_reference
+    assert_equal 'Wydawnictwo', product.publisher.name
+  end
+  
+
+
+  it "should be able to build itself from provided XML" do
+    xml = %Q{
+      <product record_reference="04325b31fdece145d22e" main_title="Erlang Programming"  url="http://api.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.main_title
+    assert_equal '04325b31fdece145d22e', product.record_reference
+    assert_equal "http://api.elibri.com.pl/api/v1/products/04325b31fdece145d22e", product.url
+  end
+
+
+  it "should be able to establish its full ONIX xml" do
+    product = Elibri::ApiClient::ApiAdapters::V1::Product.new(@api_adapter, @publisher, :record_reference => '04325b31fdece145d22e')
+    @api_adapter.expects(:onix_xml_for_product).with(product)
+    product.onix_xml
+  end
+  
+end

data/test/elibri_api_v1_adapter_publisher_test.rb

@@ -0,0 +1,61 @@
+require 'helper'
+
+
+describe Elibri::ApiClient::ApiAdapters::V1::Publisher do
+
+  before do
+    @api_adapter = mock('api_adapter')
+  end
+
+
+  it "should have several attributes" do
+    publisher = Elibri::ApiClient::ApiAdapters::V1::Publisher.new(@api_adapter,
+      :name => 'Wydawnicta Naukowo-Techniczne',
+      :publisher_id => '1020',
+      :products_count => 1503,
+      :products_url => 'http://api.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
+  end
+  
+
+
+  it "should be able to build itself from provided XML" 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"/>
+        </publisher>
+      </publishers>
+    }
+
+    publisher = Elibri::ApiClient::ApiAdapters::V1::Publisher.build_from_xml(@api_adapter, xml)
+
+    assert_equal 1, publisher.publisher_id
+    assert_equal 350, publisher.products_count
+    assert_equal "Wydawnicta Naukowo-Techniczne", publisher.name
+    assert_equal "WNT Polska Sp. z o.o.", publisher.company_name
+    assert_equal "Kraków", publisher.city
+    assert_equal "30-417", publisher.zip_code
+    assert_equal "Łagiewnicka 33a", publisher.street
+    assert_equal "(12) 252-85-92", publisher.phone1
+    assert_equal "(12) 252-85-80", publisher.phone2
+    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
+  end
+
+
+  it "should be able to establish its products list" do
+    publisher = Elibri::ApiClient::ApiAdapters::V1::Publisher.new(@api_adapter, :publisher_id => 1234)
+    @api_adapter.expects(:products_for_publisher).with(publisher)
+    publisher.products
+  end
+  
+
+end

data/test/elibri_api_v1_adapter_queue_test.rb

@@ -12,7 +12,7 @@ describe Elibri::ApiClient::ApiAdapters::V1::Queue do
     time = Time.now
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.new(@api_adapter,
       :name => 'meta',
-      :items_total => 120,
+      :products_count => 120,
       :queue_id => '192f134e666df34464bcc14d0413',
       :url => 'http://api.elibri.com.pl/api/v1/queues/meta/192f134e666df34464bcc14d0413',
       :last_insert_at => time.to_s,
@@ -20,7 +20,7 @@ describe Elibri::ApiClient::ApiAdapters::V1::Queue do
     )
 
     assert_equal 'meta', queue.name 
-    assert_equal 120, queue.items_total
+    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
@@ -30,17 +30,17 @@ describe Elibri::ApiClient::ApiAdapters::V1::Queue do
 
 
   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" items_total="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" 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"/>}
 
     queue = Elibri::ApiClient::ApiAdapters::V1::Queue.build_from_xml(@api_adapter, xml)
     assert_equal 'stocks', queue.name 
-    assert_equal 1500, queue.items_total
+    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" items_total="1500" last_insert_at="2011-02-05 21:02:22 UTC"/>}
+    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
@@ -75,8 +75,8 @@ describe Elibri::ApiClient::ApiAdapters::V1::Queue 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).with(queue)
-    queue.each_product(&block)
+    @api_adapter.expects(:each_product_onix_in_queue).with(queue)
+    queue.each_product_onix(&block)
   end
   
   

data/test/elibri_api_v1_adapter_test.rb

@@ -29,7 +29,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.each do |exception_class|
-      assert(Elibri::ApiClient::ApiAdapters::V1.const_get(exception_class) < RuntimeError)
+      assert(Elibri::ApiClient::ApiAdapters::V1::Exceptions.const_get(exception_class) < RuntimeError)
     end  
   end
   
@@ -37,9 +37,23 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   it "should be able to refill all pending queues" do
     response_stub = stub('response_stub', :code => 200, :parsed_response => nil)
     post_request_expected("#{FAKE_API_HOST}/api/v1/queues/refill_all").returns(response_stub)
-
     @adapter.refill_all_queues!
   end
+
+
+  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')
+
+    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')
+  end
+  
   
 
   describe "when asked to establish pending queues list" do
@@ -48,8 +62,8 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
       before do
         xml = <<-XML
           <pending_data>
-            <queue name="pending_meta" items_total="24" last_insert_at="2011-02-05 21:02:22 UTC"/>      
-            <queue name="pending_stocks" items_total="1500" last_insert_at="2011-02-05 21:02:22 UTC"/>         
+            <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>
         XML
 
@@ -66,10 +80,10 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
         pending_meta = pending_queues.find {|queue| queue.name == 'pending_meta' }
         pending_stocks = pending_queues.find {|queue| queue.name == 'pending_stocks' }
 
-        assert_equal 24, pending_meta.items_total
+        assert_equal 24, pending_meta.products_count
         assert_kind_of Time, pending_meta.last_insert_at 
 
-        assert_equal 1500, pending_stocks.items_total
+        assert_equal 1500, pending_stocks.products_count
         assert_kind_of Time, pending_stocks.last_insert_at 
       end
     end
@@ -79,8 +93,8 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
       before do
         xml = <<-XML
           <pending_data>
-            <queue name="pending_meta" items_total="0" />      
-            <queue name="pending_stocks" items_total="0" />         
+            <queue name="pending_meta" products_count="0" />      
+            <queue name="pending_stocks" products_count="0" />         
           </pending_data>
         XML
 
@@ -97,11 +111,12 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   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" items_total="24" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 21:02:22 UTC"/>      
+          <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
 
@@ -112,7 +127,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     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.items_total
+      assert_equal 24, picked_up_queue.products_count
       assert_kind_of Time, picked_up_queue.picked_up_at
     end
     
@@ -121,7 +136,7 @@ describe Elibri::ApiClient::ApiAdapters::V1 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.items_total
+      assert_equal 24, picked_up_queue.products_count
       assert_kind_of Time, picked_up_queue.picked_up_at
     end
 
@@ -136,31 +151,18 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   end
   
 
-  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')
-
-    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')
-  end
-  
-  
   describe "when there was error reported" do
     before do
       @xml = %q{<error id="ERROR_CODE"> <message>Error message for error ERROR_CODE</message> </error>}
       @exception_classes = {
-        '404' =>  Elibri::ApiClient::ApiAdapters::V1::NotFound,
-        '403' =>  Elibri::ApiClient::ApiAdapters::V1::Forbidden,
-        '500' =>  Elibri::ApiClient::ApiAdapters::V1::ServerError,
-        '1001' => Elibri::ApiClient::ApiAdapters::V1::QueueDoesNotExists,
-        '1002' => Elibri::ApiClient::ApiAdapters::V1::NoPendingData,
-        '1003' => Elibri::ApiClient::ApiAdapters::V1::NoRecentlyPickedUpQueues,
-        '1004' => Elibri::ApiClient::ApiAdapters::V1::InvalidPageNumber
+        '404' =>  Elibri::ApiClient::ApiAdapters::V1::Exceptions::NotFound,
+        '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
       }
     end
 
@@ -177,19 +179,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)
-      assert_raises(Elibri::ApiClient::ApiAdapters::V1::Unauthorized) { @adapter.pending_queues }
+      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)
-      assert_raises(Elibri::ApiClient::ApiAdapters::V1::UnknownError) { @adapter.pending_queues }
+      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
@@ -209,13 +212,13 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
       before do
         meta_xml = <<-XML
           <pick_up>
-            <queue name="meta" id="192f134e666df34464bcc14d04135cda2bd13a0c" url="#{FAKE_API_HOST}/api/v1/queues/meta/192f134e666df34464bcc14d04135cda2bd13a0c" items_total="24" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 21:02:22 UTC"/>      
+            <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" items_total="50" last_insert_at="2011-02-05 21:02:22 UTC" picked_up_at="2011-02-05 21:02:22 UTC"/>      
+            <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
 
@@ -235,13 +238,12 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
   end
 
 
-  describe "when asked to iterate by products" do
 
+  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" items_total="54" picked_up_at="2011-02-05 21:02:22 UTC">      
+        <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" />      
@@ -252,9 +254,8 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
           </items>
         </queue>
       XML
-
       second_page_xml = <<-XML
-        <queue name="meta" id="QUEUE_ID" items_total="54" picked_up_at="2011-02-05 21:02:22 UTC">      
+        <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" />      
@@ -266,9 +267,8 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
           </items>
         </queue>
       XML
-
       third_page_xml = <<-XML
-        <queue name="meta" id="QUEUE_ID" items_total="54" picked_up_at="2011-02-05 21:02:22 UTC">      
+        <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" />      
@@ -290,9 +290,9 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
     end
 
 
-    it "should be able to iterate through page products" do
+    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(@queue) do |page_content, page_no|
+      @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
@@ -300,10 +300,94 @@ describe Elibri::ApiClient::ApiAdapters::V1 do
 
     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(@queue) do |product_xml, product_no|
+      @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
+        <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="#{FAKE_API_HOST}/api/v1/publishers/1/products" count="350"/>
+          </publisher>
+          <publisher name="Abiekt.pl" city="Warszawa" www="http://www.abiekt.pl" company_name="Abiekt.pl Sp&#243;&#322;ka z o.o." zip_code="00-785" id="2" street="Grottgera 9a/7" phone1="609-626-500" nip="521-348-37-69" email="wojciech.szot@abiekt.pl">
+            <products url="#{FAKE_API_HOST}/api/v1/publishers/2/products" count="7"/>
+          </publisher>
+        </publishers>
+      XML
+      response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
+      get_request_expected("#{FAKE_API_HOST}/api/v1/publishers").at_least_once.returns(response_stub)
+    end
+
+
+    it "should return Publisher instances with attributes filled from returned XML" do
+      publishers = @adapter.publishers
+      assert_equal 2, publishers.size
+      assert(publishers.all? { |publisher| publisher.kind_of? Elibri::ApiClient::ApiAdapters::V1::Publisher })
+
+      wnt = publishers.find {|publisher| publisher.publisher_id == 1}
+      abiekt = publishers.find {|publisher| publisher.publisher_id == 2}
+
+      # Wyrywkowo sprawdzamy atrybuty:
+      assert_equal 350, wnt.products_count
+      assert_equal 7, abiekt.products_count
+      assert_equal "521-348-37-69", abiekt.nip
+      assert_equal "Łagiewnicka 33a", wnt.street
+    end
+  end
+
+
+
+  describe "when asked to get products list for specified publisher" do
+    before do
+      @publisher = Elibri::ApiClient::ApiAdapters::V1::Publisher.new(@adapter, :publisher_id => 1234)
+      xml = <<-XML
+        <publisher id="#{@publisher.publisher_id}" name="Wydawnicta Naukowo-Techniczne">
+          <products count="3" url="#{FAKE_API_HOST}/api/v1/publishers/#{@publisher.publisher_id}/products">
+            <product main_title="Erlang Programming" record_reference="04325b31fdece145d22e" url="#{FAKE_API_HOST}/api/v1/products/04325b31fdece145d22e"/>
+            <product main_title="The Little Schemer" record_reference="993140a24d8202a347cc" url="#{FAKE_API_HOST}/api/v1/products/993140a24d8202a347cc"/>
+            <product main_title="The Rails Way" record_reference="a40f41cf67facf1876e3" url="#{FAKE_API_HOST}/api/v1/products/a40f41cf67facf1876e3"/>
+          </products>
+        </publisher>
+      XML
+      response_stub = stub('response_stub', :code => 200, :parsed_response => Nokogiri::XML(xml))
+      get_request_expected("#{FAKE_API_HOST}/api/v1/publishers/1234/products").at_least_once.returns(response_stub)
+    end
+
+
+    it "should return Product instances with attributes filled from returned XML" do
+      products = @adapter.products_for_publisher(@publisher)
+      assert_equal 3, products.size
+      assert(products.all? { |product| product.kind_of? Elibri::ApiClient::ApiAdapters::V1::Product })
+
+      erlang_programming = products.find {|product| product.record_reference == '04325b31fdece145d22e'}
+      assert_equal 'Erlang Programming', erlang_programming.main_title
+      assert_equal '04325b31fdece145d22e', erlang_programming.record_reference
+      assert_equal "#{FAKE_API_HOST}/api/v1/products/04325b31fdece145d22e", erlang_programming.url
+    end
+  end
+
+
+  describe "when asked to product ONIX XML for specified product" do
+    before 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)
+    end
+
+
+    it "should return parsed ONIX XML" do
+      product_xml = @adapter.onix_xml_for_product(@product)
+      assert_kind_of Nokogiri::XML::Element, product_xml
+      assert_equal '076eb83a5f01cb03a217', product_xml.css('RecordReference').text
+    end
+
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_api_client
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - "Marcin Urba\xC5\x84ski"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 +02:00
+date: 2011-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,17 +51,21 @@ dependencies:
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15424103
         segments: 
+        - 3
+        - 1
         - 0
-        version: "0"
-  name: ruby-debug
+        - rc
+        - 1
+        version: 3.1.0.rc1
+  name: activesupport
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -75,7 +79,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mocha
+  name: ruby-debug
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -89,12 +93,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: minitest
+  name: mocha
   version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: minitest
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,11 +124,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,11 +140,11 @@ dependencies:
         - 2
         version: 1.6.2
   name: jeweler
-  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: 
     - - ">="
@@ -136,7 +154,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id008
+  version_requirements: *id009
   prerelease: false
 description: API client for elibri.com.pl publishing system
 email: marcin@urbanski.vdl.pl
@@ -162,6 +180,8 @@ files:
 - lib/elibri_api_client/core_extensions.rb
 - lib/elibri_api_client/version.rb
 - 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_test.rb
 - test/elibri_api_v1_adapter_test.rb
 - test/helper.rb