json_api_toolbox 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73b91ef1e5dadc1e481b783fe817242c60c340d9
-  data.tar.gz: 6ab51aa214846f0d6100ba92529bce53abfcfa3a
+  metadata.gz: 1a3598f87e949855f9f2bc6fcb64caa44f9e170d
+  data.tar.gz: 428ca57f018b06a414c5289e6ac5e9c2d299411b
 SHA512:
-  metadata.gz: 50155433bc66dd3e51a60c59e1210a7e84a83514c9cf2730c537ce00c394b4c08ba9846ec9ff194e8b9df1d224a8cac0c5c68a4ece3cae1507a55e4ddf98b838
-  data.tar.gz: 0a9510a7c553e0ac321e160b1510e93c7d41e0ade07e710fe64f305d576496fb1788a097a31dfb152668c2a729620683112648552e9d1e8f65caec3cdda0ad21
+  metadata.gz: 0d431f1d4f666505381239fa826efdb911bb432ac21ab9853d0534dce4f3436d3f96467dd79b0c51ba0ddc16749681286861e1a40a6709029541c4d82a1db1ff
+  data.tar.gz: aac705c5d9689f2e58371e1ee9f36769abf72054985a16083ccd79fd6e8045bdbea560b3b27bb1deb7310270e922ed6b1660345bf4dcaefa2438a6ce084617c3

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.5.0

data/CHANGELOG.md

@@ -6,13 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.12.2] - 2018-05-02
+## [0.14.0] - 2018-05-02
 ### Changed
+- Removing 'includes' attributes when calling without any 'includes' parameter
+- Using payload as headers on GET's so its passed by query string
+
+## [0.13.0] - 2018-05-02
+### Added
 - Added error details on exception renderizable
 - Added exception log
 
 ## [0.12.1] - 2018-04-04
-### Changed
+### Fixed
 - Bug fix proxy at Service class
 
 ## [0.12.0] - 2018-04-03

data/lib/json_api_toolbox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonApiToolbox
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/lib/service.rb

@@ -6,46 +6,62 @@ require 'json-api-vanilla'
 
 module JsonApiToolbox
   class Service
+    attr_reader :method, :url, :body
+
+    def initialize(method, url, body)
+      @method = method
+      @url = url
+      @body = body
+    end
+
+    def execute
+      response = request
+      return if response.code == 404
+      Service.parse_response(response)
+    end
+
+    def request
+      RestClient::Request.execute(
+        method: method,
+        url: url,
+        payload: build_body,
+        headers: build_header
+      )
+    rescue RestClient::ExceptionWithResponse => e
+      e.response
+    end
+
+    def build_header
+      headers = { Authorization: RequestStore.store[:token] }
+      headers[:params] = body if method == :get
+      headers
+    end
+
+    def build_body
+      method == :post ? body : nil
+    end
+
     class << self
       def get(url: nil, includes: nil, query_string: nil)
-        body = build_body(includes, query_string)
-        response = request(url, body, :get)
-        return if response.code == 404
-        parse_response(response)
+        body = build_query_string(includes, query_string)
+        new(:get, url, body).execute
       end
 
       def post(url: nil, body: nil)
-        response = request(url, body, :post)
-        parse_response(response)
+        new(:post, url, body).execute
       end
 
-      private
-
       def parse_response(response)
         response_parsed = JSON::Api::Vanilla.parse(response.body)
         response_parsed.data || response_parsed.errors
       end
 
-      def request(url, payload, method)
-        RestClient::Request.execute(
-          method: method,
-          url: url,
-          payload: payload,
-          headers: build_header
-        )
-      rescue RestClient::ExceptionWithResponse => e
-        e.response
-      end
-
-      def build_body(includes, query_string)
-        params = { includes: includes }
+      def build_query_string(includes, query_string)
+        params = {}
+        params[:includes] = includes if includes
         params.merge!(query_string) if query_string
         params
       end
-
-      def build_header
-        { Authorization: RequestStore.store[:token] }
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_api_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Adriano Bacha