forest_liana 6.3.3 → 6.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84424699c2834facc9807360cdefbc7de4bf5e473d5d8976fc257c70a5878695
-  data.tar.gz: f96a6c6e6ba27fcd42a67ffacd1ddde1133b9980eec177c969494484d2708072
+  metadata.gz: 0d8c0675fe5c776a7168baf4e5375ead76bd8319b75c29c620e6888bbd9bfaec
+  data.tar.gz: 5d20db5792e2b1a637545cfe4a024df625db72004671fb47fa3eb15c68801736
 SHA512:
-  metadata.gz: 8f509cc0cfed575e60c0b68e11cd44a6bb59c86dfd7bd5e40d14f87f9e2400b4ed7fccafc107e2eea1dbe474f564f9a48d76d84331ca5c9727adae7439176dda
-  data.tar.gz: ffdba30b4b5252116c020b42fde6d439baf910d5bcd572c73d5e6bd6c48a6fd39c9803df2300ad0617e61beb4e33bd0edd5c8286eae0a51e348226d187e04be5
+  metadata.gz: 8de8c18b1b18b60f8d7096734e16a187a4e0d87cd9d5e00ef6fa70e7a8efb042bcbc08c084c33102c810c11da56402a8f77f554e4bbfbe4e9de60e3b3b90fdcf
+  data.tar.gz: 9959a3a3a53996d7cfcf638f82c24b93a471a01cb6f7eb75e20c459711235e68ea3077c9d44a0d606f5e4a396a5739649945d26d617d1e16da58234e6e03454f

data/app/services/forest_liana/line_stat_getter.rb

@@ -3,6 +3,9 @@ module ForestLiana
     attr_accessor :record
 
     def client_timezone
+      # As stated here https://github.com/ankane/groupdate#for-sqlite
+      # groupdate does not handle timezone for SQLite
+      return nil if 'SQLite' == ActiveRecord::Base.connection.adapter_name
       @params[:timezone]
     end
 
@@ -26,9 +29,10 @@ module ForestLiana
         value = FiltersParser.new(@params[:filters], value, @params[:timezone]).apply_filters
       end
 
+      Groupdate.week_start = :monday
+
       value = value.send(time_range, group_by_date_field, {
-        time_zone: client_timezone,
-        week_start: :mon
+        time_zone: client_timezone
       })
 
       value = value.send(@params[:aggregate].downcase, @params[:aggregate_field])

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "6.3.3"
+  VERSION = "6.3.4"
 end

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

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

data/spec/dummy/db/migrate/20210511141752_create_owners.rb

@@ -0,0 +1,8 @@
+class CreateOwners < ActiveRecord::Migration[6.0]
+  def change
+    create_table :owners do |t|
+      t.string :name
+      t.datetime :hired_at
+    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: 2021_03_26_140855) do
+ActiveRecord::Schema.define(version: 2021_05_11_141752) do
 
   create_table "isle", force: :cascade do |t|
     t.string "name"
@@ -27,6 +27,11 @@ ActiveRecord::Schema.define(version: 2021_03_26_140855) do
     t.index ["island_id"], name: "index_locations_on_island_id"
   end
 
+  create_table "owners", force: :cascade do |t|
+    t.string "name"
+    t.datetime "hired_at"
+  end
+
   create_table "references", force: :cascade do |t|
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false

data/spec/services/forest_liana/line_stat_getter_spec.rb

@@ -0,0 +1,50 @@
+module ForestLiana
+  describe LineStatGetter do
+    describe 'Check client_timezone function' do
+      describe 'with a SQLite database' do
+        it 'should return nil' do
+          expect(LineStatGetter.new(Owner, {
+            timezone: "Europe/Paris",
+            aggregate: "Count",
+          }).client_timezone).to eq(nil)
+        end
+      end
+
+      describe 'with a non-SQLite database' do
+        it 'should return the timezone' do
+          ActiveRecord::Base.connection.stub(:adapter_name) { 'NotSQLite' }
+          expect(LineStatGetter.new(Owner, {
+            timezone: "Europe/Paris",
+            aggregate: "Count",
+          }).client_timezone).to eq('Europe/Paris')
+        end
+      end
+    end
+
+    describe 'Check perform function' do
+      describe 'Using a Count aggregation' do
+        describe 'Using a Week time range' do
+          it 'should return consistent data based on monday as week_start ' do
+            
+            # Week should start on monday
+            # 08-05-2021 was a Saturday
+            Owner.create(name: 'Michel', hired_at: Date.parse('08-05-2021'));
+            Owner.create(name: 'Robert', hired_at: Date.parse('09-05-2021'));
+            Owner.create(name: 'José', hired_at: Date.parse('10-05-2021'));
+            Owner.create(name: 'Yves', hired_at: Date.parse('11-05-2021'));
+
+            stat = LineStatGetter.new(Owner, {
+              timezone: "Europe/Paris",
+              aggregate: "Count",
+              time_range: "Week",
+              group_by_date_field: "hired_at",
+            }).perform
+            
+            expect(stat.value.find { |item| item[:label] == "W18-2021" }[:values][:value]).to eq(2)
+            expect(stat.value.find { |item| item[:label] == "W19-2021" }[:values][:value]).to eq(2)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 6.3.3
+  version: 6.3.4
 platform: ruby
 authors:
 - Sandro Munda
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: groupdate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: useragent
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +326,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/island.rb
 - spec/dummy/app/models/location.rb
+- spec/dummy/app/models/owner.rb
 - spec/dummy/app/models/reference.rb
 - spec/dummy/app/models/tree.rb
 - spec/dummy/app/models/user.rb
@@ -360,6 +361,7 @@ files:
 - 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/migrate/20210511141752_create_owners.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/forest_liana/collections/location.rb
 - spec/dummy/lib/forest_liana/collections/user.rb
@@ -374,6 +376,7 @@ files:
 - spec/services/forest_liana/apimap_sorter_spec.rb
 - spec/services/forest_liana/filters_parser_spec.rb
 - spec/services/forest_liana/ip_whitelist_checker_spec.rb
+- spec/services/forest_liana/line_stat_getter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
 - spec/services/forest_liana/permissions_checker_live_queries_spec.rb
@@ -478,7 +481,7 @@ homepage: https://github.com/ForestAdmin/forest-rails
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -494,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Official Rails Liana for Forest
 test_files:
@@ -604,6 +607,7 @@ test_files:
 - spec/services/forest_liana/permissions_formatter_spec.rb
 - spec/services/forest_liana/permissions_checker_live_queries_spec.rb
 - spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/line_stat_getter_spec.rb
 - spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
 - spec/requests/actions_controller_spec.rb
 - spec/requests/stats_spec.rb
@@ -620,6 +624,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/models/owner.rb
 - spec/dummy/app/models/island.rb
 - spec/dummy/app/models/location.rb
 - spec/dummy/app/models/tree.rb
@@ -627,6 +632,7 @@ test_files:
 - spec/dummy/app/config/routes.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20210511141752_create_owners.rb
 - spec/dummy/db/migrate/20190226174951_create_tree.rb
 - spec/dummy/db/migrate/20210326140855_create_locations.rb
 - spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb