forest_liana 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a779e509b0b4b9a4e38c73e759bc4935bb40a0f6
-  data.tar.gz: 830cfdca779bf2e564633a313aed465c9e71f8ea
+  metadata.gz: 9ed1df190068b491195f4ce6d96e3369a0597514
+  data.tar.gz: 40ed3f6fade056c021539de67edc5bbd62b48f2d
 SHA512:
-  metadata.gz: 34d03fc25f33fcf640742a00ea89693daa29885a8bf1b37e977c4c56944bedaaabb2ebfe03050d125e390d1d12ad23a2dfd467bb2b1d1df5cc3cfa60ffa65011
-  data.tar.gz: c8fefe895c61ec8cf80cc1117878661f96ceb1d46625e19b868cceb9dac8028fd586112524edd3704fd9e04b83195649d15629791fae9fc11b4637f3d7149744
+  metadata.gz: 1d2c8bd8bb71665e3db8ecbe48864d5ab0a41bc3702abd1537c8cf0c6a02bae651624f320a68ca73eca0525a38fdbbd323936d82e5b216217cba4305871efb15
+  data.tar.gz: f1d443cba25f22ad12d18f6430b78ad0266b720c6a4867eaf3cfbcc76cd1117bee2e65fd3f2fe5ea7949461e2b738cbe91360a53f1413eb2f8ae1612a5e7176c

data/app/controllers/forest_liana/associations_controller.rb

@@ -28,7 +28,9 @@ module ForestLiana
       @association = @resource.reflect_on_association(
         params[:association_name])
 
-      if @association.nil?
+      # Only accept "many" associations
+      if @association.nil? ||
+        [:belongs_to, :has_one].include?(@association.macro)
         render json: {status: 404}, status: :not_found
       end
     end

data/app/controllers/forest_liana/resources_controller.rb

@@ -1,5 +1,9 @@
 module ForestLiana
   class ResourcesController < ForestLiana::ApplicationController
+    begin
+      prepend ResourcesExtensions
+    rescue NameError
+    end
 
     before_filter :find_resource
 
@@ -60,8 +64,8 @@ module ForestLiana
       @resource
         .reflect_on_all_associations
         .select do |a|
-          [:belongs_to, :has_and_belongs_to_many].include?(a.macro) &&
-            !a.options[:polymorphic]
+          [:belongs_to, :has_and_belongs_to_many, :has_one]
+            .include?(a.macro) && !a.options[:polymorphic]
         end
         .map {|a| a.name.to_s }
     end

data/app/services/forest_liana/search_query_builder.rb

@@ -10,6 +10,7 @@ module ForestLiana
       @records = search_param
       @records = filter_param
       @records = has_many_filter
+      @records = belongs_to_filter
 
       @records
     end
@@ -58,7 +59,7 @@ module ForestLiana
       field = field.split(':').first if field.include?(':')
       association = @resource.reflect_on_association(field.to_sym)
 
-      association.try(:macro) === :has_many
+      [:has_many, :has_and_belongs_to_many].include?(association.try(:macro))
     end
 
     def has_many_filter
@@ -110,5 +111,36 @@ module ForestLiana
         .group("#{@resource.table_name}.id, #{association.table_name}.#{subfield}")
         .having("#{association.table_name}.#{subfield} #{operator} '#{value}'")
     end
+
+    def belongs_to_association?(field)
+      field = field.split(':').first if field.include?(':')
+      association = @resource.reflect_on_association(field.to_sym)
+      [:belongs_to, :has_one].include?(association.try(:macro))
+    end
+
+    def belongs_to_subfield_filter(field, value)
+      field, subfield = field.split(':')
+
+      association = @resource.reflect_on_association(field.to_sym)
+      return if association.blank?
+
+      operator, value = OperatorValueParser.parse(value)
+
+      @records = @records
+        .joins(field.to_sym)
+        .where("#{association.table_name}.#{subfield} #{operator} '#{value}'")
+    end
+
+    def belongs_to_filter
+      if @params[:filter]
+        @params[:filter].each do |field, value|
+          next unless belongs_to_association?(field)
+          @records = belongs_to_subfield_filter(field, value)
+        end
+      end
+
+      @records
+    end
+
   end
 end

data/lib/forest_liana/engine.rb

@@ -11,7 +11,8 @@ module ForestLiana
 
     config.middleware.insert_before 0, 'Rack::Cors' do
       allow do
-        origins '*'
+        origins 'http://localhost:4200', 'https://www.forestadmin.com',
+          'http://www.forestadmin.com'
         resource '*', headers: :any, methods: :any
       end
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.1.13"
+  VERSION = "1.1.14"
 end

metadata

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