json_api_client 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 441f2bb5cf8f6fd819fda9b1b06282a7295b314c
-  data.tar.gz: 4dafa2d5bdf7a8b8aecad456638c704f609719bb
+  metadata.gz: 3b172a6b2cca062c34df683b1fcbea5a017420a5
+  data.tar.gz: 129f0173840bafb6982f191f07fa2f815cb5dce1
 SHA512:
-  metadata.gz: d7ef003297a74702c6425a6869c30b204cc66996cd579ba46f462607eb1295a37134155160638d301a035d31fc9151d58d465890e5bf406026dff41853106363
-  data.tar.gz: 1d67ac769d524ed852e9a675b9b5e831c6f6224c0c8f4ab0666f105f010eadf735c6497d3fb5f5ec2e09700869d072c94df9b181ce67101b3bff775550d7b021
+  metadata.gz: c80f324ed56f8de4575ce6feada1576c253f034bf23c6ef1cb0bce3233a49efc4719cfa740bea078134057cc740fde6f9a7cdf883cd5bfc2b2536a44984da0f9
+  data.tar.gz: 9b8a4f4842c6045772d77757781fb76c33e10704a82754749fb344ec9a4b77f155683d64c3646b6cd2a62457f2a19f2d118eb5028f4b2656188c35da8b2baee3

data/README.md

@@ -213,6 +213,10 @@ article.title
 # should not have returned the created_at
 article.created_at
 # => raise NoMethodError
+
+# or you can use fieldsets from multiple resources
+# makes request to /articles?fields[articles]=title,body&fields[comments]=tag
+article = Article.select("title", "body",{comments: 'tag'}).first
 ```
 
 ## Sorting
@@ -485,7 +489,7 @@ class MyMoneyCaster
     end
   end
 end
-   
+
 JsonApiClient::Schema.register money: MyMoneyCaster
 
 ```

data/lib/json_api_client/associations/belongs_to.rb

@@ -16,13 +16,13 @@ module JsonApiClient
           :"#{attr_name}_id"
         end
 
-        def to_prefix_path
-          "#{attr_name.to_s.pluralize}/%{#{param}}"
+        def to_prefix_path(formatter)
+          "#{formatter.format(attr_name.to_s.pluralize)}/%{#{param}}"
         end
 
-        def set_prefix_path(attrs)
+        def set_prefix_path(attrs, formatter)
           attrs[param] = encode_part(attrs[param]) if attrs.key?(param)
-          to_prefix_path % attrs
+          to_prefix_path(formatter) % attrs
         end
       end
     end

data/lib/json_api_client/query/builder.rb

@@ -35,11 +35,7 @@ module JsonApiClient
       end
 
       def select(*fields)
-        fields = Array(fields).flatten
-        fields = fields.map { |i| i.to_s.split(",") }.flatten
-
-        @fields += fields.map(&:strip)
-
+        @fields += parse_fields(*fields)
         self
       end
 
@@ -143,7 +139,23 @@ module JsonApiClient
       end
 
       def select_params
-        @fields.empty? ? {} : {fields: {klass.table_name => @fields.join(",")}}
+        if @fields.empty?
+          {}
+        else
+          field_result = Hash.new { |h,k| h[k] = [] }
+          @fields.each do |field|
+            if field.is_a? Hash
+              field.each do |k,v|
+                field_result[k.to_s] << v
+                field_result[k.to_s] = field_result[k.to_s].flatten
+              end
+            else
+              field_result[klass.table_name] << field
+            end
+          end
+          field_result.each { |k,v| field_result[k] = v.join(',') }
+          {fields: field_result}
+        end
       end
 
       def parse_related_links(*tables)
@@ -179,6 +191,21 @@ module JsonApiClient
         end.flatten
       end
 
+      def parse_fields(*fields)
+        fields = fields.split(',') if fields.is_a? String
+        fields.map do |field|
+          case field
+          when Hash
+            field.each do |k,v|
+              field[k] = parse_fields(v)
+            end
+            field
+          else
+            Array(field).flatten.map { |i| i.to_s.split(",") }.flatten.map(&:strip)
+          end
+        end.flatten
+      end
+
     end
   end
 end

data/lib/json_api_client/resource.rb

@@ -263,11 +263,19 @@ module JsonApiClient
       end
 
       def _prefix_path
-        _belongs_to_associations.map(&:to_prefix_path).join("/")
+        paths = _belongs_to_associations.map do |a|
+          a.to_prefix_path(route_formatter)
+        end
+
+        paths.join("/")
       end
 
       def _set_prefix_path(attrs)
-        _belongs_to_associations.map { |a| a.set_prefix_path(attrs) }.join("/")
+        paths = _belongs_to_associations.map do |a|
+          a.set_prefix_path(attrs, route_formatter) 
+        end
+
+        paths.join("/")
       end
 
       def _new_scope
@@ -297,15 +305,17 @@ module JsonApiClient
       @persisted = nil
       self.links = self.class.linker.new(params.delete("links") || {})
       self.relationships = self.class.relationship_linker.new(self.class, params.delete("relationships") || {})
-      self.class.associations.each do |association|
-        if params.has_key?(association.attr_name.to_s)
-          set_attribute(association.attr_name, association.parse(params[association.attr_name.to_s]))
-        end
-      end
       self.attributes = params.merge(self.class.default_attributes)
+
       self.class.schema.each_property do |property|
         attributes[property.name] = property.default unless attributes.has_key?(property.name) || property.default.nil?
       end
+
+      self.class.associations.each do |association|
+        if params.has_key?(association.attr_name.to_s)
+          set_attribute(association.attr_name, params[association.attr_name.to_s])
+        end
+      end
     end
 
     # Set the current attributes and try to save them

data/lib/json_api_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org