forest_liana 1.3.23 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d8043614dc3f5c33832f96fd1761996d3d641e
-  data.tar.gz: 757bdc92948727aa58252c74e18b0418f206cc09
+  metadata.gz: bc99c05a0ea02c1b114bb4f3948217c4d5a82115
+  data.tar.gz: 009e5c28b3cb8bec9d11a01fdfc199882753e505
 SHA512:
-  metadata.gz: 78ce9b3db928125aeb91b97ccdde6e286563ca78f5ba0e336a14d5485d63039fe62572899ca00e273ba6951f1d44e44a6df64d18a9bbb41645c56ce656d2b224
-  data.tar.gz: 64a5f7032714e5592055dcbbf9de2ee5cee45c00d86423cde69c5d061ad571fe454b2fa7cfda8ed60b5bc6a4c9d9b33177101283f603981165322263f09386ae
+  metadata.gz: c092eef29c2f5fc175835fefbcd91c3f7065d9937e01b857c8ed72e9b774cced323ab13892e17418295115ab9f659bde33c7b7de9bcd7def05be560dd1feb36a
+  data.tar.gz: ff7ff0b8899e1dfc42c408462e26fae3f9c83cb2214c5cea448ef4162e7f9ce725d2a62542da4c89e83f0d1d92c19c274723ceb15d8c10c27e4d1b7a8335a244

data/app/controllers/forest_liana/resources_controller.rb

@@ -29,9 +29,6 @@ module ForestLiana
       getter = ResourceCreator.new(@resource, params)
       getter.perform
 
-      ActivityLogger.new.perform(current_user, 'created', params[:collection],
-                                getter.record.id)
-
       render serializer: nil,
         json: serialize_model(getter.record, include: includes)
     end
@@ -40,17 +37,13 @@ module ForestLiana
       getter = ResourceUpdater.new(@resource, params)
       getter.perform
 
-      ActivityLogger.new.perform(current_user, 'updated', params[:collection],
-                                getter.record.id)
-
       render serializer: nil,
         json: serialize_model(getter.record, include: includes)
     end
 
     def destroy
       @resource.destroy_all(id: params[:id])
-      ActivityLogger.new.perform(current_user, 'deleted', params[:collection],
-                                params[:id])
+
       render nothing: true, status: 204
     end
 

data/app/services/forest_liana/has_many_getter.rb

@@ -24,6 +24,11 @@ module ForestLiana
 
     private
 
+    def association_table_name
+      @resource.reflect_on_association(@params[:association_name])
+        .try(:table_name)
+    end
+
     def offset
       return 0 unless pagination?
 
@@ -56,7 +61,7 @@ module ForestLiana
         field.slice!(0) if order == :desc
 
         @records = @records
-          .order("#{@params[:association_name]}.#{field} #{order.upcase}")
+          .order("#{association_table_name}.#{field} #{order.upcase}")
       else
         @records
       end

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -29,7 +29,7 @@ module ForestLiana
       return nil unless is_interval_date_value()
 
       match = PERIODS_LAST_X_DAYS.match(@value)
-      return ">= #{Integer(match[1]).day.ago}" if match && match[1]
+      return ">= '#{Integer(match[1]).day.ago}'" if match && match[1]
 
       duration = PERIODS[@value.to_sym][:duration]
       period = PERIODS[@value.to_sym][:period]

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.23"
+  VERSION = "1.3.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.23
+  version: 1.3.24
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,7 +136,6 @@ files:
 - app/assets/javascripts/forest_liana/application.js
 - app/assets/stylesheets/forest_liana/application.css
 - app/assets/stylesheets/scaffold.css
-- app/controllers/forest_liana/actions_controller.rb
 - app/controllers/forest_liana/apimaps_controller.rb
 - app/controllers/forest_liana/application_controller.rb
 - app/controllers/forest_liana/associations_controller.rb
@@ -160,7 +159,6 @@ files:
 - app/serializers/forest_liana/stripe_card_serializer.rb
 - app/serializers/forest_liana/stripe_invoice_serializer.rb
 - app/serializers/forest_liana/stripe_payment_serializer.rb
-- app/services/forest_liana/activity_logger.rb
 - app/services/forest_liana/allowed_users_getter.rb
 - app/services/forest_liana/has_many_getter.rb
 - app/services/forest_liana/intercom_attributes_getter.rb

data/app/controllers/forest_liana/actions_controller.rb

@@ -1,15 +0,0 @@
-module ForestLiana
-  class ActionsController < ForestLiana::ApplicationController
-    after_action :log_activities
-
-    def log_activities
-      params[:data][:attributes][:ids].each do |record_id|
-        collection = params[:data][:attributes][:collection_name]
-        action_name = "triggered the action \"#{params[:action].capitalize}\""
-        ActivityLogger.new.perform(current_user, action_name, collection,
-                            record_id)
-      end
-      true
-    end
-  end
-end

data/app/services/forest_liana/activity_logger.rb

@@ -1,30 +0,0 @@
-require 'jwt'
-
-class ForestLiana::ActivityLogger
-
-  def perform(session, action, collection_name, resource_id)
-    uri = URI.parse("#{forest_url}/api/activity-logs")
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if forest_url.start_with?('https')
-
-    http.start do |client|
-      request = Net::HTTP::Post.new(uri.path)
-      request['Content-Type'] = 'application/json'
-      request['forest-secret-key'] = ForestLiana.secret_key
-      request.body = {
-        action: action,
-        collection: collection_name,
-        resource: resource_id,
-        user: session['data']['id']
-      }.to_json
-
-      client.request(request)
-    end
-  end
-
-  private
-
-  def forest_url
-    ENV['FOREST_URL'] || 'https://forestadmin-server.herokuapp.com';
-  end
-end