forest_liana 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df8e02deb4f4658a5ea5a25fc0f232ac70456de
-  data.tar.gz: 7572acc016113e289354bf72550bed7c53c8a2f6
+  metadata.gz: c63c52a683c93517a22822d4e3843a04ae2f2ea6
+  data.tar.gz: fa645bef5cb90dd0c5c0b6f526475637e9ada0cd
 SHA512:
-  metadata.gz: 290e84138c3b8a4ca3aa3f6bd334df6f8fe4650d776b075546d095d741f678e565a17e8d395094d880705446d95d8bf78e609fbd3f15820c62e8573e8db21c74
-  data.tar.gz: 57f64110af477a4af2e35045d9e41b1a95ee10b9276e962d0e7ab161a13c49a0550ef3b583fedc69a47c220035ef1bd37834ab9da160fd02ad33f46127c48bc4
+  metadata.gz: a7011c1496907b1c996d1dd4657289d1ba6aa8d6b5b5fa40fe05d8a4d35b8ac0b41b746caba09b57a312b3b7117cb01035dc7746ff97c49e89ff7fe99b0ade8e
+  data.tar.gz: 3c972c4d951bb5e055305a5aaa26ea0d0f4be985db3bb2c3c09dcb371e6ddde7152bb3412d891ef2d0fd75bad68677f247c1ec550fac3bd64ccd165dc6d162c5

data/app/services/forest_liana/base_getter.rb

@@ -0,0 +1,12 @@
+module ForestLiana
+  class BaseGetter
+    def get_resource
+      use_act_as_paranoid = @resource.instance_methods
+        .include? :really_destroyed?
+
+      # NOTICE: Do not unscope with the paranoia gem to prevent the retrieval
+      #         of deleted records.
+      use_act_as_paranoid ? @resource : @resource.unscoped
+    end
+  end
+end

data/app/services/forest_liana/has_many_getter.rb

@@ -1,5 +1,5 @@
 module ForestLiana
-  class HasManyGetter
+  class HasManyGetter < BaseGetter
     def initialize(resource, association, params)
       @resource = resource
       @association = association
@@ -8,8 +8,7 @@ module ForestLiana
     end
 
     def perform
-      @records = @resource
-        .unscoped
+      @records = get_resource()
         .find(@params[:id])
         .send(@params[:association_name])
         .eager_load(includes)

data/app/services/forest_liana/line_stat_getter.rb

@@ -25,7 +25,7 @@ module ForestLiana
     end
 
     def perform
-      value = @resource.unscoped.eager_load(includes)
+      value = get_resource().eager_load(includes)
 
       if @params[:filterType] && @params[:filters]
         conditions = []

data/app/services/forest_liana/pie_stat_getter.rb

@@ -5,7 +5,6 @@ module ForestLiana
     def perform
       if @params[:group_by_field]
         timezone_offset = @params[:timezone].to_i
-        value = @resource
         conditions = []
         filter_operator = ''
 
@@ -19,8 +18,7 @@ module ForestLiana
           end
         end
 
-        value = value
-          .unscoped
+        value = get_resource()
           .eager_load(includes)
           .where(conditions.join(filter_operator))
           .group(group_by_field)

data/app/services/forest_liana/resource_getter.rb

@@ -1,5 +1,5 @@
 module ForestLiana
-  class ResourceGetter
+  class ResourceGetter < BaseGetter
     attr_accessor :record
 
     def initialize(resource, params)
@@ -8,7 +8,7 @@ module ForestLiana
     end
 
     def perform
-      @record = @resource.eager_load(includes).find(@params[:id])
+      @record = get_resource().eager_load(includes).find(@params[:id])
     end
 
     def includes

data/app/services/forest_liana/resources_getter.rb

@@ -1,5 +1,5 @@
 module ForestLiana
-  class ResourcesGetter
+  class ResourcesGetter < BaseGetter
     def initialize(resource, params)
       @resource = resource
       @params = params
@@ -10,7 +10,7 @@ module ForestLiana
     end
 
     def perform
-      @records = @resource.unscoped
+      @records = get_resource
 
       if @segment && @segment.scope
         @records = @records.send(@segment.scope)

data/app/services/forest_liana/stat_getter.rb

@@ -1,5 +1,5 @@
 module ForestLiana
-  class StatGetter
+  class StatGetter < BaseGetter
     attr_accessor :record
 
     def initialize(resource, params)

data/app/services/forest_liana/value_stat_getter.rb

@@ -4,8 +4,8 @@ module ForestLiana
 
     def perform
       return if @params[:aggregate].blank?
-      valueCurrent = @resource.unscoped.eager_load(includes)
-      valuePrevious = @resource.unscoped.eager_load(includes)
+      valueCurrent = get_resource().eager_load(includes)
+      valuePrevious = get_resource().eager_load(includes)
       filter_date_interval = false
 
       if @params[:filterType] && @params[:filters]

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.7.6"
+  VERSION = "1.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,6 +168,7 @@ files:
 - app/serializers/forest_liana/stripe_payment_serializer.rb
 - app/serializers/forest_liana/stripe_subscription_serializer.rb
 - app/services/forest_liana/allowed_users_getter.rb
+- app/services/forest_liana/base_getter.rb
 - app/services/forest_liana/belongs_to_updater.rb
 - app/services/forest_liana/controller_factory.rb
 - app/services/forest_liana/has_many_associator.rb