render_json_rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e10ca36e5f58ea705579bce4585919459d277b815733909f2f7a2de4edb752b5
-  data.tar.gz: 316780c54bef1ccce1ce6b3f761a6e651c074d80af9a5e0126f77a5a92eb2731
+  metadata.gz: a80785e8f96237cbf90167c64bcd74a997d572c4aa94cea4bdd53f21e0ad402c
+  data.tar.gz: e34fb4f9f8af8dc1ef1eb642949721f36256e60a4e646f3cdbdfffa5a042102b
 SHA512:
-  metadata.gz: 5b60229ff686465af01a31fdb6f7545d7bd34ed161ca64b18c93259acf154cdc3255c6ee74cc363b98591f326338d7c8be5c734719e390c08475aa1b84a53449
-  data.tar.gz: 73b1cd6a5b93775e6bcf1c09b59ac37ea0603b6fc9b26703bcfe06b5fdb8cb25ffbefeeab68286cf429993a33439e0f308c5ce5fea345fce7337a5e27cb7efeb
+  metadata.gz: f40743ed807224c5f6b2aa2efe5ea064e91fbdef182889d308a5712d7d9764f8cc3d822198c2712a00f17accf7fecf02da90308ab7026473b1c2775560404438
+  data.tar.gz: 38c1db738769a548b9967572760f846372906b588bdbed3f76bb87671e64038752b3f0337c0aafaa86c6825439a323cd5a1e744644c7778036e08f867f3a8d83

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/lib/render_json_rails/concern.rb

@@ -49,28 +49,34 @@ module RenderJsonRails
         @render_json_config = config
       end
 
-      def render_json_options(includes: nil, fields: nil, additional_config: nil)
+      def render_json_options(includes: nil, fields: nil, override_render_json_config: nil, additional_config: nil)
         raise "należy skonfigurowac render_json metodą: render_json_config" if !defined?(@render_json_config)
 
-        name = @render_json_config[:name].to_s
+        if override_render_json_config
+          current_json_config = @render_json_config.merge(override_render_json_config)
+        else
+          current_json_config = @render_json_config
+        end
+
+        name = current_json_config[:name].to_s
 
-        if (fields.blank? || fields[name].blank?) && @render_json_config[:default_fields].present?
+        if (fields.blank? || fields[name].blank?) && current_json_config[:default_fields].present?
           fields ||= {}
-          fields[name] = @render_json_config[:default_fields].join(',')
+          fields[name] = current_json_config[:default_fields].join(',')
         end
 
         options = default_json_options(
           name: name,
           fields: fields,
-          only: @render_json_config[:only],
-          except: @render_json_config[:except],
-          methods: @render_json_config[:methods],
-          allowed_methods: @render_json_config[:allowed_methods]
+          only: current_json_config[:only],
+          except: current_json_config[:except],
+          methods: current_json_config[:methods],
+          allowed_methods: current_json_config[:allowed_methods]
         )
 
         if includes
           include_options = []
-          @render_json_config[:includes]&.each do |model_name, klass|
+          current_json_config[:includes]&.each do |model_name, klass|
             if includes.include?(model_name.to_s)
               includes2 = RenderJsonRails::Concern.includes_for_model(includes: includes, model: model_name.to_s)
               include_options << { model_name => klass.render_json_options(includes: includes2, fields: fields) }

data/lib/render_json_rails/helper.rb

@@ -17,7 +17,7 @@ module RenderJsonRails
     # fields[invoice]=number,sales_code
     # fields[invoice_position]=price_gross
     # include=positions
-    def render_json(object, additional_config: nil, status: nil, location: nil)
+    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')
@@ -31,6 +31,7 @@ module RenderJsonRails
       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?

data/lib/render_json_rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render_json_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Marcin
@@ -57,7 +57,6 @@ files:
 - lib/render_json_rails/concern.rb
 - lib/render_json_rails/helper.rb
 - lib/render_json_rails/version.rb
-- render_json_rails-0.2.gem
 - render_json_rails.gemspec
 homepage: https://github.com/intum/render_json_rails
 licenses: