forest_liana 1.5.24 → 1.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cc550679b0d1373ea2d56a14fb0e633dd3a4654
-  data.tar.gz: 2de1b2d6a258880709fc6dbd32e0c5b9d5383024
+  metadata.gz: 4545833279c4d1a547dc247f027202905333d2a1
+  data.tar.gz: 1ae312dd09108112142502d61db0440c2b6c256b
 SHA512:
-  metadata.gz: 0850225c2706025b1c39dc5f59f3e11f6dad123196feffdafd5422018181070db442bf35533b2d224886a08fef1ffd9d692f6fdd28b6fe55a148649217ba9ccd
-  data.tar.gz: 31d14bcdc9e58b0691cdf9766960bdf7d4c255efdfc0cd4207b8fb1718c13ac7c1789daa885f9ed3264e2ec8738b1bf96415f07baf382b9fba3456f4247c769f
+  metadata.gz: 922d4395f379c92d8e100fd7b6855f33eed1903d8749f9a5ca8a02fbf8f7e6e4114669e6c7045e6273e6101cd4676fe8f1d0f330c51542df3243eaa1c891b569
+  data.tar.gz: 135fa379ce6b4ef756f5667cb922e319de9e9c82d40fcddd305bd9dd978dbe404d26f30a3da41b4439336cc12ccdc21097eb94db317e673d93a880415482a277

data/app/models/forest_liana/model/collection.rb

@@ -6,7 +6,7 @@ class ForestLiana::Model::Collection
 
   attr_accessor :name, :fields, :actions, :segments, :only_for_relationships,
     :is_virtual, :is_read_only, :is_searchable, :display_name, :icon,
-    :pagination_type
+    :integration, :pagination_type
 
   def initialize(attributes = {})
     @actions = []

data/app/serializers/forest_liana/collection_serializer.rb

@@ -6,6 +6,7 @@ class ForestLiana::CollectionSerializer
   attribute :name
   attribute :display_name
   attribute :icon
+  attribute :integration
   attribute :fields
   attribute :only_for_relationships
   attribute :is_virtual

data/lib/forest_liana/bootstraper.rb

@@ -150,23 +150,28 @@ module ForestLiana
             request['forest-secret-key'] = ForestLiana.env_secret
             response = client.request(request)
 
-            unless response.body.blank?
-              warning = JSON.parse(response.body)['warning']
-            end
-
-            if response.is_a?(Net::HTTPNotFound) # NOTICE: HTTP 404 Error
-              FOREST_LOGGER.error "Cannot find the project related to the " \
-                "env_secret you configured. Can you check on Forest that you " \
-                "copied it properly in the forest_liana initializer?"
-            elsif response.is_a?(Net::HTTPBadRequest) # NOTICE: HTTP 400 Error
-              FOREST_LOGGER.error "An error occured with the apimap sent to " \
-                "Forest. Please contact support@forestadmin.com for further " \
-                "investigations."
-            elsif warning
-              FOREST_LOGGER.warn warning
+            if ['200', '202', '204', '400', '404'].include? response.code
+              unless response.body.blank?
+                warning = JSON.parse(response.body)['warning']
+              end
+
+              if response.is_a?(Net::HTTPNotFound) # NOTICE: HTTP 404 Error
+                FOREST_LOGGER.error "Cannot find the project related to the " \
+                  "env_secret you configured. Can you check on Forest that " \
+                  "you copied it properly in the forest_liana initializer?"
+              elsif response.is_a?(Net::HTTPBadRequest) # NOTICE: HTTP 400 Error
+                FOREST_LOGGER.error "An error occured with the apimap sent " \
+                  "to Forest. Please contact support@forestadmin.com for " \
+                  "further investigations."
+              elsif warning
+                FOREST_LOGGER.warn warning
+              end
+            else
+              FOREST_LOGGER.error "Forest seems to be down right now. Please " \
+                "contact support@forestadmin.com for further investigations."
             end
           end
-        rescue Errno::ECONNREFUSED
+        rescue Errno::ECONNREFUSED, SocketError
           FOREST_LOGGER.warn "Cannot send the apimap to Forest. Are you online?"
         end
       end
@@ -180,6 +185,7 @@ module ForestLiana
         name: "#{model_name}_intercom_conversations",
         display_name: collection_display_name + ' Conversations',
         icon: 'intercom',
+        integration: 'intercom',
         only_for_relationships: true,
         is_virtual: true,
         fields: [
@@ -195,6 +201,7 @@ module ForestLiana
         name: "#{model_name}_intercom_attributes",
         display_name: collection_display_name + ' Attributes',
         icon: 'intercom',
+        integration: 'intercom',
         only_for_relationships: true,
         is_virtual: true,
         fields: [
@@ -257,6 +264,7 @@ module ForestLiana
         name: "#{model_name}_stripe_payments",
         display_name: collection_display_name + ' Payments',
         icon: 'stripe',
+        integration: 'stripe',
         is_virtual: true,
         is_read_only: true,
         pagination_type: 'cursor',
@@ -288,6 +296,7 @@ module ForestLiana
         name: "#{model_name}_stripe_invoices",
         display_name: collection_display_name + ' Invoices',
         icon: 'stripe',
+        integration: 'stripe',
         is_virtual: true,
         is_read_only: true,
         pagination_type: 'cursor',
@@ -320,6 +329,7 @@ module ForestLiana
         name: "#{model_name}_stripe_cards",
         display_name: collection_display_name + ' Cards',
         icon: 'stripe',
+        integration: 'stripe',
         is_virtual: true,
         is_read_only: true,
         only_for_relationships: true,
@@ -353,6 +363,7 @@ module ForestLiana
         name: "#{model_name}_stripe_subscriptions",
         display_name: collection_display_name + ' Subscriptions',
         icon: 'stripe',
+        integration: 'stripe',
         is_virtual: true,
         is_read_only: true,
         pagination_type: 'cursor',
@@ -384,6 +395,7 @@ module ForestLiana
         name: "#{model_name}_stripe_bank_accounts",
         display_name: collection_display_name + ' Bank Accounts',
         icon: 'stripe',
+        integration: 'stripe',
         is_virtual: true,
         is_read_only: true,
         only_for_relationships: true,

data/lib/forest_liana/collection.rb

@@ -71,6 +71,7 @@ module ForestLiana::Collection
           name: self.collection_name.to_s,
           is_read_only: self.is_read_only,
           is_searchable: self.is_searchable,
+          is_virtual: true,
           fields: []
         })
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.5.24"
+  VERSION = "1.5.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.5.24
+  version: 1.5.25
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails