seoshop-api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa4ed35ddec2b94c48f102a8fd322718c2e0dde8
-  data.tar.gz: 54d1314177f02692537da16b0ebff55fe16e3e25
+  metadata.gz: 0905bbaa91678c04a25d2480c99f05fc3a31029d
+  data.tar.gz: 6c69439808f4fef6efeb163ce7dc82575e0353eb
 SHA512:
-  metadata.gz: 2451896576a230b2feeed3937b3f276c3c5a2697f8ffdb20b207322e4efc866e2554f54cccba3f00006d85c628eac25a7fdda54c42eb9212b94c3584667d463b
-  data.tar.gz: 49208714ff54f4971c1cea0e786ae201e257702c0570a5d4d550347e057eef26405143862408f0bda312dc824c74a4bdf96967599c7b45a4d5318e604382d495
+  metadata.gz: 34b8939bb3ae94905e4aa035fe362a14710778cc1b1798d7740b542e34652103b200933c5cb9bd9f60dc0cb1df25f1d410350e16daae83486f4d82c5a26cf68e
+  data.tar.gz: b02279a2057f41d8797830bf3b5c4833607404d0d45cf87a44377e606ae2b6837d5a06143b97aa1fba5831e699ebd8a86755949c10282ec4d07d16a13be837cb

data/README.md

@@ -18,20 +18,11 @@ Or install it yourself as:
 
 ## Usage
 
-Configure:
-```ruby
-
-Seoshop.configure do |conf|
-  conf.app_key = 'app_key'
-  conf.secret = 'secret'
-end
-```
-
 Create a client, and use it to call the SEOshop api.
 
 ```ruby
 
-shop_api = Seoshop::Client.new('shop_token', 'shop_language')
+shop_api = Seoshop::Client.new('api_key', 'api_secret', 'shop_token', 'shop_language', 'cluster_id')
 
 shop_api.get_shop
 

data/lib/seoshop-api.rb

@@ -3,22 +3,11 @@ require 'seoshop-api/client'
 
 module Seoshop
   class << self
-    # @!attribute url
-    # @return [String] the base url of the Seoshop Api
-    attr_accessor :url
 
     # @!attribute parallel_requests
     # @return [Integer String] defines the maximum parallel request for the gem to preform
     attr_accessor :parallel_requests
 
-    # @!attribute app_key
-    # @return [String] the app key that is registered with Storenvy
-    attr_accessor :app_key
-
-    # @!attribute secret
-    # @return [String] the secret that is registered with Storenvy
-    attr_accessor :secret
-
     # Configuration interface of the gem
     #
     # @yield [self] to accept configuration settings
@@ -39,8 +28,8 @@ module Seoshop
     #
     # @return an instance of Seoshop::Client
     #
-    def client(access_token, shop_language)
-      @client ||= Seoshop::Client.new(access_token, shop_language)
+    def client(api_key, api_secret, access_token, shop_language, cluster_id = 'eu1')
+      @client ||= Seoshop::Client.new(api_key, api_secret, access_token, shop_language, cluster_id)
     end
 
     private

data/lib/seoshop-api/client.rb

@@ -27,21 +27,43 @@ module Seoshop
     include Seoshop::Account
     include Seoshop::Brand
 
+    attr_accessor :api_key
+    attr_accessor :api_secret
     attr_accessor :access_token
     attr_accessor :shop_language
 
+    SERVER_EU1_LIVE  = 'https://api.webshopapp.com/'
+    SERVER_US1_LIVE  = 'https://api.shoplightspeed.com/'
+
     #
     # Creates a new instance of Seoshop::Client
     #
-    # @param url [String] The url to Seoshop api (https://api.webshopapp.com)
+    # @param api_key [String] The App api key
+    # @param api_secret [String] The App secret
+    # @param access_token [String] The shop access token
+    # @param shop_language [String] The shop language
+    # @param cluster_id [String] The shop cluster id
     # @param parallel_requests [Integer String] The maximum parallel request to do (5)
-    def initialize(access_token, shop_language, url = 'https://api.webshopapp.com', parallel_requests = 5)
+    def initialize(api_key, api_secret, access_token, shop_language, cluster_id = 'eu1', parallel_requests = 5)
+      @api_key = api_key
+      @api_secret = api_secret
       @access_token = access_token
       @shop_language = shop_language
-      @url = url
+      @url = get_url(cluster_id)
       @parallel_requests = parallel_requests
     end
 
+    def get_url(cluster_id)
+      case cluster_id
+        when 'eu1'
+          SERVER_EU1_LIVE
+        when 'us1'
+          SERVER_US1_LIVE
+        else
+          SERVER_EU1_LIVE
+      end
+    end
+
     #
     # Does a GET request to the url with the params
     #
@@ -125,7 +147,7 @@ module Seoshop
     def connection
       @connection ||= Faraday.new(url: @url, parallel_manager: Typhoeus::Hydra.new(max_concurrency: @parallel_requests), headers: {:seoshop_api_connector => 'Ruby'+ Seoshop::VERSION}) do |conn|
 
-        conn.basic_auth(Seoshop.app_key, Digest::MD5.hexdigest(access_token + Seoshop.secret))
+        conn.basic_auth(@api_key, Digest::MD5.hexdigest(@access_token + @api_secret))
 
         conn.use Seoshop::ResponseParser
 

data/lib/seoshop-api/version.rb

@@ -1,3 +1,3 @@
 module Seoshop
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/seoshop-api.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oauth2'
   spec.add_dependency 'faraday'
   spec.add_dependency 'typhoeus'
-  spec.add_dependency 'faraday_middleware', '0.9.0'
+  spec.add_dependency 'faraday_middleware', '~> 0.9.0'
   spec.add_dependency 'rash'
   spec.add_dependency 'oj'
   spec.add_dependency 'activesupport'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seoshop-api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nimrod Popper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for SEOshop API - written by Yotpo