render_json_rails 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91137440ff0206a13f4dc35e08b5978dfca32f05efe8a46f057df54ea5e090ad
-  data.tar.gz: 7552a89149c3407ccd6706681f61b96f91d04740c594f37cc3a587998fabc882
+  metadata.gz: 1dc319274e2045a7c895ce17f4d43cfafa0029a67becb6f54f61edb46d659d53
+  data.tar.gz: 6cd8e4556b08a9c6aee0a610773527523e24f2533c4d0b6f2b8020ffeb062918
 SHA512:
-  metadata.gz: 2574a769223d9deee3a85c227e1a21e3886a4337b1b7d00a925b900c09aea4ecb9c3bdd49e9f5db22f877f5d41b9747114690d17164e7efc56b7d821c9aa85d3
-  data.tar.gz: 6b8e57f7029b37ce70dbf0f2bcfe6a03a7b1f281bea6ad560561b8d18937a226a96559fffface5fe51fced650f5fe95bf0af84f8c25f95127f04e3a74ec5d488
+  metadata.gz: 7480441de90996af3a76fec81114064ff9fc2d6a8212c70741cdf7a0f313560d34ecf06d5b89f76ec892a4edcef63c600cbde57681f041a1daf21176badbf283
+  data.tar.gz: c22575b485b96b885c30c127f94d95f829d4bb00911f5d0c9638c97dc6d49129387836e8c837c0f6dec5eb3b932e0491729c3398f5c6afeadfa607dfaa9e66b5

data/README.md

@@ -9,9 +9,9 @@ Dzięki temu łatwo jest stworzyć backend Json API np. do pracy z Reactem lub V
 
 class Team < ActiveRecord::Base
   has_many :users
-  
+
   include RenderJsonRails::Concern
-  
+
   render_json_config name: :team,
                      includes: {
                        users: User
@@ -20,9 +20,9 @@ end
 
 class User < ActiveRecord::Base
   belongs_to :team
-  
+
   include RenderJsonRails::Concern
-  
+
   render_json_config name: :user,
                      includes: {
                        team: Team
@@ -34,7 +34,7 @@ Dodajemy też w kontrolerze ```teams_controller.rb```
 
 ```ruby
   include RenderJsonRails::Helper
-  
+
   def index
     @team = Team.all
     respond_to do |format|
@@ -42,8 +42,8 @@ Dodajemy też w kontrolerze ```teams_controller.rb```
       format.json { render_json @team }
     end
   end
-```  
-  
+```
+
 i możemy już otrzymać JSON team-u wraz z userami
 
 ```html
@@ -65,13 +65,13 @@ http://example.text/teams/1.json?fields[team]=name,description&fields[user]=emai
 ## Pełny opis ```render_json_config```
 
 ```ruby
-render_json_config name: :team, 
+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 
+  methods: [:image], # te metody zostaną dołączone
   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,
-   cateogry: Category
+   category: Category
   }
 ```
 
@@ -91,6 +91,13 @@ Or install it yourself as:
 
     $ gem install render_json_rails
 
+## Tests
+
+```
+rake test
+```
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/intum/render_json_rails.

data/Rakefile

@@ -1,5 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+# require 'active_support/core_ext/object/blank'
+# require 'active_support'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/lib/render_json_rails/concern.rb

@@ -24,10 +24,13 @@ 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(',').map{ |e| e.to_s.strip.to_sym }.find_all { |el| !except.include?(el) }
+          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.to_s) }
+            options[:methods] = (options[:methods] || []) | allowed_methods.find_all { |el| options[:only].include?(el) }
+          end
+          if options[:methods].present? && options[:only].present?
+            options[:methods].each { |method| options[:only].delete(method) }
           end
         else
           options[:except] = except
@@ -43,8 +46,15 @@ module RenderJsonRails
       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)
 
+        name = @render_json_config[:name].to_s
+
+        if (fields.blank? || fields[name].blank?) && @render_json_config[:default_fields].present?
+          fields ||= {}
+          fields[name] = @render_json_config[:default_fields].join(',')
+        end
+
         options = default_json_options(
-          name: @render_json_config[:name].to_s,
+          name: name,
           fields: fields,
           except: @render_json_config[:except],
           methods: @render_json_config[:methods],
@@ -64,6 +74,9 @@ module RenderJsonRails
         end
 
         options = RenderJsonRails::Concern.deep_meld(options, additional_config) if additional_config
+
+        options.delete(:methods) if options[:methods].blank?
+
         options
       end # render_json_options
     end # class_methods

data/lib/render_json_rails/version.rb

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

data/render_json_rails.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.add_development_dependency "activesupport"
+  spec.add_development_dependency "byebug"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: render_json_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Marcin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
-dependencies: []
+date: 2020-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: render json with 'includes' and 'fields' with simple config
 email:
 - marcin@radgost.com