forest_liana 9.20.5 → 9.20.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a276e10f6f55ce7c4b4aedf82f58847599273e82fa86b001d02573ff56d70a59
-  data.tar.gz: a8527baf9d848dbf81e3d989cd473718c859df54339df0e5172e795260b3410b
+  metadata.gz: ed69fd6aba8fea8a03a02738a6f9ca6e75ae334980e501470dbabe1d58c37497
+  data.tar.gz: a6439711199628972e57f782968244c096566919801510d2193e3d16fbe5d800
 SHA512:
-  metadata.gz: 6516197269ef7e03df7e4c75f1c474147b9332b82945a8f688791f5e739e204dc5b443b572812f8394a93e15a7cad73e43d853056116a375c568f56db9dd99bd
-  data.tar.gz: f1966c816f63eba307e6e318d7ada4f7e3bf9280360695d6eb95859e7122cfbf8fbc2d34e2a68a5ab5489203c44e4aece02fb4759c6931fd3ed9d3e589530d0f
+  metadata.gz: e6101bb2d0ea3dfe2b3944cdf5d2ca3391ecd26450653517dd30553ffd4075dcb0cb23b6659996303259f6bd931c8054a58986f9337adc5417f94df8f1aac8b2
+  data.tar.gz: 3de7e6bc1710e6e8f8e1c8b1857775091e7d5d707d57c9f7f4dd1a993c7fbac111e350a88d4623e90357b8815aaf74a1de6a01710c01a81bd039b465ca19f600

data/app/controllers/forest_liana/associations_controller.rb

@@ -27,6 +27,11 @@ module ForestLiana
     def count
       find_resource
       find_association
+      # NOTICE: find_association renders a 404 (without halting) when the
+      #         association name does not resolve; stop here instead of falling
+      #         through and dereferencing a nil @association, which surfaced as
+      #         a double-render / 500 rather than the intended 404.
+      return if performed?
       begin
         getter = HasManyGetter.new(@resource, @association, params, forest_user)
         getter.count

data/app/services/forest_liana/schema_adapter.rb

@@ -415,7 +415,7 @@ module ForestLiana
       case column.type
       when :boolean
         type = 'Boolean'
-      when :datetime
+      when :datetime, :timestamptz, :timestamp
         type = 'Date'
       when :date
         type = 'Dateonly'

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.20.5"
+  VERSION = "9.20.7"
 end

data/spec/requests/count_spec.rb

@@ -74,6 +74,20 @@ describe 'Requesting Owner', :type => :request  do
     end
   end
 
+  describe 'count on an unknown relationship' do
+    params = {
+      fields: { 'Tree' => 'id,name,owner' },
+      page: { 'number' => '1', 'size' => '10' },
+      searchExtended: '0',
+      timezone: 'Europe/Paris'
+    }
+
+    it 'should respond 404 instead of 500' do
+      get '/forest/Owner/5/relationships/unknown_things/count', params: params, headers: headers
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe 'deactivate_count_response' do
     params = {
       fields: { 'Owner' => 'id,name' },

data/spec/services/forest_liana/schema_adapter_spec.rb

@@ -1,5 +1,25 @@
 module ForestLiana
   describe SchemaAdapter do
+    describe '#get_type_for' do
+      let(:adapter) { described_class.new(Tree) }
+
+      def column_of_type(type)
+        double('Column', name: 'some_column', type: type, array: false)
+      end
+
+      it 'maps a timestamptz column to the Date type' do
+        expect(adapter.send(:get_type_for, column_of_type(:timestamptz))).to eq 'Date'
+      end
+
+      it 'maps a timestamp column to the Date type' do
+        expect(adapter.send(:get_type_for, column_of_type(:timestamp))).to eq 'Date'
+      end
+
+      it 'still maps a datetime column to the Date type' do
+        expect(adapter.send(:get_type_for, column_of_type(:datetime))).to eq 'Date'
+      end
+    end
+
     describe 'perform' do
       context 'with polymorphic association' do
         it 'should define the association with the referenced models' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.20.5
+  version: 9.20.7
 platform: ruby
 authors:
 - Sandro Munda