forest_liana 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9847fca87fc1e7caff49a8aaf899a23c33169314
-  data.tar.gz: bf383e4e3b8fcc4be34a368018bdd8ab43e1bb0c
+  metadata.gz: 1c7e65eaf32a280961a284a31d555dd41cb52b5a
+  data.tar.gz: 68d912adea12939ab9bc20779434161c01fd993c
 SHA512:
-  metadata.gz: 812421ddef29e95a562c928d610b3dfb148a7b9526ce69e88586d89c6b10a3569f9d32ea8cc8243ae1d4e67056ee406c770ed8b5a6fbf00e06a6dbd0ba01a1ea
-  data.tar.gz: bec80b2cb5b6524af1b6c2ddcbdd7a132910c85b25f9a6f06ca0455165c106c46b9cecc9c7c4dba37f4945dabc805bf8208109f89d7c3c96e38e360b3456865d
+  metadata.gz: b336890472dd721f35d08aa754166436251d7e053f4e94eeaa9d2ea5f268e97145e6860e7a4e67e8ce19192fc31b49ce194446360a52075f97650422f20a1b33
+  data.tar.gz: f2a40fd9fcfdda465440f7eb8911f5386fba5b28170bdddff0e9f093366a39c0fb74f4848e4d4f730d97ef9ad8c4baa8153c1529ea730c18cb6b70f1646600b0

data/app/controllers/forest_liana/apimaps_controller.rb

@@ -1,7 +1,7 @@
 module ForestLiana
   class ApimapsController < ActionController::Base
     def index
-      render nothing: true, status: 204
+      head :no_content
     end
   end
 end

data/app/controllers/forest_liana/application_controller.rb

@@ -49,7 +49,7 @@ module ForestLiana
           render json: { error: 'expired_token' }, status: 401, serializer: nil
         end
       else
-        render nothing: true, status: 401
+        head :unauthorized
       end
     end
 

data/app/controllers/forest_liana/associations_controller.rb

@@ -22,21 +22,21 @@ module ForestLiana
       updater = BelongsToUpdater.new(@resource, @association, params)
       updater.perform
 
-      render nothing: true, status: 204
+      head :no_content
     end
 
     def associate
       associator = HasManyAssociator.new(@resource, @association, params)
       associator.perform
 
-      render nothing: true, status: 204
+      head :no_content
     end
 
     def dissociate
       dissociator = HasManyDissociator.new(@resource, @association, params)
       dissociator.perform
 
-      render nothing: true, status: 204
+      head :no_content
     end
 
     private

data/app/controllers/forest_liana/resources_controller.rb

@@ -64,7 +64,7 @@ module ForestLiana
     def destroy
       @resource.destroy_all(id: params[:id])
 
-      render nothing: true, status: 204
+      head :no_content
     end
 
     private

data/app/controllers/forest_liana/sessions_controller.rb

@@ -9,7 +9,7 @@ module ForestLiana
       if token
         render json: { token: token }, serializer: nil
       else
-        render nothing: true, status: 401
+        head :unauthorized
       end
     end
 

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -1,12 +1,6 @@
 module ForestLiana
   class OperatorDateIntervalParser
     PERIODS = {
-      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' },
@@ -20,14 +14,10 @@ module ForestLiana
       :$yearToDate => { duration: 1, period: 'year', to_date: true }
     }
 
-    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$/;
 
@@ -39,15 +29,8 @@ module ForestLiana
       return false if @value.nil?
       return true if PERIODS[@value.to_sym]
 
-      # 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]
 
@@ -61,15 +44,8 @@ module ForestLiana
       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]
 
@@ -82,30 +58,14 @@ module ForestLiana
     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}'" +
@@ -137,24 +97,11 @@ module ForestLiana
     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]) + 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}'" +

data/lib/forest_liana.rb

@@ -15,7 +15,6 @@ module ForestLiana
   mattr_accessor :models
   mattr_accessor :excluded_models
   mattr_accessor :included_models
-  mattr_accessor :inject_forest_cors
 
   # Legacy.
   mattr_accessor :jwt_signing_key
@@ -25,5 +24,4 @@ module ForestLiana
   self.models = []
   self.excluded_models = []
   self.included_models = []
-  self.inject_forest_cors = true
 end

data/lib/forest_liana/engine.rb

@@ -13,8 +13,6 @@ module ForestLiana
     isolate_namespace ForestLiana
 
     def configure_forest_cors
-      return unless ForestLiana.inject_forest_cors
-
       rack_cors_class = Rack::Cors
       rack_cors_class = 'Rack::Cors' if Rails::VERSION::MAJOR < 5
 
@@ -30,9 +28,10 @@ module ForestLiana
       end
     end
 
+    configure_forest_cors unless ENV['FOREST_CORS_DEACTIVATED']
+
     config.after_initialize do |app|
       unless Rails.env.test?
-        configure_forest_cors
         app.eager_load!
         Bootstraper.new(app).perform
       end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/test/services/forest_liana/resources_getter_test.rb

@@ -116,7 +116,7 @@ module ForestLiana
     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' },
+        filter: { 'updated_at' => '$previousYear' },
         filterType: 'and'
       })
       getter.perform
@@ -131,7 +131,7 @@ module ForestLiana
     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' },
+        filter: { 'owner:updated_at' => '$previousYear' },
         filterType: 'and'
       })
       getter.perform

metadata

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