forest_liana 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dac4da1a71a663bfdd2f36870f8e5ccbc150b03
-  data.tar.gz: ffc0af068f5056eaa86920ca86dcdc3097509d85
+  metadata.gz: bdc8fcb5df5a924d7903d9105b26b30810ef6a52
+  data.tar.gz: cd688dccec28feaf5a66f0ea47b7c0bed89ee051
 SHA512:
-  metadata.gz: 06f4028b47406055fec5ff180cc966fafdef44b8b3dfbc1e756cf85a716647852e85db519480582d20d919ca98029d607b67de7acd2bfa7bbb9866bb565e9cb5
-  data.tar.gz: ea027353665909b1c751896a84ccd0e96db8e0b97c4d5cf35a21c5f9bfe775adc3deb0c879a0e8d909e9912e32543acbe523c25d01a58d19ff271a740a0401c0
+  metadata.gz: 0ea7d3bb580c5cee0a84f80aff39d3d1c44d65c4ecdc2b694f0531e36c3edc1e12e0591b5a2c64838e04081675fcc09672a56323dc026a43ebcde19f7f5b3ddc
+  data.tar.gz: 0832ca416bd830169ea4bb3926fa839a0b245d4e8ea0c1d13732b4cbe9cd794c8dad561ad2ac6bb12496eeb209637f91e12759559830b424c229a22592e81534

data/app/controllers/forest_liana/sessions_controller.rb

@@ -2,6 +2,7 @@ module ForestLiana
   class SessionsController < ActionController::Base
 
     def create
+      @error_message = nil
       @user_class = ForestLiana.user_class_name.constantize rescue nil
 
       user = check_user
@@ -10,7 +11,10 @@ module ForestLiana
       if token
         render json: { token: token }, serializer: nil
       else
-        if !has_internal_authentication? && ForestLiana.allowed_users.empty?
+        if @error_message
+          render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
+            [{ detail: @error_message }]), status: :unauthorized
+        elsif !has_internal_authentication? && ForestLiana.allowed_users.empty?
           render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
             [{ detail: 'Forest cannot retrieve any users for the project ' \
               'you\'re trying to unlock.' }]), status: :unauthorized
@@ -51,27 +55,35 @@ module ForestLiana
     end
 
     def encode_token(user)
-      JWT.encode({
-        exp: Time.now.to_i + 2.weeks.to_i,
-        data: {
-          id: user['id'],
-          type: 'users',
+      if ForestLiana.auth_key.nil?
+        @error_message = "Your Forest auth key seems to be missing. Can " \
+          "you check that you properly set a Forest auth key in the " \
+          "forest_liana initializer?"
+        FOREST_LOGGER.error @error_message
+        nil
+      else
+        JWT.encode({
+          exp: Time.now.to_i + 2.weeks.to_i,
           data: {
-            email: user['email'],
-            first_name: user['first_name'],
-            last_name: user['last_name'],
-            teams: user['teams']
-          },
-          relationships: {
-            renderings: {
-              data: [{
-                type: 'renderings',
-                id: params['renderingId']
-              }]
+            id: user['id'],
+            type: 'users',
+            data: {
+              email: user['email'],
+              first_name: user['first_name'],
+              last_name: user['last_name'],
+              teams: user['teams']
+            },
+            relationships: {
+              renderings: {
+                data: [{
+                  type: 'renderings',
+                  id: params['renderingId']
+                }]
+              }
             }
           }
-        }
-      } , ForestLiana.auth_key, 'HS256')
+        }, ForestLiana.auth_key, 'HS256')
+      end
     end
   end
 end

data/app/services/forest_liana/line_stat_getter.rb

@@ -3,8 +3,25 @@ module ForestLiana
     attr_accessor :record
 
     def initialize(resource, params)
+      @timezone_offset = params[:timezone].to_i
       super(resource, params)
-      @populates = {}
+    end
+
+    def client_timezone
+      ActiveSupport::TimeZone[@timezone_offset].name
+    end
+
+    def get_format
+      case @params[:time_range].try(:downcase)
+        when 'day'
+          '%d/%m/%Y'
+        when 'week'
+          'W%W-%Y'
+        when 'month'
+          '%b %Y'
+        when 'year'
+          '%Y'
+      end
     end
 
     def perform
@@ -16,34 +33,17 @@ module ForestLiana
 
         @params[:filters].try(:each) do |filter|
           operator, filter_value = OperatorValueParser.parse(filter[:value])
-          conditions <<  OperatorValueParser.get_condition(filter[:field],
-            operator, filter_value, @resource)
+          conditions << OperatorValueParser.get_condition(filter[:field],
+            operator, filter_value, @resource, @params[:timezone])
         end
 
         value = value.where(conditions.join(filter_operator))
       end
 
-      value = value.send(time_range, group_by_date_field)
-      value = value.group(group_by_field || :id) if group_by_field
-
+      value = value.send(time_range, group_by_date_field, { time_zone: client_timezone })
       value = value.send(@params[:aggregate].downcase, @params[:aggregate_field])
         .map do |k, v|
-          if k.kind_of?(Array)
-            {
-              label: k[0],
-              values: {
-                key: populate(k[1]),
-                value: v
-              }
-            }
-          else
-            {
-              label: k,
-              values: {
-                value: v
-              }
-            }
-          end
+          { label: k.strftime(get_format), values: { value: v }}
         end
 
       @record = Model::Stat.new(value: value)
@@ -55,30 +55,6 @@ module ForestLiana
       "#{@resource.table_name}.#{@params[:group_by_date_field]}"
     end
 
-    def group_by_field
-      field_name = @params[:group_by_field]
-      association = @resource.reflect_on_association(field_name) if field_name
-
-      if association
-        association.foreign_key
-      else
-        field_name
-      end
-    end
-
-    def populate(id)
-      @populates[id] ||= begin
-        field_name = @params[:group_by_field]
-        association = @resource.reflect_on_association(field_name)
-
-        if association
-          association.klass.find(id)
-        else
-          id
-        end
-      end
-    end
-
     def time_range
       "group_by_#{@params[:time_range].try(:downcase) || 'month'}"
     end

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -21,8 +21,9 @@ module ForestLiana
     PERIODS_PREVIOUS_X_DAYS = /^\$previous(\d+)Days$/;
     PERIODS_X_DAYS_TO_DATE = /^\$(\d+)DaysToDate$/;
 
-    def initialize(value)
+    def initialize(value, timezone)
       @value = value
+      @timezone_offset = timezone.to_i
     end
 
     def is_interval_date_value
@@ -55,6 +56,11 @@ module ForestLiana
       false
     end
 
+    def to_client_timezone(date)
+      # NOTICE: By default, Rails store the dates without timestamp in the database.
+      date - @timezone_offset.hours
+    end
+
     def get_interval_date_filter
       return nil unless is_interval_date_value()
 
@@ -62,20 +68,22 @@ module ForestLiana
       return "<= '#{Time.now}'" if @value == PERIODS_PAST
 
       if @value == PERIODS_TODAY
-        return "BETWEEN '#{Time.now.beginning_of_day}' AND " +
-          "'#{Time.now.end_of_day}'"
+        return "BETWEEN '#{to_client_timezone(Time.now.beginning_of_day)}' " +
+          "AND '#{to_client_timezone(Time.now.end_of_day)}'"
       end
 
       match = PERIODS_PREVIOUS_X_DAYS.match(@value)
       if match && match[1]
-        return "BETWEEN '#{Integer(match[1]).day.ago.beginning_of_day}'" +
-          " AND '#{1.day.ago.end_of_day}'"
+        return "BETWEEN '" +
+          "#{to_client_timezone(Integer(match[1]).day.ago.beginning_of_day)}'" +
+          " AND '#{to_client_timezone(1.day.ago.end_of_day)}'"
       end
 
       match = PERIODS_X_DAYS_TO_DATE.match(@value)
       if match && match[1]
-        return "BETWEEN '#{(Integer(match[1]) - 1).day.ago.beginning_of_day}'" +
-          " AND '#{Time.now}'"
+        return "BETWEEN '" +
+          "#{to_client_timezone((Integer(match[1]) - 1).day.ago.beginning_of_day)}'" +
+          " AND '#{to_client_timezone(Time.now)}'"
       end
 
       duration = PERIODS[@value.to_sym][:duration]
@@ -85,11 +93,13 @@ module ForestLiana
       to_date = PERIODS[@value.to_sym][:to_date]
 
       if to_date
-        from = Time.now.send("beginning_of_#{period_of_time}")
-        to = Time.now
+        from = to_client_timezone(Time.now.send("beginning_of_#{period_of_time}"))
+        to = to_client_timezone(Time.now)
       else
-        from = duration.send(period).ago.send("beginning_of_#{period_of_time}")
-        to = 1.send(period).ago.send("end_of_#{period_of_time}")
+        from = to_client_timezone(duration.send(period).ago
+          .send("beginning_of_#{period_of_time}"))
+        to = to_client_timezone(1.send(period).ago
+          .send("end_of_#{period_of_time}"))
       end
       "BETWEEN '#{from}' AND '#{to}'"
     end
@@ -98,20 +108,22 @@ module ForestLiana
       return nil unless has_previous_interval()
 
       if @value == PERIODS_TODAY
-        return "BETWEEN '#{1.day.ago.beginning_of_day}' AND " +
-          "'#{1.day.ago.end_of_day}'"
+        return "BETWEEN '#{to_client_timezone(1.day.ago.beginning_of_day)}' AND " +
+          "'#{to_client_timezone(1.day.ago.end_of_day)}'"
       end
 
       match = PERIODS_PREVIOUS_X_DAYS.match(@value)
       if match && match[1]
-        return "BETWEEN '#{(Integer(match[1]) * 2).day.ago.beginning_of_day}'" +
-          " AND '#{(Integer(match[1]) + 1).day.ago.end_of_day}'"
+        return "BETWEEN '" +
+          "#{to_client_timezone((Integer(match[1]) * 2).day.ago.beginning_of_day)}'" +
+          " AND '#{to_client_timezone((Integer(match[1]) + 1).day.ago.end_of_day)}'"
       end
 
       match = PERIODS_X_DAYS_TO_DATE.match(@value)
       if match && match[1]
-        return "BETWEEN '#{((Integer(match[1]) * 2) - 1).day.ago.beginning_of_day}'" +
-          " AND '#{Integer(match[1]).day.ago}'"
+        return "BETWEEN '" +
+          "#{to_client_timezone(((Integer(match[1]) * 2) - 1).day.ago.beginning_of_day)}'" +
+          " AND '#{to_client_timezone(Integer(match[1]).day.ago)}'"
       end
 
       duration = PERIODS[@value.to_sym][:duration]
@@ -121,13 +133,14 @@ module ForestLiana
       to_date = PERIODS[@value.to_sym][:to_date]
 
       if to_date
-        from = (duration).send(period).ago
-                 .send("beginning_of_#{period_of_time}")
-        to = (duration).send(period).ago
+        from = to_client_timezone((duration).send(period).ago
+                 .send("beginning_of_#{period_of_time}"))
+        to = to_client_timezone((duration).send(period).ago)
       else
-        from = (duration * 2).send(period).ago
-                 .send("beginning_of_#{period_of_time}")
-        to = (1 + duration).send(period).ago.send("end_of_#{period_of_time}")
+        from = to_client_timezone((duration * 2).send(period).ago
+                 .send("beginning_of_#{period_of_time}"))
+        to = to_client_timezone((1 + duration).send(period).ago
+              .send("end_of_#{period_of_time}"))
       end
       "BETWEEN '#{from}' AND '#{to}'"
     end

data/app/services/forest_liana/operator_value_parser.rb

@@ -31,10 +31,12 @@ module ForestLiana
       [operator, value_comparison]
     end
 
-    def self.get_condition(field, operator, value, resource)
+    def self.get_condition(field, operator, value, resource, timezone)
       field_name = self.get_field_name(field, resource)
 
-      operator_date_interval_parser = OperatorDateIntervalParser.new(value)
+      operator_date_interval_parser = OperatorDateIntervalParser
+        .new(value, timezone)
+
       if operator_date_interval_parser.is_interval_date_value()
         filter = operator_date_interval_parser.get_interval_date_filter()
         "#{field_name} #{filter}"

data/app/services/forest_liana/pie_stat_getter.rb

@@ -4,6 +4,7 @@ module ForestLiana
 
     def perform
       if @params[:group_by_field]
+        timezone_offset = @params[:timezone].to_i
         value = @resource
         conditions = []
         filter_operator = ''
@@ -14,7 +15,7 @@ module ForestLiana
           @params[:filters].try(:each) do |filter|
             operator, filter_value = OperatorValueParser.parse(filter[:value])
             conditions <<  OperatorValueParser.get_condition(filter[:field],
-              operator, filter_value, @resource)
+              operator, filter_value, @resource, @params[:timezone])
           end
         end
 
@@ -30,6 +31,8 @@ module ForestLiana
             if @resource.respond_to?(:defined_enums) &&
                @resource.defined_enums.has_key?(@params[:group_by_field])
               key = @resource.defined_enums[@params[:group_by_field]].invert[key]
+            elsif @resource.columns_hash[@params[:group_by_field]].type == :datetime
+              key = (key + timezone_offset.hours).strftime('%d/%m/%Y %T')
             end
 
             { key: key, value: value }

data/app/services/forest_liana/search_query_builder.rb

@@ -79,7 +79,7 @@ module ForestLiana
           values.split(',').each do |value|
             operator, value = OperatorValueParser.parse(value)
             conditions << OperatorValueParser.get_condition(field, operator,
-              value, @resource)
+              value, @resource, @params[:timezone])
           end
         end
 
@@ -171,7 +171,8 @@ module ForestLiana
       @records = @records
         .joins(field.to_sym)
 
-      operator_date_interval_parser = OperatorDateIntervalParser.new(value)
+      operator_date_interval_parser = OperatorDateIntervalParser.new(value,
+        @params[:timezone])
       if operator_date_interval_parser.is_interval_date_value()
         filter = operator_date_interval_parser.get_interval_date_filter()
         @records = @records.where("#{association.table_name}.#{subfield} #{filter}")

data/app/services/forest_liana/value_stat_getter.rb

@@ -15,7 +15,7 @@ module ForestLiana
         @params[:filters].try(:each) do |filter|
           operator, filter_value = OperatorValueParser.parse(filter[:value])
           conditions << OperatorValueParser.get_condition(filter[:field],
-            operator, filter_value, @resource)
+            operator, filter_value, @resource, @params[:timezone])
         end
 
         valueCurrent = valueCurrent.where(conditions.join(filter_operator))
@@ -26,7 +26,8 @@ module ForestLiana
           conditions = []
           @params[:filters].try(:each) do |filter|
             operator, filter_value = OperatorValueParser.parse(filter[:value])
-            operator_date_interval_parser = OperatorDateIntervalParser.new(filter_value)
+            operator_date_interval_parser = OperatorDateIntervalParser
+              .new(filter_value, @params[:timezone])
             if operator_date_interval_parser.has_previous_interval()
               field_name = OperatorValueParser.get_field_name(filter[:field], @resource)
               filter = operator_date_interval_parser
@@ -35,7 +36,7 @@ module ForestLiana
               filter_date_interval = true
             else
               conditions << OperatorValueParser.get_condition(filter[:field],
-                operator, filter_value, @resource)
+                operator, filter_value, @resource, @params[:timezone])
             end
           end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

data/test/services/forest_liana/resources_getter_test.rb

@@ -4,7 +4,8 @@ module ForestLiana
     test 'StringField page 1 size 15' do
       getter = ResourcesGetter.new(StringField, {
         page: { size: 15, number: 1 },
-        sort: '-id'
+        sort: '-id',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -19,7 +20,8 @@ module ForestLiana
     test 'StringField page 2 size 10' do
       getter = ResourcesGetter.new(StringField, {
         page: { size: 10, number: 2 },
-        sort: '-id'
+        sort: '-id',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -34,7 +36,8 @@ module ForestLiana
     test 'StringField sort by field' do
       getter = ResourcesGetter.new(StringField, {
         page: { size: 10, number: 1 },
-        sort: '-field'
+        sort: '-field',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -50,7 +53,8 @@ module ForestLiana
     test 'Sort by a belongs_to association' do
       getter = ResourcesGetter.new(BelongsToField, {
         page: { size: 10, number: 1 },
-        sort: 'has_one_field.id'
+        sort: 'has_one_field.id',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -65,7 +69,8 @@ module ForestLiana
     test 'Sort by a has_one association' do
       getter = ResourcesGetter.new(HasOneField, {
         page: { size: 10, number: 1 },
-        sort: '-belongs_to_field.id'
+        sort: '-belongs_to_field.id',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -84,7 +89,8 @@ module ForestLiana
           'created_at' => '>2015-06-18 08:00:00',
           'owner:name' => 'Arnaud Besnier'
         },
-        filterType: 'and'
+        filterType: 'and',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -101,7 +107,8 @@ module ForestLiana
       getter = ResourcesGetter.new(Tree, {
         page: { size: 10, number: 1 },
         sort: '-name',
-        filter: { 'owner:name' => 'Arnaud Besnier' }
+        filter: { 'owner:name' => 'Arnaud Besnier' },
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -117,7 +124,8 @@ module ForestLiana
       getter = ResourcesGetter.new(Owner, {
         page: { size: 10, number: 1 },
         filter: { 'updated_at' => '$previousYear' },
-        filterType: 'and'
+        filterType: 'and',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -132,7 +140,8 @@ module ForestLiana
       getter = ResourcesGetter.new(Tree, {
         page: { size: 10, number: 1 },
         filter: { 'owner:updated_at' => '$previousYear' },
-        filterType: 'and'
+        filterType: 'and',
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records
@@ -148,7 +157,8 @@ module ForestLiana
         page: { size: 10, number: 1 },
         filter: {
           'owner:updated_at' => 'Sat Jul 02 2016 11:52:00 GMT-0400 (EDT)',
-        }
+        },
+        timezone: '-08:00'
       })
       getter.perform
       records = getter.records

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails