push_type_admin 0.11.2 → 0.12.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12ceace1f8bce57deb7a58ff0c68e844970e29a
-  data.tar.gz: ea4f8fd0587efbab2721dfde5884f820e2c43054
+  metadata.gz: 9bb085430cbb21c88d99befb9ea12304fbea704f
+  data.tar.gz: d885249b47d170b327eaf1e2d4a50863959114ff
 SHA512:
-  metadata.gz: 786df7e2b3ac97888abb509fcb33cbb4765d2d2cfe3fa04cb59d0c9edaf5a27c86e31e17d98713e747c0bf03f9be14da44a15cd2e12d391519c960f6f8b78f70
-  data.tar.gz: a92f87208206beaf29348fe7ee42cbf9ee22f66253cdb123ba4ad04ae5ca8895cf6f283b0d89af2bf760063f06d323b261a67c600120a9c99c82b012e8c24800
+  metadata.gz: b3f3c46b6717be5a719bb1cc5bd7b7fc7a6e47004657f00a82adbe5a1c6c61fa416fc2541459b8dbb9ef6f6f466f9ae8263954229e0aaa159e552d5da837a432
+  data.tar.gz: 7ee189c5302e8673da00540ad86454dcbd6517e60531fd83dc7187f5a390f448b282da2ea94449bf212a3cdf65edf2c0581b0e3cb07beae86ea1bee43fb94389

data/test/controllers/push_type/admin/assets_controller_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 module PushType
   class Admin::AssetsControllerTest < ActionController::TestCase
 
-    let(:asset_attrs) { FactoryGirl.attributes_for(:asset) }
-    let(:asset) { FactoryGirl.create :asset }
+    let(:asset_attrs) { FactoryBot.attributes_for(:asset) }
+    let(:asset) { FactoryBot.create :asset }
     
     describe 'GET #index' do
       before do
-        5.times { FactoryGirl.create :asset }
+        5.times { FactoryBot.create :asset }
         get :index
       end
       it { response.must_render_template 'index' }
@@ -17,8 +17,8 @@ module PushType
 
     describe 'GET #trash' do
       before do
-        2.times { FactoryGirl.create :asset }
-        3.times { FactoryGirl.create :asset, deleted_at: Time.zone.now }
+        2.times { FactoryBot.create :asset }
+        3.times { FactoryBot.create :asset, deleted_at: Time.zone.now }
         get :trash
       end
       it { response.must_render_template 'trash' }
@@ -106,7 +106,7 @@ module PushType
 
     describe 'DELETE #empty' do
       before do
-        3.times { FactoryGirl.create :asset, deleted_at: Time.zone.now }
+        3.times { FactoryBot.create :asset, deleted_at: Time.zone.now }
         delete :empty
       end
       it { response.must_respond_with :redirect }

data/test/controllers/push_type/admin/nodes_controller_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 module PushType
   class Admin::NodesControllerTest < ActionController::TestCase
 
-    let(:node_attrs) { FactoryGirl.attributes_for(:node) }
+    let(:node_attrs) { FactoryBot.attributes_for(:node) }
     let(:node) { Page.create node_attrs }
     
     describe 'GET #index' do
       before do
-        5.times { FactoryGirl.create :node }
+        5.times { FactoryBot.create :node }
         get :index
       end
       it { response.must_render_template 'index' }
@@ -17,8 +17,8 @@ module PushType
 
     describe 'GET #trash' do
       before do
-        2.times { FactoryGirl.create :node }
-        3.times { FactoryGirl.create :node, deleted_at: Time.zone.now }
+        2.times { FactoryBot.create :node }
+        3.times { FactoryBot.create :node, deleted_at: Time.zone.now }
         get :trash
       end
       it { response.must_render_template 'trash' }
@@ -91,9 +91,9 @@ module PushType
 
     describe 'POST #position' do
       before do
-        @first_node = FactoryGirl.create :node
-        3.times { FactoryGirl.create :node }
-        @last_node = FactoryGirl.create :node
+        @first_node = FactoryBot.create :node
+        3.times { FactoryBot.create :node }
+        @last_node = FactoryBot.create :node
       end
       describe 'without reponsitioning' do
         before { get :index }
@@ -130,7 +130,7 @@ module PushType
 
     describe 'DELETE #empty' do
       before do
-        3.times { FactoryGirl.create :node, deleted_at: Time.zone.now }
+        3.times { FactoryBot.create :node, deleted_at: Time.zone.now }
         delete :empty
       end
       it { response.must_respond_with :redirect }

