forest_liana 1.3.10 → 1.3.11

data/test/fixtures/owner.yml

@@ -0,0 +1,17 @@
+owner_1:
+  id: 1
+  name: Sandro Munda
+  created_at: 2015-05-30 09:00:00
+  updated_at: 2016-06-27 20:00:00
+
+owner_2:
+  id: 2
+  name: Arnaud Besnier
+  created_at: 2016-05-02 09:00:00
+  updated_at: 2016-06-28 08:00:00
+
+owner_3:
+  id: 3
+  name: John Doe
+  created_at: 2014-05-02 09:00:00
+  updated_at: 2015-06-28 08:00:00

data/test/fixtures/tree.yml

@@ -0,0 +1,34 @@
+tree_1:
+  id: 1
+  name: Oak
+  owner_id: 1
+  created_at: 2010-02-11 11:00:00
+  updated_at: 2010-02-11 11:00:00
+
+tree_2:
+  id: 2
+  name: Mapple
+  owner_id: 2
+  created_at: 2010-02-15 21:00:00
+  updated_at: 2010-02-15 21:00:00
+
+tree_3:
+  id: 3
+  name: Mapple
+  owner_id: 2
+  created_at: 2012-04-11 12:00:00
+  updated_at: 2012-04-11 12:00:00
+
+tree_4:
+  id: 4
+  name: Oak
+  owner_id: 2
+  created_at: 2015-06-18 09:00:00
+  updated_at: 2015-06-18 09:00:00
+
+tree_5:
+  id: 5
+  name: Oak
+  owner_id: 3
+  created_at: 2014-06-18 09:00:00
+  updated_at: 2014-06-18 09:00:00

data/test/services/forest_liana/resources_getter_test.rb

@@ -74,5 +74,72 @@ module ForestLiana
       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, {
+        page: { size: 10, number: 1 },
+        filter: {
+          'created_at' => '>2015-06-18 08:00:00',
+          'owner:name' => 'Arnaud Besnier'
+        }
+      })
+      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 'Sort on an ambiguous field name with a filter' do
+      getter = ResourcesGetter.new(Tree, {
+        page: { size: 10, number: 1 },
+        sort: '-name',
+        filter: { 'owner:name' => 'Arnaud Besnier' }
+      })
+      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 },
+        filter: {
+          'updated_at' => '<lastYear',
+        }
+      })
+      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, {
+        page: { size: 10, number: 1 },
+        filter: {
+          'owner:updated_at' => '<lastYear',
+        }
+      })
+      getter.perform
+      records = getter.records
+      count = getter.count
+
+      assert records.count == 1
+      assert count = 1
+      assert records.first.id == 5
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,8 +209,10 @@ files:
 - test/dummy/app/models/has_many_through_field.rb
 - test/dummy/app/models/has_one_field.rb
 - test/dummy/app/models/integer_field.rb
+- test/dummy/app/models/owner.rb
 - test/dummy/app/models/polymorphic_field.rb
 - test/dummy/app/models/string_field.rb
+- test/dummy/app/models/tree.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -249,6 +251,9 @@ files:
 - test/dummy/db/migrate/20150616150629_create_polymorphic_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/20160627172810_create_owner.rb
+- test/dummy/db/migrate/20160627172951_create_tree.rb
+- test/dummy/db/migrate/20160628173505_add_timestamps.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -261,7 +266,9 @@ files:
 - test/fixtures/has_many_field.yml
 - test/fixtures/has_many_through_field.yml
 - test/fixtures/has_one_field.yml
+- test/fixtures/owner.yml
 - test/fixtures/string_field.yml
+- test/fixtures/tree.yml
 - test/forest_liana_test.rb
 - test/integration/navigation_test.rb
 - test/services/forest_liana/resources_getter_test.rb
@@ -308,8 +315,10 @@ test_files:
 - test/dummy/app/models/has_many_through_field.rb
 - test/dummy/app/models/has_one_field.rb
 - test/dummy/app/models/integer_field.rb
+- test/dummy/app/models/owner.rb
 - test/dummy/app/models/polymorphic_field.rb
 - test/dummy/app/models/string_field.rb
+- test/dummy/app/models/tree.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -348,6 +357,9 @@ test_files:
 - test/dummy/db/migrate/20150616150629_create_polymorphic_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/20160627172810_create_owner.rb
+- test/dummy/db/migrate/20160627172951_create_tree.rb
+- test/dummy/db/migrate/20160628173505_add_timestamps.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -362,7 +374,9 @@ test_files:
 - test/fixtures/has_many_field.yml
 - test/fixtures/has_many_through_field.yml
 - test/fixtures/has_one_field.yml
+- test/fixtures/owner.yml
 - test/fixtures/string_field.yml
+- test/fixtures/tree.yml
 - test/forest_liana_test.rb
 - test/integration/navigation_test.rb
 - test/services/forest_liana/resources_getter_test.rb