glib-web 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce5921c4af9524cc6878c67521f8430dfac0e019beb296326b8ee0c866a6cd8
-  data.tar.gz: ab5e417f1cdef79b23c282479f15d50fd708589a01758eea0c3c0327e096bc15
+  metadata.gz: a318fa9377a19b89642be242b820ee9e2670f0bff29e6a346806b76f8906b16f
+  data.tar.gz: 8797bfd1ab030db735284adcf8c9ddf86441dbd0b189273ca8e7cd0f4d8cdd57
 SHA512:
-  metadata.gz: 567b6a172d515122068d7b3c71c4145417c8dda212ae4c5c8a195b150dc8e80990f218539aaf99df1f9e1d1cfb13f718030447e5983c5eca7cf7e2e3392657ab
-  data.tar.gz: 5d6eca808238984d03e4b242e2da9a02b090e9983a240e8d30b06282da3b961c6eed595b52e760a9cff06061526f3f207e53920515eefd3d165680097d57e538
+  metadata.gz: dfe9421dcc2b4897220d5a7cea9ef1e258bbfbd9a4667b5a5c40e0a39876f7cc666b40b4b0f0efe4d3efb8020d888542d1757d625cf83b3cabcb53a6a27787e6
+  data.tar.gz: 3f6abcd4c53f2abd78b7a96c539c59dec16559147502b28ba3d4fb80f2bdea756a3e51f887082429043d8322bba4d75bb318fcaef27a1ffac121708aa4012d6e

data/app/controllers/concerns/application/json/ui.rb

@@ -14,7 +14,7 @@ module Concerns::Application::Json::Ui
   end
 
   # Override
-  def form_authenticity_token
+  def form_authenticity_token(*args)
     Rails.env.test? ? 'test_token' : super
   end
 

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -0,0 +1,12 @@
+module Glib
+  module DynamicTextsHelper
+    def dt(key, default_value = '', scope = 'itinerarybuilder')
+      new_key = key
+      if key.starts_with?('.')
+        new_key = "#{controller_name}.#{action_name}#{key}"
+      end
+
+      Glib::Text.get_content(scope, new_key, default_value)
+    end
+  end
+end

data/app/helpers/glib/json_ui/view_builder/panels.rb

@@ -76,8 +76,6 @@ class Glib::JsonUi::ViewBuilder
               json.view 'fields/hidden-v1'
               json.name 'authenticity_token'
               json.value page.context.form_authenticity_token
-              # Produce consistent token for predictible test results
-              # json.value Rails.env.test? ? 'test_token' : page.context.form_authenticity_token
             end
           end
 

data/app/models/glib/dynamic_text_record.rb

@@ -0,0 +1,6 @@
+module Glib
+  class DynamicTextRecord < ActiveRecord::Base
+    self.abstract_class = true
+    connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
+  end
+end

data/app/models/glib/text.rb

@@ -0,0 +1,35 @@
+module Glib
+  class Text < Glib::DynamicTextRecord
+    validates :scope, presence: true
+    validates :key, presence: true, uniqueness: { scope: :scope }
+    validates :content, presence: true
+
+    after_save :update_to_redis
+
+    def self.get_content(scope, key, default_value)
+      scope_key = "#{scope}.#{key}"
+
+      unless content = $dt_redis.get(scope_key)
+        if text = find_by(scope: scope, key: key)
+          update_content(scope_key, text.content)
+          content = text.content
+        else
+          create(scope: scope, key: key, content: default_value)
+          update_content(scope_key, default_value)
+          content = default_value
+        end
+      end
+
+      content
+    end
+
+    private
+      def self.update_content(scope_key, content)
+        $dt_redis.set(scope_key, content)
+      end
+
+      def update_to_redis
+        Glib::Text.update_content("#{scope}.#{key}", content)
+      end
+  end
+end

data/app/views/json_ui/garage/home/blank.json.jbuilder

@@ -3,7 +3,7 @@ sleep 0.5
 json.title 'Menu'
 
 json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
+  render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: false
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     scroll.label text: 'Blank page'

data/lib/generators/glib/install_generator.rb

