forest_liana 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed1df190068b491195f4ce6d96e3369a0597514
-  data.tar.gz: 40ed3f6fade056c021539de67edc5bbd62b48f2d
+  metadata.gz: a9ddcb2a3b21734d0089682d98f29e6dba11c0e6
+  data.tar.gz: 9677980c020592ac28fc506941a192d495a3b29e
 SHA512:
-  metadata.gz: 1d2c8bd8bb71665e3db8ecbe48864d5ab0a41bc3702abd1537c8cf0c6a02bae651624f320a68ca73eca0525a38fdbbd323936d82e5b216217cba4305871efb15
-  data.tar.gz: f1d443cba25f22ad12d18f6430b78ad0266b720c6a4867eaf3cfbcc76cd1117bee2e65fd3f2fe5ea7949461e2b738cbe91360a53f1413eb2f8ae1612a5e7176c
+  metadata.gz: 69b1b1798846619b230ea7ddb610459b8accdbb04068c9de8cefb6d5bf5c2f3c8e5d2da9cc42868648209c481fe58bae2431cd276777da4a9061f277dffb1c8c
+  data.tar.gz: ddb0ac09089dcdf41758671d4b0e9e2a2777d42d64fe79f44f35d7a70fe12a907564ffa7888b77b7dac77770efb0376a03416a456e6b92eb56afac25356dfc2c

data/app/serializers/forest_liana/serializer_factory.rb

@@ -60,13 +60,18 @@ module ForestLiana
         end
 
         def relationship_related_link(attribute_name)
-          ret = {
-            href: "#{self_link}/#{format_name(attribute_name)}"
-          }
+          ret = {}
 
           relationship_records = object.send(attribute_name)
           if relationship_records.respond_to?(:each)
-            ret[:meta] = { count: relationship_records.count }
+
+            if Rails::VERSION::MAJOR == 4
+              ret[:meta] = { count: relationship_records.distinct.count }
+            else
+              ret[:meta] = {
+                count: relationship_records.count(:id, distinct: true)
+              }
+            end
           end
 
           ret

data/config/routes.rb

@@ -15,7 +15,4 @@ 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.14"
+  VERSION = "1.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,6 @@ 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

data/app/controllers/forest_liana/associations_controller.rb

@@ -1,53 +0,0 @@
-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