forest_liana 7.4.3 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c1625a185880dd9f650027f661cf4c77c0f8e89d37232b10ab4c38e2e5a3ab
-  data.tar.gz: 8e0715058ba88dfcfd984e04e04704183961953a2fa98b68157d61fb570a4b70
+  metadata.gz: 70e79aed5a598ec4ac195b6281431084b65bac321fba53477944e5050e3e9e09
+  data.tar.gz: ecfb92ede45086a4b81b17d4d6d6ac4042a3f88bd1b791a1eec8d497a764e12e
 SHA512:
-  metadata.gz: 1da6072f77399edc8a63739542654120ea81cd474fc357ea006729bc5faa7d6222620f8da19788432c6bc6ef947e25529d1deb458b694a62e4452e89b50529b5
-  data.tar.gz: a200341e566a858576d7cd84f4338f280976b90fdaf16d5a51c0b0435e3038eaf176f941c65b60b41b2c7324eea3721486231106995dd3d99bde69ce035693c1
+  metadata.gz: 70e36b8a47900a631c1aef01dfffad903817dbd97d73dde936ef047734204c5d316f37faf5aa9a0ce79a263aa911a1868fe32e06e162a52094d8370da3ab6d76
+  data.tar.gz: 9840f9d3a40822447b348880cc9976be797e254ceda1e779c92d2552f5e51cf6fbcebf7a21ef988162cf4cdf3fcb66a2a701062e6dbe8fbb9af3b8d4dac42996

data/app/controllers/forest_liana/resources_controller.rb

@@ -8,9 +8,13 @@ module ForestLiana
     rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
 
     if Rails::VERSION::MAJOR < 4
-      before_filter :find_resource
+      before_filter :find_resource, except: :count
     else
-      before_action :find_resource
+      before_action :find_resource, except: :count
+    end
+
+    def deactivate_count_response
+      render serializer: nil, json: { meta: { count: 'deactivated '} }
     end
 
     def index
@@ -54,6 +58,7 @@ module ForestLiana
     end
 
     def count
+      find_resource
       begin
         checker = ForestLiana::PermissionsChecker.new(
           @resource,

data/lib/forest_liana/version.rb

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

data/spec/dummy/config/routes.rb

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

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

@@ -0,0 +1,10 @@
+class Forest::OwnersController < ForestLiana::ResourcesController
+  def count
+    if (params[:search])
+      deactivate_count_response
+    else
+      params[:collection] = 'Owner'
+      super
+    end
+  end
+end

data/spec/requests/count_spec.rb

@@ -0,0 +1,79 @@
+require 'rails_helper'
+
+describe 'Requesting Owner', :type => :request  do
+  before(:each) do
+    1.upto(10) do |i|
+     Owner.create(name: "Owner #{i}")
+    end
+  end
+
+  after(:each) do
+    Owner.destroy_all
+  end
+
+  before(:each) do
+    allow(ForestLiana::IpWhitelist).to receive(:retrieve) { true }
+    allow(ForestLiana::IpWhitelist).to receive(:is_ip_whitelist_retrieved) { true }
+    allow(ForestLiana::IpWhitelist).to receive(:is_ip_valid) { true }
+
+    allow_any_instance_of(ForestLiana::PermissionsChecker).to receive(:is_authorized?) { true }
+
+    allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return({})
+  end
+
+  token = JWT.encode({
+                       id: 38,
+                       email: 'michael.kelso@that70.show',
+                       first_name: 'Michael',
+                       last_name: 'Kelso',
+                       team: 'Operations',
+                       rendering_id: 16,
+                       exp: Time.now.to_i + 2.weeks.to_i
+                     }, ForestLiana.auth_secret, 'HS256')
+
+  headers = {
+    'Accept' => 'application/json',
+    'Content-Type' => 'application/json',
+    'Authorization' => "Bearer #{token}"
+  }
+  describe 'count' do
+    params = {
+      fields: { 'Owner' => 'id,name' },
+      page: { 'number' => '1', 'size' => '10' },
+      searchExtended: '0',
+      sort: '-id',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 200' do
+      get '/forest/Owner/count', params: params, headers: headers
+      expect(response.status).to eq(200)
+    end
+
+    it 'should equal to 10' do
+      get '/forest/Owner/count', params: params, headers: headers
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe 'deactivate_count_response' do
+    params = {
+      fields: { 'Product' => 'id,name' },
+      page: { 'number' => '1', 'size' => '10' },
+      search: 'foo',
+      searchExtended: '0',
+      sort: '-id',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 200' do
+      get '/forest/Owner/count', params: params, headers: headers
+      expect(response.status).to eq(200)
+    end
+
+    it 'should equal to deactivated response' do
+      get '/forest/Owner/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.4.3
+  version: 7.5.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-03-29 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/owners_controller.rb
 - spec/helpers/forest_liana/query_helper_spec.rb
 - spec/helpers/forest_liana/schema_helper_spec.rb
 - spec/lib/forest_liana/bootstrapper_spec.rb
@@ -379,6 +380,7 @@ files:
 - spec/rails_helper.rb
 - spec/requests/actions_controller_spec.rb
 - spec/requests/authentications_spec.rb
+- spec/requests/count_spec.rb
 - spec/requests/resources_spec.rb
 - spec/requests/stats_spec.rb
 - spec/services/forest_liana/apimap_sorter_spec.rb
@@ -510,171 +512,173 @@ signing_key:
 specification_version: 4
 summary: Official Rails Liana for Forest
 test_files:
-- test/test_helper.rb
+- test/routing/route_test.rb
 - test/services/forest_liana/operator_date_interval_parser_test.rb
 - test/services/forest_liana/schema_adapter_test.rb
-- test/routing/route_test.rb
-- test/forest_liana_test.rb
-- test/dummy/Rakefile
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
-- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
-- test/dummy/db/migrate/20160627172951_create_tree.rb
-- test/dummy/db/migrate/20160628173505_add_timestamps.rb
-- test/dummy/db/migrate/20150608130516_create_date_field.rb
-- test/dummy/db/migrate/20181111162121_create_references_table.rb
-- test/dummy/db/migrate/20160627172810_create_owner.rb
-- test/dummy/db/migrate/20150608132621_create_string_field.rb
-- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
-- test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb
-- test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
-- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
-- test/dummy/db/migrate/20150608131610_create_float_field.rb
-- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
-- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
-- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
-- test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
-- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
-- test/dummy/db/migrate/20150608131430_create_integer_field.rb
 - test/dummy/config.ru
-- test/dummy/README.rdoc
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/secrets.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/database.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/db/schema.rb
+- test/dummy/db/migrate/20150608131430_create_integer_field.rb
+- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
+- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
+- test/dummy/db/migrate/20160627172810_create_owner.rb
+- test/dummy/db/migrate/20150608132621_create_string_field.rb
+- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
+- test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
+- test/dummy/db/migrate/20150608130516_create_date_field.rb
+- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
+- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
+- test/dummy/db/migrate/20181111162121_create_references_table.rb
+- test/dummy/db/migrate/20150608131610_create_float_field.rb
+- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
+- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
+- test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb
+- test/dummy/db/migrate/20160627172951_create_tree.rb
+- test/dummy/db/migrate/20160628173505_add_timestamps.rb
+- test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
+- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/models/date_field.rb
 - test/dummy/app/models/belongs_to_field.rb
-- test/dummy/app/models/tree.rb
+- test/dummy/app/models/decimal_field.rb
+- test/dummy/app/models/string_field.rb
+- test/dummy/app/models/integer_field.rb
+- test/dummy/app/models/has_many_through_field.rb
 - test/dummy/app/models/boolean_field.rb
+- test/dummy/app/models/owner.rb
 - test/dummy/app/models/polymorphic_field.rb
-- test/dummy/app/models/reference.rb
+- test/dummy/app/models/has_and_belongs_to_many_field.rb
 - test/dummy/app/models/belongs_to_class_name_field.rb
-- test/dummy/app/models/integer_field.rb
-- test/dummy/app/models/date_field.rb
 - test/dummy/app/models/serialize_field.rb
-- test/dummy/app/models/decimal_field.rb
-- test/dummy/app/models/owner.rb
+- test/dummy/app/models/reference.rb
+- test/dummy/app/models/tree.rb
+- test/dummy/app/models/float_field.rb
 - test/dummy/app/models/has_many_field.rb
-- test/dummy/app/models/has_many_class_name_field.rb
-- test/dummy/app/models/string_field.rb
 - test/dummy/app/models/has_one_field.rb
-- test/dummy/app/models/has_many_through_field.rb
-- test/dummy/app/models/float_field.rb
-- test/dummy/app/models/has_and_belongs_to_many_field.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/config/manifest.js
+- test/dummy/app/models/has_many_class_name_field.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/public/500.html
-- test/fixtures/serialize_field.yml
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/Rakefile
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/README.rdoc
+- test/test_helper.rb
+- test/forest_liana_test.rb
+- test/fixtures/has_many_through_field.yml
 - test/fixtures/has_one_field.yml
+- test/fixtures/tree.yml
 - test/fixtures/owner.yml
 - test/fixtures/has_many_field.yml
-- test/fixtures/has_many_through_field.yml
-- test/fixtures/tree.yml
-- test/fixtures/reference.yml
+- test/fixtures/serialize_field.yml
 - test/fixtures/belongs_to_field.yml
+- test/fixtures/reference.yml
 - test/fixtures/string_field.yml
-- spec/helpers/forest_liana/query_helper_spec.rb
-- spec/helpers/forest_liana/schema_helper_spec.rb
+- spec/rails_helper.rb
+- spec/requests/stats_spec.rb
+- spec/requests/actions_controller_spec.rb
+- spec/requests/authentications_spec.rb
+- spec/requests/resources_spec.rb
+- spec/requests/count_spec.rb
+- spec/services/forest_liana/resource_updater_spec.rb
+- spec/services/forest_liana/ip_whitelist_checker_spec.rb
+- spec/services/forest_liana/permissions_formatter_spec.rb
+- spec/services/forest_liana/resources_getter_spec.rb
+- spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
+- spec/services/forest_liana/value_stat_getter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
-- spec/services/forest_liana/has_many_getter_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
-- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
-- spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
-- spec/services/forest_liana/permissions_formatter_spec.rb
 - spec/services/forest_liana/filters_parser_spec.rb
-- spec/services/forest_liana/apimap_sorter_spec.rb
-- spec/services/forest_liana/pie_stat_getter_spec.rb
-- spec/services/forest_liana/resources_getter_spec.rb
 - spec/services/forest_liana/permissions_getter_spec.rb
+- spec/services/forest_liana/has_many_getter_spec.rb
 - spec/services/forest_liana/line_stat_getter_spec.rb
-- spec/services/forest_liana/value_stat_getter_spec.rb
-- spec/services/forest_liana/resource_updater_spec.rb
+- spec/services/forest_liana/pie_stat_getter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
-- spec/services/forest_liana/ip_whitelist_checker_spec.rb
-- spec/spec_helper.rb
-- spec/lib/forest_liana/bootstrapper_spec.rb
-- spec/lib/forest_liana/schema_file_updater_spec.rb
-- spec/config/initializers/logger_spec.rb
-- spec/rails_helper.rb
-- spec/dummy/Rakefile
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rake
-- spec/dummy/bin/rails
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
-- spec/dummy/db/migrate/20190226174951_create_tree.rb
-- spec/dummy/db/migrate/20210326110524_create_references.rb
-- spec/dummy/db/migrate/20210526084712_create_products.rb
-- spec/dummy/db/migrate/20190226172951_create_user.rb
-- spec/dummy/db/migrate/20210511141752_create_owners.rb
-- spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
-- spec/dummy/db/migrate/20210326140855_create_locations.rb
-- spec/dummy/db/migrate/20190226173051_create_isle.rb
+- spec/services/forest_liana/schema_adapter_spec.rb
 - spec/dummy/config.ru
-- spec/dummy/README.rdoc
-- spec/dummy/lib/forest_liana/collections/user.rb
-- spec/dummy/lib/forest_liana/collections/island.rb
-- spec/dummy/lib/forest_liana/collections/location.rb
-- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/forest_liana.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/tree.rb
-- spec/dummy/app/models/reference.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/forest_liana.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20210526084712_create_products.rb
+- spec/dummy/db/migrate/20210326140855_create_locations.rb
+- spec/dummy/db/migrate/20210326110524_create_references.rb
+- spec/dummy/db/migrate/20210511141752_create_owners.rb
+- spec/dummy/db/migrate/20190226174951_create_tree.rb
+- spec/dummy/db/migrate/20190226172951_create_user.rb
+- spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
+- spec/dummy/db/migrate/20190226173051_create_isle.rb
+- spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/island.rb
 - spec/dummy/app/models/owner.rb
-- spec/dummy/app/models/product.rb
 - spec/dummy/app/models/location.rb
+- spec/dummy/app/models/reference.rb
+- spec/dummy/app/models/tree.rb
+- spec/dummy/app/models/product.rb
+- spec/dummy/app/models/island.rb
 - spec/dummy/app/config/routes.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/forest/islands_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/requests/resources_spec.rb
-- spec/requests/authentications_spec.rb
-- spec/requests/actions_controller_spec.rb
-- spec/requests/stats_spec.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/Rakefile
+- 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
+- spec/dummy/lib/forest_liana/collections/island.rb
+- spec/dummy/bin/setup
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/README.rdoc
+- spec/config/initializers/logger_spec.rb
+- spec/spec_helper.rb
+- spec/lib/forest_liana/schema_file_updater_spec.rb
+- spec/lib/forest_liana/bootstrapper_spec.rb
+- spec/helpers/forest_liana/query_helper_spec.rb
+- spec/helpers/forest_liana/schema_helper_spec.rb