pwinty 1.1.0 → 3.0.0

metadata

@@ -1,92 +1,201 @@
 --- !ruby/object:Gem::Specification
 name: pwinty
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 3.0.0
 platform: ruby
 authors:
-- Derek Lucas
+- Thomas Harvey
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-struct-setters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-description: Order photo prints with Ruby
+        version: '2.2'
+description: This wraps the Pwinty API at version 3 and aims to make your ruby life
+  easier when interacting with the API.
 email:
-- d@derekplucas.com
+- tom@alush.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
-- CHANGELOG.md
-- CONTRIBUTING.md
+- CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
-- lib/multipart.rb
+- bin/console
+- bin/setup
 - lib/pwinty.rb
+- lib/pwinty/base.rb
+- lib/pwinty/country.rb
+- lib/pwinty/http_errors.rb
+- lib/pwinty/image.rb
+- lib/pwinty/order.rb
+- lib/pwinty/order_status.rb
+- lib/pwinty/photo_status.rb
+- lib/pwinty/shipment.rb
+- lib/pwinty/shipping_info.rb
 - lib/pwinty/version.rb
 - pwinty.gemspec
-- test/test_client.rb
-- test/test_helper.rb
-homepage: http://github.com/dereklucas/pwinty
+homepage: https://github.com/tomharvey/pwinty3-rb
 licenses:
 - MIT
 metadata: {}
@@ -106,11 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: A Ruby client for the Pwinty API
-test_files:
-- test/test_client.rb
-- test/test_helper.rb
-has_rdoc: 
+summary: Order photo prints through Pwinty
+test_files: []

data/CHANGELOG.md