@@ -0,0 +1,18 @@
+module Glib
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+
+      class_option :redis_env_key, type: :string, default: 'DT_REDIS_URL'
+      class_option :database_env_key, type: :string, default: 'DT_DATABASE_URL'
+      class_option :app_name, type: :string, default: Rails.application.class.parent_name
+
+      def copy_initializer
+        template '20191017062519_create_texts.rb', 'db/dynamic_text_migrate/20191017062519_create_texts.rb'
+        template '20191024063257_add_scope_to_texts.rb', 'db/dynamic_text_migrate/20191024063257_add_scope_to_texts.rb'
+        template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
+        template 'database.yml', 'config/database.yml'
+      end
+    end
+  end
+end

data/lib/generators/templates/20191017062519_create_texts.rb

@@ -0,0 +1,12 @@
+class CreateTexts < ActiveRecord::Migration[6.0]
+  def change
+    create_table :texts do |t|
+      t.string :key
+      t.text :content
+
+      t.timestamps
+    end
+
+    add_index :texts, :key, unique: true
+  end
+end

data/lib/generators/templates/20191024063257_add_scope_to_texts.rb

@@ -0,0 +1,7 @@
+class AddScopeToTexts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :texts, :scope, :string
+    remove_index :texts, :key
+    add_index :texts, [:scope, :key], unique: true
+  end
+end

data/lib/generators/templates/database.yml

@@ -0,0 +1,107 @@
+# PostgreSQL. Versions 9.1 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
+  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
+  host: <%= "\<\%\= ENV.fetch(\"DATABASE_HOST\") {} \%\>" %>
+  username: <%= "\<\%\= ENV.fetch(\"DATABASE_USER\") {} \%\>" %>
+  password: <%= "\<\%\= ENV.fetch(\"DATABASE_PASSWORD\") {} \%\>" %>
+
+development:
+  primary:
+    <<: *default
+    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_development\" \%\>" %>
+  dynamic_text:
+    <<: *default
+    migrations_paths: db/dynamic_text_migrate
+    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_development\" \%\>" %>
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: ItineraryBuilder
+
+  # The password associated with the postgres role (username).
+  #password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  primary:
+    <<: *default
+    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_test\" \%\>" %>
+  dynamic_text:
+    <<: *default
+    migrations_paths: db/dynamic_text_migrate
+    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_test\" \%\>" %>
+
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= "\<\%\= ENV[\'DATABASE_URL\'] \%\>" %>
+#
+
+production_default: &production_default
+  adapter: postgresql
+  encoding: unicode
+  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
+
+production:
+  primary:
+    <<: *production_default
+    url: <%= "\<\%\= ENV[\"DATABASE_URL\"] \%\>" %>
+  dynamic_text:
+    <<: *production_default
+    migrations_paths: db/dynamic_text_migrate
+    url: <%= "\<\%\= ENV[\"#{options[:database_env_key]}\"] \%\>" %>

data/lib/generators/templates/dynamic_text.rb

@@ -0,0 +1,2 @@
+dt_redis_url = ENV.fetch('<%= options[:redis_env_key] %>', 'redis://localhost:6379')
+$dt_redis = Redis.new(url: dt_redis_url)

data/lib/glib/json_crawler/http.rb

@@ -20,39 +20,38 @@ module Glib
       end
 
       def get(url, controller)
-
-        http_header = {
-          'Client-DeviceOS' => user[:device],
-          'Client-Version' => user[:version],
-        }
-
-        # Allow repeating urls because excluding them makes the test results really hard to analyze.
-        # if history.include?(url)
-
-        if url.blank?
-          nil
-        else
-          @context.assert_match URI_REGEXP, url
-          history << url
-          @context.get url, params: {}, headers: http_header
-          response = @context.response
-          JsonCrawler::Router.log controller, url, response
-          if (code = response.code.to_i) == 302
-            redirect_uri = URI(response.headers['Location'])
-            redirect_uri.query = [redirect_uri.query, "format=json"].compact.join('&')
-            return get redirect_uri.to_s, controller
-          else
-            response_times << response.headers['X-Runtime'].to_f
-            @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
-
-            if response.media_type == 'application/json'
-              JSON.parse(response.body)
-            else
-              nil
-            end
-          end
-        end
-
+        fetch(:get, url, controller)
+
+        # http_header = {
+        #   'Client-DeviceOS' => user[:device],
+        #   'Client-Version' => user[:version],
+        # }
+
+        # # Allow repeating urls because excluding them makes the test results really hard to analyze.
+        # # if history.include?(url)
+
+        # if url.blank?
+        #   nil
+        # else
+        #   @context.assert_match URI_REGEXP, url
+        #   history << url
+        #   @context.get url, params: {}, headers: http_header
+        #   response = @context.response
+        #   JsonCrawler::Router.log controller, url, response
+        #   if (code = response.code.to_i) == 302
+        #     redirect_uri = URI(response.headers['Location'])
+        #     redirect_uri.query = [redirect_uri.query, "format=json"].compact.join('&')
+        #     return get redirect_uri.to_s, controller
+        #   else
+        #     response_times << response.headers['X-Runtime'].to_f
+        #     @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
+        #     if response.content_type == 'application/json'
+        #       JSON.parse(response.body)
+        #     else
+        #       nil
+        #     end
+        #   end
+        # end
       end
 
       def post(url, controller, params)
@@ -73,24 +72,37 @@ module Glib
 
       private
         def fetch(method, url, controller, params = {})
-          if url.blank? || history.include?(url)
-            nil
-          else
-            # history << url
-            @context.assert_match(URI_REGEXP, url)
+          return nil if url.blank?
 
-            http_header = {
-              'Client-DeviceOS' => user[:device],
-              'Client-Version' => user[:version],
-              'X-CSRF-Token' => user[:token]
-            }
+          if method == :get
+            return nil if history.include?(url)
 
-            @context.send(method, url, params: params, headers: http_header)
-            response = @context.response
-            response_times << response.headers['X-Runtime'].to_f
-            @context.assert_includes VALID_RESPONSE_CODES, response.code.to_i, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
-            JsonCrawler::Router.log(controller, url, response)
+            history << url
+          end
+
+          @context.assert_match(URI_REGEXP, url)
+
+          http_header = {
+            'Client-DeviceOS' => user[:device],
+            'Client-Version' => user[:version],
+            'X-CSRF-Token' => user[:token]
+          }
+
+          params.each do |name, value|
+            params[name] = "" if value.is_a?(Array) && value.size == 0
+          end
 
+          @context.send(method, url, params: params, headers: http_header)
+          response = @context.response
+          JsonCrawler::Router.log(controller, url, response)
+
+          if (code = response.code.to_i) == 302
+            redirect_uri = URI(response.headers['Location'])
+            redirect_uri.query = [redirect_uri.query, "format=json"].compact.join('&')
+            return get redirect_uri.to_s, controller
+          else
+            response_times << response.headers['X-Runtime'].to_f
+            @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
             if response.media_type == 'application/json'
               JSON.parse(response.body)
             else
@@ -100,4 +112,4 @@ module Glib
         end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - ''
@@ -35,6 +35,7 @@ files:
 - app/controllers/concerns/application/json/ui.rb
 - app/controllers/concerns/application/json/validation.rb
 - app/controllers/glib/home_controller.rb
+- app/helpers/glib/dynamic_texts_helper.rb
 - app/helpers/glib/json_ui/abstract_builder.rb
 - app/helpers/glib/json_ui/action_builder.rb
 - app/helpers/glib/json_ui/list_builders.rb
@@ -48,6 +49,8 @@ files:
 - app/helpers/glib/json_ui/view_builder/banners.rb
 - app/helpers/glib/json_ui/view_builder/fields.rb
 - app/helpers/glib/json_ui/view_builder/panels.rb
+- app/models/glib/dynamic_text_record.rb
+- app/models/glib/text.rb
 - app/views/app/views/json_ui/vue/renderer.html.erb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
@@ -111,6 +114,11 @@ files:
 - app/views/json_ui/garage/views/misc.json.jbuilder
 - app/views/json_ui/garage/views/texts.json.jbuilder
 - config/routes.rb
+- lib/generators/glib/install_generator.rb
+- lib/generators/templates/20191017062519_create_texts.rb
+- lib/generators/templates/20191024063257_add_scope_to_texts.rb
+- lib/generators/templates/database.yml
+- lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
 - lib/glib/engine.rb
 - lib/glib/json_crawler.rb