forest_liana 1.1.28 → 1.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cacff1cf8cc8776b030d561c5f3fb2fcfca0ffd
-  data.tar.gz: 9bab1157945c7ba58a5e7b60509f1e85d493735c
+  metadata.gz: 1b687506a6797279131b36df0bfc64abd86fade4
+  data.tar.gz: 4d4a03bcd5f529c234cdfc160f4e8c061c97dea1
 SHA512:
-  metadata.gz: bd00d71d1c413cbfd93121f23d2d36cf928f7b5d0233c3870562a957005ee66b171771d69a721f90d1b908225058e01614e9bd723785d451f1e1d12a609b90ca
-  data.tar.gz: 9097d120274e73de5cbf254cc6da318db7d91d2b12962913d0adfb5057cc0b75551b483823a0ca1669e0cac5b7a50fef441e795a26f473e9c4b6151ad9f32d63
+  metadata.gz: 4d17df6bfb4519de6e7425fb7a5315b3233ea58d0a7dc696d16f868f51c3c6829b4eecfaf14a2117f5e5ca1419c98cf47f8b8a8393a43df5b949ce21ff93ec67
+  data.tar.gz: 8159e958705d5042b3d8622bb5f8994f5c45710fe50eeae16316f0d29eccedc8b84357fbd2a0c2ebc77b2fd78679198cca4d3f4859ddb4d571129432d927caad

data/app/controllers/forest_liana/application_controller.rb

@@ -4,6 +4,10 @@ module ForestLiana
   class ApplicationController < ActionController::Base
     before_filter :authenticate_user_from_jwt
 
+    def current_user
+      @jwt_decoded_token
+    end
+
     def serialize_model(model, options = {})
       options[:is_collection] = false
       JSONAPI::Serializer.serialize(model, options)
@@ -28,8 +32,9 @@ module ForestLiana
 
     def authenticate_user_from_jwt
       if request.headers['Authorization']
-        JWT.decode request.headers['Authorization'].split[1],
-          ForestLiana.jwt_signing_key
+        @jwt_decoded_token = JWT.decode(
+          request.headers['Authorization'].split[1],
+          ForestLiana.jwt_signing_key).try(:first)
       else
         render nothing: true, status: 401
       end

data/app/controllers/forest_liana/resources_controller.rb

@@ -25,24 +25,29 @@ module ForestLiana
     end
 
     def create
-      if Rails::VERSION::MAJOR == 4
-        record = @resource.create!(resource_params.permit!)
-      else
-        record = @resource.create!(resource_params, without_protection: true)
-      end
+      getter = ResourceCreator.new(@resource, params)
+      getter.perform
+
+      ActivityLogger.new.perform(current_user, 'created', params[:collection],
+                                getter.record.id)
 
-      render json: serialize_model(record, include: includes)
+      render json: serialize_model(getter.record, include: includes)
     end
 
     def update
       getter = ResourceUpdater.new(@resource, params)
       getter.perform
 
+      ActivityLogger.new.perform(current_user, 'updated', params[:collection],
+                                getter.record.id)
+
       render 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
 
@@ -64,7 +69,7 @@ module ForestLiana
       @resource
         .reflect_on_all_associations
         .select do |a|
-          [:belongs_to, :has_and_belongs_to_many, :has_one]
+          [:belongs_to, :has_one]
             .include?(a.macro) && !a.options[:polymorphic]
         end
         .map {|a| a.name.to_s }

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -1,9 +1,10 @@
 module ForestLiana
   class ResourceDeserializer
 
-    def initialize(resource, params)
+    def initialize(resource, record, params)
       @params = params
       @resource = resource
+      @record = record
     end
 
     def perform
@@ -36,9 +37,13 @@ module ForestLiana
               @attributes[name] = nil
             end
           when :has_many, :has_and_belongs_to_many
-            if data.is_a?(Hash)
-              @attributes[name] = data.map do |x|
-                association.klass.find(x[:id])
+            if data.is_a?(Array)
+              data.each do |x|
+                existing_records = @record.send(name)
+                new_record = association.klass.find(x[:id])
+                if !existing_records.include?(new_record)
+                  existing_records << new_record
+                end
               end
             end
           end

data/app/services/forest_liana/activity_logger.rb

@@ -0,0 +1,35 @@
+require 'jwt'
+
+class ForestLiana::ActivityLogger
+
+  def perform(user, action, collection_name, resource_id)
+    token = JWT.encode({}, ForestLiana.jwt_signing_key, 'HS256')
+    uri = URI.parse("#{forest_url}/api/projects/#{project_id(user)}/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['Authorization'] = "Bearer #{token}"
+      request.body = {
+        session: user['session'],
+        action: action,
+        collection: collection_name,
+        resource: resource_id
+      }.to_json
+
+      client.request(request)
+    end
+  end
+
+  private
+
+  def project_id(user)
+    user['session']['data']['relationships']['project']['data']['id'];
+  end
+
+  def forest_url
+    ENV['FOREST_URL'] || 'https://forestadmin-server.herokuapp.com';
+  end
+end

data/app/services/forest_liana/resource_creator.rb

@@ -0,0 +1,23 @@
+module ForestLiana
+  class ResourceCreator
+    attr_accessor :record
+
+    def initialize(resource, params)
+      @resource = resource
+      @params = params
+    end
+
+    def perform
+      if Rails::VERSION::MAJOR == 4
+        @record = @resource.create!(resource_params.permit!)
+      else
+        @record = @resource.create!(resource_params, without_protection: true)
+      end
+    end
+
+    def resource_params
+      ResourceDeserializer.new(@resource, @params[:resource]).perform
+    end
+
+  end
+end

data/app/services/forest_liana/resource_updater.rb

@@ -18,7 +18,7 @@ module ForestLiana
     end
 
     def resource_params
-      ResourceDeserializer.new(@resource, @params[:resource]).perform
+      ResourceDeserializer.new(@resource, @record, @params[:resource]).perform
     end
 
   end

data/app/services/forest_liana/schema_adapter.rb

@@ -31,7 +31,8 @@ module ForestLiana
           type: ['String'],
           reference: 'intercom_conversations.id',
           column: nil,
-          is_searchable: false
+          is_searchable: false,
+          integration: 'intercom'
         }
 
         @collection.fields << {
@@ -39,7 +40,8 @@ module ForestLiana
           type: 'String',
           reference: 'intercom_attributes.id',
           column: nil,
-          is_searchable: false
+          is_searchable: false,
+          integration: 'intercom'
         }
       end
 
@@ -51,7 +53,8 @@ module ForestLiana
           type: ['String'],
           reference: 'stripe_payments.id',
           column: nil,
-          is_searchable: false
+          is_searchable: false,
+          integration: 'stripe'
         }
 
         @collection.fields << {
@@ -59,7 +62,8 @@ module ForestLiana
           type: ['String'],
           reference: 'stripe_invoices.id',
           column: nil,
-          is_searchable: false
+          is_searchable: false,
+          integration: 'stripe'
         }
 
         @collection.fields << {
@@ -67,7 +71,8 @@ module ForestLiana
           type: ['String'],
           reference: 'stripe_cards.id',
           column: nil,
-          is_searchable: false
+          is_searchable: false,
+          integration: 'stripe'
         }
       end
 

data/lib/forest_liana/bootstraper.rb

@@ -26,7 +26,7 @@ module ForestLiana
 
       # Monkey patch the find_serializer_class_name method to specify the
       # good serializer to use.
-      JSONAPI::Serializer.class_eval do
+      ::JSONAPI::Serializer.class_eval do
         def self.find_serializer_class_name(obj)
           SerializerFactory.get_serializer_name(obj.class)
         end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.1.28"
+  VERSION = "1.1.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.1.28
+  version: 1.1.29
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,6 +170,7 @@ 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/collection.rb
 - app/services/forest_liana/has_many_getter.rb
 - app/services/forest_liana/intercom_attributes_getter.rb
@@ -177,6 +178,7 @@ files:
 - app/services/forest_liana/line_stat_getter.rb
 - app/services/forest_liana/operator_value_parser.rb
 - app/services/forest_liana/pie_stat_getter.rb
+- app/services/forest_liana/resource_creator.rb
 - app/services/forest_liana/resource_getter.rb
 - app/services/forest_liana/resource_updater.rb
 - app/services/forest_liana/resources_getter.rb