push_type_admin 0.8.2 → 0.9.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c45588a5fa922b89b76dad850c14c8818818918
-  data.tar.gz: 06a16d7bb9b474d3e8bcf7edf571e318d07a2f9c
+  metadata.gz: 6c128365e6147524859615f40e304d447e8db515
+  data.tar.gz: a6e833650eb0ba7570d90495b530c0969ec5683f
 SHA512:
-  metadata.gz: 37f55b4e84b5dbf6aefde6a5e16b8b94a3ef18c22b06a7eb7f92348f003e89386354eb8ab13c63ff5a67d44fb41e909fd9a24f1bdef9c5a37ed2ca6f076dec49
-  data.tar.gz: 27b6e2f33f608bae8f99306a65f2d7c024edc8785124668ce1a1f9d693cfd870d5e3758c4470363930ae328c2f8f6cf23ac5fefb9ba89bb13b034d18881298d4
+  metadata.gz: 7647a1de7f0b0a32934ee42285a0754d5d5c7ed1173d035a61931ae98b7d08398cb8481c513fe74335234356f12519e690704f62c729fead9107e6f377c6a636
+  data.tar.gz: 9309eb873da635b7752d3f49be1afd8949d342fc828cae6b62d2f8582d43f3fc470d716346ace80b89d24f2af1e3f0f22309ff2d0afd926049740d75ae8af509

data/app/assets/javascripts/push_type/admin.js.coffee

@@ -28,8 +28,6 @@
 #= require_tree ./wysiwyg
 #= require_self
 
-Turbolinks.enableProgressBar()
-
 Math.uid = -> Math.floor(Math.random()*16777215).toString(16)
 
 # Document should by bound first and only then should

data/app/assets/javascripts/push_type/webpack/admin.bundle.js

@@ -122,7 +122,7 @@
 	  }
 	};
 
-	(0, _expose$ExposeJQueryJquery2.default)(document).on('ready page:load', function () {
+	(0, _expose$ExposeJQueryJquery2.default)(document).on('ready page:load turbolinks:load', function () {
 	  window.fndtnInit = false;
 	  new _exposeVueVue2.default(app);
 

data/app/controllers/push_type/admin_controller.rb

@@ -2,7 +2,7 @@ module PushType
   class AdminController < ActionController::Base
 
     layout 'push_type/admin'
-    before_filter :initial_breadcrumb
+    before_action :initial_breadcrumb
     helper_method :push_type_user
 
     # TODO - do I need to require all helpers

data/app/controllers/push_type/assets_controller.rb

@@ -3,8 +3,8 @@ require_dependency "push_type/admin_controller"
 module PushType
   class AssetsController < AdminController
 
-    before_filter :build_asset, only: [:new, :create, :upload]
-    before_filter :load_asset,  only: [:edit, :update, :destroy, :restore]
+    before_action :build_asset, only: [:new, :create, :upload]
+    before_action :load_asset,  only: [:edit, :update, :destroy, :restore]
 
     def index
       respond_to do |format|

data/app/controllers/push_type/nodes_controller.rb

@@ -3,8 +3,8 @@ require_dependency "push_type/admin_controller"
 module PushType
   class NodesController < AdminController
 
-    before_filter :build_node,  only: [:new, :create]
-    before_filter :load_node,   only: [:edit, :update, :destroy, :restore, :position]
+    before_action :build_node,  only: [:new, :create]
+    before_action :load_node,   only: [:edit, :update, :destroy, :restore, :position]
 
     def index
       @nodes = node_scope.not_trash.page(params[:page]).per(30)
@@ -83,7 +83,7 @@ module PushType
 
     def build_node
       @node = node_scope.new type: params[:kind].camelcase, creator: push_type_user, updater: push_type_user
-      @node.attributes = @node.attributes.merge(node_params)
+      @node.attributes = @node.attributes.merge(node_params.to_h)
     end
 
     def load_node
@@ -92,7 +92,7 @@ module PushType
 
     def node_params
       params.fetch(@node.type.underscore.to_sym, {}).permit(:title, :slug, :status, :published_at, :published_to).tap do |whitelist|
-        @node.fields.keys.each { |k| whitelist[k] = params[@node.type.underscore.to_sym][k] if params[@node.type.underscore.to_sym].try(:[], k) }
+        @node.fields.keys.each { |k| whitelist[k] = params[@node.type.underscore.to_sym].to_unsafe_h[k] if params[@node.type.underscore.to_sym].try(:[], k) }
       end
     end
 

data/app/controllers/push_type/users_controller.rb

@@ -3,8 +3,8 @@ require_dependency "push_type/admin_controller"
 module PushType
   class UsersController < AdminController
 
-    before_filter :build_user,  only: [:new, :create]
-    before_filter :load_user,   only: [:edit, :update, :destroy]
+    before_action :build_user,  only: [:new, :create]
+    before_action :load_user,   only: [:edit, :update, :destroy]
 
     def index
       @users = user_scope.page(params[:page]).per(30)
@@ -41,7 +41,7 @@ module PushType
         redirect_to push_type.users_path
       else
         flash[:alert] = 'Trying to delete yourself is the thirty seventh sign of madness.'
-        redirect_to :back
+        redirect_back fallback_location: push_type.user_path(@user)
       end
     end
 
@@ -57,7 +57,7 @@ module PushType
 
     def build_user
       @user = user_scope.new
-      @user.attributes = @user.attributes.merge(user_params)
+      @user.attributes = @user.attributes.merge(user_params.to_h)
     end
 
     def load_user

data/app/views/push_type/fields/_matrix.html.haml

@@ -11,7 +11,7 @@
       %tbody.rows
         // Static existing rows
         - field.rows.each do |row|
-          = f.fields_for "#{ field.name }[]", row do |r|
+          = f.fields_for field.name, row, index: nil do |r|
             %tr
               - if field.grid?
                 - row.fields.each do |name, sub_field|
@@ -29,7 +29,7 @@
                 %a.alert{ :'v-remove-row' => true }= ficon(:x)
 
         // Dynamic rows
-        = f.fields_for "#{ field.name }[]", field.structure do |r|
+        = f.fields_for field.name, field.structure, index: nil do |r|
           %tr{ :'v-for' => 'row in rows', :'track-by' => 'id' }
             - if field.grid?
               - field.fields.each do |name, sub_field|

data/app/webpack/javascripts/admin.es6

@@ -43,7 +43,7 @@ const app = {
   }
 }
 
-$(document).on('ready page:load', function() {
+$(document).on('ready page:load turbolinks:load', function() {
   window.fndtnInit = false;
   new Vue(app);
 

data/test/controllers/push_type/assets_controller_test.rb

@@ -33,7 +33,7 @@ module PushType
     end
 
     describe 'POST #create' do
-      let(:action!) { post :create, asset: asset_attrs }
+      let(:action!) { post :create, params: { asset: asset_attrs } }
       describe 'with valid asset' do
         before { action! }
         it { response.must_respond_with :redirect }
@@ -52,7 +52,7 @@ module PushType
 
     describe 'POST #upload' do
       let(:json_response) { JSON.parse(response.body) }
-      let(:action!) { post :upload, format: :json, asset: asset_attrs }
+      let(:action!) { post :upload, format: :json, params: { asset: asset_attrs } }
       describe 'with valid asset' do
         before { action! }
         it { response.must_respond_with :success }
@@ -72,13 +72,13 @@ module PushType
     end
 
     describe 'GET #edit' do
-      before { get :edit, id: asset.id }
+      before { get :edit, params: { id: asset.id } }
       it { response.must_render_template 'edit' }
       it { assigns[:asset].must_equal asset }
     end
 
     describe 'PUT #update' do
-      before { put :update, id: asset.id, asset: { description: new_description } }
+      before { put :update, params: { id: asset.id, asset: { description: new_description } } }
       describe 'with valid asset' do
         let(:new_description) { 'Foo bar baz' }
         it { response.must_respond_with :redirect }
@@ -88,7 +88,7 @@ module PushType
     end
 
     describe 'DELETE #destroy' do
-      before { delete :destroy, id: asset.id }
+      before { delete :destroy, params: { id: asset.id } }
       it { response.must_respond_with :redirect }
       it { flash[:notice].must_be :present? }
       it { asset.reload.must_be :trashed? }
@@ -97,7 +97,7 @@ module PushType
     describe 'PUT #restore' do
       before do
         asset.trash!
-        put :restore, id: asset.id
+        put :restore, params: { id: asset.id }
       end
       it { response.must_respond_with :redirect }
       it { flash[:notice].must_be :present? }

data/test/controllers/push_type/nodes_controller_test.rb

@@ -26,14 +26,14 @@ module PushType
     end
 
     describe 'GET #new' do
-      before { get :new, kind: 'page' }
+      before { get :new, params: { kind: 'page' } }
       it { response.must_render_template 'new' }
       it { assigns[:node].must_be :new_record? }
       it { assigns[:node].must_be_instance_of Page }
     end
 
     describe 'POST #create' do
-      let(:action!) { post :create, kind: 'page', page: node_attrs }
+      let(:action!) { post :create, params: { kind: 'page', page: node_attrs } }
       describe 'with valid node' do
         before { action! }
         it { response.must_respond_with :redirect }
@@ -51,13 +51,13 @@ module PushType
     end
 
     describe 'GET #edit' do
-      before { get :edit, id: node.id }
+      before { get :edit, params: { id: node.id } }
       it { response.must_render_template 'edit' }
       it { assigns[:node].must_equal node }
     end
 
     describe 'PUT #update' do
-      before { put :update, id: node.id, page: { title: new_title } }
+      before { put :update, params: { id: node.id, page: { title: new_title } } }
       describe 'with valid node' do
         let(:new_title) { 'Foo bar baz' }
         it { response.must_respond_with :redirect }
@@ -73,7 +73,7 @@ module PushType
 
     describe 'DELETE #destroy' do
       describe 'with untrashed node' do
-        before { delete :destroy, id: node.id }
+        before { delete :destroy, params: { id: node.id } }
         it { response.must_respond_with :redirect }
         it { flash[:notice].must_be :present? }
         it { node.reload.must_be :trashed? }
@@ -81,7 +81,7 @@ module PushType
       describe 'with trashed node' do
         before do
           node.trash!
-          delete :destroy, id: node.id
+          delete :destroy, params: { id: node.id }
         end
         it { response.must_respond_with :redirect }
         it { flash[:notice].must_be :present? }
@@ -102,7 +102,7 @@ module PushType
       end
       describe 'append node' do
         before do
-          post :position, id: @last_node.id, prev: @first_node.id
+          post :position, params: { id: @last_node.id, prev: @first_node.id }
           get :index
         end
         it { assigns[:nodes].first.must_equal @first_node }
@@ -110,7 +110,7 @@ module PushType
       end
       describe 'prepend node' do
         before do
-          post :position, id: @last_node.id, next: @first_node.id
+          post :position, params: { id: @last_node.id, next: @first_node.id }
           get :index
         end
         it { assigns[:nodes][1].must_equal @first_node }
@@ -121,7 +121,7 @@ module PushType
     describe 'PUT #restore' do
       before do
         node.trash!
-        put :restore, id: node.id
+        put :restore, params: { id: node.id }
       end
       it { response.must_respond_with :redirect }
       it { flash[:notice].must_be :present? }

data/test/controllers/push_type/users_controller_test.rb

@@ -23,7 +23,7 @@ module PushType
     end
 
     describe 'POST #create' do
-      let(:action!) { post :create, user: user_attrs }
+      let(:action!) { post :create, params: { user: user_attrs } }
       describe 'with valid user' do
         before { action! }
         it { response.must_respond_with :redirect }
@@ -41,13 +41,13 @@ module PushType
     end
 
     describe 'GET #edit' do
-      before { get :edit, id: user.id }
+      before { get :edit, params: { id: user.id } }
       it { response.must_render_template 'edit' }
       it { assigns[:user].must_equal user }
     end
 
     describe 'PUT #update' do
-      before { put :update, id: user.id, user: { name: new_name } }
+      before { put :update, params: { id: user.id, user: { name: new_name } } }
       describe 'with valid user' do
         let(:new_name) { 'Foo bar baz' }
         it { response.must_respond_with :redirect }
@@ -62,7 +62,7 @@ module PushType
     end
 
     describe 'DELETE #destroy' do
-      before { delete :destroy, id: user.id }
+      before { delete :destroy, params: { id: user.id } }
       it { response.must_respond_with :redirect }
       it { flash[:notice].must_be :present? }
       it { proc { user.reload }.must_raise ActiveRecord::RecordNotFound }

data/test/dummy/README.md

@@ -0,0 +1,24 @@
+# README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...

data/test/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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

@@ -5,7 +5,7 @@
 // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.

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

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/test/dummy/app/assets/stylesheets/application.css

@@ -6,9 +6,9 @@
  * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_tree .
  *= require_self

data/test/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

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

@@ -1,5 +1,3 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 end

data/test/dummy/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/test/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/test/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

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

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Dummy</title>
+    <%= csrf_meta_tags %>
 
-<%= yield %>
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>

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

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/test/dummy/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/setup

@@ -1,29 +1,34 @@
 #!/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 = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/test/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/test/dummy/config/cable.yml

@@ -0,0 +1,9 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1

data/test/dummy/config/database.yml

@@ -1,4 +1,4 @@
-# PostgreSQL. Versions 8.2 and up are supported.
+# PostgreSQL. Versions 9.1 and up are supported.
 #
 # Install the pg driver:
 #   gem install pg
@@ -19,7 +19,7 @@ default: &default
   encoding: unicode
   # For details on connection pooling, see rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
 
 development:
   <<: *default

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

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

@@ -9,13 +9,28 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  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=172800'
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -27,15 +42,13 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end