shipcloud 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 266ce622e2711933494527c5f8399799c1e6e062
-  data.tar.gz: 0fcd0029452c89b96d40bd615fce634c848eff03
+  metadata.gz: b7fe7d70855f9f9d09443128ae9f2441aa1ae5d8
+  data.tar.gz: d10ee0cab165095c93b05f0fe89bf3013a9c0deb
 SHA512:
-  metadata.gz: d0981f70cd47a5fcf2e21b4980f22fb371ae9caacf9a23ce03fdad61d15e4534e0f5e9b8e1691dad6460e6ff4869c5971a5359a6065435e55e5199fe4b97d4a5
-  data.tar.gz: 6d4c9c07b4c63f935c2efe521f44e3c65e4c90299384bfd033d7a1222054c76ce91b11a7968d4a917eb89a12d758f0257736120bb70936b0c1ec400d15bc7889
+  metadata.gz: 1b43899286a6b7f6ec792b035c68c8544aefea872336d41e737c6b0e012ade065d580e526be7dc9412c9cfd71d6fa7778bca4bb7aa5c415e120e4d59744f3936
+  data.tar.gz: ffe6d71d40372d558ccf12590fb3b2699cd5cae7800d167a277c64227f9b797f5c6b7a8993b98a66a9c1d69fa636607f4eba359e43d1099afa902e7a90093c83

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.5
+  - 2.2.1
   - jruby
   - rbx-2

data/README.md

@@ -1,4 +1,4 @@
-[![Code Climate](https://codeclimate.com/github/webionate/shipcloud-ruby.png)](https://codeclimate.com/github/webionate/shipcloud-ruby) [![Build Status](https://travis-ci.org/webionate/shipcloud-ruby.png?branch=master)](https://travis-ci.org/webionate/shipcloud-ruby)
+[![Code Climate](https://codeclimate.com/github/shipcloud/shipcloud-ruby.png)](https://codeclimate.com/github/shipcloud/shipcloud-ruby) [![Build Status](https://travis-ci.org/shipcloud/shipcloud-ruby.png?branch=master)](https://travis-ci.org/shipcloud/shipcloud-ruby)
 # shipcloud
 
 A Ruby wrapper for the shipcloud API
@@ -41,8 +41,8 @@ To create a new Shipment on the shipclod platform, you need to provide the name
 For details, see *[shipcloud API documentation on Shipments](http://docs.shipcloud.apiary.io/#shipmentresources)*
 ```
 Shipcloud::Shipment.create(
-    carrier: 'ups', 
-    from: from-address-params, 
+    carrier: 'ups',
+    from: from-address-params,
     to: to-address-params,
     package: package-params,
     create_shipping_label: true

data/lib/shipcloud.rb

@@ -16,10 +16,12 @@ module Shipcloud
 
   autoload :Base,           "shipcloud/base"
   autoload :Shipment,       "shipcloud/shipment"
+  autoload :Carrier,        "shipcloud/carrier"
 
   module Operations
     autoload :Create,       "shipcloud/operations/create"
     autoload :Find,         "shipcloud/operations/find"
+    autoload :All,          "shipcloud/operations/all"
     autoload :Delete,       "shipcloud/operations/delete"
     autoload :Update,       "shipcloud/operations/update"
   end

data/lib/shipcloud/carrier.rb

@@ -0,0 +1,8 @@
+module Shipcloud
+  class Carrier < Base
+    include Shipcloud::Operations::All
+
+    attr_reader :name, :display_name
+  end
+end
+

data/lib/shipcloud/operations/all.rb

@@ -0,0 +1,18 @@
+module Shipcloud
+  module Operations
+    module All
+      module ClassMethods
+        # Loads all Objects of the resource
+        def all
+          response = Shipcloud.request(:get, "#{self.name.split("::").last.downcase}s", {})
+          response.map {|hash| self.new(hash) }
+        end
+      end
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+    end
+  end
+end
+

data/lib/shipcloud/request/validator.rb

@@ -26,7 +26,7 @@ module Shipcloud
       end
 
       def validate_response_data
-        raise APIError.new(info.data["errors"]) if info.data["errors"]
+        raise APIError.new(info.data["errors"]) if info.data.is_a?(Hash) && info.data["errors"]
       end
     end
   end

data/lib/shipcloud/version.rb

@@ -1,3 +1,3 @@
 module Shipcloud
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/shipcloud.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |spec|
   spec.name          = "shipcloud"
   spec.version       = Shipcloud::VERSION
   spec.authors       = ["sthollmann"]
-  spec.email         = ["stefan@webionate.de"]
+  spec.email         = ["stefan@shipcloud.io"]
   spec.description   = %q{A wrapper for the shipcloud API}
   spec.summary       = %q{A wrapper for the shipcloud API}
-  spec.homepage      = "https://github.com/webionate/shipcloud-ruby"
+  spec.homepage      = "https://github.com/shipcloud/shipcloud-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "json"
-  spec.add_development_dependency 'bundler', '~> 1.6.0'
-  spec.add_development_dependency 'rake', '~> 10.3.0'
-  spec.add_development_dependency 'rspec', '~> 2.99.0'
-  spec.add_development_dependency 'webmock', '~> 1.18.0'
-  spec.add_development_dependency 'pry', '~> 0.10.0'
+  spec.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.0'
+  spec.add_development_dependency 'bundler', '>= 1.3.0', '< 2.0'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'rspec', '~> 2.99'
+  spec.add_development_dependency 'webmock', '~> 1.18'
+  spec.add_development_dependency 'pry', '~> 0.10'
 end

data/spec/shipcloud/carrier_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Shipcloud::Carrier do
+  describe '#initialize' do
+    it 'initializes all attributes correctly' do
+      valid_attributes = { name: 'bogus', display_name: 'Bogus Carrier' }
+      carrier = Shipcloud::Carrier.new(valid_attributes)
+
+      expect(carrier.name).to eq 'bogus'
+      expect(carrier.display_name).to eq 'Bogus Carrier'
+    end
+  end
+
+  describe '.all' do
+    it 'makes a new Get request using the correct API endpoint' do
+      expect(Shipcloud).to receive(:request).
+        with(:get, 'carriers', {}).and_return([])
+
+      Shipcloud::Carrier.all
+    end
+
+    it 'returns a list of Carrier objects' do
+      stub_carriers_request
+
+      carriers = Shipcloud::Carrier.all
+
+      carriers.each do |carrier|
+        expect(carrier).to be_a Shipcloud::Carrier
+      end
+    end
+
+    it 'initializes the Carrier objects correctly' do
+      stub_carriers_request
+      allow(Shipcloud::Carrier).to receive(:new)
+
+      carriers = Shipcloud::Carrier.all
+
+      expect(Shipcloud::Carrier).to have_received(:new).
+        with({ 'name' => 'carrier_1', 'display_name' => 'Carrier 1' })
+      expect(Shipcloud::Carrier).to have_received(:new).
+        with({ 'name' => 'carrier_2', 'display_name' => 'Carrier 2' })
+    end
+  end
+
+  def stub_carriers_request
+    allow(Shipcloud).to receive(:request).
+      with(:get, 'carriers', {}).
+      and_return(
+        [
+          { 'name' => 'carrier_1', 'display_name' => 'Carrier 1' },
+          { 'name' => 'carrier_2', 'display_name' => 'Carrier 2' },
+        ]
+      )
+  end
+end

data/spec/shipcloud/request/validator_spec.rb

@@ -9,5 +9,16 @@ describe Shipcloud::Request::Validator do
 
       validator.validated_data_for(response).should eq "response" => "ok"
     end
+
+    it 'raises an APIError if the response contains errors' do
+      info = Shipcloud::Request::Info.new(:get, 'random', {})
+      validator = Shipcloud::Request::Validator.new info
+      response = OpenStruct.new(body: '{"errors":["some error"]}', code: 200)
+
+      expect { validator.validated_data_for(response) }.to raise_error(
+        Shipcloud::APIError,
+        ['some error'].to_s
+      )
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,4 +3,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'shipcloud'
 require 'rspec'
 require "webmock/rspec"
-require "pry"
+require "pry"
+
+RSpec.configure do |config|
+  config.after(:each) do
+    Shipcloud.api_key = nil
+  end
+end

metadata

@@ -1,102 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: shipcloud
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - sthollmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
 description: A wrapper for the shipcloud API
 email:
-- stefan@webionate.de
+- stefan@shipcloud.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -110,6 +122,8 @@ files:
 - Rakefile
 - lib/shipcloud.rb
 - lib/shipcloud/base.rb
+- lib/shipcloud/carrier.rb
+- lib/shipcloud/operations/all.rb
 - lib/shipcloud/operations/create.rb
 - lib/shipcloud/operations/delete.rb
 - lib/shipcloud/operations/find.rb
@@ -121,13 +135,14 @@ files:
 - lib/shipcloud/shipment.rb
 - lib/shipcloud/version.rb
 - shipcloud.gemspec
+- spec/shipcloud/carrier_spec.rb
 - spec/shipcloud/request/base_spec.rb
 - spec/shipcloud/request/connection_spec.rb
 - spec/shipcloud/request/validator_spec.rb
 - spec/shipcloud/shipment_spec.rb
 - spec/shipcloud_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/webionate/shipcloud-ruby
+homepage: https://github.com/shipcloud/shipcloud-ruby
 licenses:
 - MIT
 metadata: {}
@@ -147,11 +162,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A wrapper for the shipcloud API
 test_files:
+- spec/shipcloud/carrier_spec.rb
 - spec/shipcloud/request/base_spec.rb
 - spec/shipcloud/request/connection_spec.rb
 - spec/shipcloud/request/validator_spec.rb