@@ -1,10 +0,0 @@
-## 1.1.0 (2016-12-26)
-
-* Add support for adding photos in a batch (Thanks @bumi!)
-* Support for configurable Pwinty API versions (Thanks @bumi!)
-* Added support for passing client credentials as arguments instead of ENV variables (Thanks @bumi!)
-
-
-## 1.0.1 (2015-04-10)
-
-* Create a working Pwinty client with [rest-client](https://github.com/rest-client/rest-client)

data/CONTRIBUTING.md

@@ -1,18 +0,0 @@
-## Getting Involved
-
-New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
-
-### Coding
-
-* Pick a task:
-  * Offer feedback on open [pull requests](https://github.com/dereklucas/pwinty/pulls).
-  * Review open [issues](https://github.com/dereklucas/pwinty/issues) for things to help on.
-  * [Create an issue](https://github.com/dereklucas/pwinty/issues/new) to start a discussion on additions or features.
-* Fork the project, add your changes and tests to cover them in a topic branch.
-* Commit your changes and rebase against `dereklucas/pwinty` to ensure everything is up to date.
-* [Submit a pull request](https://github.com/dereklucas/pwinty/compare/)
-
-### Non-Coding
-
-* Offer feedback on open [issues](https://github.com/dereklucas/pwinty/issues).
-* Organize or volunteer at events.

data/lib/multipart.rb

@@ -1,76 +0,0 @@
-# License:: Distributed under the terms of the WTFPL (http://www.wtfpl.net/txt/copying/)
-
-require 'rubygems'
-require 'mime/types'
-require 'cgi'
-
-
-module Multipart
-  VERSION = "1.0.0"
-
-  # Formats a given hash as a multipart form post
-  # If a hash value responds to :string or :read messages, then it is
-  # interpreted as a file and processed accordingly; otherwise, it is assumed
-  # to be a string
-  class Post
-    # We have to pretend we're a web browser...
-    USERAGENT = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6"
-    BOUNDARY = "0123456789ABLEWASIEREISAWELBA9876543210"
-    CONTENT_TYPE = "multipart/form-data; boundary=#{ BOUNDARY }"
-    HEADER = { "Content-Type" => CONTENT_TYPE, "User-Agent" => USERAGENT }
-
-    def self.prepare_query(params)
-      fp = []
-
-      params.each do |k, v|
-        # Are we trying to make a file parameter?
-        if v.respond_to?(:path) and v.respond_to?(:read) then
-          fp.push(FileParam.new(k.to_s, v.path, v.read))
-        # We must be trying to make a regular parameter
-        else
-          fp.push(StringParam.new(k.to_s, v))
-        end
-      end
-
-      # Assemble the request body using the special multipart format
-      query = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("") + "--" + BOUNDARY + "--"
-      return query, HEADER
-    end
-  end
-
-  private
-
-  # Formats a basic string key/value pair for inclusion with a multipart post
-  class StringParam
-    attr_accessor :k, :v
-
-    def initialize(k, v)
-      @k = k
-      @v = v
-    end
-
-    def to_multipart
-      return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"\r\n\r\n#{v}\r\n"
-    end
-  end
-
-  # Formats the contents of a file or string for inclusion with a multipart
-  # form post
-  class FileParam
-    attr_accessor :k, :filename, :content
-
-    def initialize(k, filename, content)
-      @k = k
-      @filename = filename
-      @content = content
-    end
-
-    def to_multipart
-      # If we can tell the possible mime-type from the filename, use the
-      # first in the list; otherwise, use "application/octet-stream"
-      mime_type = MIME::Types.type_for(filename)[0] || MIME::Types["application/octet-stream"][0]
-      return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"; filename=\"#{ filename }\"\r\n" +
-             "Content-Type: #{ mime_type.simplified }\r\n\r\n#{ content }\r\n"
-    end
-  end
-end

data/test/test_client.rb

@@ -1,117 +0,0 @@
-require "test_helper"
-
-class TestClient < Test::Unit::TestCase
-
-  def setup
-    @params = {
-      recipientName: "FirstName LastName",
-      address1: "123 Anywhere Street",
-      addressTownOrCity: "San Francisco",
-      stateOrCounty: "CA",
-      postalOrZipCode: "94101",
-      countryCode: "US",
-      payment: "InvoiceMe",
-      qualityLevel: "Standard"
-    }
-
-    @client = Pwinty.client(merchant_id: ENV['PWINTY_MERCHANT_ID'], api_key: ENV['PWINTY_API_KEY'], production: false)
-
-    @order_keys = %w[ id status price
-                      address1 address2
-                      addressTownOrCity
-                      countryCode
-                      destinationCountryCode
-                      errorMessage qualityLevel
-                      payment paymentUrl
-                      photos postalOrZipCode
-                      recipientName shippingInfo
-                      stateOrCounty ]
-  end
-
-  def test_initialize
-    body = @client.catalog
-    assert_equal body.class, Hash
-  end
-
-  def test_catalog_integration
-    body = @client.catalog
-    assert_equal body.class, Hash
-    assert_equal body["countryCode"], "US"
-    assert_equal body["qualityLevel"], "Standard"
-    assert_equal body["shippingRates"].class, Array
-    assert_equal body["items"].class, Array
-  end
-  def test_get_orders_integration
-    # NOTE: works only if you already have an order created. the first ever test run will probably fail
-    body = @client.get_orders
-    assert_equal body.class, Array
-    assert_equal body.first.keys.sort!, @order_keys.sort!
-  end
-  def test_countries_integration
-    body = @client.countries
-    keys = %w[ countryCode name
-               hasProducts errorMessage ]
-
-    assert_equal body.class, Array
-    assert_equal body.first.keys.sort!, keys.sort!
-  end
-
-  def test_orders_integration
-    # create Order
-    body = @client.create_order(@params)
-    assert_equal body.keys.sort!, @order_keys.sort!
-    assert_equal body["postalOrZipCode"], "94101"
-    id = body["id"]
-
-
-    body = @client.update_order(id: id, recipientName: 'Travis CI', postalOrZipCode: '94102')
-    assert_equal body.keys.sort!, @order_keys.sort!
-    assert_equal body["postalOrZipCode"], "94102"
-
-    # add Photo to Order via URL
-    body = @client.add_photo(orderId: id,
-                             type: "4x6",
-                             url: "http://i.imgur.com/xXnrL.jpg",
-                             copies: 1, sizing: "Crop")
-    photo_id = body['id']
-    first_photo = body
-
-    keys = %w[ id type url
-               status copies
-               sizing priceToUser
-               price md5Hash previewUrl
-               thumbnailUrl attributes
-               errorMessage ]
-
-    assert_equal body.keys.sort!, keys.sort!
-
-    # Check photo was uploaded
-    body = @client.get_photos(id)
-    assert_equal body.length, 1
-    assert_equal body.first, first_photo
-
-    # Check photo was uploaded
-    body = @client.get_photo(id, photo_id)
-    assert_equal body, first_photo
-
-    # Delete photo
-    body = @client.delete_photo(id, photo_id)
-    assert_equal body['errorMessage'], nil
-
-    # TODO: Need to add a photo via file
-
-    # get Order Status
-    body = @client.get_order_status(id)
-    keys = %w[id isValid generalErrors photos]
-    if body["error"]
-      assert body["error"].class, String
-    else
-      assert_equal body.keys.sort!, keys.sort!
-    end
-
-    # Cancel Order
-    body = @client.update_order_status(id, "Cancelled")
-    assert_equal body['errorMessage'], nil
-  end
-
-end