forest_liana 1.1.16 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f236c05a4fda3ca63553fbe3bdc740c16a7199
-  data.tar.gz: ea83ef6b9644a7598356e7a1c0a5948c4eb6332a
+  metadata.gz: 9975c9e7f8829d9319f87884f378a6ce6fe14003
+  data.tar.gz: a3df564fc0d904e8b06ce425829e5e48294dce91
 SHA512:
-  metadata.gz: 0f974c93a1fe87bc596ba6684f179dbe7bcec36e4b171d29215cf2c16b93ba1d254730ae1b7463245a5c9dba0655dc37f100eb7f0f3ddab599c6c32650012531
-  data.tar.gz: 0894696de4d8986d7bcc9936cb3087e28e5197bb7d8a4db91867bdc1a3ae5f6796e504ad9ac8b72347a1407361528fb7b9d9019654ee8f6e640ea194cf9e0e89
+  metadata.gz: a43660cf62cee56e03cc22a8600cde3d87c86ae2027fc314918d1a7000705576aa90b5c682db55761cb024c8947fdfee11e357a45dd5e37f368b71654bcc2d2c
+  data.tar.gz: 7a8d51ac14099dc957ac5a55df661da890867a33c946e93b136e0e97efb37f7b073297ef488712d280e0bcf0017bfc7416f65b951ea2e19089236652d108ab0b

data/app/controllers/forest_liana/associations_controller.rb

@@ -0,0 +1,53 @@
+module ForestLiana
+  class AssociationsController < ForestLiana::ApplicationController
+
+    before_filter :find_resource
+    before_filter :find_association
+
+    def index
+      getter = HasManyGetter.new(@resource, @association, params)
+      getter.perform
+
+      render json: serialize_models(getter.records,
+                                    include: includes,
+                                    count: getter.count,
+                                    params: params)
+    end
+
+    private
+
+    def find_resource
+      @resource = SchemaUtils.find_model_from_table_name(params[:collection])
+
+      if @resource.nil? || !@resource.ancestors.include?(ActiveRecord::Base)
+        render json: {status: 404}, status: :not_found
+      end
+    end
+
+    def find_association
+      @association = @resource.reflect_on_association(
+        params[:association_name])
+
+      # Only accept "many" associations
+      if @association.nil? ||
+        [:belongs_to, :has_one].include?(@association.macro)
+        render json: {status: 404}, status: :not_found
+      end
+    end
+
+    def resource_params
+      ResourceDeserializer.new(@resource, params[:resource]).perform
+    end
+
+    def includes
+      @association.klass
+        .reflect_on_all_associations
+        .select do |a|
+          [: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/deserializers/forest_liana/resource_deserializer.rb

@@ -15,23 +15,31 @@ module ForestLiana
     end
 
     def extract_attributes
-      @params['data']['attributes'].select {|attr| column?(attr)}
+      if @params[:data][:attributes]
+        @params['data']['attributes'].select {|attr| column?(attr)}
+      else
+        ActionController::Parameters.new()
+      end
     end
 
     def extract_relationships
       if @params['data']['relationships']
         @params['data']['relationships'].each do |name, relationship|
           data = relationship['data']
+          association = @resource.reflect_on_association(name)
 
-          if column?(name.foreign_key) # belongs_to
+          case association.try(:macro)
+          when :has_one, :belongs_to
             if data.is_a?(Hash)
-              @attributes[name.foreign_key] = data[:id]
-            elsif !data
-              @attributes[name.foreign_key] = nil
+              @attributes[name] = association.klass.find(data[:id])
+            elsif data.blank?
+              @attributes[name] = nil
             end
-          elsif data # has_many
-            @attributes[name] = data.map do |x|
-              associated_record(x[:type], x[:id])
+          when :has_many, :has_and_belongs_to_many
+            if data.is_a?(Hash)
+              @attributes[name] = data.map do |x|
+                association.klass.find(x[:id])
+              end
             end
           end
         end
@@ -62,11 +70,5 @@ module ForestLiana
     def column?(attribute)
       @resource.columns.find {|x| x.name == attribute}.present?
     end
-
-    def associated_record(type, id)
-      resource = SchemaUtils.find_model_from_table_name(type.underscore)
-      resource.find(id)
-    end
-
   end
 end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -66,8 +66,10 @@ module ForestLiana
           if relationship_records.respond_to?(:each)
 
             if Rails::VERSION::MAJOR == 4
+              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
               ret[:meta] = { count: relationship_records.distinct.count }
             else
+              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
               ret[:meta] = {
                 count: relationship_records.count(:id, distinct: true)
               }

data/app/services/forest_liana/has_many_getter.rb

@@ -8,8 +8,6 @@ module ForestLiana
 
     def perform
       @records = @resource.find(@params[:id]).send(@params[:association_name])
-
-      @records
     end
 
     def records

data/config/routes.rb

@@ -15,4 +15,7 @@ ForestLiana::Engine.routes.draw do
   post ':collection' => 'resources#create'
   put ':collection/:id' => 'resources#update'
   delete ':collection/:id' => 'resources#destroy'
+
+  # Associations
+  get ':collection/:id/:association_name' => 'associations#index'
 end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.1.16"
+  VERSION = "1.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors:
 - Sandro Munda
@@ -28,16 +28,16 @@ dependencies:
   name: jsonapi-serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - app/assets/stylesheets/scaffold.css
 - app/controllers/forest_liana/apimaps_controller.rb
 - app/controllers/forest_liana/application_controller.rb
+- app/controllers/forest_liana/associations_controller.rb
 - app/controllers/forest_liana/resources_controller.rb
 - app/controllers/forest_liana/stats_controller.rb
 - app/controllers/forest_liana/stripe_controller.rb