RubyGems - trix_on_rails - Versions diffs - 0.1.4 → 0.2.0 - Mend

trix_on_rails 0.1.4 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

checksums.yaml +4 -4
data/app/assets/javascripts/trix-core.js +8 -8
data/app/assets/javascripts/trix.js +10 -14
data/app/assets/stylesheets/trix.css +268 -177
data/lib/trix_on_rails/version.rb +1 -1
data/test/dummy/Rakefile +1 -1
data/test/dummy/app/assets/javascripts/application.js +2 -1
data/test/dummy/app/assets/javascripts/cable.js +13 -0
data/test/dummy/app/assets/stylesheets/application.css +1 -0
data/test/dummy/app/channels/application_cable/channel.rb +4 -0
data/test/dummy/app/channels/application_cable/connection.rb +4 -0
data/test/dummy/app/controllers/application_controller.rb +0 -2
data/test/dummy/app/controllers/pages_controller.rb +58 -0
data/test/dummy/app/mailers/application_mailer.rb +4 -0
data/test/dummy/app/models/application_record.rb +3 -0
data/test/dummy/app/models/page.rb +2 -0
data/test/dummy/app/views/layouts/application.html.erb +9 -9
data/test/dummy/app/views/layouts/mailer.html.erb +13 -0
data/test/dummy/app/views/layouts/mailer.text.erb +1 -0
data/test/dummy/app/views/pages/_form.html.erb +34 -0
data/test/dummy/app/views/pages/edit.html.erb +6 -0
data/test/dummy/app/views/pages/index.html.erb +31 -0
data/test/dummy/app/views/pages/new.html.erb +5 -0
data/test/dummy/app/views/pages/show.html.erb +19 -0
data/test/dummy/bin/rails +1 -1
data/test/dummy/bin/setup +8 -4
data/test/dummy/bin/update +4 -4
data/test/dummy/bin/yarn +11 -0
data/test/dummy/config.ru +2 -1
data/test/dummy/config/application.rb +4 -9
data/test/dummy/config/boot.rb +2 -2
data/test/dummy/config/cable.yml +10 -0
data/test/dummy/config/database.yml +15 -8
data/test/dummy/config/environment.rb +1 -1
data/test/dummy/config/environments/development.rb +14 -11
data/test/dummy/config/environments/production.rb +23 -10
data/test/dummy/config/environments/test.rb +4 -6
data/test/dummy/config/initializers/application_controller_renderer.rb +8 -6
data/test/dummy/config/initializers/assets.rb +6 -3
data/test/dummy/config/initializers/cookies_serializer.rb +2 -0
data/test/dummy/config/locales/en.yml +10 -0
data/test/dummy/config/puma.rb +56 -0
data/test/dummy/config/routes.rb +2 -0
data/test/dummy/config/secrets.yml +1 -5
data/test/dummy/config/spring.rb +6 -0
data/test/dummy/db/migrate/20171116134443_create_pages.rb +11 -0
data/test/dummy/db/schema.rb +23 -0
data/test/dummy/package.json +5 -0
data/test/dummy/public/404.html +6 -6
data/test/dummy/public/422.html +6 -6
data/test/dummy/public/500.html +6 -6
data/test/dummy/public/apple-touch-icon-precomposed.png +0 -0
data/test/dummy/public/apple-touch-icon.png +0 -0
data/test/dummy/test/application_system_test_case.rb +5 -0
data/test/dummy/test/controllers/pages_controller_test.rb +48 -0
data/test/dummy/test/fixtures/pages.yml +11 -0
data/test/dummy/test/models/page_test.rb +7 -0
data/test/dummy/test/system/pages_test.rb +9 -0
metadata +82 -38
data/test/dummy/README.md +0 -24
data/test/dummy/config/initializers/active_record_belongs_to_required_by_default.rb +0 -4
data/test/dummy/config/initializers/callback_terminator.rb +0 -4
data/test/dummy/config/initializers/cors.rb +0 -14
data/test/dummy/config/initializers/session_store.rb +0 -3
data/test/dummy/log/test.log +0 -8

data/lib/trix_on_rails/version.rb CHANGED

@@ -1,3 +1,3 @@
 module TrixOnRails
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/test/dummy/Rakefile CHANGED

@@ -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/javascripts/application.js CHANGED

@@ -10,4 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require trix

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

@@ -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 CHANGED

@@ -12,4 +12,5 @@
  *
  *= require_tree .
  *= require_self
+ *= require trix
  */

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

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

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

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

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

@@ -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/controllers/pages_controller.rb ADDED

@@ -0,0 +1,58 @@
+class PagesController < ApplicationController
+  before_action :set_page, only: [:show, :edit, :update, :destroy]
+  # GET /pages
+  def index
+    @pages = Page.all
+  end
+  # GET /pages/1
+  def show
+  end
+  # GET /pages/new
+  def new
+    @page = Page.new
+  end
+  # GET /pages/1/edit
+  def edit
+  end
+  # POST /pages
+  def create
+    @page = Page.new(page_params)
+    if @page.save
+      redirect_to @page, notice: 'Page was successfully created.'
+    else
+      render :new
+    end
+  end
+  # PATCH/PUT /pages/1
+  def update
+    if @page.update(page_params)
+      redirect_to @page, notice: 'Page was successfully updated.'
+    else
+      render :edit
+    end
+  end
+  # DELETE /pages/1
+  def destroy
+    @page.destroy
+    redirect_to pages_url, notice: 'Page was successfully destroyed.'
+  end
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_page
+      @page = Page.find(params[:id])
+    end
+    # Only allow a trusted parameter "white list" through.
+    def page_params
+      params.require(:page).permit(:header, :title, :page)
+    end
+end

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

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

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

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

data/test/dummy/app/models/page.rb ADDED

	@@ -0,0 +1,2 @@
1	+ class Page < ApplicationRecord
2	+ end

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

@@ -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' %>
+    <%= javascript_include_tag 'application' %>
+  </head>
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>

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

@@ -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 ADDED

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

data/test/dummy/app/views/pages/_form.html.erb ADDED

@@ -0,0 +1,34 @@
+<%= form_with(model: page, local: true) do |form| %>
+  <% if page.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(page.errors.count, "error") %> prohibited this page from being saved:</h2>
+      <ul>
+      <% page.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="field">
+    <%= form.label :header %>
+    <%= form.text_field :header, id: :page_header %>
+  </div>
+  <div class="field">
+    <%= form.label :title %>
+    <%= form.text_field :title, id: :page_title %>
+  </div>
+  <div class="field">
+    <%= form.label :page %>
+    <%= form.text_area :page, id: :page_page %>
+  </div>
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
+<trix-editor></trix-editor>

data/test/dummy/app/views/pages/edit.html.erb ADDED

@@ -0,0 +1,6 @@
+<h1>Editing Page</h1>
+<%= render 'form', page: @page %>
+<%= link_to 'Show', @page %> |
+<%= link_to 'Back', pages_path %>

data/test/dummy/app/views/pages/index.html.erb ADDED

@@ -0,0 +1,31 @@
+<p id="notice"><%= notice %></p>
+<h1>Pages</h1>
+<table>
+  <thead>
+    <tr>
+      <th>Header</th>
+      <th>Title</th>
+      <th>Page</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @pages.each do |page| %>
+      <tr>
+        <td><%= page.header %></td>
+        <td><%= page.title %></td>
+        <td><%= page.page %></td>
+        <td><%= link_to 'Show', page %></td>
+        <td><%= link_to 'Edit', edit_page_path(page) %></td>
+        <td><%= link_to 'Destroy', page, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<br>
+<%= link_to 'New Page', new_page_path %>

data/test/dummy/app/views/pages/new.html.erb ADDED

@@ -0,0 +1,5 @@
+<h1>New Page</h1>
+<%= render 'form', page: @page %>
+<%= link_to 'Back', pages_path %>

data/test/dummy/app/views/pages/show.html.erb ADDED

@@ -0,0 +1,19 @@
+<p id="notice"><%= notice %></p>
+<p>
+  <strong>Header:</strong>
+  <%= @page.header %>
+</p>
+<p>
+  <strong>Title:</strong>
+  <%= @page.title %>
+</p>
+<p>
+  <strong>Page:</strong>
+  <%= @page.page %>
+</p>
+<%= link_to 'Edit', edit_page_path(@page) %> |
+<%= link_to 'Back', pages_path %>

data/test/dummy/bin/rails CHANGED

@@ -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 CHANGED

@@ -16,7 +16,11 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
-  system('bundle check') or system!('bundle install')
+  system('bundle check') || system!('bundle install')
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
@@ -24,11 +28,11 @@ chdir APP_ROOT do
   # end
   puts "\n== Preparing database =="
-  system! 'ruby bin/rake db:setup'
+  system! 'bin/rails db:setup'
   puts "\n== Removing old logs and tempfiles =="
-  system! 'ruby bin/rake log:clear tmp:clear'
+  system! 'bin/rails log:clear tmp:clear'
   puts "\n== Restarting application server =="
-  system! 'ruby bin/rake restart'
+  system! 'bin/rails restart'
 end

data/test/dummy/bin/update CHANGED

@@ -16,14 +16,14 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
-  system 'bundle check' or system! 'bundle install'
+  system('bundle check') || system!('bundle install')
   puts "\n== Updating database =="
-  system! 'bin/rake db:migrate'
+  system! 'bin/rails db:migrate'
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rake log:clear tmp:clear'
+  system! 'bin/rails log:clear tmp:clear'
   puts "\n== Restarting application server =="
-  system! 'bin/rake restart'
+  system! 'bin/rails restart'
 end

data/test/dummy/bin/yarn ADDED

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

data/test/dummy/config.ru CHANGED

@@ -1,4 +1,5 @@
 # This file is used by Rack-based servers to start the application.
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
 run Rails.application

data/test/dummy/config/application.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 require 'rails/all'
@@ -7,17 +7,12 @@ require "trix_on_rails"
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake time:zones:all" for a time zone names list. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
   end
 end

data/test/dummy/config/boot.rb CHANGED

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/test/dummy/config/cable.yml ADDED

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

data/test/dummy/config/database.yml CHANGED

@@ -1,9 +1,20 @@
+# MySQL. Versions 5.1.10 and up are supported.
+#
+# Install the MySQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.7/en/old-client.html
+#
 default: &default
   adapter: mysql2
   encoding: utf8
-  pool: 5
-  username: <%=Rails.application.secrets.database["user"]%>
-  password: <%=Rails.application.secrets.database["password"]%>
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  username: <%=Rails.application.secrets.database[:user]%>
+  password: <%=Rails.application.secrets.database[:password]%>
   socket: /tmp/mysql.sock
 development:
@@ -12,8 +23,4 @@ development:
 test:
   <<: *default
-  database: dummy_test
-production:
-  <<: *default
-  database: dummy_production
+  database: dummy_test

data/test/dummy/config/environment.rb CHANGED

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