glib-web 0.5.56 → 0.5.61

data/config/routes.rb

@@ -1,8 +1,8 @@
-Glib::Web::Engine.routes.draw do
-  scope module: :glib do
-    get 'json_ui_garage', to: 'home#json_ui_garage'
-    post 'json_ui_garage', to: 'home#json_ui_garage'
-    patch 'json_ui_garage', to: 'home#json_ui_garage'
-    delete 'json_ui_garage', to: 'home#json_ui_garage'
-  end
+Glib::Web::Engine.routes.draw do
+  scope module: :glib do
+    get 'json_ui_garage', to: 'home#json_ui_garage'
+    post 'json_ui_garage', to: 'home#json_ui_garage'
+    patch 'json_ui_garage', to: 'home#json_ui_garage'
+    delete 'json_ui_garage', to: 'home#json_ui_garage'
+  end
 end

data/lib/generators/glib/install_generator.rb

@@ -1,24 +1,24 @@
-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
-        [
-          '20191017062519_create_texts.rb',
-          '20191024063257_add_scope_to_texts.rb',
-          '20191112095018_add_lang_to_texts.rb',
-          '20191126071051_create_active_storage_tables.active_storage.rb'
-        ].each do |migration_file|
-          template migration_file, "db/dynamic_text_migrate/#{migration_file}"
-        end
-        template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
-        template 'database.yml', 'config/database.yml'
-      end
-    end
-  end
-end
+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
+        [
+          '20191017062519_create_texts.rb',
+          '20191024063257_add_scope_to_texts.rb',
+          '20191112095018_add_lang_to_texts.rb',
+          '20191126071051_create_active_storage_tables.active_storage.rb'
+        ].each do |migration_file|
+          template migration_file, "db/dynamic_text_migrate/#{migration_file}"
+        end
+        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

@@ -1,12 +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
+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

@@ -1,7 +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
+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/20191112095018_add_lang_to_texts.rb

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

data/lib/generators/templates/20191126071051_create_active_storage_tables.active_storage.rb

@@ -1,27 +1,27 @@
-# This migration comes from active_storage (originally 20170806125915)
-class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
-  def change
-    create_table :active_storage_blobs do |t|
-      t.string   :key,        null: false
-      t.string   :filename,   null: false
-      t.string   :content_type
-      t.text     :metadata
-      t.bigint   :byte_size,  null: false
-      t.string   :checksum,   null: false
-      t.datetime :created_at, null: false
-
-      t.index [ :key ], unique: true
-    end
-
-    create_table :active_storage_attachments do |t|
-      t.string     :name,     null: false
-      t.references :record,   null: false, polymorphic: true, index: false
-      t.references :blob,     null: false
-
-      t.datetime :created_at, null: false
-
-      t.index [ :record_type, :record_id, :name, :blob_id ], name: 'index_active_storage_attachments_uniqueness', unique: true
-      t.foreign_key :active_storage_blobs, column: :blob_id
-    end
-  end
-end
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: 'index_active_storage_attachments_uniqueness', unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/lib/generators/templates/database.yml

@@ -1,107 +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]}\"] \%\>" %>
+# 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

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

data/lib/glib-web.rb

@@ -1,9 +1,9 @@
-require 'glib/version'
-require 'glib/engine' if defined?(::Rails)
-require 'glib/value'
-require 'glib/json_crawler'
-
-require 'glib/dynamic_text'
-require 'glib/crypt'
-require 'glib/test_helpers'
-require 'glib/mailer_tester'
+require 'glib/version'
+require 'glib/engine' if defined?(::Rails)
+require 'glib/value'
+require 'glib/json_crawler'
+
+require 'glib/dynamic_text'
+require 'glib/crypt'
+require 'glib/test_helpers'
+require 'glib/mailer_tester'

data/lib/glib/crypt/utils.rb

@@ -1,26 +1,26 @@
-module Glib
-  module Crypt
-    class Utils
-      def self.encrypt(original_message, encryption_secret, encryption_salt)
-        encryptor = message_encryptor(encryption_secret, encryption_salt)
-        CGI.escape(encryptor.encrypt_and_sign(original_message))
-      end
-
-      def self.decrypt(encrypted_message, encryption_secret, encryption_salt)
-        encryptor = message_encryptor(encryption_secret, encryption_salt)
-        begin
-          encryptor.decrypt_and_verify(CGI.unescape(encrypted_message))
-        rescue ActiveSupport::MessageEncryptor::InvalidMessage
-          nil
-        end
-      end
-
-      private
-        def self.message_encryptor(encryption_secret, encryption_salt)
-          key_generator = ActiveSupport::KeyGenerator.new(encryption_secret, iterations: 1000)
-          key_secret = key_generator.generate_key(encryption_salt, 32)
-          ActiveSupport::MessageEncryptor.new(key_secret, digest: 'SHA1', serializer: JSON)
-        end
-    end
-  end
-end
+module Glib
+  module Crypt
+    class Utils
+      def self.encrypt(original_message, encryption_secret, encryption_salt)
+        encryptor = message_encryptor(encryption_secret, encryption_salt)
+        CGI.escape(encryptor.encrypt_and_sign(original_message))
+      end
+
+      def self.decrypt(encrypted_message, encryption_secret, encryption_salt)
+        encryptor = message_encryptor(encryption_secret, encryption_salt)
+        begin
+          encryptor.decrypt_and_verify(CGI.unescape(encrypted_message))
+        rescue ActiveSupport::MessageEncryptor::InvalidMessage
+          nil
+        end
+      end
+
+      private
+        def self.message_encryptor(encryption_secret, encryption_salt)
+          key_generator = ActiveSupport::KeyGenerator.new(encryption_secret, iterations: 1000)
+          key_secret = key_generator.generate_key(encryption_salt, 32)
+          ActiveSupport::MessageEncryptor.new(key_secret, digest: 'SHA1', serializer: JSON)
+        end
+    end
+  end
+end