forest_liana 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c38a671d9137793a03aa5081ff0fc5602dd26fd2015f29d5e94205a82562f35
-  data.tar.gz: 0b38be20c307f00be9645383d4655eec0ccb38cc747e43ed7c7759b8f884284b
+  metadata.gz: d9848129f2f5c8fa6a8f473898b97b291141ac75b166ffb048e37bf0beee7710
+  data.tar.gz: 9541c943609b5c7ae327681fef57595c1efcc4566130b0a84ca4ef18a988279f
 SHA512:
-  metadata.gz: 5ed3dfb92b55a1516db98f6ad2b838a16348d9c4ae01e32ddc53d7f592fb92a883d35759dc33fccf1cb9ce28d597735c1d41b67c1a408c87ffd969fe8396771d
-  data.tar.gz: 4efa06e606a4e62594b039875e10188658b52a52a9ba4e9bf4855c6746d80fc4efb61ff2acefb366b1b071d74d01b79f12253770b8df29987d7f5ddea003438e
+  metadata.gz: 59b7edfc50fd69d01ee77128ce697093d323bff74c1bec07cf92c7337029aead57eadf0ff72a19d825e41cb915fbf116380d04339e34b59fc31b59457d698e98
+  data.tar.gz: 061a4c5cd8bbe61bcb6968a7fbd538dbd0e4cb2f88be7181888d222a5d15443f8e593a1d360cf19ebca11e95f349f5b51c4628bda998ed16aa6e43350a873ce8

data/app/helpers/forest_liana/schema_helper.rb

@@ -4,5 +4,11 @@ module ForestLiana
       collection_name = ForestLiana.name_for(active_record_class)
       ForestLiana.apimap.find { |collection| collection.name.to_s == collection_name }
     end
+
+    def self.is_smart_field?(model, field_name)
+      collection = self.find_collection_from_model(model)
+      field_found = collection.fields.find { |collection_field| collection_field[:field].to_s == field_name } if collection
+      field_found && field_found[:is_virtual]
+    end
   end
 end

data/app/services/forest_liana/filters_parser.rb

@@ -47,30 +47,56 @@ module ForestLiana
     end
 
     def parse_condition(condition)
-      ensure_valid_condition(condition)
+      where = parse_condition_without_smart_field(condition)
 
-      operator = condition['operator']
-      value = condition['value']
-      field = condition['field']
+      field_name = condition['field']
 
-      if @operator_date_parser.is_date_operator?(operator)
-        condition = @operator_date_parser.get_date_filter(operator, value)
-        return "#{parse_field_name(field)} #{condition}"
+      if ForestLiana::SchemaHelper.is_smart_field?(@resource, field_name)
+        schema = ForestLiana.schema_for_resource(@resource)
+        field_schema = schema.fields.find do |field|
+          field[:field].to_s == field_name
+        end
+
+        unless field_schema.try(:[], :filter)
+          raise ForestLiana::Errors::NotImplementedMethodError.new("method filter on smart field '#{field_name}' not found")
+        end
+
+        return field_schema[:filter].call(condition, where)
       end
 
-      if is_belongs_to(field)
-        association = field.partition(':').first.to_sym
-        association_field = field.partition(':').last
+      where
+    end
+
+    def get_association_field_and_resource(field_name)
+      if is_belongs_to(field_name)
+        association = field_name.partition(':').first.to_sym
+        association_field = field_name.partition(':').last
 
         unless @resource.reflect_on_association(association)
           raise ForestLiana::Errors::HTTP422Error.new("Association '#{association}' not found")
         end
 
         current_resource = @resource.reflect_on_association(association).klass
+
+        return association_field, current_resource
       else
-        association_field = field
-        current_resource = @resource
+        return field_name, @resource
       end
+    end
+
+    def parse_condition_without_smart_field(condition)
+      ensure_valid_condition(condition)
+
+      operator = condition['operator']
+      value = condition['value']
+      field_name = condition['field']
+
+      if @operator_date_parser.is_date_operator?(operator)
+        condition = @operator_date_parser.get_date_filter(operator, value)
+        return "#{parse_field_name(field_name)} #{condition}"
+      end
+
+      association_field, current_resource = get_association_field_and_resource(field_name)
 
       # NOTICE: Set the integer value instead of a string if "enum" type
       # NOTICE: Rails 3 do not have a defined_enums method
@@ -78,7 +104,7 @@ module ForestLiana
         value = current_resource.defined_enums[association_field][value]
       end
 
-      parsed_field = parse_field_name(field)
+      parsed_field = parse_field_name(field_name)
       parsed_operator = parse_operator(operator)
       parsed_value = parse_value(operator, value)
       field_and_operator = "#{parsed_field} #{parsed_operator}"
@@ -149,16 +175,16 @@ module ForestLiana
 
         association = get_association_name_for_condition(field)
         quoted_table_name = ActiveRecord::Base.connection.quote_column_name(association)
-        quoted_field_name = ActiveRecord::Base.connection.quote_column_name(field.split(':')[1])
+        field_name = field.split(':')[1]
       else
         quoted_table_name = @resource.quoted_table_name
-        quoted_field_name = ActiveRecord::Base.connection.quote_column_name(field)
         current_resource = @resource
+        field_name = field
       end
+      quoted_field_name = ActiveRecord::Base.connection.quote_column_name(field_name)
 
       column_found = current_resource.columns.find { |column| column.name == field.split(':').last }
-
-      if column_found.nil?
+      if column_found.nil? && !ForestLiana::SchemaHelper.is_smart_field?(current_resource, field_name)
         raise ForestLiana::Errors::HTTP422Error.new("Field '#{field}' not found")
       end
 

data/config/initializers/errors.rb

@@ -46,6 +46,12 @@ module ForestLiana
       end
     end
 
+    class NotImplementedMethodError < ExpectedError
+      def initialize(message = "Method not implemented")
+        super(501, :internal_server_error, message, 'MethodNotImplementedError')
+      end
+    end
+
     class InconsistentSecretAndRenderingError < ExpectedError
       def initialize(message=ForestLiana::MESSAGES[:SERVER_TRANSACTION][:SECRET_AND_RENDERINGID_INCONSISTENT])
         super(500, :internal_server_error, message, 'InconsistentSecretAndRenderingError')

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end

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

@@ -2,4 +2,5 @@ class Island < ActiveRecord::Base
   self.table_name = 'isle'
 
   has_many :trees
+  has_one :location
 end

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

@@ -0,0 +1,3 @@
+class Location < ActiveRecord::Base
+  belongs_to :island
+end

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

@@ -0,0 +1,2 @@
+class Reference < ActiveRecord::Base
+end

data/spec/dummy/db/migrate/20210326110524_create_references.rb

@@ -0,0 +1,8 @@
+class CreateReferences < ActiveRecord::Migration[6.0]
+  def change
+    create_table :references do |t|
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20210326140855_create_locations.rb

@@ -0,0 +1,10 @@
+class CreateLocations < ActiveRecord::Migration[6.0]
+  def change
+    create_table :locations do |t|
+      t.string :coordinates
+      t.references :island, index: true
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_07_16_135241) do
+ActiveRecord::Schema.define(version: 2021_03_26_140855) do
 
   create_table "isle", force: :cascade do |t|
     t.string "name"
@@ -19,6 +19,19 @@ ActiveRecord::Schema.define(version: 2019_07_16_135241) do
     t.datetime "updated_at"
   end
 
+  create_table "locations", force: :cascade do |t|
+    t.string "coordinates"
+    t.integer "island_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["island_id"], name: "index_locations_on_island_id"
+  end
+
+  create_table "references", force: :cascade do |t|
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "trees", force: :cascade do |t|
     t.string "name"
     t.integer "owner_id"

data/spec/dummy/lib/forest_liana/collections/location.rb

@@ -0,0 +1,10 @@
+class Forest::Location
+  include ForestLiana::Collection
+
+  collection :Location
+
+  field :alter_coordinates, type: 'String' do
+    object.name + 'XYZ'
+  end
+
+end

data/spec/dummy/lib/forest_liana/collections/user.rb

@@ -0,0 +1,15 @@
+class Forest::User
+  include ForestLiana::Collection
+
+  collection :User
+
+  filter_cap_name = lambda do |condition, where|
+    capitalize_name = condition['value'].capitalize
+    "name IS '#{capitalize_name}'"
+  end
+
+  field :cap_name, type: 'String', filter: filter_cap_name do
+    object.name.upcase
+  end
+
+end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -0,0 +1,359 @@
+module ForestLiana
+  describe ResourcesGetter do
+    let(:resource) { User }
+    let(:pageSize) { 10 }
+    let(:pageNumber) { 1 }
+    let(:sort) { 'id' }
+    let(:fields) { }
+    let(:filters) { }
+
+    let(:getter) { described_class.new(resource, {
+      page: { size: pageSize, number: pageNumber },
+      sort: sort,
+      fields: fields,
+      filters: filters,
+    })}
+
+    before(:each) do
+      users = ['Michel', 'Robert', 'Vince', 'Sandro', 'Olesya', 'Romain', 'Valentin', 'Jason', 'Arnaud', 'Jeff', 'Steve', 'Marc', 'Xavier', 'Paul', 'Mickael', 'Mike', 'Maxime', 'Gertrude', 'Monique', 'Mia', 'Rachid', 'Edouard', 'Sacha', 'Caro', 'Amand', 'Nathan', 'Noémie', 'Robin', 'Gaelle', 'Isabelle']
+      .map { |name| User.create(name: name) }
+
+      islands = [
+        { :name => 'Skull', :updated_at => Time.now - 1.years },
+        { :name => 'Muerta', :updated_at => Time.now - 5.years },
+        { :name => 'Treasure', :updated_at => Time.now },
+        { :name => 'Birds', :updated_at => Time.now - 7.years },
+        { :name => 'Lille', :updated_at => Time.now - 1.years }
+      ].map { |island| Island.create(name: island[:name], updated_at: island[:updated_at]) }
+
+      trees = [
+        { :name => 'Lemon Tree', :created_at => Time.now - 7.years, :island => islands[0], :owner => users[0], :cutter => users[0] },
+        { :name => 'Ginger Tree', :created_at => Time.now - 7.years, :island => islands[0], :owner => users[1], :cutter => users[0] },
+        { :name => 'Apple Tree', :created_at => Time.now - 5.years, :island => islands[1], :owner => users[2], :cutter => users[0] },
+        { :name => 'Pear Tree', :created_at => Time.now + 4.hours, :island => islands[3], :owner => users[3], :cutter => users[1] },
+        { :name => 'Choco Tree', :created_at => Time.now, :island => islands[3], :owner => users[4], :cutter => users[1] }
+      ].map { |tree| Tree.create(name: tree[:name], created_at: tree[:created_at], island: tree[:island], owner: tree[:owner], cutter: tree[:cutter]) }
+
+      locations = [
+        { :coordinates => '12345', :island => islands[0] },
+        { :coordinates => '54321', :island => islands[1] },
+        { :coordinates => '43215', :island => islands[2] },
+        { :coordinates => '21543', :island => islands[3] },
+        { :coordinates => '32154', :island => islands[4] }
+      ].map { |location| Location.create(coordinates: location[:coordinates], island: location[:island]) }
+
+      reference = Reference.create()
+    end
+
+    after(:each) do
+      User.destroy_all
+      Island.destroy_all
+      Location.destroy_all
+      Tree.destroy_all
+    end
+
+    describe 'when there are more records than the page size' do
+      describe 'when asking for the 1st page and 15 records' do
+        let(:pageSize) { 15 }
+        let(:sort) { '-id' }
+
+        it 'should get only the expected records' do
+          getter.perform
+          records = getter.records
+          count = getter.count
+
+          expect(records.count).to eq 15
+          expect(count).to eq 30
+          expect(records.first.id).to eq 30
+          expect(records.last.id).to eq 16
+        end
+      end
+
+      describe 'when asking for the 2nd page and 10 records' do
+        let(:pageNumber) { 2 }
+        let(:sort) { '-id' }
+
+        it 'should get only the expected records' do
+          getter.perform
+          records = getter.records
+          count = getter.count
+
+          expect(records.count).to eq 10
+          expect(count).to eq 30
+          expect(records.first.id).to eq 20
+          expect(records.last.id).to eq 11
+        end
+      end
+    end
+
+    describe 'when on a model having a reserved SQL word as name' do
+      let(:resource) { Reference }
+
+      it 'should get the ressource properly' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 1
+        expect(count).to eq 1
+        expect(records.first.id).to eq 1
+      end
+    end
+
+    describe 'when sorting by a specific field' do
+      let(:pageSize) { 5 }
+      let(:sort) { '-name' }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 5
+        expect(count).to eq 30
+        expect(records.map(&:name)).to eq ['Xavier', 'Vince', 'Valentin', 'Steve', 'Sandro']
+      end
+    end
+
+    describe 'when sorting by a belongs_to association' do
+      let(:resource) { Tree }
+      let(:sort) { 'owner.name' }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 5
+        expect(count).to eq 5
+        expect(records.map(&:id)).to eq [1, 5, 2, 4, 3]
+      end
+    end
+
+    describe 'when sorting by a has_one association' do
+      let(:resource) { Island }
+      let(:sort) { 'location.coordinates' }
+      let(:pageSize) { 5 }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 5
+        expect(count).to eq 5
+        expect(records.map(&:id)).to eq [1, 4, 5, 3, 2]
+      end
+    end
+
+    describe 'when filtering on an ambiguous field' do
+      let(:resource) { Tree }
+      let(:pageSize) { 5 }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        aggregator: 'and',
+        conditions: [{
+          field: 'created_at',
+          operator: 'after',
+          value: "#{Time.now - 6.year}",
+        }, {
+          field: 'cutter:name',
+          operator: 'equal',
+          value: 'Michel'
+        }]
+      }.to_json }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 1
+        expect(count).to eq 1
+        expect(records.first.id).to eq 3
+        expect(records.first.name).to eq 'Apple Tree'
+        expect(records.first.cutter.name).to eq 'Michel'
+      end
+    end
+
+    describe 'when filtering on before x hours ago' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'created_at',
+        operator: 'before_x_hours_ago',
+        value: 3
+      }.to_json }
+
+      it 'should filter as expected' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 3
+        expect(count).to eq 3
+        expect(records.map(&:name)).to eq ['Lemon Tree', 'Ginger Tree', 'Apple Tree']
+      end
+    end
+
+    describe 'when filtering on after x hours ago' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'created_at',
+        operator: 'after_x_hours_ago',
+        value: 3
+      }.to_json }
+
+      it 'should filter as expected' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 2
+        expect(count).to eq 2
+        expect(records.map(&:name)).to eq ['Pear Tree', 'Choco Tree']
+      end
+    end
+
+    describe 'when sorting on an ambiguous field name with a filter' do
+      let(:resource) { Tree }
+      let(:sort) { '-name' }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'cutter:name',
+        operator: 'equal',
+        value: 'Michel'
+      }.to_json }
+
+      it 'should get only the sorted expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 3
+        expect(count).to eq 3
+        expect(records.map(&:name)).to eq ['Lemon Tree', 'Ginger Tree', 'Apple Tree']
+      end
+    end
+
+    describe 'when filtering on an updated_at field of the main collection' do
+      let(:resource) { Island }
+      let(:filters) { {
+        field: 'updated_at',
+        operator: 'previous_year'
+      }.to_json }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 2
+        expect(count).to eq 2
+        expect(records.map(&:name)).to eq ['Skull', 'Lille']
+      end
+    end
+
+    describe 'when filtering on an updated_at field of an associated collection' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'island:updated_at',
+        operator: 'previous_year'
+      }.to_json }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 2
+        expect(count).to eq 2
+        expect(records.map(&:name)).to eq ['Lemon Tree', 'Ginger Tree']
+      end
+    end
+
+    describe 'when filtering on an exact updated_at field of an associated collection' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'island:updated_at',
+        operator: 'equal',
+        value: 'Sat Jul 02 2016 11:52:00 GMT-0400 (EDT)',
+      }.to_json }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 0
+        expect(count).to eq 0
+      end
+    end
+
+    describe 'when filtering on a field of an associated collection that does not exist' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'leaf:id',
+        operator: 'equal',
+        value: 1
+      }.to_json }
+
+      it 'should raise the right error' do
+        expect { getter }.to raise_error(ForestLiana::Errors::HTTP422Error, "Association 'leaf' not found")
+      end
+    end
+
+    describe 'when filtering on a field that does not exists' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id' } }
+      let(:filters) { {
+        field: 'content',
+        operator: 'contains',
+        value: 'c'
+      }.to_json }
+
+      it 'should raise the right error' do
+        expect { getter }.to raise_error(ForestLiana::Errors::HTTP422Error, "Field 'content' not found")
+      end
+    end
+
+    describe 'when filtering on a smart field' do
+      let(:filters) { {
+        field: 'cap_name',
+        operator: 'equal',
+        value: 'MICHEL',
+      }.to_json }
+
+      it 'should filter as expected' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq 1
+        expect(count).to eq 1
+        expect(records.first.id).to eq 1
+        expect(records.first.name).to eq 'Michel'
+      end
+    end
+
+    describe 'when filtering on a smart field with no filter method' do
+      let(:resource) { Location }
+      let(:filters) { {
+        field: 'alter_coordinates',
+        operator: 'equal',
+        value: '12345XYZ',
+      }.to_json }
+
+      it 'should raise the right error' do
+        expect { getter }.to raise_error(
+          ForestLiana::Errors::NotImplementedMethodError,
+           "method filter on smart field 'alter_coordinates' not found"
+        )
+      end
+    end
+  end
+end

