forest_liana 2.13.7 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16318e2524b21f70f7486522ffb5a3c7c1f665e0
-  data.tar.gz: 15fdb1c6676f2085ac309da628b11828307525ce
+  metadata.gz: 0e5ad26fa4fc70fb9b65e3327884b7d2c9f0b7bb
+  data.tar.gz: 06a6093675ef2b6906dd45b585d3be366230a718
 SHA512:
-  metadata.gz: 2b86c92edbd972fa0c6b8b039de6f116d942b5642fd69c05eeaa4a6397f245e702d9ddb50a4ac30b5c50da960dff7c493848e3cda79b8c854ce27ac3f72dbabf
-  data.tar.gz: c5523d04cfa10feb27c457c40fab742bc295ff97e111242ec6d455901269e83cdf8cb26caf76a7b4846fd9d2c67c0ed1713a6341c8c4d9cb8be69249c12e3465
+  metadata.gz: 4a209c7f717e94558c2c2f23235b3f45d65542d5cb52a2b9d559dea1e3d31ee3bea929ab77c8502c7923013c4e97b9fea713a107741f17aab5d1805f16722c91
+  data.tar.gz: 05ac2085057362df3aa8bd4424d53d15399fad2efe1bc97a64e6ec56be8451bd04e4c279d3c069ae893a232aeaa9ebd43b04b5a4b15cdf3e28d4c7feff9a8457

data/app/services/forest_liana/authorization_getter.rb

@@ -18,7 +18,7 @@ module ForestLiana
           headers = { 'email' => @auth_data[:email], 'password' => @auth_data[:password] }
         end
 
-        query_parameters = { 'renderingId' => @rendering_id }
+        query_parameters = {}
 
         if @two_factor_registration
           query_parameters['two-factor-registration'] = true

data/lib/forest_liana/bootstraper.rb

@@ -1,9 +1,7 @@
 module ForestLiana
   class Bootstraper
 
-    def initialize(app)
-      @app = app
-
+    def initialize
       @integration_stripe_valid = false
       @integration_intercom_valid = false
 
@@ -17,23 +15,39 @@ module ForestLiana
       end
     end
 
-    def perform
-      fetch_models
-      check_integrations_setup
-      namespace_duplicated_models
-      create_factories
+    def perform(with_feedback=false)
+      introspect_and_generate_factories
 
       if ForestLiana.env_secret
-        create_apimap
-        require_lib_forest_liana
-        format_and_validate_smart_actions
+        generate_apimap
+        send_apimap(with_feedback)
+      end
+    end
+
+    def display_apimap
+      introspect_and_generate_factories
 
-        send_apimap
+      if ForestLiana.env_secret
+        generate_apimap
+        puts " = Current Forest Apimap:\n#{JSON.pretty_generate(get_apimap_serialized)}"
       end
     end
 
     private
 
+    def introspect_and_generate_factories
+      fetch_models
+      check_integrations_setup
+      namespace_duplicated_models
+      create_factories
+    end
+
+    def generate_apimap
+      create_apimap
+      require_lib_forest_liana
+      format_and_validate_smart_actions
+    end
+
     def is_sti_parent_model?(model)
       return false unless model.try(:table_exists?)
 
@@ -199,26 +213,32 @@ module ForestLiana
       end
     end
 
-    def send_apimap
+    def get_apimap_serialized
+      apimap = JSONAPI::Serializer.serialize(ForestLiana.apimap, {
+        is_collection: true,
+        include: ['actions', 'segments'],
+        meta: {
+          liana: 'forest-rails',
+          liana_version: liana_version,
+          framework_version: Gem.loaded_specs["rails"].version.version,
+          orm_version: Gem.loaded_specs["activerecord"].version.version,
+          database_type: database_type
+        }
+      })
+
+      ForestLiana::ApimapSorter.new(apimap).perform
+    end
+
+    def send_apimap(with_feedback=false)
       if ForestLiana.env_secret && ForestLiana.env_secret.length != 64
         FOREST_LOGGER.error "Your env_secret does not seem to be correct. " \
           "Can you check on Forest that you copied it properly in the " \
           "forest_liana initializer?"
       else
