forest_liana 1.3.47 → 1.3.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf1799aa5b9009bfbc98c0b1f2169669d3b024d
-  data.tar.gz: 314d7aa632676a29799151c09f2d2f45c72ef870
+  metadata.gz: 6db1641f295cb1be97c63a55623100e571c14b6d
+  data.tar.gz: b2be28e7ba9d66e0dafd86f47cb8ca6826f438ad
 SHA512:
-  metadata.gz: cfb47fb895b9fe499d049a29b354b977a535924c7824a207b4aa105519a48388a34a7cc8db29b37aa18dab5d75e7adb91af094d1b105fd331c7d1d8d858e555f
-  data.tar.gz: 0f70bdbb88da79898579476341bf7ea7e9903ba9cdb649bd13738287ca58df6f398df72c79950eb59e8a476a8a8181192b7504f9e63c7a8e908dd7d1388efdce
+  metadata.gz: 2966c778d6a512d84cd9b3d23edc6a9fc18eca9ea1724509e2c44a1e2a30ca9f6e01ebcf969d9b0e4e45c50b1eaa58b6f3d146891b9d48aecc06762cba6598c2
+  data.tar.gz: 2ae9b44ba753511a8c3a14c9c8ebf101975a1ed3a011368e5b45240344c22f9b18ebf826523cd563ababa5b5382005532ed4a50e846396a33586fd70ec0f3d67

data/app/controllers/forest_liana/application_controller.rb

@@ -2,7 +2,12 @@ require 'jwt'
 
 module ForestLiana
   class ApplicationController < ActionController::Base
-    before_filter :authenticate_user_from_jwt
+    if Rails::VERSION::MAJOR < 4
+      before_filter :authenticate_user_from_jwt
+    else
+      before_action :authenticate_user_from_jwt
+    end
+
     wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 
 

data/app/controllers/forest_liana/associations_controller.rb

@@ -1,8 +1,12 @@
 module ForestLiana
   class AssociationsController < ForestLiana::ApplicationController
-
-    before_filter :find_resource
-    before_filter :find_association
+    if Rails::VERSION::MAJOR < 4
+      before_filter :find_resource
+      before_filter :find_association
+    else
+      before_action :find_resource
+      before_action :find_association
+    end
 
     def index
       getter = HasManyGetter.new(@resource, @association, params)

data/app/controllers/forest_liana/resources_controller.rb

@@ -5,7 +5,11 @@ module ForestLiana
     rescue NameError
     end
 
-    before_filter :find_resource
+    if Rails::VERSION::MAJOR < 4
+      before_filter :find_resource
+    else
+      before_action :find_resource
+    end
 
     def index
       getter = ResourcesGetter.new(@resource, params)

data/app/controllers/forest_liana/sessions_controller.rb

@@ -20,9 +20,20 @@ module ForestLiana
     end
 
     def check_user
-      ForestLiana.allowed_users.find do |allowed_user|
-        allowed_user['email'] == params['email'] &&
-          BCrypt::Password.new(allowed_user['password']) == params['password']
+      # NOTICE: Use the ForestUser table for authentication.
+      if defined? ForestUser
+        user = ForestUser.find_by(email: params['email'])
+        return nil if user.blank?
+
+        if BCrypt::Password.new(user['password_hash']) == params['password']
+          user
+        end
+      # NOTICE: Query Forest server for authentication.
+      else
+        ForestLiana.allowed_users.find do |allowed_user|
+          allowed_user['email'] == params['email'] &&
+            BCrypt::Password.new(allowed_user['password']) == params['password']
+        end
       end
     end
 

data/app/controllers/forest_liana/stats_controller.rb

@@ -1,6 +1,10 @@
 module ForestLiana
   class StatsController < ForestLiana::ApplicationController
-    before_filter :find_resource
+    if Rails::VERSION::MAJOR < 4
+      before_action :find_resource
+    else
+      before_action :find_resource
+    end
 
     def show
       case params[:type].try(:downcase)

data/app/models/forest_liana/model/action.rb

@@ -4,7 +4,7 @@ class ForestLiana::Model::Action
   include ActiveModel::Serialization
   extend ActiveModel::Naming
 
-  attr_accessor :name, :endpoint, :http_method, :fields, :redirect
+  attr_accessor :id, :name, :endpoint, :http_method, :fields, :redirect
 
   def initialize(attributes = {})
     attributes.each do |name, value|
@@ -15,8 +15,4 @@ class ForestLiana::Model::Action
   def persisted?
     false
   end
-
-  def id
-    name
-  end
 end

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -1,17 +1,35 @@
 module ForestLiana
   class OperatorDateIntervalParser
     PERIODS = {
-      yesterday: { duration: 1, period: 'day' },
-      lastWeek: { duration: 1, period: 'week' },
-      last2Weeks: { duration: 2, period: 'week' },
-      lastMonth: { duration: 1, period: 'month' },
-      last3Months: { duration: 3, period: 'month' },
-      lastYear: { duration: 1, period: 'year' }
+      yesterday: { duration: 1, period: 'day' }, # TODO: Remove once new filter protocol is live
+      lastWeek: { duration: 1, period: 'week' }, # TODO: Remove once new filter protocol is live
+      last2Weeks: { duration: 2, period: 'week' }, # TODO: Remove once new filter protocol is live
+      lastMonth: { duration: 1, period: 'month' }, # TODO: Remove once new filter protocol is live
+      last3Months: { duration: 3, period: 'month' }, # TODO: Remove once new filter protocol is live
+      lastYear: { duration: 1, period: 'year' }, # TODO: Remove once new filter protocol is live
+      '$yesterday': { duration: 1, period: 'day' },
+      '$previousWeek': { duration: 1, period: 'week' },
+      '$previousMonth': { duration: 1, period: 'month' },
+      '$previousQuarter': { duration: 3, period: 'month',
+        period_of_time: 'quarter' },
+      '$previousYear': { duration: 1, period: 'year' },
+      '$weekToDate': { duration: 1, period: 'week', to_date: true },
+      '$monthToDate': { duration: 1, period: 'month', to_date: true },
+      '$quarterToDate': { duration: 3, period: 'month',
+        period_of_time: 'quarter', to_date: true },
+      '$yearToDate': { duration: 1, period: 'year', to_date: true }
     }
 
-    PERIODS_FROM_NOW = 'fromNow'
-    PERIODS_TODAY = 'today'
-    PERIODS_LAST_X_DAYS = /^last(\d+)days$/
+    PERIODS_FROM_NOW = 'fromNow' # TODO: Remove once new filter protocol is live
+    PERIODS_TODAY_DEPRECATED = 'today' # TODO: Remove once new filter protocol is live
+
+    PERIODS_PAST = '$past';
+    PERIODS_FUTURE = '$future';
+    PERIODS_TODAY = '$today';
+
+    PERIODS_LAST_X_DAYS = /^last(\d+)days$/ # TODO: Remove once new filter protocol is live
+    PERIODS_PREVIOUS_X_DAYS = /^\$previous(\d+)Days$/;
+    PERIODS_X_DAYS_TO_DATE = /^\$(\d+)DaysToDate$/;
 
     def initialize(value)
       @value = value
@@ -20,68 +38,150 @@ module ForestLiana
     def is_interval_date_value
       return false if @value.nil?
       return true if PERIODS[@value.to_sym]
-      return true if [PERIODS_FROM_NOW, PERIODS_TODAY].include? @value
 
+      # TODO: Remove once new filter protocol is live
+      return true if [PERIODS_FROM_NOW, PERIODS_TODAY_DEPRECATED].include? @value
+
+      return true if [PERIODS_PAST, PERIODS_FUTURE, PERIODS_TODAY].include? @value
+
+      # TODO: Remove once new filter protocol is live
       match = PERIODS_LAST_X_DAYS.match(@value)
       return true if match && match[1]
 
+      match = PERIODS_PREVIOUS_X_DAYS.match(@value)
+      return true if match && match[1]
+
+      match = PERIODS_X_DAYS_TO_DATE.match(@value)
+      return true if match && match[1]
+
       false
     end
 
     def has_previous_interval
       return false if @value.nil?
       return true if PERIODS[@value.to_sym]
+
+      # TODO: Remove once new filter protocol is live
+      return true if PERIODS_TODAY_DEPRECATED == @value
+
       return true if PERIODS_TODAY == @value
 
+      # TODO: Remove once new filter protocol is live
       match = PERIODS_LAST_X_DAYS.match(@value)
       return true if match && match[1]
 
+      match = PERIODS_PREVIOUS_X_DAYS.match(@value)
+      return true if match && match[1]
+
+      match = PERIODS_X_DAYS_TO_DATE.match(@value)
+      return true if match && match[1]
+
       false
     end
 
     def get_interval_date_filter
       return nil unless is_interval_date_value()
 
+      # TODO: Remove once new filter protocol is live
       return ">= '#{Time.now}'" if @value == PERIODS_FROM_NOW
 
+      return ">= '#{Time.now}'" if @value == PERIODS_FUTURE
+      return "<= '#{Time.now}'" if @value == PERIODS_PAST
+
+      # TODO: Remove once new filter protocol is live
+      if @value == PERIODS_TODAY_DEPRECATED
+        return "BETWEEN '#{Time.now.beginning_of_day}' AND " +
+          "'#{Time.now.end_of_day}'"
+      end
+
       if @value == PERIODS_TODAY
         return "BETWEEN '#{Time.now.beginning_of_day}' AND " +
           "'#{Time.now.end_of_day}'"
       end
 
+      # TODO: Remove once new filter protocol is live
       match = PERIODS_LAST_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}'"
       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}'"
+      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}'"
+      end
+
       duration = PERIODS[@value.to_sym][:duration]
       period = PERIODS[@value.to_sym][:period]
-
-      from = duration.send(period).ago.send("beginning_of_#{period}")
-      to = 1.send(period).ago.send("end_of_#{period}")
+      period_of_time = PERIODS[@value.to_sym][:period_of_time] ||
+        PERIODS[@value.to_sym][:period]
+      to_date = PERIODS[@value.to_sym][:to_date]
+
+      if to_date
+        from = Time.now.send("beginning_of_#{period_of_time}")
+        to = 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}")
+      end
       "BETWEEN '#{from}' AND '#{to}'"
     end
 
     def get_interval_date_filter_for_previous_interval
       return nil unless has_previous_interval()
 
+      # TODO: Remove once new filter protocol is live
+      if @value == PERIODS_TODAY_DEPRECATED
+        return "BETWEEN '#{1.day.ago.beginning_of_day}' AND " +
+          "'#{1.day.ago.end_of_day}'"
+      end
+
       if @value == PERIODS_TODAY
         return "BETWEEN '#{1.day.ago.beginning_of_day}' AND " +
           "'#{1.day.ago.end_of_day}'"
       end
 
+      # TODO: Remove once new filter protocol is live
       match = PERIODS_LAST_X_DAYS.match(@value)
       if match && match[1]
-        return "BETWEEN '#{Integer(match[1] * 2).day.ago.beginning_of_day}'" +
-          " AND '#{Integer(match[1]).day.ago.end_of_day}'"
+        return "BETWEEN '#{(Integer(match[1]) * 2).day.ago.beginning_of_day}'" +
+          " AND '#{(Integer(match[1]) + 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}'"
+      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}'"
       end
 
       duration = PERIODS[@value.to_sym][:duration]
       period = PERIODS[@value.to_sym][:period]
-
-      from = (duration * 2).send(period).ago.send("beginning_of_#{period}")
-      to = (1 + duration).send(period).ago.send("end_of_#{period}")
+      period_of_time = PERIODS[@value.to_sym][:period_of_time] ||
+        PERIODS[@value.to_sym][:period]
+      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
+      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}")
+      end
       "BETWEEN '#{from}' AND '#{to}'"
     end
   end

data/app/services/forest_liana/pie_stat_getter.rb

@@ -37,6 +37,12 @@ module ForestLiana
           .order("#{@params[:aggregate].downcase}_#{field} DESC")
           .send(@params[:aggregate].downcase, @params[:aggregate_field])
           .map do |k, v|
+            # NOTICE: Display the enum name instead of a integer if "enum" type
+            if @resource.respond_to?(:defined_enums) &&
+               @resource.defined_enums.has_key?(@params[:group_by_field])
+              k = @resource.defined_enums[@params[:group_by_field]].invert[k]
+            end
+
             { key: k, value: v }
           end
 

data/lib/forest_liana/bootstraper.rb

@@ -45,16 +45,36 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
 
     private
 
+    def fetch_sti_models(model)
+      type_field = model.columns.find {|c| c.name == 'type' }
+      if type_field
+        model.descendants.each do |sti_model|
+          if analyze_model?(sti_model)
+            ForestLiana.models << sti_model
+          end
+        end
+      end
+    end
+
     def analyze_model?(model)
       return model && model.table_exists? && !SchemaUtils.habtm?(model) &&
         SchemaUtils.model_included?(model)
     end
 
     def fetch_models
-      ActiveRecord::Base.subclasses.each do |model|
+      ActiveRecord::Base.subclasses.each {|model| fetch_model(model)}
+    end
+
+    def fetch_model(model)
+      if model.abstract_class?
+        model.descendants.each {|submodel| fetch_model(submodel)}
+      else
+        fetch_sti_models(model) if model.try(:table_exists?)
+
         if analyze_model?(model)
           ForestLiana.models << model
         end
+
       end
     end
 
@@ -267,6 +287,7 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
         ],
         actions: [
           ForestLiana::Model::Action.new({
+            id: 'stripe.Refund',
             name: 'Refund',
             endpoint: '/forest/stripe_payments/refunds'
           })

data/lib/forest_liana/collection.rb

@@ -14,6 +14,7 @@ module ForestLiana::Collection
     end
 
     def action(name, opts = {})
+      opts[:id] = "#{self.collection_name.to_s}.#{name}" 
       opts[:name] = name
       model.actions << ForestLiana::Model::Action.new(opts)
     end

data/lib/forest_liana/engine.rb

@@ -12,7 +12,10 @@ module ForestLiana
   class Engine < ::Rails::Engine
     isolate_namespace ForestLiana
 
-    config.middleware.insert_before 0, 'Rack::Cors' do
+    rack_cors_class = Rack::Cors
+    rack_cors_class = 'Rack::Cors' if Rails::VERSION::MAJOR < 5
+
+    config.middleware.insert_before 0, rack_cors_class do
       allow do
         hostnames = ['localhost:4200', 'app.forestadmin.com',
                      'www.forestadmin.com']

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.47"
+  VERSION = "1.3.48"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.47
+  version: 1.3.48
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails