temando 0.1.3 → 0.1.4

data/lib/temando/api/entities/anything.rb

@@ -5,19 +5,37 @@ module Temando::Api
         @anything = anything
       end
 
+      def weight_units
+        if @anything.weight < 9.5 then
+          'Grams'
+        else
+          'Kilograms'
+        end
+      end
+
+      def converted_weight
+        if weight_units == 'Grams' then
+          (@anything.weight * 1000).ceil
+        else
+          @anything.weight.ceil
+        end
+      end
+
       def build_xml(xml)
         xml.anything do
           xml.class_ @anything.shipping_class
           xml.packagingOptimisation(@anything.packaging_optimization.presence || "N")
           xml.subclass @anything.shipping_subclass
           xml.packaging @anything.shipping_packaging
+          xml.palletType @anything.pallet_type unless @anything.pallet_type.nil?
+          xml.palletNature @anything.pallet_nature unless @anything.pallet_nature.nil?
           xml.qualifierFreightGeneralFragile(@anything.fragile ? 'Y' : 'N')
           xml.distanceMeasurementType 'Centimetres'
-          xml.weightMeasurementType 'Kilograms'
+          xml.weightMeasurementType weight_units
           xml.length((@anything.length.to_f * 100).ceil)
           xml.width((@anything.width.to_f * 100).ceil)
           xml.height((@anything.height.to_f * 100).ceil)
-          xml.weight @anything.weight.ceil
+          xml.weight converted_weight
           xml.quantity @anything.quantity
           xml.description @anything.description
         end

data/lib/temando/item/general_goods.rb

@@ -2,6 +2,13 @@ module Temando
   module Item
     # A GeneralGood is a type of item that can be shipped by Temando.
     class GeneralGoods < Temando::Item::Base
+      attr_accessor :shipping_packaging, :pallet_type, :pallet_nature
+
+      def initialize(attributes={})
+        @shipping_packaging = 'Parcel'
+        super
+      end
+
       def shipping_class
         'General Goods'
       end
@@ -10,13 +17,9 @@ module Temando
         'Household Goods'
       end
 
-      def shipping_packaging
-        'Parcel'
-      end
-
       def fragile
         false
       end
     end
-   end
+  end
 end

data/lib/temando/version.rb

@@ -1,3 +1,3 @@
 module Temando
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fixtures/xml/get_quotes_by_request/request.xml

@@ -18,11 +18,11 @@
           <packaging>Parcel</packaging>
           <qualifierFreightGeneralFragile>N</qualifierFreightGeneralFragile>
           <distanceMeasurementType>Centimetres</distanceMeasurementType>
-          <weightMeasurementType>Kilograms</weightMeasurementType>
+          <weightMeasurementType>Grams</weightMeasurementType>
           <length>10</length>
           <width>10</width>
           <height>10</height>
-          <weight>1</weight>
+          <weight>1000</weight>
           <quantity>2</quantity>
           <description>Contains hats.</description>
         </anything>

data/spec/units/api/entities/anything_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Temando::Api::Entities::Anything do
+  let(:item) { valid_temando_item(:description => 'Contains hats.', :quantity => 2) }
+
+  describe ".converted_weight" do
+    it "formats large weights as Kilograms" do
+      item.weight = 10.2
+      entity = Temando::Api::Entities::Anything.new(item)
+      entity.converted_weight.should == 11
+      entity.weight_units.should == 'Kilograms'
+    end
+
+    it "formats medium weights as Grams" do
+      item.weight = 9.2
+      entity = Temando::Api::Entities::Anything.new(item)
+      entity.converted_weight.should == 9200
+      entity.weight_units.should == 'Grams'
+    end
+
+    it "formats small weights as Grams" do
+      item.weight = 0.033
+      entity = Temando::Api::Entities::Anything.new(item)
+      entity.converted_weight.should == 33
+      entity.weight_units.should == 'Grams'
+    end
+  end
+end

data/spec/units/item/general_goods_spec.rb

@@ -18,4 +18,38 @@ describe Temando::Item::GeneralGoods do
       valid_item.should_not be_valid
     end
   end
+
+  describe ".shipping_packaging" do
+    it 'defaults to "Parcel"' do
+      valid_item.shipping_packaging.should == 'Parcel'
+    end
+
+    it 'can be set and read' do
+      valid_item.shipping_packaging = 'Pallet'
+      valid_item.shipping_packaging.should == 'Pallet'
+    end
+  end
+
+  describe ".pallet_type" do
+    it 'defaults to nil' do
+      valid_item.pallet_type.should be_nil
+    end
+
+    it 'can be set and read' do
+      valid_item.pallet_type = 'Plain'
+      valid_item.pallet_type.should == 'Plain'
+    end
+  end
+
+  describe ".pallet_nature" do
+    it 'defaults to nil' do
+      valid_item.pallet_nature.should be_nil
+    end
+
+    it 'can be set and read' do
+      valid_item.pallet_nature = 'Not Required'
+      valid_item.pallet_nature.should == 'Not Required'
+    end
+  end
+
 end

data/temando.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec', '~> 2.11.0'
   gem.add_development_dependency 'faker'
+  gem.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temando
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby API to Temando - an Australian transport fulfilment broker
 email:
 - jason@reinteractive.net
@@ -145,6 +161,7 @@ files:
 - spec/support/default_disable_remote.rb
 - spec/support/factories/item_factory.rb
 - spec/support/xml_fixtures.rb
+- spec/units/api/entities/anything_spec.rb
 - spec/units/api/entities/quote_spec.rb
 - spec/units/api/get_quotes_by_request_spec.rb
 - spec/units/api/soap_client_spec.rb
@@ -186,6 +203,7 @@ test_files:
 - spec/support/default_disable_remote.rb
 - spec/support/factories/item_factory.rb
 - spec/support/xml_fixtures.rb
+- spec/units/api/entities/anything_spec.rb
 - spec/units/api/entities/quote_spec.rb
 - spec/units/api/get_quotes_by_request_spec.rb
 - spec/units/api/soap_client_spec.rb