render_json_rails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80785e8f96237cbf90167c64bcd74a997d572c4aa94cea4bdd53f21e0ad402c
-  data.tar.gz: e34fb4f9f8af8dc1ef1eb642949721f36256e60a4e646f3cdbdfffa5a042102b
+  metadata.gz: 953bda8c189fb384794868cd8c587ae2ff5d77010ef8afc2f1774e0627909aee
+  data.tar.gz: f1dcce70063189b906bc054b862b224a7dcbd8e3ec1b924d54d5cc45d039115e
 SHA512:
-  metadata.gz: f40743ed807224c5f6b2aa2efe5ea064e91fbdef182889d308a5712d7d9764f8cc3d822198c2712a00f17accf7fecf02da90308ab7026473b1c2775560404438
-  data.tar.gz: 38c1db738769a548b9967572760f846372906b588bdbed3f76bb87671e64038752b3f0337c0aafaa86c6825439a323cd5a1e744644c7778036e08f867f3a8d83
+  metadata.gz: 8cc2b78ed7487a8c927eabb35562ac455c64bb03499aaca69fa9755f2a3ea0ca72fe0ca77e48d365cdd729bf1da28c94439dd56b220cf4223e4c22ca02fc625c
+  data.tar.gz: 78fd5b3917b300d660707b5ab108478428359a43fc8f5f698fceb5ed5c3ca5f54a9468ec1904e91e73df49860c37231c823101904d5a54d392388bb9c242a176

data/lib/render_json_rails/concern.rb

@@ -17,13 +17,16 @@ module RenderJsonRails
       #  zostaną one wyświelone w json-ie
       # TODO:
       # [ ] spradzanie czy parametry "fields" i "include" sa ok i jesli nie to error
-      def default_json_options(name:, fields: nil, only: nil, except: nil, methods: nil, allowed_methods: nil)
+      def default_json_options(name:, fields: nil, only: nil, except: nil, methods: nil, allowed_methods: nil, additional_fields: nil)
         # name ||= self.name.underscore.gsub('/', '_')
         # raise self.name.underscore.gsub('/', '_')
         # except ||= [:account_id, :agent, :ip]
 
         options = {}
         if fields && fields[name].present?
+          if additional_fields && additional_fields[name].present?
+            fields[name] += ",#{additional_fields[name]}"
+          end
           options[:only] = fields[name].split(',').map{ |e| e.to_s.strip.to_sym }.find_all { |el| !except&.include?(el) }
           if only.present?
             options[:only] = options[:only].find_all do |el|
@@ -41,6 +44,10 @@ module RenderJsonRails
           options[:except] = except
           options[:only] = only if only.present?
           options[:methods] = methods
+          if additional_fields && additional_fields[name].present? && allowed_methods
+            additional_methods = additional_fields[name].split(',').map{ |e| e.to_s.strip.to_sym }.find_all { |el| allowed_methods.include?(el) }
+            options[:methods] = (options[:methods] || []) | additional_methods
+          end
         end
         options
       end
@@ -49,11 +56,13 @@ module RenderJsonRails
         @render_json_config = config
       end
 
-      def render_json_options(includes: nil, fields: nil, override_render_json_config: nil, additional_config: nil)
+      def render_json_options(includes: nil, fields: nil, override_render_json_config: nil, additional_config: nil, additional_fields: nil)
         raise "należy skonfigurowac render_json metodą: render_json_config" if !defined?(@render_json_config)
 
         if override_render_json_config
-          current_json_config = @render_json_config.merge(override_render_json_config)
+          current_json_config = override_render_json_config # @render_json_config.merge(override_render_json_config)
+          current_json_config[:name] ||= @render_json_config[:name]
+          current_json_config[:default_fields] ||= @render_json_config[:default_fields]
         else
           current_json_config = @render_json_config
         end
@@ -71,7 +80,8 @@ module RenderJsonRails
           only: current_json_config[:only],
           except: current_json_config[:except],
           methods: current_json_config[:methods],
-          allowed_methods: current_json_config[:allowed_methods]
+          allowed_methods: current_json_config[:allowed_methods],
+          additional_fields: additional_fields
         )
 
         if includes

data/lib/render_json_rails/helper.rb

@@ -18,22 +18,20 @@ module RenderJsonRails
     # fields[invoice_position]=price_gross
     # include=positions
     def render_json(object, override_render_json_config: nil, additional_config: nil, status: nil, location: nil)
-      raise "objekt nie moze byc null" if object == nil
 
-      if object.class.to_s.include?('ActiveRecord_Relation')
-        return render json: [] if !object[0]
-
-        class_object = object[0].class
+      if (class_object = RenderJsonRails::Helper.find_render_json_options_class!(object))
+        includes = params[:include].to_s.split(',').map { |el| el.to_s.strip } if params[:include]
+        options = class_object.render_json_options(
+          includes: includes,
+          fields: params[:fields],
+          override_render_json_config: override_render_json_config,
+          additional_config: additional_config,
+          additional_fields: params[:additional_fields]
+        )
       else
-        class_object = object.class
+        options = {}
       end
-      includes = params[:include].to_s.split(',').map { |el| el.to_s.strip } if params[:include]
-      options = class_object.render_json_options(
-        includes: includes,
-        fields: params[:fields],
-        override_render_json_config: override_render_json_config,
-        additional_config: additional_config
-      )
+
       if params[:formatted] && !Rails.env.development? || params[:formatted] != 'no' && Rails.env.development?
         json = JSON.pretty_generate(object.as_json(options))
         render json: json, status: status, location: location
@@ -44,5 +42,21 @@ module RenderJsonRails
         render options
       end
     end
+
+    def self.find_render_json_options_class!(object)
+      return nil if object == nil
+
+      if object.class.respond_to?(:render_json_options)
+        object.class
+      # elsif object.is_a?(ActiveRecord::Base)
+      #   raise "klasa: #{object.class} nie ma konfiguracji 'render_json_config'"
+      elsif object.respond_to?(:first)
+        RenderJsonRails::Helper.find_render_json_options_class!(object[0])
+      else
+        nil
+      end
+
+    end
+
   end
 end

data/lib/render_json_rails/version.rb

@@ -1,3 +1,3 @@
 module RenderJsonRails
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_json_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Marcin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,7 +62,7 @@ homepage: https://github.com/intum/render_json_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,8 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Simle JSON API render like JonApi
 test_files: []