forest_liana 1.3.51 → 1.3.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fa4d0087fec1ce7d9d730640a0ec5b39035a39a
-  data.tar.gz: d39230ec74fde4917e1532659c935b9973c6913f
+  metadata.gz: 49ce2bea2aeb0b45516ad7e84e4879369ea12880
+  data.tar.gz: 37c94be3fcd9c8ebdde55f76a10938106807a577
 SHA512:
-  metadata.gz: 122744b37e139dfd9573f8ab12018470b4deebd5c152a4d906a8b9f77d232625373c3888daf327a6e1d84a03628de4cde8c728d98ac06c476d2ecc8bdf11c991
-  data.tar.gz: 0388fb5e7c2baef1ac7c2110dbff673dd0915bb5393005c22775b9b4e8ebd123a0d84bdc4812479003c5f139215f51b827ebdaeee77a718297fd12eed1f9dbc0
+  metadata.gz: 6f867e92adf3495795418ab5fff10236b1f15e08545967a555a6582792c6f58723fd86264d4e6117bc7662e05febe32d291f51463cf40ca2f9c3e262883c3948
+  data.tar.gz: 7b55764e1282a53dfc3d850cd0187b266af72389d5eb1abdc447306c217cd1a39e8c0d525e4e9c7ee948b4f5a5cf9509cdcb61838f8305f9f2a2ed5a8b122b3b

data/app/controllers/forest_liana/associations_controller.rb

@@ -13,7 +13,7 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json: serialize_models(getter.records,
-                                                     include: includes,
+                                                     include: getter.includes,
                                                      count: getter.count,
                                                      params: params)
     end
@@ -65,17 +65,5 @@ module ForestLiana
     def resource_params
       ResourceDeserializer.new(@resource, params[:resource], true).perform
     end
-
-    def includes
-      @association.klass
-        .reflect_on_all_associations
-        .select do |a|
-          SchemaUtils.model_included?(a.klass) &&
-            [:belongs_to, :has_and_belongs_to_many].include?(a.macro) &&
-            !a.options[:polymorphic]
-        end
-        .map {|a| a.name.to_s }
-    end
-
   end
 end

data/app/controllers/forest_liana/resources_controller.rb

@@ -16,7 +16,7 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json: serialize_models(getter.records,
-                                                     include: includes,
+                                                     include: includes(getter),
                                                      count: getter.count,
                                                      params: params)
     end
@@ -26,14 +26,17 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json:
-        serialize_model(getter.record, include: includes)
+        serialize_model(getter.record, include: includes(getter))
     end
 
     def create
       creator = ResourceCreator.new(@resource, params)
       creator.perform
 
-      if creator.record.valid?
+      if creator.errors
+        render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
+          creator.errors), status: 400
+      elsif creator.record.valid?
         render serializer: nil,
           json: serialize_model(creator.record, include: includes)
       else
@@ -46,7 +49,10 @@ module ForestLiana
       updater = ResourceUpdater.new(@resource, params)
       updater.perform
 
-      if updater.record.valid?
+      if updater.errors
+        render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
+          updater.errors), status: 400
+      elsif updater.record.valid?
         render serializer: nil,
           json: serialize_model(updater.record, include: includes)
       else
@@ -76,10 +82,8 @@ module ForestLiana
       ResourceDeserializer.new(@resource, params[:resource], true).perform
     end
 
-    def includes
-      SchemaUtils.one_associations(@resource)
-        .select { |a| SchemaUtils.model_included?(a.klass) }
-        .map { |a| a.name.to_s }
+    def includes(getter)
+      getter.includes.map(&:to_s)
     end
   end
 end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -108,10 +108,14 @@ module ForestLiana
 
           if ret[:href].blank?
             begin
-              relationship_records = object.send(attribute_name)
+              if @options[:include].try(:include?, attribute_name.to_s)
+                object.send(attribute_name)
+              end
 
-              if relationship_records.respond_to?(:each)
-                ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/relationships/#{attribute_name}"
+              SchemaUtils.many_associations(object.class).each do |a|
+                if a.name == attribute_name
+                  ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/relationships/#{attribute_name}"
+                end
               end
             rescue TypeError, ActiveRecord::StatementInvalid, NoMethodError
               puts "Cannot load the association #{attribute_name} on #{object.class.name} #{object.id}."
