shipppit-canada-post 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd38859443dc7b05a54e7aa1a261da790092a3ee
-  data.tar.gz: bd72c15948dcfed708388ebc41c29da061bc8004
+  metadata.gz: e71df1fc73d258b2507a86f1acaea2febf74667c
+  data.tar.gz: 5df51cc9a3174de2a3faaddbd873f5eb80ce3990
 SHA512:
-  metadata.gz: 652e4fece5355352bedcd17f1190c4ca23ae5626c805da4e998e3476665f452f6a5cbd0d4d65d8a79d1074b44c67ca37bd8445e922ffd1488968ffad58199e1e
-  data.tar.gz: 3403823d0b6b9c1d6f8a81ec2725c9384c3d8ed44b0a2cef6edc3179393d4746a1f46abfb986b54893968f3aaeee1ab43df7434e49e5f535452ca6a92696629f
+  metadata.gz: c56d09c4bc84a56f2e311d16c66d792254e5e5edd365dda58995eaeba6bdf82a1982f54478f8fae25e9662fe76c1813884002d8090a9eede5de1f90ac4137f71
+  data.tar.gz: 82b8070994af506e4ed57bba35543f9f23482ae1a5746fb18dcef3e23054969fc244c7e5dc5cb22e2a4557c0ff800d2a96eaea78a4e8661cca66325bc111c103

data/README.md

@@ -214,7 +214,7 @@ canada_post_service.create(
 Use this call to get a unique registration token (token-id) required to launch a merchant into the Canada Post sign-up process.
 
 ```ruby
-@token = canada_post_service.registration
+@token = canada_post_service.registration_token
 {'token-id' => '11111111111111111111111'}
 ```
 

data/lib/canada_post.rb

@@ -6,7 +6,6 @@ require "canada_post/request/registration"
 require "canada_post/client"
 require "canada_post/credentials"
 require "canada_post/rate"
-require "canada_post/shipment"
 
 module CanadaPost
   # Exceptions: CandaPost::RateError

data/lib/canada_post/client.rb

@@ -33,19 +33,23 @@ module CanadaPost
       Request::Registration.new(@credentials).get_token
     end
 
+    def get_merchant_info(token)
+      Request::Registration.new(@credentials).merchant_info(token)
+    end
+
     def get_artifact(url)
       manifest = Request::Manifest.new(@credentials).get_manifest(url)
       if manifest[:errors].present?
         return {
-          status: false,
-          error: manifest[:errors]
+            status: false,
+            error: manifest[:errors]
         }
       else
         artifact_link = get_artifact_link(manifest[:manifest])
         artifact = Request::Manifest.new(@credentials).get_artifact(artifact_link)
         return {
-          status: true,
-          artifact: artifact
+            status: true,
+            artifact: artifact
         }
       end
     end

data/lib/canada_post/credentials.rb

@@ -9,7 +9,7 @@ module CanadaPost
       @username         = options[:username]
       @password         = options[:password]
       @customer_number  = options[:customer_number]
-      @mode             = options[:mode] || "development"
+      @mode             = options[:mode] || 'development'
     end
 
   end

data/lib/canada_post/request/base.rb

@@ -3,7 +3,6 @@ require 'nokogiri'
 require 'active_support/core_ext/hash'
 require 'canada_post/helpers'
 require 'canada_post/rate'
-require 'canada_post/shipment'
 
 module CanadaPost
   module Request

data/lib/canada_post/request/shipping.rb

@@ -91,7 +91,6 @@ module CanadaPost
             headers: shipping_header,
             basic_auth: @authorization
         )
-        puts api_response
         process_response(api_response)
       end
 

data/lib/canada_post/version.rb

@@ -1,3 +1,3 @@
 module CanadaPost
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/manifest_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'canada_post'
-require 'canada_post/shipment'
 require 'canada_post/client'
 
 describe CanadaPost::Request::Manifest do

data/spec/registration_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'canada_post'
-require 'canada_post/shipment'
 require 'canada_post/client'
 
 describe CanadaPost::Request::Registration do

data/spec/shipping_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 require 'canada_post'
-require 'canada_post/shipment'
 require 'canada_post/client'
 
-describe CanadaPost::Shipment do
+describe CanadaPost::Request::Shipping do
   context 'missing required parameters' do
     it 'does raise Rate exception' do
       expect { CanadaPost::Client.new }.to raise_error(CanadaPost::RateError)
@@ -100,16 +99,16 @@ describe CanadaPost::Shipment do
     context "Create MOBO shipping (on behalf of)", :vcr do
       let(:shipping) {
         canada_post_service.create(
-          sender: sender,
-          destination: destination,
-          package: package,
-          mobo: mobo,
-          notification: notification,
-          preferences: preferences,
-          group_id: group_id[:value],
-          mailing_date: mailing_date[:value],
-          service_code: service_code[:value],
-          contract_number: contract_number[:value]
+            sender: sender,
+            destination: destination,
+            package: package,
+            mobo: mobo,
+            notification: notification,
+            preferences: preferences,
+            group_id: group_id[:value],
+            mailing_date: mailing_date[:value],
+            service_code: service_code[:value],
+            contract_number: contract_number[:value]
         )
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipppit-canada-post
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Olivier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -150,9 +150,7 @@ files:
 - lib/canada_post/request/manifest.rb
 - lib/canada_post/request/rate.rb
 - lib/canada_post/request/registration.rb
-- lib/canada_post/request/shipment.rb
 - lib/canada_post/request/shipping.rb
-- lib/canada_post/shipment.rb
 - lib/canada_post/version.rb
 - spec/config/canada_post_credentials.example.yml
 - spec/manifest_spec.rb

data/lib/canada_post/request/shipment.rb

@@ -1,96 +0,0 @@
-module CanadaPost
-  module Request
-    class Shipment < Base
-
-      def process_request
-        api_response = client(shipment_url, build_xml, shipment_headers)
-        response = parse_response(api_response)
-
-        if success?(response)
-          rate_reply_details = response[:price_quotes][:price_quote] || []
-          rate_reply_details = [rate_reply_details] if rate_reply_details.is_a? Hash
-          rate_reply_details.map do |rate_reply|
-            CanadaPost::Shipment.new(rate_reply)
-          end
-        else
-          error_message = if response[:messages]
-            response[:messages][:message][:description]
-          else
-            'api_response.response'
-          end
-          raise ShipmentError, error_message
-        end
-      end
-
-      private
-
-      def shipment_headers
-        api_url += "rs/{mailed by customer}/{mobo}/shipment"
-      end
-
-      def shipment_headers
-        {
-          'Content-type' => 'application/vnd.cpc.shipment-v7+xml',
-          'Accept'       => 'application/vnd.cpc.shipment-v7+xml'
-        }
-      end
-
-      def build_xml
-        ns = "http://www.canadapost.ca/ws/shipment-v7"
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.send(:"mailing-scenario", xmlns: ns) {
-            add_requested_shipment(xml)
-          }
-        end
-        builder.doc.root.to_xml
-      end
-
-      def add_requested_shipment(xml)
-        xml.send(:"customer-number", @customer_number)
-        add_package(xml)
-        add_services(xml)
-        add_shipper(xml)
-        add_recipient(xml)
-      end
-
-      def add_shipper(xml)
-        xml.send(:"origin-postal-code", @shipper[:postal_code])
-      end
-
-      def add_recipient(xml)
-        xml.destination {
-          add_destination(xml)
-        }
-      end
-
-      def add_destination(xml)
-        if @recipient[:country_code] == "CA"
-          xml.domestic {
-            xml.send(:"postal-code", @recipient[:postal_code])
-          }
-        elsif @recipient[:country_code] == "US"
-          xml.send(:"united-states") {
-            xml.send(:"zip-code",  @recipient[:postal_code])
-          }
-        else
-          xml.international {
-            xml.send(:"country-code", @recipient[:country_code])
-          }
-        end
-      end
-
-      def add_services(xml)
-        if @service_type
-          xml.services {
-            xml.send(:"service-code", @service_type)
-          }
-        end
-      end
-
-      def success?(response)
-        response[:price_quotes]
-      end
-
-    end
-  end
-end

data/lib/canada_post/shipment.rb

@@ -1,68 +0,0 @@
-module CanadaPost
-  class Shipment
-
-    def initialize(options={})
-      @credentials = Credentials.new(options)
-    end
-
-    def create(options = {})
-      Request::Shipping.new(@credentials, options).process_request
-    end
-
-    def get_price(shipping_id)
-      Request::Shipping.new(@credentials).get_price(shipping_id)
-    end
-
-    def get_label(label_url)
-      Request::Shipping.new(@credentials).get_label(label_url)
-    end
-
-    def get_manifest(url)
-      Request::Manifest.new(@credentials).get_manifest(url)
-    end
-
-    def registration_token
-      Request::Registration.new(@credentials).get_token
-    end
-
-    def get_merchant_info(token)
-      Request::Registration.new(@credentials).merchant_info(token)
-    end
-
-    def get_artifact(url)
-      manifest = Request::Manifest.new(@credentials).get_manifest(url)
-      if manifest[:errors].present?
-        return {
-            status: false,
-            error: manifest[:errors]
-        }
-      else
-        artifact_link = get_artifact_link(manifest[:manifest])
-        artifact = Request::Manifest.new(@credentials).get_artifact(artifact_link)
-        return {
-            status: true,
-            artifact: artifact
-        }
-      end
-    end
-
-    def get_artifact_link(manifest)
-      links = manifest[:links]
-      if links.present?
-        links[:link].each do |link|
-          if link[:rel] == 'artifact'
-            return link[:href]
-          end
-        end
-      end
-    end
-
-    def details(shipping_id)
-      Request::Shipping.new(@credentials).details(shipping_id)
-    end
-
-    def rate(options={})
-      Request::Rate.new(@credentials, options).process_request
-    end
-  end
-end