-        apimap = JSONAPI::Serializer.serialize(ForestLiana.apimap, {
-          is_collection: true,
-          include: ['actions', 'segments'],
-          meta: {
-            liana: 'forest-rails',
-            liana_version: liana_version,
-            framework_version: Gem.loaded_specs["rails"].version.version,
-            orm_version: Gem.loaded_specs["activerecord"].version.version,
-            database_type: database_type
-          }
-        })
+        apimap = get_apimap_serialized
 
         begin
-          apimap = ForestLiana::ApimapSorter.new(apimap).perform
+          puts " = Sending Forest Apimap:\n#{JSON.pretty_generate(apimap)}" if with_feedback
           uri = URI.parse("#{forest_url}/forest/apimaps")
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = true if forest_url.start_with?('https')
@@ -234,6 +254,14 @@ module ForestLiana
                 warning = JSON.parse(response.body)['warning']
               end
 
+              if with_feedback
+                if response.is_a?(Net::HTTPOK) || response.is_a?(Net::HTTPNoContent)
+                  puts " = Apimap Received - nothing changed"
+                elsif response.is_a?(Net::HTTPAccepted)
+                  puts " = Apimap Received - update detected (currently updating the UI)"
+                end
+              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 " \
@@ -242,10 +270,10 @@ module ForestLiana
                 FOREST_LOGGER.error "An error occured with the apimap sent " \
                   "to Forest. Please contact support@forestadmin.com for " \
                   "further investigations."
-                elsif response.is_a?(Net::HTTPServiceUnavailable) # NOTICE: HTTP 503 Error
-                  FOREST_LOGGER.warn "Forest is in maintenance for a few " \
-                    "minutes. We are upgrading your experience in the " \
-                    "forest. We just need a few more minutes to get it right."
+              elsif response.is_a?(Net::HTTPServiceUnavailable) # NOTICE: HTTP 503 Error
+                FOREST_LOGGER.warn "Forest is in maintenance for a few " \
+                  "minutes. We are upgrading your experience in the " \
+                  "forest. We just need a few more minutes to get it right."
               elsif warning
                 FOREST_LOGGER.warn warning
               end

data/lib/forest_liana/engine.rb

@@ -67,11 +67,13 @@ module ForestLiana
             "domains for CORS constraint:\n#{error}"
         end
 
-        eager_load_active_record_descendants(app)
+        unless ENV['FOREST_DEACTIVATE_AUTOMATIC_APIMAP']
+          eager_load_active_record_descendants(app)
 
-        if database_available?
-          # NOTICE: Do not run the code below on rails g forest_liana:install.
-          Bootstraper.new(app).perform if ForestLiana.env_secret || ForestLiana.secret_key
+          if database_available?
+            # NOTICE: Do not run the code below on rails g forest_liana:install.
+            Bootstraper.new().perform if ForestLiana.env_secret || ForestLiana.secret_key
+          end
         end
       end
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "2.13.7"
+  VERSION = "2.14.0"
 end

data/lib/tasks/display_apimap.rake

@@ -0,0 +1,8 @@
+namespace :forest do
+  desc "Display the current Forest Apimap version"
+  task(:display_apimap).clear
+  task display_apimap: :environment do
+    bootstraper = ForestLiana::Bootstraper.new()
+    bootstraper.display_apimap
+  end
+end

data/lib/tasks/send_apimap.rake

@@ -0,0 +1,12 @@
+namespace :forest do
+  desc "Synchronize the models/customization with Forest servers"
+  task(:send_apimap).clear
+  task send_apimap: :environment do
+    if ForestLiana.env_secret
+      bootstraper = ForestLiana::Bootstraper.new()
+      bootstraper.perform(true)
+    else
+      puts 'Cannot send the Apimap, Forest cannot find your env_secret'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 2.13.7
+  version: 2.14.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,6 +288,8 @@ files:
 - lib/forest_liana/mixpanel_event.rb
 - lib/forest_liana/version.rb
 - lib/generators/forest_liana/install_generator.rb
+- lib/tasks/display_apimap.rake
+- lib/tasks/send_apimap.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js