titlepage 1.2.1 → 1.3.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require 'spec/rake/spectask'
 
-PKG_VERSION = "1.2.1"
+PKG_VERSION = "1.3.0"
 PKG_NAME = "titlepage"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBYFORGE_PROJECT = 'rbook'
@@ -71,7 +71,7 @@ spec = Gem::Specification.new do |spec|
   spec.rdoc_options << '--title' << 'titlepage Documentation' << '--main'  << 'README' << '-q'
   spec.add_dependency('rbook-isbn', '>= 1.0')
   spec.add_dependency('andand', '1.3.1')
-  spec.add_dependency('troelskn-handsoap', '0.2.7')
+  spec.add_dependency('handsoap', '>= 1.0')
   spec.author = "James Healy"
   spec.email = "jimmy@deefa.com"
   spec.rubyforge_project = "rbook"

data/lib/titlepage.rb

@@ -1,18 +1,9 @@
 # encoding: utf-8
 
-require 'bigdecimal'
-require 'net/http'
-require 'rubygems'
-gem 'troelskn-handsoap', '0.2.7'
-gem 'andand', '1.3.1'
+require "bigdecimal"
 require "handsoap"
 require "andand"
-
-require 'rbook/isbn'
-
-if RUBY_VERSION < "1.9"
-  require 'iconv'
-end
+require "rbook/isbn"
 
 # a convenience module for accessing the SOAP API for http://www.titlepage.com.
 # Uses boilerplate code generated by soap4r.

data/lib/titlepage/utils.rb

@@ -10,32 +10,6 @@ module TitlePage
 
   class Response
 
-    private
-
-    # ensure all specified attributes are encoded as UTF-8. At this stage the
-    # Titlepage API is encoded in ISO-8859-1, but this *should* continue to
-    # work if they change that.
-    #
-    def normalise_attrib_encodings!(current_enc, attributes)
-      return if current_enc.downcase == "utf-8"
-
-      if RUBY_VERSION < "1.9"
-        attributes.each do |attrib|
-          if self.__send__(attrib)
-            new_val = Iconv.conv("utf-8",current_enc, self.__send__(attrib))
-            self.__send__("#{attrib}=", new_val)
-          end
-        end
-      else
-        current_enc = Encoding.find(current_enc)
-        attributes.each do |attrib|
-          if self.__send__(attrib)
-            self.__send__(attrib).force_encoding(current_enc)
-            self.__send__(attrib).encode!("utf-8")
-          end
-        end
-      end
-    end
   end
 
   class ProductIdentifier < TitlePage::Response
@@ -55,7 +29,6 @@ module TitlePage
       id = self.new
       id.product_id_type = node.xpath("//item/ProductIDType/text()").to_s
       id.id_value = node.xpath("//item/IDValue/text()").to_s
-      id.normalise_encodings!(node.document.encoding)
       id
     end
 
@@ -63,7 +36,6 @@ module TitlePage
     #
     def normalise_encodings!(current_enc)
       attribs = [:product_id_type, :id_value]
-      normalise_attrib_encodings!(current_enc, attribs)
     end
   end
 
@@ -89,18 +61,9 @@ module TitlePage
       title.title_without_prefix = node.xpath("//Title/TitleWithoutPrefix/text()").first.andand.to_s
       title.subtitle = node.xpath("//Title/Subtitle/text()").first.andand.to_s
 
-      # normalise encodings to utf-8
-      title.normalise_encodings!(node.document.encoding)
       title
     end
 
-    # ensure all string attributes are UTF-8 encoded
-    #
-    def normalise_encodings!(current_enc)
-      attribs = [:title_type, :title_text, :title_prefix, :title_without_prefix, :subtitle]
-      normalise_attrib_encodings!(current_enc, attribs)
-    end
-
   end
 
   class Contributor < TitlePage::Response
@@ -129,17 +92,9 @@ module TitlePage
       contrib.person_name_inverted = node.xpath("//item/PersonNameInverted/text()").first.andand.to_s
       contrib.titles_before_names = node.xpath("//item/TitlesBeforeNames/text()").first.andand.to_s
       contrib.key_names = node.xpath("//item/KeyNames/text()").first.andand.to_s
-      contrib.normalise_encodings!(node.document.encoding)
       contrib
     end
 
