shipping-scale 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3356c36762733c31023ea62e9652f0b12b0b92f6
-  data.tar.gz: 1b2c906fcad03b078f56f88e82dc5ff48a22057f
+  metadata.gz: 6895d8b360e1db8c6ff8de0dd9f4a61577368125
+  data.tar.gz: 68d68bcb2e4beefb59232f33bf14d6bcdbd44ed4
 SHA512:
-  metadata.gz: de91ad6c1681d17285898c92848d738c35bd16d55809551e56d230028c93411abe6065379e75bb7235533e102df575cbed8db133bad94ad3b06755ae68acffc9
-  data.tar.gz: 412db0928def8f25de3e52272e552087a525f0062b1e8601b75521ddc2a6add145e9e7598498cb69970d83268d332b475c1908aa6aecfb77ffb9262fa216402f
+  metadata.gz: 009e37f216d3a1cad3ac8053954e7abce48de48430999f900ee784af235aa446d687ab82641a7d86ee212c3bcd13a06dc6cfa2393a7cfefd5d00453fdb0671f9
+  data.tar.gz: 79b2a3c2b6a10a0dbcbfde3ed57b1d2202a52e669e22793d20fcc5ddf20ac4d57833f9c942318fcfddda9e71f7d6b20b6f2f77cbbd078ee07eee68e1689de651

data/README.md

@@ -37,14 +37,12 @@ end
 
 ## Usage
 
-If you have all of the necessary information for the package you want to ship, using the gem is as simples as creating an instance of `ShipingScale::Package` and using `#get_price!`.  Other details are also returned with this method.
+If you have all of the necessary information for the package you want to ship, using the gem is as simple as creating an instance of `ShipingScale::Package` and using `#get_price!`.  Other details are also returned with this method.
 
 ```ruby
 package_options = { 
-  weight: 1,
-  length: 3,
-  width: 2,
-  height: 3,
+  pounds: 1,
+  ounces: 8, # or weight: 1.5
   zip_origin: "66204",
   zip_destination: "63501" 
 }
@@ -59,7 +57,7 @@ package.price # => 15
 # for other details sent back from the request
 package.details # => { zip_origination: "66204", zip_destination: "63501", pounds: "1", ... }
 ```
-
+Currently, all rates retreived from the USPS API are for 2-day Priority Mail only.
 
 ## License
 

data/lib/shipping_scale.rb

@@ -1,16 +1,20 @@
 require "shipping_scale/version"
 require "builder"
 require "nokogiri"
-require "snakecase_string"
+require "string_module"
+require "typhoeus"
+
 
 module ShippingScale 
 
   autoload :Client,          "shipping_scale/client"
   autoload :Configuration,   "shipping_scale/configuration"
+  autoload :Error,           "shipping_scale/error"
+  autoload :Package,         "shipping_scale/packaging/package"
+  autoload :Packaging,       "shipping_scale/packaging/packaging"
   autoload :Request,         "shipping_scale/request"
   autoload :Response,        "shipping_scale/response"
-  autoload :Error,           "shipping_scale/error"
-  autoload :Package,         "shipping_scale/package"
+  autoload :Shipment,        "shipping_scale/packaging/shipment"
 
   class << self 
     attr_writer :config

data/lib/shipping_scale/client.rb

@@ -1,15 +1,13 @@
-require "typhoeus"
-
 module ShippingScale
   class Client
     def request(request)
-      server = server(request)
+      server = "http://production.shippingapis.com/ShippingAPI.dll"
 
       response = Typhoeus::Request.get(server, {
         timeout: ShippingScale.config.timeout,
         params: {
           "API" => request.api,
-          "XML" => request.build
+          "XML" => request.build.body.clean_xml
         }
       })
 

data/lib/shipping_scale/configuration.rb

@@ -1,5 +1,5 @@
 module ShippingScale
