seoshop-api 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0905bbaa91678c04a25d2480c99f05fc3a31029d
-  data.tar.gz: 6c69439808f4fef6efeb163ce7dc82575e0353eb
+  metadata.gz: 3cefc1453a78871c993ff68e3946754aa8a97dd0
+  data.tar.gz: af5617ab1bd6606543c6219dbcd9389a1c2f91a5
 SHA512:
-  metadata.gz: 34b8939bb3ae94905e4aa035fe362a14710778cc1b1798d7740b542e34652103b200933c5cb9bd9f60dc0cb1df25f1d410350e16daae83486f4d82c5a26cf68e
-  data.tar.gz: b02279a2057f41d8797830bf3b5c4833607404d0d45cf87a44377e606ae2b6837d5a06143b97aa1fba5831e699ebd8a86755949c10282ec4d07d16a13be837cb
+  metadata.gz: b73b2065d3667b1c2d103fbd54c3c0108e43c0d11a2b2bae9e85b3d8e0636bfa704269614f1914788a94d6d868e8327751bf4d454dd79d8f6b49002a98e398a8
+  data.tar.gz: 520642d15292a5319e08f4fbdd7c8a22b9f3de53110b8836b981216e1e5ad8e47952a6e22f63ca30aeb4c635a3018d7d11db59aa766983ca0c7e890dec55c9a7

data/.gitignore

@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 pkg
 .DS_Store
 .idea/
-=======
 *.gem
 *.rbc
 .bundle
@@ -20,4 +18,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
->>>>>>> origin/master
+vendor/

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+- 2.2
+- 2.3
+deploy:
+  provider: rubygems
+  api_key:
+    secure: Ub9rAJHJeLuFmi6MO/TA71cL9zRWW++rXhACeho+KZGJfn9XGrQD6wVhQJtEUlag0M+LzgWeAiorPK66oSM2ZLNkmHyyajoh9uwv6J6G2IZ+sbC3NqvmEAWltvy1JU4ElZKY3aVRLAL/1CTtvrmS1Fjv5gPKizW3FrBTIFlXMVg=
+  gem: seoshop-api
+  on:
+    branch: master
+    repo: YotpoLtd/seoshop-api

data/Rakefile

@@ -1 +1,3 @@
 require "bundler/gem_tasks"
+
+task default: :build

data/lib/seoshop-api/client.rb

@@ -155,8 +155,8 @@ module Seoshop
         conn.response :rashify
 
         # Setting request and response to use JSON/XML
-        conn.request :oj
-        conn.response :oj
+        conn.request :multi_json
+        conn.response :multi_json
 
         # Set to use instrumentals to get time logs
         conn.use :instrumentation

data/lib/seoshop-api/core/response_parser.rb

@@ -10,96 +10,27 @@ module Seoshop
         if env[:status] == 200
           body = env[:response].body.response || env[:response].body
         elsif env[:status] == 401
-          raise Seoshop::ResponseParser::HTTPUnauthorized.new 'invalid Seoshop credentials'
+          raise HTTPUnauthorized.new 'invalid Seoshop credentials'
         elsif env[:status] == 403
-          raise Seoshop::ResponseParser::HTTPForbidden.new env[:response].body.message
+          raise HTTPForbidden.new env[:response].body.message
         elsif env[:status] == 404
-          raise Seoshop::ResponseParser::HTTPNotFound.new env[:response].body.message
+          raise HTTPNotFound.new env[:response].body.message
         elsif env[:status] == 429
           rate_limits = env[:response_headers]['X-RateLimit-Remaining'].split('/')
           rate_limits_reset = env[:response_headers]['X-RateLimit-Reset'].split('/')
           seconds = rate_limits_reset[0] if rate_limits[0] == '-1'
           seconds = rate_limits_reset[1] if rate_limits[1] == '-1'
           seconds = rate_limits_reset[2] if rate_limits[2] == '-1'
-          raise Seoshop::ResponseParser::RateLimit.new "RateLimit reset in #{seconds} seconds"
+          raise RateLimit.new "RateLimit reset in #{seconds} seconds"
         elsif env[:response] && env[:response].body && env[:response].body.status
           body = env[:response].body.status
         end
         env[:body] = body
       end
     end