-    # ensure all string attributes are UTF-8 encoded
-    #
-    def normalise_encodings!(current_enc)
-      attribs = [:contributor_role, :person_name, :person_name_inverted, :titles_before_names, :key_names]
-      normalise_attrib_encodings!(current_enc, attribs)
-    end
-
   end
 
   class Stock < TitlePage::Response
@@ -157,16 +112,9 @@ module TitlePage
       stock = self.new
       stock.on_hand = node.xpath("//Stock/OnHand/text()").first.andand.to_s
       stock.on_order = node.xpath("//Stock/OnOrder/text()").first.andand.to_s
-      stock.normalise_encodings!(node.document.encoding)
       stock
     end
 
-    # ensure all string attributes are UTF-8 encoded
-    #
-    def normalise_encodings!(current_enc)
-      attribs = [:on_hand, :on_order]
-      normalise_attrib_encodings!(current_enc, attribs)
-    end
   end
 
   class Price < TitlePage::Response
@@ -184,16 +132,9 @@ module TitlePage
       price.price_type_code = node.xpath("//Price/PriceTypeCode/text()").first.andand.to_s
       val = node.xpath("//Price/PriceAmount/text()").first.andand.to_s
       price.price_amount = BigDecimal.new(val) if val.size > 0
-      price.normalise_encodings!(node.document.encoding)
       price
     end
 
-    # ensure all string attributes are UTF-8 encoded
-    #
-    def normalise_encodings!(current_enc)
-      attribs = [:price_type_code]
-      normalise_attrib_encodings!(current_enc, attribs)
-    end
   end
 
   class SupplyDetail < TitlePage::Response
@@ -230,16 +171,9 @@ module TitlePage
       sd.stock = TitlePage::Stock.from_xml(node.xpath("//SupplyDetail/Stock").first)
       sd.pack_quantity = node.xpath("//SupplyDetail/PackQuantity/text()").first.andand.to_s.andand.to_i
       sd.price = TitlePage::Price.from_xml(node.xpath("//SupplyDetail/Price").first)
-      sd.normalise_encodings!(node.document.encoding)
       sd
     end
 
-    # ensure all string attributes are UTF-8 encoded
-    #
-    def normalise_encodings!(current_enc)
-      attribs = [:supplier_name, :supplier_role, :product_availability, :expected_ship_date]
-      normalise_attrib_encodings!(current_enc, attribs)
-    end
   end
 
   class Product
@@ -274,12 +208,19 @@ module TitlePage
     #
     def to_hash
       {
-        :supplier => self.supply_detail.supplier_name,
-        :title    => self.title.title_text,
         :ean      => self.product_identifiers.first.id_value,
+        :title    => self.title.title_text,
+        :subtitle    => self.title.subtitle,
+        :contributors => self.contributors.collect { |c| c.person_name_inverted },
+        :supplier => self.supply_detail.supplier_name,
+        :supplier_role => self.supply_detail.supplier_role,
         :price    => self.supply_detail.price.price_amount.to_s("F").to_f,
         :availability => self.supply_detail.product_availability,
-        :contributors => self.contributors.collect { |c| c.person_name_inverted }
+        :on_hand  => self.supply_detail.stock.on_hand,
+        :on_order  => self.supply_detail.stock.on_order,
+        :expected_shop_date => self.supply_detail.expected_ship_date,
+        :pack_quantity => self.supply_detail.pack_quantity,
+
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: titlepage
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +11:00
+date: 2009-11-14 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,14 @@ dependencies:
         version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: troelskn-handsoap
+  name: handsoap
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.7
+        version: "1.0"
     version: 
 description: This library is designed to assist with using the titlepage.com SOAP API.
 email: jimmy@deefa.com
@@ -53,13 +53,13 @@ extra_rdoc_files:
 - COPYING
 - LICENSE
 files: 
-- examples/titlepage.rb
 - examples/titlepage_www.rb
-- lib/titlepage/client.rb
-- lib/titlepage/driver.rb
+- examples/titlepage.rb
+- lib/titlepage.rb
 - lib/titlepage/utils.rb
+- lib/titlepage/client.rb
 - lib/titlepage/wwwclient.rb
-- lib/titlepage.rb
+- lib/titlepage/driver.rb
 - Rakefile
 - README
 - COPYING