shopkit 0.1.0 → 0.1.1

data/Gemfile

@@ -2,7 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "faraday_middleware"
+gem "faraday", "~> 0.8.1"
+gem "faraday_middleware", "~> 0.8.8"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -12,5 +13,5 @@ group :development do
   gem "bundler"
   gem "jeweler"
   gem "rspec"
-  gem "fakeweb"
+  gem "webmock", "~> 1.8.7"
 end

data/Gemfile.lock

@@ -1,11 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.8)
+    crack (0.3.1)
     diff-lcs (1.1.3)
-    fakeweb (1.3.0)
     faraday (0.8.1)
       multipart-post (~> 1.1)
-    faraday_middleware (0.8.7)
+    faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)
     git (1.2.5)
     jeweler (1.8.3)
@@ -31,6 +32,9 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
+    webmock (1.8.7)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
     yard (0.8.1)
 
 PLATFORMS
@@ -38,9 +42,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  fakeweb
-  faraday_middleware
+  faraday (~> 0.8.1)
+  faraday_middleware (~> 0.8.8)
   jeweler
   rspec
   shoulda
+  webmock (~> 1.8.7)
   yard

data/lib/shopkit/client/orders.rb

@@ -6,6 +6,10 @@ module Shopkit
         get('/orders', options)['orders']
       end
 
+      def order(id, options={})
+        get("/orders/#{id}", options)['order']
+      end
+
     end
 
     include Orders

data/lib/shopkit/client/webhooks.rb

@@ -0,0 +1,13 @@
+module Shopkit
+  class Client
+    module Webhooks
+
+      def create_webhook(options={})
+        post('/webhooks', options)['webhook']
+      end
+
+    end
+
+    include Webhooks
+  end
+end

data/lib/shopkit/connection.rb

@@ -7,6 +7,7 @@ module Shopkit
     private
 
     def connection
+      #@conn ||= Faraday.new(:url => "https://#{url}") do |builder|
       @conn ||= Faraday.new(:url => "http://#{url}") do |builder|
         builder.request :oauth2, access_token
         #builder.request :json

data/lib/shopkit/request.rb

@@ -1,5 +1,3 @@
-require 'multi_json'
-
 module Shopkit
   module Request
     def delete(path, options={}, version=api_version)

data/lib/shopkit/version.rb

@@ -1,3 +1,3 @@
 module Shopkit
-  VERSION = "0.1.0" unless defined?(Shopkit::VERSION)
+  VERSION = "0.1.1" unless defined?(Shopkit::VERSION)
 end