-  class Configuration < Struct.new(:user_id, :timeout, :testing, :zip_origin, :zip_destination)
+  class Configuration < Struct.new(:user_id, :timeout, :testing, :zip_origination, :zip_destination)
     def initialize
       self.timeout = 5
       self.testing = false

data/lib/shipping_scale/packaging/package.rb

@@ -0,0 +1,63 @@
+module ShippingScale
+  class Package < Packaging
+
+    class << self
+      def shipment(details)
+        packages = details.map { |package| new(package) }
+        ShippingScale::Shipment.new(packages)
+      end
+    end
+
+    attr_reader(
+      :weight,
+      :pounds,
+      :ounces,
+      :length,
+      :width,
+      :height,
+      :zip_origination,
+      :zip_destination,
+    )
+
+    def initialize(**options)
+      @weight = options[:weight]
+      @pounds = (options[:pounds]) ? options[:pounds] : get_pounds
+      @ounces = (options[:ounces]) ? options[:ounces] : get_ounces
+      @zip_origination = (options[:zip_origination]) ? options[:zip_origination] : ShippingScale.config.zip_origination 
+      @zip_destination = (options[:zip_destination]) ? options[:zip_destination] : ShippingScale.config.zip_destination
+
+      @packages = [self]
+    end
+    
+    def build_xml(package) 
+      attrs.each do |k, v| 
+        package.tag!(k.to_s.upper_camelcase, v) 
+      end
+    end
+    #TODO set methods to determin service, container, and size
+
+    private
+
+    def get_pounds
+      @weight.floor.to_i
+    end
+
+    def get_ounces
+      frac = @weight - @weight.floor
+      ((frac * 16) / 10).ceil.to_i
+    end
+
+    def attrs
+      {
+        service: "All",
+        zip_origination: @zip_origination,
+        zip_destination: @zip_destination,
+        pounds: @pounds,
+        ounces: @ounces,
+        container: "VARIABLE",
+        size: "Regular",
+        machinable: "true"
+      }
+    end
+  end
+end

data/lib/shipping_scale/packaging/packaging.rb

@@ -0,0 +1,18 @@
+module ShippingScale
+  class Packaging
+    attr_accessor :response, :packages
+
+    def get_price!(options = {})
+      ShippingScale::Request.config(options)
+      @response = ShippingScale::Request.new(packages: packages).send!     
+    end
+
+    def price
+      response.price
+    end
+
+    def details
+      response.details
+    end
+  end
+end

data/lib/shipping_scale/packaging/shipment.rb

@@ -0,0 +1,11 @@
+module ShippingScale
+  class Shipment < Packaging
+    def initialize(packages)
+      @packages = packages
+    end
+
+    def prices
+      response.prices
+    end
+  end
+end

data/lib/shipping_scale/request.rb

@@ -33,7 +33,8 @@ module ShippingScale
       xml.tag!(self.class.tag, USERID: ShippingScale.config.user_id) do |req|
         req.tag!("Revision", "2")
         packages_to_xml(req)
-      end 
+      end
+      xml
     end
 
     def send!

data/lib/shipping_scale/response.rb

@@ -17,17 +17,36 @@ module ShippingScale
     attr_reader :xml
 
     def details
-      details = {}
+      details = {postage: []}
 
       xml.search("Package").children.each do |node|
-        details[node.name.snakecase.to_sym] = node.text
+        if node.name == "Postage"
+          postage = {}
+          node.children.each do |child|
+            postage[child.name.to_s.snakecase.to_sym] = child.text
+          end
+          details[:postage].push(postage)
+        else
+          details[node.name.to_s.snakecase.to_sym] = node.text
+        end
       end
 
       return details
     end
 
     def price
-      xml.search("Package").children.search("Postage").text.to_f
+      xml.search("Postage[CLASSID='1']").search("Rate").inject(0) { |sum, t| sum + t.text.to_f }
+    end
+
+    def prices
+      prices = {}
+      xml.search("Package").each do |package|
+        key = package.attribute("ID").value.to_s
+        value = package.search("Postage[CLASSID='1']").search("Rate").text.to_f
+        prices[key] = value
+      end
+
+      prices
     end
   end
 end

data/lib/shipping_scale/version.rb

@@ -1,3 +1,3 @@
 module ShippingScale
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/string_module.rb

@@ -0,0 +1,46 @@
+class String
+  def snakecase
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr('-', '_').
+    gsub(/\s/, '_').
+    gsub(/__+/, '_').
+    downcase
+  end
+
+  def camelcase(*separators)
+    case separators.first
+    when Symbol, TrueClass, FalseClass, NilClass
+      first_letter = separators.shift
+    end
+
+    separators = ['_', '\s'] if separators.empty?
+
+    str = self.dup
+
+    separators.each do |s|
+      str = str.gsub(/(?:#{s}+)([a-z])/){ $1.upcase }
+    end
+
+    case first_letter
+    when :upper, true
+      str = str.gsub(/(\A|\s)([a-z])/){ $1 + $2.upcase }
+    when :lower, false
+      str = str.gsub(/(\A|\s)([A-Z])/){ $1 + $2.downcase }
+    end
+
+    str
+  end
+
+  def upper_camelcase(*separators)
+    camelcase(:upper, *separators)
+  end
+
+  def lower_camelcase(*separators)
+    camelcase(:lower, *separators)
+  end
+
+  def clean_xml
+    self.gsub(/<body\/>/, "")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipping-scale
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Josh Reinhardt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -138,14 +138,18 @@ files:
 - bin/setup
 - lib/.DS_Store
 - lib/shipping_scale.rb
+- lib/shipping_scale/.DS_Store
 - lib/shipping_scale/client.rb
 - lib/shipping_scale/configuration.rb
 - lib/shipping_scale/error.rb
-- lib/shipping_scale/package.rb
+- lib/shipping_scale/packaging/package.rb
+- lib/shipping_scale/packaging/packaging.rb
+- lib/shipping_scale/packaging/shipment.rb
 - lib/shipping_scale/request.rb
 - lib/shipping_scale/response.rb
 - lib/shipping_scale/version.rb
-- lib/snakecase_string.rb
+- lib/string_module.rb
+- shipping-scale-0.1.0.gem
 - shipping-scale.gemspec
 - tasks/rspec.rake
 homepage: https://github.com/jereinhardt/shipping-scale

data/lib/shipping_scale/package.rb

@@ -1,40 +0,0 @@
-module ShippingScale
-  class Package
-    def initialize(**options)
-      @weight = options[:weight]
-      @pounds = options[:pounds]
-      @ounces = options[:ounces]
-      @length = options[:length]
-      @width = options[:width]
-      @height = options[:height]
-      @zip_origin = (options[:zip_origin]) ? options[:zip_origin] : ShippingScale.config.zip_origin 
-      @zip_destination = (options[:zip_destination]) ? options[:zip_destination] : ShippingScale.config.zip_destination
-
-      @attrs = options
-    end
-
-    attr_accessor :response
-    
-    def build_xml(package) 
-      package.tag!("Service", "All")
-      package.tag!("Container", "VARAIBLE")
-      package.tag!("Size", "REGULAR")
-      @attrs.each { |k, v| package.tag!(k.to_s, v) }
-    end
-
-    def get_price!(options = {})
-      ShippingScale::Request.config(options)
-      @response = ShippingScale::Request.new(packages: [self]).send!     
-    end
-
-    def price 
-      response.price
-    end
-
-    def details
-      response.details
-    end
-
-    #TODO set methods to determin service, container, and size
-  end
-end

data/lib/snakecase_string.rb

@@ -1,10 +0,0 @@
-class String
-  def snakecase
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr('-', '_').
-    gsub(/\s/, '_').
-    gsub(/__+/, '_').
-    downcase
-  end
-end