@@ -186,7 +190,7 @@ module ForestLiana
           serializer.send(serializer_association(a), a.name) {
             if [:has_one, :belongs_to].include?(a.macro)
               begin
-                object.send(a.name).try(:reload)
+                object.send(a.name)
               rescue ActiveRecord::RecordNotFound
                 nil
               end

data/app/services/forest_liana/has_many_getter.rb

@@ -4,6 +4,13 @@ module ForestLiana
       @resource = resource
       @association = association
       @params = params
+      @field_names_requested = field_names_requested
+    end
+
+    def field_names_requested
+      return nil unless @params[:fields] && @params[:fields][@association.table_name]
+      @params[:fields][@association.table_name].split(',')
+                                            .map { |name| name.to_sym }
     end
 
     def perform
@@ -11,6 +18,8 @@ module ForestLiana
         .unscoped
         .find(@params[:id])
         .send(@params[:association_name])
+        .select(select)
+        .eager_load(includes)
       @records = sort_query
     end
 
@@ -18,12 +27,38 @@ module ForestLiana
       @records.limit(limit).offset(offset)
     end
 
+    def includes
+      @association.klass
+        .reflect_on_all_associations
+        .select do |association|
+          inclusion = SchemaUtils.model_included?(association.klass) &&
+            [:belongs_to, :has_and_belongs_to_many].include?(association.macro) &&
+            !association.options[:polymorphic]
+
+          if @field_names_requested
+            inclusion && @field_names_requested.include?(association.name)
+          else
+            inclusion
+          end
+        end
+        .map { |association| association.name.to_s }
+    end
+
     def count
       @records.to_a.length
     end
 
     private
 
+    def select
+      column_names = @association.klass.column_names.map { |name| name.to_sym }
+      if @field_names_requested
+        column_names & @field_names_requested
+      else
+        column_names
+      end
+    end
+
     def association_table_name
       @resource.reflect_on_association(@params[:association_name])
         .try(:table_name)

data/app/services/forest_liana/resource_creator.rb

@@ -1,19 +1,26 @@
 module ForestLiana
   class ResourceCreator
     attr_accessor :record
+    attr_accessor :errors
 
     def initialize(resource, params)
       @resource = resource
       @params = params
+      @errors = nil
     end
 
     def perform
-      if has_strong_parameter
-        @record = @resource.create(resource_params)
-      else
-        @record = @resource.create(resource_params, without_protection: true)
+      begin
+        if has_strong_parameter
+          @record = @resource.create(resource_params)
+        else
+          @record = @resource.create(resource_params, without_protection: true)
+        end
+        set_has_many_relationships
+      rescue ActiveRecord::StatementInvalid => exception
+        # NOTICE: SQL request cannot be executed properly
+        @errors = [{ detail: exception.cause.error }]
       end
-      set_has_many_relationships
     end
 
     def resource_params

data/app/services/forest_liana/resource_getter.rb

@@ -8,7 +8,13 @@ module ForestLiana
     end
 
     def perform
-      @record = @resource.find(@params[:id])
+      @record = @resource.eager_load(includes).find(@params[:id])
+    end
+
+    def includes
+      SchemaUtils.one_associations(@resource)
+        .select { |association| SchemaUtils.model_included?(association.klass) }
+        .map(&:name)
     end
 
   end

data/app/services/forest_liana/resource_updater.rb

@@ -1,19 +1,26 @@
 module ForestLiana
   class ResourceUpdater
     attr_accessor :record
+    attr_accessor :errors
 
     def initialize(resource, params)
       @resource = resource
       @params = params
+      @errors = nil
     end
 
     def perform
-      @record = @resource.find(@params[:id])
+      begin
+        @record = @resource.find(@params[:id])
 
-      if has_strong_parameter
-        @record.update_attributes(resource_params)
-      else
-        @record.update_attributes(resource_params, without_protection: true)
+        if has_strong_parameter
+          @record.update_attributes(resource_params)
+        else
+          @record.update_attributes(resource_params, without_protection: true)
+        end
+      rescue ActiveRecord::StatementInvalid => exception
+        # NOTICE: SQL request cannot be executed properly
+        @errors = [{ detail: exception.cause.error }]
       end
     end
 

data/app/services/forest_liana/resources_getter.rb

@@ -3,6 +3,30 @@ module ForestLiana
     def initialize(resource, params)
       @resource = resource
       @params = params
+      @field_names_requested = field_names_requested
+    end
+
+    def field_names_requested
+      return nil unless @params[:fields] && @params[:fields][@resource.table_name]
+
+      associations_for_query = []
+
+      # NOTICE: Populate the necessary associations for filters
+      if @params[:filter]
+        @params[:filter].each do |field, values|
+          if field.include? ':'
+            associations_for_query << field.split(':').first.to_sym
+          end
+        end
+      end
+
+      if @params[:sort] && @params[:sort].include?('.')
+        associations_for_query << @params[:sort].split('.').first.to_sym
+      end
+
+      field_names = @params[:fields][@resource.table_name].split(',')
+                                              .map { |name| name.to_sym }
+      field_names | associations_for_query
     end
 
     def perform
@@ -12,17 +36,29 @@ module ForestLiana
     end
 
     def records
-      @sorted_records.offset(offset).limit(limit).to_a
+      @sorted_records.select(select).offset(offset).limit(limit).to_a
     end
 
     def count
       @records.count
     end
 
+    def includes
+      includes = SchemaUtils.one_associations(@resource)
+        .select { |association| SchemaUtils.model_included?(association.klass) }
+        .map(&:name)
+
+      if @field_names_requested
+        includes & @field_names_requested
+      else
+        includes
+      end
+    end
+
     private
 
     def search_query
-      SearchQueryBuilder.new(@records, @params).perform
+      SearchQueryBuilder.new(@records, @params, includes).perform
     end
 
     def sort_query
@@ -31,9 +67,6 @@ module ForestLiana
           order = detect_sort_order(@params[:sort])
           field.slice!(0) if order == :desc
 
-          ref = field.split('.')[0]
-          @records = @records.includes(ref) if association?(ref)
-
           field = detect_reference(field)
           if field.index('.').nil?
             @records = @records
@@ -63,7 +96,7 @@ module ForestLiana
           .find {|a| a.name == ref.to_sym }
 
         if association
-          "#{association.table_name}.#{field}"
+          "\"#{association.table_name}\".\"#{field}\""
         else
           param
         end
@@ -76,10 +109,13 @@ module ForestLiana
       @resource.reflect_on_association(field.to_sym).present?
     end
 
-    def includes
-      SchemaUtils.one_associations(@resource)
-        .select { |a| SchemaUtils.model_included?(a.klass) }
-        .map(&:name)
+    def select
+      column_names = @resource.column_names.map { |name| name.to_sym }
+      if @field_names_requested
+        column_names & @field_names_requested
+      else
+        column_names
+      end
     end
 
     def offset

data/app/services/forest_liana/schema_utils.rb

@@ -13,6 +13,12 @@ module ForestLiana
       end
     end
 
+    def self.many_associations(active_record_class)
+      self.associations(active_record_class).select do |x|
+        [:has_many, :has_and_belongs_to_many].include?(x.macro)
+      end
+    end
+
     def self.find_model_from_table_name(table_name)
       model = nil
 
@@ -66,4 +72,3 @@ module ForestLiana
     end
   end
 end
-

data/app/services/forest_liana/search_query_builder.rb

@@ -1,9 +1,10 @@
 module ForestLiana
   class SearchQueryBuilder
 
-    def initialize(resource, params)
+    def initialize(resource, params, includes)
       @resource = @records = resource
       @params = params
+      @includes = includes
     end
 
     def perform
@@ -51,15 +52,16 @@ module ForestLiana
         end
 
         SchemaUtils.one_associations(@resource).map(&:name).each do |association|
-          resource = @resource.reflect_on_association(association.to_sym)
-          resource.klass.columns.each do |column|
-            if !column.array && (column.type == :string || column.type == :text)
-              conditions <<
-                "LOWER(\"#{resource.table_name}\".\"#{column.name}\") LIKE " +
-                "'%#{@params[:search].downcase}%'"
+          if @includes.include? association.to_sym
+            resource = @resource.reflect_on_association(association.to_sym)
+            resource.klass.columns.each do |column|
+              if !column.array && (column.type == :string || column.type == :text)
+                conditions <<
+                  "LOWER(\"#{resource.table_name}\".\"#{column.name}\") LIKE " +
+                  "'%#{@params[:search].downcase}%'"
+              end
             end
           end
-          @resource = @resource.eager_load(association.to_sym)
         end
 
         @records = @resource.where(conditions.join(' OR '))

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.51"
+  VERSION = "1.3.52"
 end

metadata

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