render_json_rails 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc319274e2045a7c895ce17f4d43cfafa0029a67becb6f54f61edb46d659d53
-  data.tar.gz: 6cd8e4556b08a9c6aee0a610773527523e24f2533c4d0b6f2b8020ffeb062918
+  metadata.gz: eb405a241676a116ccdac4592f94dc5c594ecc9e2ef57e143abac35a0c16a8da
+  data.tar.gz: c5b19f1919ded93a0284f7840318db2e3ed6348398b564a52ff10e66eb2289ee
 SHA512:
-  metadata.gz: 7480441de90996af3a76fec81114064ff9fc2d6a8212c70741cdf7a0f313560d34ecf06d5b89f76ec892a4edcef63c600cbde57681f041a1daf21176badbf283
-  data.tar.gz: c22575b485b96b885c30c127f94d95f829d4bb00911f5d0c9638c97dc6d49129387836e8c837c0f6dec5eb3b932e0491729c3398f5c6afeadfa607dfaa9e66b5
+  metadata.gz: 942b07e300001cf70c9295e0dff798277f4b846871acedc9c255109c314983d3882cf34a47be445f6181675d1897de65502af8c07e7bf14066fba30b4632c560
+  data.tar.gz: 3d2e700f497789a001860b17794f5441598237f28dbe4178fd021dcca65a448eb3f9786d799224639943cb02293b0644f62e7870c5fb556603ab889b0d7d4ecc

data/README.md

@@ -24,9 +24,16 @@ class User < ActiveRecord::Base
   include RenderJsonRails::Concern
 
   render_json_config name: :user,
+                     except: [:account_id, :id],
+                     default_fields: [:login, :email, :calculated_age],
+                     allowed_methods: [:calculated_age],
                      includes: {
                        team: Team
                      }
+
+  def calculated_age
+    rand(100)
+  end
 end
 ```
 
@@ -67,7 +74,9 @@ http://example.text/teams/1.json?fields[team]=name,description&fields[user]=emai
 ```ruby
 render_json_config name: :team,
   except: [:account_id, :config], # tych pól nie będzie w json-ie
-  methods: [:image], # te metody zostaną dołączone
+  only: [:id, :name], # tylko te pola będą w jsonie (wymiennie z except)
+  default_fields: [:id, :name, :members], # domyślnie wyświetlone pola + metody
+  methods: [:image], # ten parametr warto uzywac tylko, gdy nie ma parametru "default_fields" - przy ustawionym "default_fields" trzeba metody wymienic w allowed_methods
   allowed_methods: [:members], # te metody mogą być dodane przez parametr fileds np: fields[team]=id,members
   includes: { # to mozna dołączać za pomoca parametru include np include=users,category
    users: Users,

data/lib/render_json_rails/concern.rb

@@ -17,14 +17,17 @@ 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, except: nil, methods: nil, allowed_methods: nil)
+      def default_json_options(name:, fields: nil, only: nil, except: nil, methods: nil, allowed_methods: nil)
         # name ||= self.name.underscore.gsub('/', '_')
         # raise self.name.underscore.gsub('/', '_')
-        except ||= [:account_id, :agent, :ip]
+        # except ||= [:account_id, :agent, :ip]
 
         options = {}
         if fields && fields[name].present?
-          options[:only] = fields[name].split(',').map{ |e| e.to_s.strip.to_sym }.find_all { |el| !except.include?(el) }
+          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 { |el| only.include?(el) || allowed_methods&.include?(el) || methods&.include?(el) }
+          end
           options[:methods] = methods&.find_all { |el| options[:only].include?(el) }
           if allowed_methods
             options[:methods] = (options[:methods] || []) | allowed_methods.find_all { |el| options[:only].include?(el) }
@@ -34,6 +37,7 @@ module RenderJsonRails
           end
         else
           options[:except] = except
+          options[:only] = only if only.present?
           options[:methods] = methods
         end
         options
@@ -56,6 +60,7 @@ module RenderJsonRails
         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]

data/lib/render_json_rails/version.rb

@@ -1,3 +1,3 @@
 module RenderJsonRails
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render_json_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Marcin