forest_liana 7.5.0 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70e79aed5a598ec4ac195b6281431084b65bac321fba53477944e5050e3e9e09
-  data.tar.gz: ecfb92ede45086a4b81b17d4d6d6ac4042a3f88bd1b791a1eec8d497a764e12e
+  metadata.gz: c97d05c2880b945fbcf8dedbdc4f6b5a131bd2554fbe6cc96893f138605ee251
+  data.tar.gz: 436dbead1e46549772e63a53d1b24effa6c0f66e49bb2b8829bded39b3c9efdc
 SHA512:
-  metadata.gz: 70e36b8a47900a631c1aef01dfffad903817dbd97d73dde936ef047734204c5d316f37faf5aa9a0ce79a263aa911a1868fe32e06e162a52094d8370da3ab6d76
-  data.tar.gz: 9840f9d3a40822447b348880cc9976be797e254ceda1e779c92d2552f5e51cf6fbcebf7a21ef988162cf4cdf3fcb66a2a701062e6dbe8fbb9af3b8d4dac42996
+  metadata.gz: ae51cf5c7bbbd52021d604f871de5f880a6de198fd08da6c09f9b1255925a5174e26a10baa2dfa59e6380970d7400dc3b75ac4376e32f9a6e9146f74e0572ff0
+  data.tar.gz: 297718c752c3d6522295a6a513ed89c679b20c57c3d66f6ee3997a32ed5f34fdbf6deaa4bbbaa8d062bd09689c5cc8aef33d895a741772e669cc1fadf455466b

data/app/controllers/forest_liana/application_controller.rb

@@ -90,6 +90,10 @@ module ForestLiana
       head :internal_server_error
     end
 
+    def deactivate_count_response
+      render serializer: nil, json: { meta: { count: 'deactivated '} }
+    end
+
     private
 
     def force_utf8_encoding(json)

data/app/controllers/forest_liana/associations_controller.rb

@@ -1,11 +1,11 @@
 module ForestLiana
   class AssociationsController < ForestLiana::ApplicationController
     if Rails::VERSION::MAJOR < 4
-      before_filter :find_resource
-      before_filter :find_association
+      before_filter :find_resource, except: :count
+      before_filter :find_association, except: :count
     else
-      before_action :find_resource
-      before_action :find_association
+      before_action :find_resource, except: :count
+      before_action :find_association, except: :count
     end
 
     def index
@@ -25,6 +25,8 @@ module ForestLiana
     end
 
     def count
+      find_resource
+      find_association
       begin
         getter = HasManyGetter.new(@resource, @association, params, forest_user)
         getter.count

data/app/controllers/forest_liana/resources_controller.rb

@@ -13,10 +13,6 @@ module ForestLiana
       before_action :find_resource, except: :count
     end
 
-    def deactivate_count_response
-      render serializer: nil, json: { meta: { count: 'deactivated '} }
-    end
-
     def index
       begin
         if request.format == 'csv'

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.5.0"
+  VERSION = "7.5.1"
 end

data/spec/dummy/app/models/owner.rb

@@ -1,2 +1,3 @@
 class Owner < ActiveRecord::Base
+  has_many :trees
 end

data/spec/dummy/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   namespace :forest do
     post '/actions/test' => 'islands#test'
     get '/Owner/count' , to: 'owners#count'
+    get '/Owner/:id/relationships/trees/count' , to: 'owner_trees#count'
   end
 
   mount ForestLiana::Engine => "/forest"

data/spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb

@@ -0,0 +1,11 @@
+class Forest::OwnerTreesController < ForestLiana::AssociationsController
+  def count
+    if (params[:search])
+      deactivate_count_response
+    else
+      params[:collection] = 'Owner'
+      params[:association_name] = 'trees'
+      super
+    end
+  end
+end

data/spec/requests/count_spec.rb

@@ -3,7 +3,8 @@ require 'rails_helper'
 describe 'Requesting Owner', :type => :request  do
   before(:each) do
     1.upto(10) do |i|
-     Owner.create(name: "Owner #{i}")
+      owner = Owner.create(name: "Owner #{i}")
+      Tree.create(name: "Tree #{i}", owner_id: owner.id)
     end
   end
 
@@ -52,13 +53,33 @@ describe 'Requesting Owner', :type => :request  do
 
     it 'should equal to 10' do
       get '/forest/Owner/count', params: params, headers: headers
+      expect(response.body).to eq('{"count":10}')
+    end
+  end
+
+  describe 'count on relationships' do
+    params = {
+      fields: { 'Tree' => 'id,name,owner' },
+      page: { 'number' => '1', 'size' => '10' },
+      searchExtended: '0',
+      sort: '-id',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 200' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
       expect(response.status).to eq(200)
     end
+
+    it 'should equal to 1' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
+      expect(response.body).to eq('{"count":1}')
+    end
   end
 
   describe 'deactivate_count_response' do
     params = {
-      fields: { 'Product' => 'id,name' },
+      fields: { 'Owner' => 'id,name' },
       page: { 'number' => '1', 'size' => '10' },
       search: 'foo',
       searchExtended: '0',
@@ -76,4 +97,25 @@ describe 'Requesting Owner', :type => :request  do
       expect(response.body).to eq('{"meta":{"count":"deactivated "}}')
     end
   end
+
+  describe 'deactivate_count_response' do
+    params = {
+      fields: { 'Tree' => 'id,name,owner' },
+      page: { 'number' => '1', 'size' => '10' },
+      search: 'foo',
+      searchExtended: '0',
+      sort: '-id',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 200' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
+      expect(response.status).to eq(200)
+    end
+
+    it 'should equal to deactivated response' do
+      get '/forest/Owner/1/relationships/trees/count', params: params, headers: headers
+      expect(response.body).to eq('{"meta":{"count":"deactivated "}}')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.5.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -372,6 +372,7 @@ files:
 - spec/dummy/lib/forest_liana/collections/island.rb
 - spec/dummy/lib/forest_liana/collections/location.rb
 - spec/dummy/lib/forest_liana/collections/user.rb
+- spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb
 - spec/dummy/lib/forest_liana/controllers/owners_controller.rb
 - spec/helpers/forest_liana/query_helper_spec.rb
 - spec/helpers/forest_liana/schema_helper_spec.rb
@@ -667,6 +668,7 @@ test_files:
 - spec/dummy/app/controllers/forest/islands_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/Rakefile
+- spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb
 - spec/dummy/lib/forest_liana/controllers/owners_controller.rb
 - spec/dummy/lib/forest_liana/collections/user.rb
 - spec/dummy/lib/forest_liana/collections/location.rb