data/shopkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "shopkit"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["saberma"]
-  s.date = "2012-06-27"
+  s.date = "2012-07-13"
   s.description = "a gem for the ShopQi API"
   s.email = "mahb45@gmail.com"
   s.extra_rdoc_files = [
@@ -30,17 +30,21 @@ Gem::Specification.new do |s|
     "lib/shopkit/client/orders.rb",
     "lib/shopkit/client/products.rb",
     "lib/shopkit/client/shop.rb",
+    "lib/shopkit/client/webhooks.rb",
     "lib/shopkit/configuration.rb",
     "lib/shopkit/connection.rb",
     "lib/shopkit/request.rb",
     "lib/shopkit/version.rb",
     "shopkit.gemspec",
+    "spec/json/order.json",
     "spec/json/orders.json",
     "spec/json/products.json",
     "spec/json/shop.json",
+    "spec/json/webhook.json",
     "spec/shopkit/client/orders_spec.rb",
     "spec/shopkit/client/products_spec.rb",
     "spec/shopkit/client/shop_spec.rb",
+    "spec/shopkit/client/webhooks_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/saberma/shopkit"
@@ -53,30 +57,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday_middleware>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.8.1"])
+      s.add_runtime_dependency(%q<faraday_middleware>, ["~> 0.8.8"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.8.7"])
     else
-      s.add_dependency(%q<faraday_middleware>, [">= 0"])
+      s.add_dependency(%q<faraday>, ["~> 0.8.1"])
+      s.add_dependency(%q<faraday_middleware>, ["~> 0.8.8"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<webmock>, ["~> 1.8.7"])
     end
   else
-    s.add_dependency(%q<faraday_middleware>, [">= 0"])
+    s.add_dependency(%q<faraday>, ["~> 0.8.1"])
+    s.add_dependency(%q<faraday_middleware>, ["~> 0.8.8"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<webmock>, ["~> 1.8.7"])
   end
 end
 

data/spec/json/order.json

@@ -0,0 +1,27 @@
+{
+  "order": {
+    "cancel_reason": null,
+    "cancelled_at": null,
+    "closed_at": "2012-05-15T21:36:38+08:00",
+    "created_at": "2012-04-16T23:07:33+08:00",
+    "customer_id": 2,
+    "email": "mahb45@gmail.com",
+    "financial_status": "pending",
+    "fulfillment_status": "fulfilled",
+    "id": 99,
+    "name": "#1095",
+    "note": "",
+    "number": 95,
+    "order_number": 1095,
+    "payment_id": 8,
+    "shipping_rate": "普通快递-0",
+    "shop_id": 2,
+    "status": "closed",
+    "subtotal_price": 45.0,
+    "token": "96b1d0806a03012f21f6480aa969d9a6",
+    "total_line_items_price": 45.0,
+    "total_price": 45.0,
+    "trade_no": null,
+    "updated_at": "2012-05-15T21:36:38+08:00"
+  }
+}

data/spec/json/webhook.json

@@ -0,0 +1,8 @@
+{
+  "webhook":
+    {
+      "id": 1,
+      "event": "order/fulfilled",
+      "callback_url": "http://lvh.me/webhook"
+    }
+}

data/spec/shopkit/client/orders_spec.rb

@@ -2,12 +2,15 @@ require 'spec_helper'
 
 describe Shopkit::Client::Orders do
 
-  before do
+  it 'should get orders' do
     fake_web "orders"
+    Shopkit.orders.size.should_not eql 0
   end
 
-  it 'should get orders' do
-    Shopkit.orders.size.should_not eql 0
+  it 'should get order' do
+    id = 99
+    fake_web "orders/#{id}", json_file: :order
+    Shopkit.order(id)['id'].should eql id
   end
   
 end

data/spec/shopkit/client/webhooks_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Shopkit::Client::Webhooks do
+
+  before do
+    fake_web 'webhooks', method: :post, json_file: :webhook
+  end
+
+  it 'should be create' do
+    webhook = Shopkit.create_webhook(webhook: {event: 'order/fulfilled', callback_url: 'http://lvh.me/webhook'})
+    webhook['id'].should_not be_nil
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
-require 'fakeweb'
 require 'shopkit'
+require 'webmock/rspec'
 
-FakeWeb.allow_net_connect = false
 RSpec.configure do |config|
 
   config.before(:each) do
@@ -16,11 +15,13 @@ RSpec.configure do |config|
   end
 
   def fake_web(endpoint, options={})
-    body = options.has_key?(:body) ? options.delete(:body) : load_json(endpoint)
+    file = options[:json_file] || endpoint
+    body = options.has_key?(:body) ? options.delete(:body) : load_json(file)
     method = options.delete(:method) || :get
 
-    url = "https://#{Shopkit.url}/api/#{endpoint}.json"
-    FakeWeb.register_uri(method, url, {:body => body, :content_type => "text/json"}.merge(options))
+    #url = "https://#{Shopkit.url}/api/#{endpoint}.json"
+    url = "http://#{Shopkit.url}/api/#{endpoint}.json"
+    stub_request(method, url).to_return(body: body, headers: { content_type: 'text/json' })
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopkit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -108,21 +124,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.7
 description: a gem for the ShopQi API
 email: mahb45@gmail.com
 executables: []
@@ -144,17 +160,21 @@ files:
 - lib/shopkit/client/orders.rb
 - lib/shopkit/client/products.rb
 - lib/shopkit/client/shop.rb
+- lib/shopkit/client/webhooks.rb
 - lib/shopkit/configuration.rb
 - lib/shopkit/connection.rb
 - lib/shopkit/request.rb
 - lib/shopkit/version.rb
 - shopkit.gemspec
+- spec/json/order.json
 - spec/json/orders.json
 - spec/json/products.json
 - spec/json/shop.json
+- spec/json/webhook.json
 - spec/shopkit/client/orders_spec.rb
 - spec/shopkit/client/products_spec.rb
 - spec/shopkit/client/shop_spec.rb
+- spec/shopkit/client/webhooks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/saberma/shopkit
 licenses:
@@ -171,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -789845379
+      hash: 15336915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: