Fixed nested resources keys escaping (#236)

* Added vagrantfile with provision

* Fixed nested resource_id escape

* Added test for resource escaping

* Updated README.md

* Fixed setting prefix path for belongs_to association

* Revert "Updated README.md"

This reverts commit 77958b8.

* Revert "Added vagrantfile with provision"

This reverts commit 4f9f029.

Author: qelphybox

lib/json_api_client/associations/base_association.rb

@@ -23,4 +23,4 @@ def from_result_set(result_set)
       end
     end
   end
-end
+end

lib/json_api_client/associations/belongs_to.rb

@@ -11,14 +11,20 @@ def belongs_to(attr_name, options = {})
       end
 
       class Association < BaseAssociation
+        include Helpers::URI
         def param
           :"#{attr_name}_id"
         end
 
         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

lib/json_api_client/helpers.rb

@@ -3,5 +3,6 @@ module Helpers
     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

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

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 @@ def custom(method_name, options, params)
 
       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

lib/json_api_client/resource.rb

@@ -119,7 +119,7 @@ def path(params = nil)
         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 @@ def _prefix_path
         _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

test/unit/association_test.rb

@@ -496,6 +496,7 @@ def test_belongs_to_path
     end
     assert_equal("foos/%{foo_id}/specifieds", Specified.path)
     assert_equal("foos/1/specifieds", Specified.path({foo_id: 1}))
+    assert_equal("foos/%D0%99%D0%A6%D0%A3%D0%9A%D0%95%D0%9D/specifieds", Specified.path({foo_id: 'ЙЦУКЕН'}))
   end
 
   def test_find_belongs_to