render_json_rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90cc1574d9f07dd9306bb4416625ad680c8a2777bd62de9529b7a110576d6928
-  data.tar.gz: be85fbe2ca6984d1efe32ad8531b6913d755761259c9cbb143b007663fb59340
+  metadata.gz: 91137440ff0206a13f4dc35e08b5978dfca32f05efe8a46f057df54ea5e090ad
+  data.tar.gz: 7552a89149c3407ccd6706681f61b96f91d04740c594f37cc3a587998fabc882
 SHA512:
-  metadata.gz: b533b034543b5bbce37a7d8d1a039fb94d8c64557c8635a998c7459499868c70cfdd2d593110ca2389d9724dd7f436cfc14d506287e01967e7a9ab0fa3f2347d
-  data.tar.gz: b9ca7bd1f3221de4739824db73dfb5a868bd5725d3528103eee5ff368825d7477eb7700398aef46804d64efccdc749d75da2806d4d01b1150d42c0f255a6fbd6
+  metadata.gz: 2574a769223d9deee3a85c227e1a21e3886a4337b1b7d00a925b900c09aea4ecb9c3bdd49e9f5db22f877f5d41b9747114690d17164e7efc56b7d821c9aa85d3
+  data.tar.gz: 6b8e57f7029b37ce70dbf0f2bcfe6a03a7b1f281bea6ad560561b8d18937a226a96559fffface5fe51fced650f5fe95bf0af84f8c25f95127f04e3a74ec5d488

data/README.md

@@ -80,7 +80,7 @@ render_json_config name: :team,
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'render_json_rails', git: 'https://github.com/intum/render_json_rails'
+gem 'render_json_rails'
 ```
 
 And then execute:
@@ -95,14 +95,3 @@ Or install it yourself as:
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/intum/render_json_rails.
 
-
-## TMP
-
-Tworzenie gema
-
-```
-gem build render_json_rails.gemspec
-
-gem push --key github --host https://rubygems.pkg.github.com/intum render_json_rails-0.1.XXX.gem
-```
-

data/lib/render_json_rails/concern.rb

@@ -24,10 +24,10 @@ module RenderJsonRails
 
         options = {}
         if fields && fields[name].present?
-          options[:only] = fields[name].split(',').find_all{ |el| !except.include?(el.to_sym) }
-          options[:methods] = methods&.find_all{ |el| options[:only].include?(el.to_s) }
+          options[:only] = fields[name].split(',').find_all { |el| !except.include?(el.to_sym) }
+          options[:methods] = methods&.find_all { |el| options[:only].include?(el.to_s) }
           if allowed_methods
-            options[:methods] = (options[:methods] || []) | allowed_methods.find_all{ |el| options[:only].include?(el.to_s) }
+            options[:methods] = (options[:methods] || []) | allowed_methods.find_all { |el| options[:only].include?(el.to_s) }
           end
         else
           options[:except] = except
@@ -38,10 +38,8 @@ module RenderJsonRails
 
       def render_json_config(config)
         @render_json_config = config
-        # @render_json_config[:methods] = [:image]
       end
 
-      # rubocop:disable Lint/UnusedMethodArgument
       def render_json_options(includes: nil, fields: nil, additional_config: nil)
         raise "należy skonfigurowac render_json metodą: render_json_config" if !defined?(@render_json_config)
 
@@ -58,29 +56,19 @@ module RenderJsonRails
           @render_json_config[:includes].each do |name, klass|
             if includes.include?(name.to_s)
               includes2 = RenderJsonRails::Concern.includes_for_model(includes: includes, model: name.to_s)
-              # raise includes2.inspect + ' ' + includes.inspect
               include_options << { name => klass.render_json_options(includes: includes2, fields: fields) }
             end
           end if @render_json_config[:includes]
 
-          # if includes.include?('questions')
-          #   includes2 = RenderJsonRails::Concern.includes_for_model(includes: includes, model: 'questions')
-          #   # raise includes2.inspect + ' ' + includes.inspect
-          #   include_options << { questions: Organize::Question.render_json_options(includes: includes2, fields: fields) }
-          # end
           options[:include] = include_options
         end
 
+        options = RenderJsonRails::Concern.deep_meld(options, additional_config) if additional_config
         options
       end # render_json_options
-      # rubocop:enable Lint/UnusedMethodArgument
-
-
     end # class_methods
 
     def self.includes_for_model(includes:, model:)
-      # include.split(',')
-      # includes.delete(to_remove)
       includes = includes.map do |el|
         if el.start_with?(model + '.')
           el = el.gsub(/^#{model}\./, '')
@@ -88,8 +76,25 @@ module RenderJsonRails
           el = nil
         end
       end
-      includes.find_all{ |el| el.present? }
-      # raise includes.to_json
+      includes.find_all { |el| el.present? }
+    end
+
+    private
+
+    def self.deep_meld(h1, h2)
+      h1.deep_merge(h2) do |key, this_val, other_val|
+        if this_val != nil && other_val == nil
+          this_val
+        elsif this_val == nil && other_val != nil
+          other_val
+        elsif this_val.is_a?(Array) && other_val.is_a?(Array)
+          this_val | other_val
+        elsif this_val.is_a?(Hash) && other_val.is_a?(Hash)
+          deep_meld(this_val, other_val)
+        else
+          [this_val, other_val]
+        end
+      end
     end
   end
-end
+end

data/lib/render_json_rails/helper.rb

@@ -27,7 +27,7 @@ module RenderJsonRails
       else
         class_object = object.class
       end
-      includes = params[:include].to_s.split(',').map{ |el| el.to_s.strip } if params[:include]
+      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],
@@ -44,4 +44,4 @@ module RenderJsonRails
       end
     end
   end
-end
+end

data/lib/render_json_rails/version.rb

@@ -1,3 +1,3 @@
 module RenderJsonRails
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/render_json_rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_json_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Marcin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies: []
 description: render json with 'includes' and 'fields' with simple config
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simle JSON API render like JonApi