json_api_client 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6080263ed5bd33871ec24abc5e89a8f70b6e63c
-  data.tar.gz: c084e334f7435d9301f5c5577df6b8b7b8baf6c5
+  metadata.gz: 441f2bb5cf8f6fd819fda9b1b06282a7295b314c
+  data.tar.gz: 4dafa2d5bdf7a8b8aecad456638c704f609719bb
 SHA512:
-  metadata.gz: 141e23e17b57f4aa31a7299cb9d43acf177bc9703869dd4e97577cc32da7ee3bfe8924fdb69ff2ae8c62b3972d6b209c4b1848e940bdcbb2e33adf2fbf955ad9
-  data.tar.gz: 74b02104a09ef030924b5b885e397c35facd293e749a03a9fa8e8a83f2c11799a5006563d5dd095ec709623e4e393296a0a0b852433562cfec960aeeb2c1b70d
+  metadata.gz: d7ef003297a74702c6425a6869c30b204cc66996cd579ba46f462607eb1295a37134155160638d301a035d31fc9151d58d465890e5bf406026dff41853106363
+  data.tar.gz: 1d67ac769d524ed852e9a675b9b5e831c6f6224c0c8f4ab0666f105f010eadf735c6497d3fb5f5ec2e09700869d072c94df9b181ce67101b3bff775550d7b021

data/lib/json_api_client/associations/base_association.rb

@@ -23,4 +23,4 @@ module JsonApiClient
       end
     end
   end
-end
+end

data/lib/json_api_client/associations/belongs_to.rb

@@ -11,6 +11,7 @@ module JsonApiClient
       end
 
       class Association < BaseAssociation
+        include Helpers::URI
         def param
           :"#{attr_name}_id"
         end
@@ -18,7 +19,12 @@ module JsonApiClient
         def to_prefix_path
           "#{attr_name.to_s.pluralize}/%{#{param}}"
         end
+
+        def set_prefix_path(attrs)
+          attrs[param] = encode_part(attrs[param]) if attrs.key?(param)
+          to_prefix_path % attrs
+        end
       end
     end
   end
-end
+end

data/lib/json_api_client/helpers.rb

@@ -3,5 +3,6 @@ module JsonApiClient
     autoload :Callbacks, 'json_api_client/helpers/callbacks'
     autoload :Dirty, 'json_api_client/helpers/dirty'
     autoload :DynamicAttributes, 'json_api_client/helpers/dynamic_attributes'
+    autoload :URI, 'json_api_client/helpers/uri'
   end
-end
+end

data/lib/json_api_client/helpers/uri.rb

@@ -0,0 +1,9 @@
+module JsonApiClient
+  module Helpers
+    module URI
+      def encode_part(part)
+        Addressable::URI.encode_component(part, Addressable::URI::CharacterClasses::UNRESERVED)
+      end
+    end
+  end
+end

data/lib/json_api_client/query/requestor.rb

@@ -2,6 +2,7 @@ module JsonApiClient
   module Query
     class Requestor
       extend Forwardable
+      include Helpers::URI
 
       def initialize(klass)
         @klass = klass
@@ -49,16 +50,12 @@ module JsonApiClient
 
       def resource_path(parameters)
         if resource_id = parameters[klass.primary_key]
-          File.join(klass.path(parameters), encoded(resource_id))
+          File.join(klass.path(parameters), encode_part(resource_id))
         else
           klass.path(parameters)
         end
       end
 
-      def encoded(part)
-        Addressable::URI.encode_component(part, Addressable::URI::CharacterClasses::UNRESERVED)
-      end
-
       def request(type, path, params)
         klass.parser.parse(klass, connection.run(type, path, params, klass.custom_headers))
       end

data/lib/json_api_client/resource.rb

@@ -119,7 +119,7 @@ module JsonApiClient
         parts = [resource_path]
         if params && _prefix_path.present?
           path_params = params.delete(:path) || params
-          parts.unshift(_prefix_path % path_params.symbolize_keys)
+          parts.unshift(_set_prefix_path(path_params.symbolize_keys))
         else
           parts.unshift(_prefix_path)
         end
@@ -266,6 +266,10 @@ module JsonApiClient
         _belongs_to_associations.map(&:to_prefix_path).join("/")
       end
 
+      def _set_prefix_path(attrs)
+        _belongs_to_associations.map { |a| a.set_prefix_path(attrs) }.join("/")
+      end
+
       def _new_scope
         query_builder.new(self)
       end

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jeff Ching
@@ -131,6 +131,7 @@ files:
 - lib/json_api_client/helpers/callbacks.rb
 - lib/json_api_client/helpers/dirty.rb
 - lib/json_api_client/helpers/dynamic_attributes.rb
+- lib/json_api_client/helpers/uri.rb
 - lib/json_api_client/implementation.rb
 - lib/json_api_client/included_data.rb
 - lib/json_api_client/linking.rb