vend 0.0.8 → 0.0.9

data/lib/vend/oauth2/auth_code.rb

@@ -2,9 +2,7 @@ require 'oauth2'
 
 module Vend
   module Oauth2
-
     class AuthCode
-
       DEFAULT_OPTIONS = {}
       AUTHORIZE_URL = '/connect'
       TOKEN_URL = '/api/1.0/token'
@@ -20,12 +18,12 @@ module Vend
       end
 
       def authorize_url
-        get_oauth2_client.auth_code.authorize_url(:redirect_uri => redirect_uri)
+        get_oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri)
       end
 
       def token_from_code(code)
         client = get_oauth2_client(store)
-        client.auth_code.get_token(code, :redirect_uri => redirect_uri)
+        client.auth_code.get_token(code, redirect_uri: redirect_uri)
       end
 
       def refresh_token(auth_token, refresh_token)
@@ -33,16 +31,15 @@ module Vend
         access_token.refresh!
       end
 
-      protected
+    protected
+
       def get_oauth2_client(domain_prefix = 'secure')
         OAuth2::Client.new(client_id, secret, {
-            site: "https://#{domain_prefix}.vendhq.com",
-            authorize_url: AUTHORIZE_URL,
-            token_url: TOKEN_URL
+          site: "https://#{domain_prefix}.vendhq.com",
+          authorize_url: AUTHORIZE_URL,
+          token_url: TOKEN_URL
         })
       end
-
     end
-
   end
 end

data/lib/vend/oauth2/client.rb

@@ -1,8 +1,6 @@
 module Vend
   module Oauth2
-
     class Client < Vend::Client
-
       DEFAULT_OPTIONS = {}
 
       include Logable
@@ -21,11 +19,9 @@ module Vend
 
       def http_client_options
         options.merge(
-            :auth_token => @auth_token, :base_url => base_url
+          auth_token: @auth_token, base_url: base_url
         )
       end
-
     end
-
   end
 end

data/lib/vend/pagination_info.rb

@@ -22,7 +22,8 @@ module Vend
       pages == page
     end
 
-    protected
+  protected
+
     def pagination
       @pagination ||= (response['pagination'] || {"pages" => 1, "page" => 1})
     end

data/lib/vend/resource/customer.rb

@@ -1,11 +1,9 @@
 module Vend
   module Resource
-
     class Customer < Vend::Base
       url_scope :since
       findable_by :email
-      findable_by :name, :as => :q
+      findable_by :name, as: :q
     end
-
   end
 end

data/lib/vend/resource/outlet.rb

@@ -1,7 +1,5 @@
 module Vend
   module Resource
-
     class Outlet < Vend::Base; end
-
   end
 end

data/lib/vend/resource/payment_type.rb

@@ -1,7 +1,5 @@
 module Vend
   module Resource
-
     class PaymentType < Vend::Base; end
-
   end
 end

data/lib/vend/resource/product.rb

@@ -1,12 +1,10 @@
 module Vend
   module Resource
-
     class Product < Vend::Base
       url_scope :since
       url_scope :active
 
       cast_attribute :supply_price, Float
     end
-
   end
 end

data/lib/vend/resource/register.rb

@@ -1,7 +1,5 @@
 module Vend
   module Resource
-
     class Register < Vend::Base; end
-
   end
 end

data/lib/vend/resource/register_sale.rb

@@ -1,12 +1,10 @@
-
 module Vend
   module Resource
-
     class RegisterSale < Vend::Base
       url_scope :since
       url_scope :outlet_id
       url_scope :tag
-      findable_by :state, :as => :status
+      findable_by :state, as: :status
 
       def register_sale_products
         attrs["register_sale_products"].collect do |sale_product_attrs|
@@ -15,9 +13,8 @@ module Vend
       end
 
       def self.default_collection_request_args
-        super.merge(:url_params => {:page_size => 200})
+        super.merge(url_params: {page_size: 200})
       end
     end
-
   end
 end

data/lib/vend/resource/register_sale_product.rb

@@ -9,7 +9,7 @@ module Vend
         @attrs = attrs
       end
 
-      def method_missing(method_name, *args, &block)
+      def method_missing(method_name, *_args, &_block)
         if attrs.keys.include? method_name.to_s
           attrs[method_name.to_s]
         else

data/lib/vend/resource/supplier.rb

@@ -0,0 +1,23 @@
+module Vend
+  module Resource
+    class Supplier < Vend::Base
+      # Returns the endpoint name for a collection of this resource
+      def self.collection_name
+        endpoint_name
+      end
+
+      # Builds a collection of instances from a JSON response
+      def self.build_from_json(client, json)
+        json[collection_name.pluralize].map do |attrs|
+          self.build(client, attrs)
+        end
+      end
+
+      # Initializes a single object from a JSON response.
+      # Assumes the response is a JSON array with a single item.
+      def self.initialize_singular(client, json)
+        self.build(client, json[collection_name.pluralize].first)
+      end
+    end
+  end
+end

data/lib/vend/resource/tax.rb

@@ -1,7 +1,5 @@
 module Vend
   module Resource
-
     class Tax < Vend::Base; end
-
   end
 end

data/lib/vend/resource/user.rb

@@ -1,7 +1,5 @@
 module Vend
   module Resource
-
     class User < Vend::Base; end
-
   end
 end

data/lib/vend/resource_collection.rb

@@ -4,10 +4,9 @@ module Vend
   # resources.  This class will automatically fetch paginated results if the
   # target_class supports it.
   class ResourceCollection
-
-    class PageOutOfBoundsError  < StandardError ; end
-    class AlreadyScopedError    < StandardError ; end
-    class ScopeNotFoundError    < StandardError ; end
+    class PageOutOfBoundsError < StandardError; end
+    class AlreadyScopedError < StandardError; end
+    class ScopeNotFoundError < StandardError; end
 
     include Enumerable
     extend Forwardable
@@ -39,9 +38,7 @@ module Vend
     end
 
     def pagination
-      if response.instance_of? Hash
-        PaginationInfo.new(response)
-      end
+      PaginationInfo.new(response) if response.instance_of? Hash
     end
 
     def last_page?
@@ -66,7 +63,7 @@ module Vend
     end
 
     def has_scope?(name)
-      scopes.any? {|s| s.name == name }
+      scopes.any? { |s| s.name == name }
     end
 
     def method_missing(method_name, *args, &block)
@@ -90,20 +87,17 @@ module Vend
     end
 
     def get_scope(name)
-
       result = scopes.find { |scope| scope.name == name }
       if result.nil?
         raise ScopeNotFoundError.new(
           "Scope: #{name} was not found in #{scopes}."
         )
       end
-      return result
+      result
     end
 
     def get_or_create_page_scope
-      unless has_scope? :page
-        scope(:page, page)
-      end
+      scope(:page, page) unless has_scope? :page
       get_scope :page
     end
 
@@ -116,10 +110,12 @@ module Vend
       endpoint + scopes.join
     end
 
-    protected
+  protected
+
     attr_accessor :response
 