data/spec/services/forest_liana/schema_adapter_spec.rb

@@ -8,7 +8,7 @@ module ForestLiana
           end
 
           expect(collection.fields.map { |field| field[:field] }).to eq(
-            ["id", "name", "created_at", "updated_at", "trees"]
+            ["id", "name", "created_at", "updated_at", "trees", "location"]
           )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -325,6 +325,8 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/island.rb
+- spec/dummy/app/models/location.rb
+- spec/dummy/app/models/reference.rb
 - spec/dummy/app/models/tree.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -356,7 +358,11 @@ files:
 - spec/dummy/db/migrate/20190226174951_create_tree.rb
 - spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
 - spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
+- spec/dummy/db/migrate/20210326110524_create_references.rb
+- spec/dummy/db/migrate/20210326140855_create_locations.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/lib/forest_liana/collections/location.rb
+- spec/dummy/lib/forest_liana/collections/user.rb
 - spec/helpers/forest_liana/is_same_data_structure_helper_spec.rb
 - spec/helpers/forest_liana/query_helper_spec.rb
 - spec/helpers/forest_liana/schema_helper_spec.rb
@@ -373,6 +379,7 @@ files:
 - spec/services/forest_liana/permissions_checker_live_queries_spec.rb
 - spec/services/forest_liana/permissions_formatter_spec.rb
 - spec/services/forest_liana/permissions_getter_spec.rb
+- spec/services/forest_liana/resources_getter_spec.rb
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/spec_helper.rb
 - test/dummy/README.rdoc
@@ -462,7 +469,6 @@ files:
 - test/services/forest_liana/has_many_getter_test.rb
 - test/services/forest_liana/pie_stat_getter_test.rb
 - test/services/forest_liana/resource_updater_test.rb
-- test/services/forest_liana/resources_getter_test.rb
 - test/services/forest_liana/schema_adapter_test.rb
 - test/services/forest_liana/scope_validator_test.rb
 - test/services/forest_liana/value_stat_getter_test.rb
@@ -491,154 +497,160 @@ signing_key:
 specification_version: 4
 summary: Official Rails Liana for Forest
 test_files:
-- test/dummy/config/application.rb
+- test/dummy/config.ru
+- test/dummy/README.rdoc
 - test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/secrets.yml
-- test/dummy/config/environments/development.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/routes.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
+- test/dummy/db/migrate/20160627172810_create_owner.rb
+- test/dummy/db/migrate/20150616150629_create_polymorphic_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/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
+- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
+- test/dummy/db/migrate/20150608130516_create_date_field.rb
+- test/dummy/db/migrate/20160628173505_add_timestamps.rb
+- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
+- test/dummy/db/migrate/20160627172951_create_tree.rb
+- test/dummy/db/migrate/20181111162121_create_references_table.rb
+- test/dummy/db/migrate/20150608131610_create_float_field.rb
+- test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
+- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
+- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
+- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
+- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
+- test/dummy/db/migrate/20150608132621_create_string_field.rb
+- test/dummy/db/schema.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/models/tree.rb
+- test/dummy/app/models/belongs_to_class_name_field.rb
+- test/dummy/app/models/string_field.rb
+- test/dummy/app/models/float_field.rb
 - test/dummy/app/models/reference.rb
+- test/dummy/app/models/has_one_field.rb
+- test/dummy/app/models/integer_field.rb
+- test/dummy/app/models/boolean_field.rb
 - test/dummy/app/models/belongs_to_field.rb
-- test/dummy/app/models/string_field.rb
-- test/dummy/app/models/has_many_through_field.rb
-- test/dummy/app/models/has_many_class_name_field.rb
 - test/dummy/app/models/date_field.rb
-- test/dummy/app/models/polymorphic_field.rb
-- test/dummy/app/models/boolean_field.rb
-- test/dummy/app/models/belongs_to_class_name_field.rb
-- test/dummy/app/models/has_one_field.rb
 - test/dummy/app/models/has_many_field.rb
+- test/dummy/app/models/serialize_field.rb
 - test/dummy/app/models/has_and_belongs_to_many_field.rb
 - test/dummy/app/models/decimal_field.rb
+- test/dummy/app/models/has_many_through_field.rb
+- test/dummy/app/models/tree.rb
 - test/dummy/app/models/owner.rb
-- test/dummy/app/models/serialize_field.rb
-- test/dummy/app/models/integer_field.rb
-- test/dummy/app/models/float_field.rb
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/polymorphic_field.rb
+- test/dummy/app/models/has_many_class_name_field.rb
 - test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/README.rdoc
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/setup
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
 - test/dummy/public/404.html
+- test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20150608131430_create_integer_field.rb
-- test/dummy/db/migrate/20181111162121_create_references_table.rb
-- test/dummy/db/migrate/20150608130516_create_date_field.rb
-- test/dummy/db/migrate/20160627172810_create_owner.rb
-- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
-- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
-- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
-- test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb
-- test/dummy/db/migrate/20160627172951_create_tree.rb
-- test/dummy/db/migrate/20150608132621_create_string_field.rb
-- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
-- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
-- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
-- test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
-- test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
-- test/dummy/db/migrate/20160628173505_add_timestamps.rb
-- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
-- test/dummy/db/migrate/20150608131610_create_float_field.rb
-- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
-- test/fixtures/tree.yml
+- test/dummy/public/favicon.ico
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/fixtures/serialize_field.yml
+- test/fixtures/string_field.yml
+- test/fixtures/has_many_field.yml
+- test/fixtures/belongs_to_field.yml
+- test/fixtures/reference.yml
 - test/fixtures/has_many_through_field.yml
 - test/fixtures/owner.yml
-- test/fixtures/has_many_field.yml
-- test/fixtures/string_field.yml
-- test/fixtures/serialize_field.yml
+- test/fixtures/tree.yml
 - test/fixtures/has_one_field.yml
-- test/fixtures/reference.yml
-- test/fixtures/belongs_to_field.yml
+- test/routing/route_test.rb
+- test/forest_liana_test.rb
+- test/test_helper.rb
 - test/services/forest_liana/value_stat_getter_test.rb
-- test/services/forest_liana/resources_getter_test.rb
-- test/services/forest_liana/has_many_getter_test.rb
 - test/services/forest_liana/resource_updater_test.rb
 - test/services/forest_liana/pie_stat_getter_test.rb
-- test/services/forest_liana/schema_adapter_test.rb
+- test/services/forest_liana/has_many_getter_test.rb
 - test/services/forest_liana/scope_validator_test.rb
-- test/routing/route_test.rb
-- test/forest_liana_test.rb
-- test/test_helper.rb
-- spec/dummy/config/application.rb
+- test/services/forest_liana/schema_adapter_test.rb
+- spec/dummy/config.ru
+- spec/dummy/README.rdoc
 - spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/routes.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/forest_liana.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/db/migrate/20210326140855_create_locations.rb
+- spec/dummy/db/migrate/20190226173051_create_isle.rb
+- spec/dummy/db/migrate/20190226172951_create_user.rb
+- spec/dummy/db/migrate/20190226174951_create_tree.rb
+- spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
+- spec/dummy/db/migrate/20210326110524_create_references.rb
+- spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/lib/forest_liana/collections/location.rb
+- spec/dummy/lib/forest_liana/collections/user.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/config/routes.rb
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/models/tree.rb
-- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/location.rb
+- spec/dummy/app/models/reference.rb
 - spec/dummy/app/models/island.rb
-- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/tree.rb
 - spec/dummy/Rakefile
-- spec/dummy/config.ru
-- spec/dummy/README.rdoc
+- spec/dummy/bin/setup
+- spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/setup
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20190226173051_create_isle.rb
-- spec/dummy/db/migrate/20190226174951_create_tree.rb
-- spec/dummy/db/migrate/20190226172951_create_user.rb
-- spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
-- spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
-- spec/requests/resources_spec.rb
+- spec/helpers/forest_liana/is_same_data_structure_helper_spec.rb
+- spec/helpers/forest_liana/query_helper_spec.rb
+- spec/helpers/forest_liana/schema_helper_spec.rb
+- spec/spec_helper.rb
 - spec/requests/authentications_spec.rb
-- spec/requests/actions_controller_spec.rb
+- spec/requests/resources_spec.rb
 - spec/requests/stats_spec.rb
-- spec/spec_helper.rb
-- spec/services/forest_liana/filters_parser_spec.rb
+- spec/requests/actions_controller_spec.rb
+- spec/rails_helper.rb
+- spec/services/forest_liana/schema_adapter_spec.rb
+- spec/services/forest_liana/ip_whitelist_checker_spec.rb
+- spec/services/forest_liana/resources_getter_spec.rb
 - spec/services/forest_liana/permissions_checker_live_queries_spec.rb
+- spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/permissions_formatter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
-- spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
-- spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/filters_parser_spec.rb
 - spec/services/forest_liana/permissions_getter_spec.rb
-- spec/services/forest_liana/ip_whitelist_checker_spec.rb
-- spec/services/forest_liana/permissions_formatter_spec.rb
-- spec/rails_helper.rb
-- spec/helpers/forest_liana/schema_helper_spec.rb
-- spec/helpers/forest_liana/is_same_data_structure_helper_spec.rb
-- spec/helpers/forest_liana/query_helper_spec.rb

data/test/services/forest_liana/resources_getter_test.rb