data/test/controllers/push_type/admin/users_controller_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 module PushType
   class Admin::UsersControllerTest < ActionController::TestCase
 
-    let(:user_attrs) { FactoryGirl.attributes_for(:user) }
-    let(:user) { FactoryGirl.create :user }
+    let(:user_attrs) { FactoryBot.attributes_for(:user) }
+    let(:user) { FactoryBot.create :user }
     
     describe 'GET #index' do
       before do
-        5.times { FactoryGirl.create :user }
+        5.times { FactoryBot.create :user }
         get :index
       end
       it { response.must_render_template 'index' }

data/test/dummy/app/assets/javascripts/application.js

@@ -11,5 +11,6 @@
 // about supported directives.
 //
 //= require rails-ujs
+//= require activestorage
 //= require turbolinks
 //= require_tree .

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,2 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery with: :exception
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -3,6 +3,7 @@
   <head>
     <title>Dummy</title>
     <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>

data/test/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/setup

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
-
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

data/test/dummy/bin/update

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 

data/test/dummy/bin/yarn

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

data/test/dummy/config/cable.yml

@@ -6,5 +6,5 @@ test:
 
 production:
   adapter: redis
-  url: redis://localhost:6379/1
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
   channel_prefix: dummy_production

data/test/dummy/config/credentials.yml.enc

@@ -0,0 +1 @@
+z13DOntf0OzOefgm4GJVW0pQzr51nV3EmRhebncNl64lkIoJQfZ6QM9iCDtqsfqG96dWoC65yVMrSxCle9m40jMUJrgdPcU1AakwcDYIwjgdOop6UG8vu52QUEUsyoFnDDTxxJ/oBBpokS9dBzRgJ1wy9l34P80Ox1nq6/WKlMjo+mT9ei70YT8Z0IqwztFgfk8JXnUbSiPfiKzMh7cairtRv/2Oxo3RgObiIUvsmvvZu/wmA4x64p4xB0doLbI2rRzkKpBXS8rrKx5EsTwDjETC5vx7j7mF4KQMlfGvIjDQLiCxIc2TYKJnZLcWbuFeX3oumQ9lfLXxumdbxX6VMYR/Zb/oamDtczG7nMU0mRCCqpGNZCSU/vEsZ0A6AQqHyGNOGm75oK6uqk4rOM7aXOvY8twRViHNa/G9--mXx3dbwyIcQez2kA--ieoLT+HLPLIW1bZNwv1UJQ==

data/test/dummy/config/environments/development.rb

@@ -13,12 +13,13 @@ Rails.application.configure do
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -26,6 +27,9 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
@@ -37,6 +41,9 @@ Rails.application.configure do
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.

data/test/dummy/config/environments/production.rb

@@ -14,10 +14,9 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
-  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
-  # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = true
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
@@ -39,6 +38,9 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
@@ -60,6 +62,7 @@ Rails.application.configure do
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "dummy_#{Rails.env}"
+
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.

data/test/dummy/config/environments/test.rb

@@ -15,7 +15,7 @@ Rails.application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.
@@ -27,6 +27,10 @@ Rails.application.configure do
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.

data/test/dummy/config/initializers/content_security_policy.rb

@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true

data/test/dummy/config/initializers/push_type.rb

@@ -45,6 +45,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = 'b8814f7d872adb5630e21b8d6974e8c01933af9982186ec562c4d16461e034e7'
+  # config.dragonfly_secret = '1702f338b089daec42d035a02e76e86c9da262a0b7d8a6fa7ed153a84fc41769'
 
 end

data/test/dummy/config/master.key

@@ -0,0 +1 @@
+30bb8554b046a4e3122786f302b22055

data/test/dummy/config/puma.rb

@@ -26,31 +26,9 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
+# process behavior so workers use less memory.
 #
 # preload_app!
 
-# If you are preloading your application and using Active Record, it's
-# recommended that you close any connections to the database before workers
-# are forked to prevent connection leakage.
-#
-# before_fork do
-#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
-# end
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted, this block will be run. If you are using the `preload_app!`
-# option, you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, as Ruby
-# cannot share connections between processes.
-#
-# on_worker_boot do
-#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-#
-
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart

data/test/dummy/config/spring.rb

@@ -1,6 +1,6 @@
-%w(
+%w[
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-).each { |path| Spring.watch(path) }
+].each { |path| Spring.watch(path) }

data/test/dummy/config/storage.yml

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

data/test/dummy/db/migrate/20180416190651_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,26 @@
+# 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
+    end
+  end
+end