shopify_api 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9fc203a46569db4cddb7ed4c82f9392dfdbb33
-  data.tar.gz: ee232e9226eee62db4edd51db94ad38a66bb532b
+  metadata.gz: 4b7258c4c1368bc212523e4f8454567e21d46737
+  data.tar.gz: 3ab24e5dba88ffb8172b7b4b9f9b72029fefe208
 SHA512:
-  metadata.gz: 5aaec38706d2c2226260f34ef597108fc68bb1a578f030553771e895e8b03b8dbb0d650ea88a6b3b6097b596e8f967f0315ca922dbfe13566a167e478b32f0ab
-  data.tar.gz: d5bf632be11ffdf315c25616e26bfdd8c4e4fe89034ed98b182af5cd4b14dda035fd1dfe556ffc9a8119efbe5a188dd2e7b74399a1f6270027a24ef770e14990
+  metadata.gz: b3f0a8efebafd6e97a057c5e87de87a1fc81be1a587c4471c5c2129589d0ecbae0ba2b7398b5ecc6e6b4986e2cd1a2f9c85bbb090209e7438d7c31d42b885ab8
+  data.tar.gz: e38505ed41e9ae8bd00377483b57cf8a8b62dfff37eb218193cc620665309e978668193ede11b824cb2e7bf3bcbd820e85b4b5eb88a49539c6167eef7bb6e22e

data/CHANGELOG

@@ -1,3 +1,8 @@
+== Version 3.2.2
+
+* Temporary fix for the CLI
+* Add a specific exception for signature validation failures
+
 == Version 3.2.1
 
 * Added CarrierService resource

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    shopify_api (3.2.1)
+    shopify_api (3.2.2)
       activeresource (>= 3.0.0)
-      thor (>= 0.14.4)
+      thor (~> 0.18.1)
 
 GEM
   remote: https://rubygems.org/
@@ -44,6 +44,7 @@ PLATFORMS
 DEPENDENCIES
   activeresource (~> 4.0.0)
   fakeweb
+  minitest (~> 4.0)
   mocha (>= 0.9.8)
   rake
   shopify_api!

data/lib/shopify_api/cli.rb

@@ -1,10 +1,11 @@
 require 'thor'
 require 'abbrev'
+require 'yaml'
 
 module ShopifyAPI
   class Cli < Thor
     include Thor::Actions
-    
+
     class ConfigFileError < StandardError
     end
 
@@ -15,7 +16,7 @@ module ShopifyAPI
         puts prefix + c
       end
     end
-    
+
     desc "add CONNECTION", "create a config file for a connection named CONNECTION"
     def add(connection)
       file = config_file(connection)
@@ -35,7 +36,7 @@ module ShopifyAPI
         default(connection)
       end
     end
-    
+
     desc "remove CONNECTION", "remove the config file for CONNECTION"
     def remove(connection)
       file = config_file(connection)
@@ -46,7 +47,7 @@ module ShopifyAPI
         no_config_file_error(file)
       end
     end
-    
+
     desc "edit [CONNECTION]", "open the config file for CONNECTION with your default editor"
     def edit(connection=nil)
       file = config_file(connection)
@@ -60,7 +61,7 @@ module ShopifyAPI
         no_config_file_error(file)
       end
     end
-    
+
     desc "show [CONNECTION]", "output the location and contents of the CONNECTION's config file"
     def show(connection=nil)
       connection ||= default_connection
@@ -72,7 +73,7 @@ module ShopifyAPI
         no_config_file_error(file)
       end
     end
-    
+
     desc "default [CONNECTION]", "show the default connection, or make CONNECTION the default"
     def default(connection=nil)
       if connection
@@ -90,15 +91,15 @@ module ShopifyAPI
         puts "There is no default connection set"
       end
     end
-    
+
     desc "console [CONNECTION]", "start an API console for CONNECTION"
     def console(connection=nil)
       file = config_file(connection)
-      
+
       config = YAML.load(File.read(file))
       puts "using #{config['domain']}"
       ShopifyAPI::Base.site = site_from_config(config)
-      
+
       require 'irb'
       require 'irb/completion'
       ARGV.clear
@@ -110,15 +111,15 @@ module ShopifyAPI
     end
 
     private
-    
+
     def shop_config_dir
       @shop_config_dir ||= File.join(ENV['HOME'], '.shopify', 'shops')
     end
-    
+
     def default_symlink
       @default_symlink ||= File.join(shop_config_dir, 'default')
     end
-    
+
     def config_file(connection)
       if connection
         File.join(shop_config_dir, "#{connection}.yml")
@@ -126,35 +127,35 @@ module ShopifyAPI
         default_symlink
       end
     end
-    
+
     def site_from_config(config)
       protocol = config['protocol'] || 'https'
       api_key  = config['api_key']
       password = config['password']
       domain   = config['domain']
-    
+
       ShopifyAPI::Base.site = "#{protocol}://#{api_key}:#{password}@#{domain}/admin"
     end
-    
+
     def available_connections
       @available_connections ||= begin
         pattern = File.join(shop_config_dir, "*.yml")
         Dir.glob(pattern).map { |f| File.basename(f, ".yml") }
       end
     end
-    
+
     def default_connection_target
       @default_connection_target ||= File.readlink(default_symlink)
     end
-    
+
     def default_connection
       @default_connection ||= File.basename(default_connection_target, ".yml")
     end
-    
+
     def default?(connection)
       default_connection == connection
     end
-    
+
     def no_config_file_error(filename)
       raise ConfigFileError, "There is no config file at #{filename}"
     end

data/lib/shopify_api/session.rb

@@ -1,6 +1,9 @@
 
 module ShopifyAPI
 
+  class ValidationException < StandardError
+  end
+
   class Session
     cattr_accessor :api_key
     cattr_accessor :secret
@@ -74,7 +77,7 @@ module ShopifyAPI
       return token if token
 
       unless self.class.validate_signature(params) && params[:timestamp].to_i > 24.hours.ago.utc.to_i
-        raise "Invalid Signature: Possible malicious login"
+        raise ShopifyAPI::ValidationException, "Invalid Signature: Possible malicious login"
       end
 
       code = params['code']

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/shopify_api.gemspec

@@ -25,15 +25,17 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_dependency("activeresource", [">= 3.0.0"])
-  s.add_dependency("thor", [">= 0.14.4"])
-  
+  s.add_dependency("thor", ["~> 0.18.1"])
+
   if s.respond_to?(:add_development_dependency)
     s.add_development_dependency("mocha", ">= 0.9.8")
     s.add_development_dependency("fakeweb")
+    s.add_development_dependency("minitest", "~> 4.0")
     s.add_development_dependency("rake")
   else
     s.add_dependency("mocha", ">= 0.9.8")
     s.add_dependency("fakeweb")
+    s.add_dependency("minitest", "~> 4.0")
     s.add_dependency("rake")
   end
 end

data/test/checkouts_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class CheckoutsTest < Test::Unit::TestCase
+  test "get all should get all orders" do
+    fake 'checkouts', :method => :get, :status => 200, :body => load_fixture('checkouts')
+    checkout = ShopifyAPI::Checkout.all
+    assert_equal 450789469, checkout.first.id
+  end
+end

data/test/cli_test.rb

@@ -10,7 +10,7 @@ class CliTest < Test::Unit::TestCase
     `rm -rf #{@test_home}`
     ENV['HOME'] = @test_home
     @cli = ShopifyAPI::Cli.new
-    
+
     FileUtils.mkdir_p(@shop_config_dir)
     File.open(config_file('foo'), 'w') do |file|
       file.puts valid_options.merge('domain' => 'foo.myshopify.com').to_yaml
@@ -20,11 +20,11 @@ class CliTest < Test::Unit::TestCase
       file.puts valid_options.merge('domain' => 'bar.myshopify.com').to_yaml
     end
   end
-  
+
   def teardown
     `rm -rf #{@test_home}`
   end
-  
+
   test "add with blank domain" do
     `rm -rf #{@shop_config_dir}/*`
     $stdout.expects(:print).with("Domain? (leave blank for foo.myshopify.com) ")
@@ -33,9 +33,9 @@ class CliTest < Test::Unit::TestCase
     $stdin.expects(:gets).times(3).returns("", "key", "pass")
     @cli.expects(:puts).with("\nopen https://foo.myshopify.com/admin/api in your browser to get API credentials\n")
     @cli.expects(:puts).with("Default connection is foo")
-    
+
     @cli.add('foo')
-    
+
     config = YAML.load(File.read(config_file('foo')))
     assert_equal 'foo.myshopify.com', config['domain']
     assert_equal 'key', config['api_key']
@@ -43,7 +43,7 @@ class CliTest < Test::Unit::TestCase
     assert_equal 'https', config['protocol']
     assert_equal config_file('foo'), File.readlink(@default_symlink)
   end
-  
+
   test "add with explicit domain" do
     `rm -rf #{@shop_config_dir}/*`
     $stdout.expects(:print).with("Domain? (leave blank for foo.myshopify.com) ")
@@ -52,58 +52,58 @@ class CliTest < Test::Unit::TestCase
     $stdin.expects(:gets).times(3).returns("bar.myshopify.com", "key", "pass")
     @cli.expects(:puts).with("\nopen https://bar.myshopify.com/admin/api in your browser to get API credentials\n")
     @cli.expects(:puts).with("Default connection is foo")
-    
+
     @cli.add('foo')
-    
+
     config = YAML.load(File.read(config_file('foo')))
     assert_equal 'bar.myshopify.com', config['domain']
   end
-  
+
   test "list" do
     @cli.expects(:puts).with("   bar")
     @cli.expects(:puts).with(" * foo")
-    
+
     @cli.list
   end
-  
+
   test "show default" do
     @cli.expects(:puts).with("Default connection is foo")
-    
+
     @cli.default
   end
-  
+
   test "set default" do
     @cli.expects(:puts).with("Default connection is bar")
-    
+
     @cli.default('bar')
-    
+
     assert_equal config_file('bar'), File.readlink(@default_symlink)
   end
-  
+
   test "remove default connection" do
     @cli.remove('foo')
-    
+
     assert !File.exist?(@default_symlink)
     assert !File.exist?(config_file('foo'))
     assert File.exist?(config_file('bar'))
   end
-  
+
   test "remove non-default connection" do
     @cli.remove('bar')
-    
+
     assert_equal config_file('foo'), File.readlink(@default_symlink)
     assert File.exist?(config_file('foo'))
     assert !File.exist?(config_file('bar'))
   end
-  
+
   private
-  
+
   def valid_options
     {'domain' => 'snowdevil.myshopify.com', 'api_key' => 'key', 'password' => 'pass', 'protocol' => 'https'}
   end
-  
+
   def config_file(connection)
     File.join(@shop_config_dir, "#{connection}.yml")
   end
-  
-end
+
+end

data/test/fixtures/checkouts.json

@@ -0,0 +1,186 @@
+{
+  "checkouts": [
+    {
+      "buyer_accepts_marketing": false,
+      "cart_token": "68778783ad298f1c80c3bafcddeea02f",
+      "closed_at": null,
+      "completed_at": null,
+      "created_at": "2012-10-12T07:05:27-04:00",
+      "currency": "USD",
+      "email": "bob.norman@hostmail.com",
+      "gateway": null,
+      "id": 450789469,
+      "landing_site": null,
+      "note": null,
+      "referring_site": null,
+      "shipping_lines": [
+        {
+          "title": "Free Shipping",
+          "price": "0.00",
+          "code": "Free Shipping",
+          "source": "shopify"
+        }
+      ],
+      "source": null,
+      "source_identifier": null,
+      "source_name": "web",
+      "source_url": null,
+      "subtotal_price": "398.00",
+      "taxes_included": false,
+      "token": "2a1ace52255252df566af0faaedfbfa7",
+      "total_discounts": "0.00",
+      "total_line_items_price": "398.00",
+      "total_price": "409.94",
+      "total_tax": "11.94",
+      "total_weight": 400,
+      "updated_at": "2012-10-12T07:05:27-04:00",
+      "line_items": [
+        {
+          "applied_discounts": [
+
+          ],
+          "compare_at_price": null,
+          "fulfillment_service": "manual",
+          "gift_card": false,
+          "grams": 200,
+          "id": 49148385,
+          "line_price": "199.00",
+          "price": "199.00",
+          "product_id": 632910392,
+          "properties": null,
+          "quantity": 1,
+          "requires_shipping": true,
+          "sku": "IPOD2008RED",
+          "tax_lines": [
+
+          ],
+          "taxable": true,
+          "title": "IPod Nano - 8GB",
+          "variant_id": 49148385,
+          "variant_title": "Red",
+          "vendor": "Apple"
+        },
+        {
+          "applied_discounts": [
+
+          ],
+          "compare_at_price": null,
+          "fulfillment_service": "manual",
+          "gift_card": false,
+          "grams": 200,
+          "id": 808950810,
+          "line_price": "199.00",
+          "price": "199.00",
+          "product_id": 632910392,
+          "properties": null,
+          "quantity": 1,
+          "requires_shipping": true,
+          "sku": "IPOD2008PINK",
+          "tax_lines": [
+
+          ],
+          "taxable": true,
+          "title": "IPod Nano - 8GB",
+          "variant_id": 808950810,
+          "variant_title": "Pink",
+          "vendor": "Apple"
+        }
+      ],
+      "name": "#450789469",
+      "note_attributes": [
+        {
+          "name": "custom engraving",
+          "value": "Happy Birthday"
+        },
+        {
+          "name": "colour",
+          "value": "green"
+        }
+      ],
+      "discount_codes": [
+        {
+          "code": "TENOFF",
+          "amount": "10.00"
+        }
+      ],
+      "abandoned_checkout_url": "https://checkout.local/orders/690933842/2a1ace52255252df566af0faaedfbfa7?recovered=1",
+      "tax_lines": [
+        {
+          "price": "11.94",
+          "rate": 0.06,
+          "title": "State Tax"
+        }
+      ],
+      "billing_address": {
+        "address1": "Chestnut Street 92",
+        "address2": "",
+        "city": "Louisville",
+        "company": null,
+        "country": "United States",
+        "first_name": "Bob",
+        "last_name": "Norman",
+        "latitude": "45.41634",
+        "longitude": "-75.6868",
+        "phone": "555-625-1199",
+        "province": "Kentucky",
+        "zip": "40202",
+        "name": "Bob Norman",
+        "country_code": "US",
+        "province_code": "KY"
+      },
+      "shipping_address": {
+        "address1": "Chestnut Street 92",
+        "address2": "",
+        "city": "Louisville",
+        "company": null,
+        "country": "United States",
+        "first_name": "Bob",
+        "last_name": "Norman",
+        "latitude": "45.41634",
+        "longitude": "-75.6868",
+        "phone": "555-625-1199",
+        "province": "Kentucky",
+        "zip": "40202",
+        "name": "Bob Norman",
+        "country_code": "US",
+        "province_code": "KY"
+      },
+      "customer": {
+        "accepts_marketing": false,
+        "created_at": "2014-03-07T16:12:37-05:00",
+        "email": "bob.norman@hostmail.com",
+        "first_name": "Bob",
+        "id": 207119551,
+        "last_name": "Norman",
+        "last_order_id": null,
+        "multipass_identifier": null,
+        "note": null,
+        "orders_count": 0,
+        "state": "disabled",
+        "total_spent": "0.00",
+        "updated_at": "2014-03-07T16:12:37-05:00",
+        "verified_email": true,
+        "tags": "",
+        "last_order_name": null,
+        "default_address": {
+          "address1": "Chestnut Street 92",
+          "address2": "",
+          "city": "Louisville",
+          "company": null,
+          "country": "United States",
+          "first_name": null,
+          "id": 207119551,
+          "last_name": null,
+          "phone": "555-625-1199",
+          "province": "Kentucky",
+          "zip": "40202",
+          "name": null,
+          "province_code": "KY",
+          "country_code": "US",
+          "country_name": "United States",
+          "default": true
+        }
+      }
+    }
+  ]
+}