@@ -1,284 +0,0 @@
-module ForestLiana
-  class ResourcesGetterTest < ActiveSupport::TestCase
-
-    test 'StringField page 1 size 15' do
-      getter = ResourcesGetter.new(StringField, {
-        page: { size: 15, number: 1 },
-        sort: '-id',
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 15
-      assert count = 30
-      assert records.first.id == 30
-      assert records.last.id == 16
-    end
-
-    test 'on a model having a reserved name' do
-      getter = ResourcesGetter.new(Reference, {
-        page: { size: 10, number: 1 },
-        sort: '-id',
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 1
-      assert count = 1
-      assert records.first.id == 1
-    end
-
-    test 'StringField page 2 size 10' do
-      getter = ResourcesGetter.new(StringField, {
-        page: { size: 10, number: 2 },
-        sort: '-id',
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 10
-      assert count = 30
-      assert records.first.id == 20
-      assert records.last.id == 11
-    end
-
-    test 'StringField sort by field' do
-      getter = ResourcesGetter.new(StringField, {
-        page: { size: 10, number: 1 },
-        sort: '-field',
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 10
-      assert count = 30
-      assert records.map(&:field) == ['Test 9', 'Test 8', 'Test 7', 'Test 6',
-                                      'Test 5', 'Test 4', 'Test 30', 'Test 3',
-                                      'Test 29', 'Test 28']
-    end
-
-    test 'Sort by a belongs_to association' do
-      getter = ResourcesGetter.new(BelongsToField, {
-        page: { size: 10, number: 1 },
-        sort: 'has_one_field.id',
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 10
-      assert count = 30
-      assert records.first.has_one_field_id == 1
-      assert records.last.has_one_field_id == 10
-    end
-
-    test 'Sort by a has_one association' do
-      getter = ResourcesGetter.new(HasOneField, {
-        page: { size: 10, number: 1 },
-        sort: '-belongs_to_field.id',
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 10
-      assert count = 30
-      assert records.first.belongs_to_field.id == 30
-      assert records.last.belongs_to_field.id == 21
-    end
-
-    test 'Filter on ambiguous field' do
-      getter = ResourcesGetter.new(Tree, {
-        fields: { 'Tree' => 'id' },
-        page: { size: 10, number: 1 },
-        filters: {
-          aggregator: 'and',
-          conditions: [{
-            field: 'created_at',
-            operator: 'after',
-            value: "#{Time.now.year - 5}-06-18 08:00:00",
-          }, {
-            field: 'owner:name',
-            operator: 'equal',
-            value: 'Arnaud Besnier'
-          }]
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 1
-      assert count = 1
-      assert records.first.id == 4
-      assert records.first.name == 'Oak'
-      assert records.first.owner.name == 'Arnaud Besnier'
-    end
-
-    test 'Filter before x hours' do
-      getter = ResourcesGetter.new(Tree, {
-        fields: { 'Tree' => 'id' },
-        page: { size: 10, number: 1 },
-        filters: {
-          field: 'created_at',
-          operator: 'before_x_hours_ago',
-          value: 3
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 5
-      assert count = 5
-      assert records.first.id == 4
-      assert records.first.name == 'Oak'
-      assert records.first.owner.name == 'Arnaud Besnier'
-    end
-
-    test 'Filter after x hours' do
-      getter = ResourcesGetter.new(Tree, {
-        fields: { 'Tree' => 'id' },
-        page: { size: 10, number: 1 },
-        filters: {
-          field: 'created_at',
-          operator: 'after_x_hours_ago',
-          value: 3
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 3
-      assert count = 3
-    end
-
-    test 'Sort on an ambiguous field name with a filter' do
-      getter = ResourcesGetter.new(Tree, {
-        fields: { 'Tree' => 'id' },
-        page: { size: 10, number: 1 },
-        sort: '-name',
-        filters: {
-          field: 'owner:name',
-          operator: 'equal',
-          value: 'Arnaud Besnier'
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 3
-      assert count = 3
-      assert records.first.name == 'Oak'
-      assert records.last.name == 'Mapple'
-    end
-
-    test 'Filter on an updated_at field of the main collection' do
-      getter = ResourcesGetter.new(Owner, {
-        page: { size: 10, number: 1 },
-        filters: {
-          field: 'updated_at',
-          operator: 'previous_year'
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 1
-      assert count = 1
-      assert records.first.id == 3
-    end
-
-    test 'Filter on an updated_at field of an associated collection' do
-      getter = ResourcesGetter.new(Tree, {
-        fields: { 'Tree' => 'id' },
-        page: { size: 10, number: 1 },
-        filters: {
-          field: 'owner:updated_at',
-          operator: 'previous_year'
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 2
-      assert count = 2
-      assert records.first.id == 6
-    end
-
-    test 'Filter equal on an updated_at field of an associated collection' do
-      getter = ResourcesGetter.new(Tree, {
-        fields: { 'Tree' => 'id' },
-        page: { size: 10, number: 1 },
-        filters: {
-          field: 'owner:updated_at',
-          operator: 'equal',
-          value: 'Sat Jul 02 2016 11:52:00 GMT-0400 (EDT)',
-        }.to_json,
-        timezone: 'America/Nome'
-      })
-      getter.perform
-      records = getter.records
-      count = getter.count
-
-      assert records.count == 0
-      assert count = 0
-    end
-
-    test 'Filter on a field of an associated collection that does not exist' do
-      exception = assert_raises(ForestLiana::Errors::HTTP422Error) {
-        ForestLiana::ResourcesGetter.new(Tree, {
-          fields: { 'Tree' => 'id'},
-          searchExtended: '0',
-          timezone: 'Europe/Paris',
-          filters: {
-            field: 'leaf:id',
-            operator: 'equal',
-            value: 1
-          }.to_json,
-          collection: 'Tree'
-        })
-      }
-      assert_equal("Association 'leaf' not found", exception.message)
-    end
-
-    test 'Filter on a field that does not exists' do
-      exception = assert_raises(ForestLiana::Errors::HTTP422Error) {
-        ForestLiana::ResourcesGetter.new(Tree, {
-          fields: { 'Tree' => 'id'},
-          searchExtended: '0',
-          timezone: 'Europe/Paris',
-          filters: {
-            field: 'content',
-            operator: 'contains',
-            value: 'c'
-          }.to_json,
-          collection: 'Article'
-        })
-      }
-
-      assert_equal("Field 'content' not found", exception.message)
-    end
-
-  end
-end