forest_liana 1.5.19 → 1.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79d5b975e9e3892289dbff875172e1146adc7bf
-  data.tar.gz: 6cc20037481515764004884a3f0aee305516e4af
+  metadata.gz: c0609cf8516ae79379606bff03060b124cb88329
+  data.tar.gz: e46eb8f4d03d79cd6b7ac90b731c010e337180ab
 SHA512:
-  metadata.gz: 17f1f4babee8484e60c2198d7133e5ddc3c8069fd9386ea27330cb5bfee53e1d12e56fd80eb8dd405fbc6ec4cbc69d9d267535942f949d15b5d3c08125e2c78e
-  data.tar.gz: 00486b9e196a49763937c84835d28b1e25f9085eb7253e418efd5e731922f2024bc14de655f871570d180aeba682c02d59d402783e2d16be68d47285a7eb9f68
+  metadata.gz: 9a7c1cee91ef4161f980b81ba71cd2ea0569f41ea6ecf1b8058d437718fba656607ad15efff5e8e3f410bdc5e33467c40638dd45e945215f76053aed3157cc02
+  data.tar.gz: 21941decf71abafbaa33ef7faa7bd6a265be8d8d40dfd3fa4562214a57aff1e0f26c5b63e9eac2d6ecae89e24b3e5b47fb4a5f570bea2dc98bda4366a6a56319

data/app/controllers/forest_liana/apimaps_controller.rb

@@ -1,5 +1,5 @@
 module ForestLiana
-  class ApimapsController < ActionController::Base
+  class ApimapsController < ::ActionController::Base
     def index
       head :no_content
     end

data/app/controllers/forest_liana/application_controller.rb

@@ -1,7 +1,7 @@
 require 'jwt'
 
 module ForestLiana
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ActionController::Base
     if Rails::VERSION::MAJOR < 4
       before_filter :authenticate_user_from_jwt
     else

data/app/controllers/forest_liana/sessions_controller.rb

@@ -1,5 +1,5 @@
 module ForestLiana
-  class SessionsController < ActionController::Base
+  class SessionsController < ::ActionController::Base
 
     def create
       @error_message = nil

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -96,7 +96,11 @@ module ForestLiana
 
       @params['data']['attributes'].each do |key, value|
         if value && carrierwave_attribute?(key)
-          @attributes[key] = ForestLiana::Base64StringIO.new(value)
+          if value.match(/\Adata:\w+\/.+;base64,.+/)
+            @attributes[key] = ForestLiana::Base64StringIO.new(value)
+          else
+            @attributes.delete(key)
+          end
         end
       end
     end

data/app/services/forest_liana/resources_getter.rb

@@ -3,6 +3,7 @@ module ForestLiana
     def initialize(resource, params)
       @resource = resource
       @params = params
+      @count_needs_includes = false
       @field_names_requested = field_names_requested
 
       get_segment()
@@ -17,18 +18,25 @@ module ForestLiana
         @records = @records.where(@segment.where.call())
       end
 
-      @records = @records.eager_load(includes)
-
       @records = search_query
-      @sorted_records = sort_query
+      @records_to_count = @records
+
+      # NOTICE: For performance reasons, do not eager load the data if there is
+      #         no search or filters on associations.
+      if @count_needs_includes
+        @records_to_count = @records_to_count.eager_load(includes)
+      end
+
+      @records = @records.eager_load(includes)
+      @records_sorted = sort_query
     end
 
     def records
-      @sorted_records.offset(offset).limit(limit).to_a
+      @records_sorted.offset(offset).limit(limit).to_a
     end
 
     def count
-      @records.count
+      @records_to_count.count
     end
 
     def includes
@@ -67,10 +75,13 @@ module ForestLiana
         @params[:filter].each do |field, values|
           if field.include? ':'
             associations_for_query << field.split(':').first.to_sym
+            @count_needs_includes = true
           end
         end
       end
 
+      @count_needs_includes = true if @params[:search]
+
       if @params[:sort] && @params[:sort].include?('.')
         associations_for_query << @params[:sort].split('.').first.to_sym
       end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.5.19"
+  VERSION = "1.5.20"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,4 +1,4 @@
-class ApplicationController < ActionController::Base
+class ApplicationController < ::ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.5.19
+  version: 1.5.20
 platform: ruby
 authors:
 - Sandro Munda