-    protected
+  protected
+
     def get_next_page
       if last_page?
         raise PageOutOfBoundsError.new(

data/lib/vend/scope.rb

@@ -1,6 +1,5 @@
 module Vend
   class Scope
-
     attr_reader :name
     attr_accessor :value
 
@@ -17,7 +16,7 @@ module Vend
       else
         result = value.to_s
       end
-      CGI::escape(result)
+      CGI.escape(result)
     end
 
     def to_s

data/lib/vend/version.rb

@@ -1,3 +1,3 @@
 module Vend #:nodoc:
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/integration/customer_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Vend::Resource::Customer do
-
   let(:expected_attributes) do
     {
       'id'              => '6cbfbc20-3d5f-11e0-8697-4040f540b50a',
@@ -16,18 +15,22 @@ describe Vend::Resource::Customer do
 
   let(:expected_collection_length) { 1 }
 
-  specify { client.Customer.should respond_to(:find_by_email) }
-  specify { client.Customer.should respond_to(:find_by_name) }
+  specify :find_by_email do
+    expect(client.Customer).to respond_to(:find_by_email)
+  end
+
+  specify :find_by_name do
+    expect(client.Customer).to respond_to(:find_by_name)
+  end
 
   it "returns a collection of customers from a search" do
-    stub_request(:get, "https://bar:baz@foo.vendhq.com/api/customers?email=foo@example.com").
-      to_return(:status => 200, :body => get_mock_response('customers.find_by_email.json'))
+    stub_request(:get, "https://bar:baz@foo.vendhq.com/api/customers?email=foo@example.com")
+      .to_return(status: 200, body: get_mock_response('customers.find_by_email.json'))
 
     collection = client.Customer.find_by_email('foo@example.com')
-    collection.first.should be_a Vend::Resource::Customer
-    collection.first.email.should == 'foo@example.com'
+    expect(collection.first).to be_a Vend::Resource::Customer
+    expect(collection.first.email).to eq 'foo@example.com'
   end
 
-  it_should_behave_like "a resource with a collection GET endpoint"
-
+  it_behaves_like "a resource with a collection GET endpoint"
 end

data/spec/integration/outlet_spec.rb

@@ -1,15 +1,14 @@
 require 'spec_helper'
 
 describe Vend::Resource::Outlet do
-
   let(:expected_attributes) do
     {
       'id'              => '6cb5c88c-3d5f-11e0-8697-4040f540b50a',
-      'name'   => 'Main Outlet',
+      'name'   => 'Main Outlet'
     }
   end
 
   let(:expected_collection_length) { 1 }
 
-  it_should_behave_like "a resource with a collection GET endpoint"
+  it_behaves_like "a resource with a collection GET endpoint"
 end

data/spec/integration/payment_types_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Vend::Resource::PaymentType do
-
   let(:expected_attributes) do
     {
       'id'              => '6cde3ba0-3d5f-11e0-8697-4040f540b50a',
@@ -11,5 +10,5 @@ describe Vend::Resource::PaymentType do
 
   let(:expected_collection_length) { 1 }
 
-  it_should_behave_like "a resource with a collection GET endpoint"
+  it_behaves_like "a resource with a collection GET endpoint"
 end

data/spec/integration/product_spec.rb

@@ -12,34 +12,33 @@ describe Vend::Resource::Product do
 
   let(:expected_collection_length) { 2 }
 
-  it_should_behave_like "a resource with a collection GET endpoint"
-  it_should_behave_like "a resource with a DELETE endpoint"
+  it_behaves_like "a resource with a collection GET endpoint"
+  it_behaves_like "a resource with a DELETE endpoint"
 
   describe "pagination" do
-
-    let(:username)  {"foo"}
-    let(:password)  {"bar"}
-    let(:store)     {"baz"}
+    let(:username)  { "foo" }
+    let(:password)  { "bar" }
+    let(:store)     { "baz" }
 
     let(:client) do
       Vend::Client.new(store, username, password)
     end
 
     before do
-      stub_request( :get,
-        "https://#{username}:#{password}@#{store}.vendhq.com/api/products"
-      ).to_return(
-        :status => 200, :body => get_mock_response('products/page/1.json')
-      )
-      stub_request( :get,
-        "https://#{username}:#{password}@#{store}.vendhq.com/api/products/page/2"
-      ).to_return(
-        :status => 200, :body => get_mock_response('products/page/2.json')
-      )
+      stub_request(:get,
+                   "https://#{username}:#{password}@#{store}.vendhq.com/api/products"
+                  ).to_return(
+                    status: 200, body: get_mock_response('products/page/1.json')
+                  )
+      stub_request(:get,
+                   "https://#{username}:#{password}@#{store}.vendhq.com/api/products/page/2"
+                  ).to_return(
+                    status: 200, body: get_mock_response('products/page/2.json')
+                  )
     end
 
     it "returns paginated results" do
-      client.Product.all.count.should == 4
+      expect(client.Product.all.count).to eq 4
     end
 
     it "returns the first result" do
@@ -48,28 +47,26 @@ describe Vend::Resource::Product do
   end
 
   describe "chaining" do
-    let(:username)  {"foo"}
-    let(:password)  {"bar"}
-    let(:store)     {"baz"}
+    let(:username)  { "foo" }
+    let(:password)  { "bar" }
+    let(:store)     { "baz" }
 
-    let(:timestamp) { Time.new(2012,7,5,11,12,13) }
+    let(:timestamp) { Time.new(2012, 7, 5, 11, 12, 13) }
 
     let(:client) do
       Vend::Client.new(store, username, password)
     end
 
     before do
-      stub_request( :get,
-        "https://#{username}:#{password}@#{store}.vendhq.com/api/products/active/1/since/2012-07-05+11:12:13"
-      ).to_return(
-        :status => 200, :body => get_mock_response('products.active.since.json')
-      )
+      stub_request(:get,
+                   "https://#{username}:#{password}@#{store}.vendhq.com/api/products/active/1/since/2012-07-05+11:12:13"
+                  ).to_return(
+                    status: 200, body: get_mock_response('products.active.since.json')
+                  )
     end
 
     it "allows scope chaining" do
-      client.Product.active(1).since(timestamp).count.should == 3
+      expect(client.Product.active(1).since(timestamp).count).to eq 3
     end
-
-
   end
 end