-  end
-
-  #
-  # Response middleware that decodes the response body from JSON.
-  #
-  class ParseOj < FaradayMiddleware::ResponseMiddleware
-    dependency do
-      require 'oj' unless defined?(::Oj)
-    end
-
-    define_parser do |body|
-      begin
-        ::Oj.load(body, mode: :compat) unless body.strip.empty?
-      rescue Oj::ParseError => e
-      end
-    end
-  end
-
-  # Request middleware that encodes the body as JSON.
-  #
-  # Processes only requests with matching Content-type or those without a type.
-  # If a request doesn't have a type but has a body, it sets the Content-type
-  # to JSON MIME-type.
-  #
-  # Doesn't try to encode bodies that already are in string form.
-  class EncodeOj < Faraday::Middleware
-    CONTENT_TYPE = 'Content-Type'.freeze
-    MIME_TYPE    = 'application/json'.freeze
-
-    dependency do
-      require 'oj' unless defined?(::Oj)
-    end
-
-    def call(env)
-      match_content_type(env) do |data|
-        env[:body] = encode data
-      end
-      @app.call env
-    end
-
-    def encode(data)
-      ::Oj.dump data
-    end
-
-    def match_content_type(env)
-      if process_request?(env)
-        env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE
-        yield env[:body] unless env[:body].respond_to?(:to_str)
-      end
-    end
-
-    def process_request?(env)
-      type = request_type(env)
-      has_body?(env) and (type.empty? or type == MIME_TYPE)
-    end
-
-    def has_body?(env)
-      body = env[:body] and !(body.respond_to?(:to_str) and body.empty?)
-    end
-
-    def request_type(env)
-      type = env[:request_headers][CONTENT_TYPE].to_s
-      type = type.split(';', 2).first if type.index(';')
-      type
-    end
-
-    class Seoshop::ResponseParser::RateLimit < Exception; end
-    class Seoshop::ResponseParser::HTTPForbidden < Exception; end
-    class Seoshop::ResponseParser::HTTPUnauthorized < Exception; end
-    class Seoshop::ResponseParser::HTTPNotFound < Exception; end
+    class RateLimit < Exception; end
+    class HTTPForbidden < Exception; end
+    class HTTPUnauthorized < Exception; end
+    class HTTPNotFound < Exception; end
   end
 end
-
-Faraday.register_middleware :response, oj: Seoshop::ParseOj
-Faraday.register_middleware :request, oj: Seoshop::EncodeOj

data/lib/seoshop-api/version.rb

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

data/seoshop-api.gemspec

@@ -6,8 +6,8 @@ require 'seoshop-api/version'
 Gem::Specification.new do |spec|
   spec.name          = "seoshop-api"
   spec.version       = Seoshop::VERSION
-  spec.authors       = ["Nimrod Popper"]
-  spec.email         = ["nimrod@yotpo.com"]
+  spec.authors       = ["Nimrod Popper", "Vladislav Shub"]
+  spec.email         = ["nimrod@yotpo.com", "vlad@yotpo.com"]
   spec.description   = %q{Ruby wrapper for SEOshop API - written by Yotpo}
   spec.summary       = %q{Ruby wrapper for SEOshop API - written by Yotpo}
   spec.homepage      = "https://github.com/YotpoLtd/seoshop-api"
@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "rake", "~> 10.0"
 
   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'
+  spec.add_dependency 'faraday_middleware-multi_json'
   spec.add_dependency 'rash'
-  spec.add_dependency 'oj'
   spec.add_dependency 'activesupport'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: seoshop-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Nimrod Popper
+- Vladislav Shub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -84,18 +85,18 @@ dependencies:
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rash
+  name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: rash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,11 +140,13 @@ dependencies:
 description: Ruby wrapper for SEOshop API - written by Yotpo
 email:
 - nimrod@yotpo.com
+- vlad@yotpo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -183,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for SEOshop API - written by Yotpo