ecwid_api 0.1.0 → 0.2.0

data/lib/ecwid_api/product.rb

@@ -1,5 +1,3 @@
-require "open-uri"
-
 module EcwidApi
 	class Product < Entity
     self.url_root = "products"
@@ -27,11 +25,7 @@ module EcwidApi
     #
     # Returns a Faraday::Response object
     def upload_image!(filename)
-      client.post("#{url}/image") do |req|
-        req.body = open(filename).read
-      end.tap do |response|
-        raise_on_failure(response)
-      end
+      client.post_image("#{url}/image", filename)
     end
 
     # Public: Uploads gallery images for a Product
@@ -43,11 +37,7 @@ module EcwidApi
     # Returns an Array of Faraday::Response object
     def upload_gallery_images!(*filenames)
       filenames.map do |filename|
-        client.post("#{url}/gallery") do |req|
-          req.body = open(filename).read
-        end.tap do |response|
-          raise_on_failure(response)
-        end
+        client.post_image("#{url}/gallery", filename)
       end
     end
 
@@ -57,9 +47,7 @@ module EcwidApi
     #
     # Returns a Faraday::Response object
     def delete_gallery_images!
-      client.delete("#{url}/gallery").tap do |response|
-        raise_on_failure(response)
-      end
+      client.delete("#{url}/gallery")
     end
 
     def combinations

data/lib/ecwid_api/product_combination.rb

@@ -24,11 +24,7 @@ module EcwidApi
     #
     # Returns a Faraday::Response object
     def upload_image!(filename)
-      client.post("#{url}/image") do |req|
-        req.body = open(filename).read
-      end.tap do |response|
-        raise_on_failure(response)
-      end
+      client.post_image("#{url}/image", filename)
     end
   end
 end

data/lib/ecwid_api/version.rb

@@ -1,3 +1,3 @@
 module EcwidApi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/ext/string.rb

@@ -1,13 +1,13 @@
-class String
-  def camel_case
-    split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
-  end unless method_defined?(:camel_case)
-
-  def underscore
-    self.gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
-  end unless method_defined?(:underscore)
+class String
+  def camel_case
+    split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+  end unless method_defined?(:camel_case)
+
+  def underscore
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end unless method_defined?(:underscore)
 end

data/spec/api/categories_spec.rb

@@ -1,31 +1,31 @@
-require 'spec_helper'
-
-describe EcwidApi::Api::Categories, faraday: true do
-  subject { client.categories }
-
-  describe "#all" do
-    it "gets all of the categories from the client" do
-      expect(client).to receive(:get).with("categories", hash_including({})).and_call_original
-      subject.all
-    end
-
-    it "gets sub categories" do
-      expect(client).to receive(:get).with("categories", hash_including(parent: 5)).and_call_original
-      subject.all(parent: 5)
-    end
-  end
-
-  describe "#root" do
-    it "gets the root level categories" do
-      expect(subject).to receive(:all).with(hash_including(parent: 0)).and_call_original
-      subject.root
-    end
-  end
-
-  describe "#find" do
-    it "finds a single category" do
-      expect(client).to receive(:get).with("categories/#{5}").and_call_original
-      subject.find(5)
-    end
-  end
+require 'spec_helper'
+
+describe EcwidApi::Api::Categories, faraday: true do
+  subject { client.categories }
+
+  describe "#all" do
+    it "gets all of the categories from the client" do
+      expect(client).to receive(:get).with("categories", hash_including({})).and_call_original
+      subject.all
+    end
+
+    it "gets sub categories" do
+      expect(client).to receive(:get).with("categories", hash_including(parent: 5)).and_call_original
+      subject.all(parent: 5)
+    end
+  end
+
+  describe "#root" do
+    it "gets the root level categories" do
+      expect(subject).to receive(:all).with(hash_including(parent: 0)).and_call_original
+      subject.root
+    end
+  end
+
+  describe "#find" do
+    it "finds a single category" do
+      expect(client).to receive(:get).with("categories/#{5}").and_call_original
+      subject.find(5)
+    end
+  end
 end

data/spec/api/orders_spec.rb

@@ -1,30 +1,30 @@
-require 'spec_helper'
-
-describe EcwidApi::Api::Orders, faraday: true do
-  subject { client.orders }
-
-  describe "#all" do
-    it "passes the parameters to the client" do
-      expect(client).to receive(:get).with("orders", hash_including(from_date: '1982-05-17'))
-      subject.all(from_date: '1982-05-17')
-    end
-
-    it "gets the proper response (see fixtures)" do
-      subject.all.count.should == 2
-    end
-
-    it "gets EcwidApi::Order types" do
-      subject.all.all? { |order| order.is_a?(EcwidApi::Order) }.should be_true
-    end
-  end
-
-  describe "#find" do
-    it "is an `EcwidApi::Order`" do
-      subject.find(35).is_a?(EcwidApi::Order).should be_true
-    end
-
-    it "is nil when not found" do
-      subject.find(404).should be_nil
-    end
-  end
+require 'spec_helper'
+
+describe EcwidApi::Api::Orders, faraday: true do
+  subject { client.orders }
+
+  describe "#all" do
+    it "passes the parameters to the client" do
+      expect(client).to receive(:get).with("orders", hash_including(from_date: '1982-05-17'))
+      subject.all(from_date: '1982-05-17')
+    end
+
+    it "gets the proper response (see fixtures)" do
+      subject.all.count.should == 2
+    end
+
+    it "gets EcwidApi::Order types" do
+      subject.all.all? { |order| order.is_a?(EcwidApi::Order) }.should be_true
+    end
+  end
+
+  describe "#find" do
+    it "is an `EcwidApi::Order`" do
+      subject.find(35).is_a?(EcwidApi::Order).should be_true
+    end
+
+    it "is nil when not found" do
+      subject.find(404).should be_nil
+    end
+  end
 end

data/spec/category_spec.rb

@@ -1,34 +1,34 @@
-require 'spec_helper'
-
-describe EcwidApi::Category, faraday: true do
-  subject { EcwidApi::Category.new({"id" => 123, "parentId" => 456}, client: client) }
-
-  describe "#sub_categories" do
-    it "sends the request to the CategoryApi" do
-      expect(client.categories).to receive(:all).with(parent: 123)
-      subject.sub_categories
-    end
-
-    it "is memoized" do
-      subject.sub_categories
-      expect(client.categories).to_not receive(:all)
-      subject.sub_categories
-    end
-  end
-
-  describe "#parent" do
-    it "sends the request for the parent to the CategoryApi" do
-      expect(client.categories).to receive(:find).with(456)
-      subject.parent
-    end
-
-    context "without a parent" do
-      subject { EcwidApi::Category.new({"id" => 123}) }
-
-      it "returns nil" do
-        expect(client.categories).to_not receive(:find)
-        subject.parent.should be_nil
-      end
-    end
-  end
+require 'spec_helper'
+
+describe EcwidApi::Category, faraday: true do
+  subject { EcwidApi::Category.new({"id" => 123, "parentId" => 456}, client: client) }
+
+  describe "#sub_categories" do
+    it "sends the request to the CategoryApi" do
+      expect(client.categories).to receive(:all).with(parent: 123)
+      subject.sub_categories
+    end
+
+    it "is memoized" do
+      subject.sub_categories
+      expect(client.categories).to_not receive(:all)
+      subject.sub_categories
+    end
+  end
+
+  describe "#parent" do
+    it "sends the request for the parent to the CategoryApi" do
+      expect(client.categories).to receive(:find).with(456)
+      subject.parent
+    end
+
+    context "without a parent" do
+      subject { EcwidApi::Category.new({"id" => 123}) }
+
+      it "returns nil" do
+        expect(client.categories).to_not receive(:find)
+        subject.parent.should be_nil
+      end
+    end
+  end
 end

data/spec/client_spec.rb

@@ -1,21 +1,21 @@
-require "spec_helper"
-
-describe EcwidApi::Client do
-  subject { client }
-
-  describe "#store_url" do
-    its(:store_url) { "http://app.ecwid.com/api/v3/12345" }
-  end
-
-  describe "#get", faraday: true do
-    it "delegates to the Faraday connection" do
-      expect(subject.send(:connection)).to receive(:get).with("categories", parent: 1)
-
-      subject.get "categories", parent: 1
-    end
-
-    it "returns a Faraday::Response" do
-      subject.get("categories", parent: 1).is_a?(Faraday::Response).should be_true
-    end
-  end
+require "spec_helper"
+
+describe EcwidApi::Client do
+  subject { client }
+
+  describe "#store_url" do
+    its(:store_url) { "http://app.ecwid.com/api/v3/12345" }
+  end
+
+  describe "#get", faraday: true do
+    it "delegates to the Faraday connection" do
+      expect(subject.send(:connection)).to receive(:get).with("categories", parent: 1)
+
+      subject.get "categories", parent: 1
+    end
+
+    it "returns a Faraday::Response" do
+      subject.get("categories", parent: 1).is_a?(Faraday::Response).should be_true
+    end
+  end
 end

data/spec/helpers/client.rb

@@ -1,32 +1,32 @@
-module Helpers
-  module Client
-    def client
-      @client ||= EcwidApi::Client.new(12345, "access_token").tap do |client|
-        allow(client).to receive(:connection).and_return(faraday)
-      end
-    end
-
-    def fixtures
-      %w(categories category orders products)
-    end
-
-    def faraday_stubs
-      ::Faraday::Adapter::Test::Stubs.new do |stub|
-        fixtures.each do |fixture|
-          stub.get(fixture) { [ 200, {"Content-Type" => "application/json"}, File.read("spec/fixtures/#{fixture}.json") ] }
-        end
-        stub.get("/categories/5") { [200, {"Content-Type" => "application/json"}, File.read("spec/fixtures/category.json") ] }
-        stub.get("/orders/35") { [200, {"Content-Type" => "application/json"}, File.read("spec/fixtures/order.json") ] }
-        stub.get("/orders/404") { [404, {"Content-Type" => "application/json"}, nil ] }
-      end
-    end
-
-    # Public: Returns a test Faraday::Connection
-    def faraday
-      ::Faraday.new do |builder|
-        builder.response :json, content_type: /\bjson$/
-        builder.adapter :test, faraday_stubs
-      end
-    end
-  end
+module Helpers
+  module Client
+    def client
+      @client ||= EcwidApi::Client.new(12345, "access_token").tap do |client|
+        allow(client).to receive(:connection).and_return(faraday)
+      end
+    end
+
+    def fixtures
+      %w(categories category orders products)
+    end
+
+    def faraday_stubs
+      ::Faraday::Adapter::Test::Stubs.new do |stub|
+        fixtures.each do |fixture|
+          stub.get(fixture) { [ 200, {"Content-Type" => "application/json"}, File.read("spec/fixtures/#{fixture}.json") ] }
+        end
+        stub.get("/categories/5") { [200, {"Content-Type" => "application/json"}, File.read("spec/fixtures/category.json") ] }
+        stub.get("/orders/35") { [200, {"Content-Type" => "application/json"}, File.read("spec/fixtures/order.json") ] }
+        stub.get("/orders/404") { [404, {"Content-Type" => "application/json"}, nil ] }
+      end
+    end
+
+    # Public: Returns a test Faraday::Connection
+    def faraday
+      ::Faraday.new do |builder|
+        builder.response :json, content_type: /\bjson$/
+        builder.adapter :test, faraday_stubs
+      end
+    end
+  end
 end

data/spec/oauth_spec.rb

@@ -1,40 +1,40 @@
-require 'spec_helper'
-
-describe EcwidApi::OAuth do
-  subject do
-    EcwidApi::OAuth.new do |config|
-      config.client_id = "client_id"
-      config.client_secret = "client_secret"
-      config.scope = "scope"
-      config.redirect_uri = "https://example.com/oauth"
-    end
-  end
-
-  its(:oauth_url) { should == "https://my.ecwid.com/api/oauth/authorize?client_id=client_id&scope=scope&response_type=code&redirect_uri=https%3A%2F%2Fexample.com%2Foauth" }
-
-  describe "#access_token(code)" do
-    let(:response) do
-      double("response").tap do |response|
-        allow(response).to receive(:success?).and_return(true)
-        allow(response).to receive(:body).and_return(access_token: "the_token", store_id: "12345")
-      end
-    end
-
-    before(:each) do
-      allow(subject.send(:connection)).to receive(:post).with("/api/oauth/token", hash_including(code: "code")).and_return(response)
-    end
-
-    it "sends a request to the API for an access_token" do
-      expect(subject.send(:connection)).to receive(:post).with("/api/oauth/token", hash_including(code: "code")).and_return(response)
-      subject.access_token("code")
-    end
-
-    it "returns an object that has the access_token" do
-      subject.access_token("code").access_token.should == "the_token"
-    end
-
-    it "returns an object that has the store_id" do
-      subject.access_token("code").store_id.should == "12345"
-    end
-  end
+require 'spec_helper'
+
+describe EcwidApi::OAuth do
+  subject do
+    EcwidApi::OAuth.new do |config|
+      config.client_id = "client_id"
+      config.client_secret = "client_secret"
+      config.scope = "scope"
+      config.redirect_uri = "https://example.com/oauth"
+    end
+  end
+
+  its(:oauth_url) { should == "https://my.ecwid.com/api/oauth/authorize?client_id=client_id&scope=scope&response_type=code&redirect_uri=https%3A%2F%2Fexample.com%2Foauth" }
+
+  describe "#access_token(code)" do
+    let(:response) do
+      double("response").tap do |response|
+        allow(response).to receive(:success?).and_return(true)
+        allow(response).to receive(:body).and_return(access_token: "the_token", store_id: "12345")
+      end
+    end
+
+    before(:each) do
+      allow(subject.send(:connection)).to receive(:post).with("/api/oauth/token", hash_including(code: "code")).and_return(response)
+    end
+
+    it "sends a request to the API for an access_token" do
+      expect(subject.send(:connection)).to receive(:post).with("/api/oauth/token", hash_including(code: "code")).and_return(response)
+      subject.access_token("code")
+    end
+
+    it "returns an object that has the access_token" do
+      subject.access_token("code").access_token.should == "the_token"
+    end
+
+    it "returns an object that has the store_id" do
+      subject.access_token("code").store_id.should == "12345"
+    end
+  end
 end