actiontext 6.1.3.1 → 7.0.0.alpha1

data/lib/generators/action_text/install/install_generator.rb

@@ -9,43 +9,45 @@ module ActionText
       source_root File.expand_path("templates", __dir__)
 
       def install_javascript_dependencies
-        rails_command "app:binstub:yarn", inline: true
-
-        say "Installing JavaScript dependencies", :green
-        run "#{Thor::Util.ruby_command} bin/yarn add #{js_dependencies.map { |name, version| "#{name}@#{version}" }.join(" ")}",
-          abort_on_failure: true, capture: true
+        if Pathname(destination_root).join("package.json").exist?
+          say "Installing JavaScript dependencies", :green
+          run "yarn add @rails/actiontext trix"
+        end
       end
 
-      def append_dependencies_to_package_file
-        if (app_javascript_pack_path = Pathname.new("app/javascript/packs/application.js")).exist?
-          js_dependencies.each_key do |dependency|
-            line = %[require("#{dependency}")]
+      def append_javascript_dependencies
+        destination = Pathname(destination_root)
 
-            unless app_javascript_pack_path.read.include? line
-              say "Adding #{dependency} to #{app_javascript_pack_path}", :green
-              append_to_file app_javascript_pack_path, "\n#{line}"
-            end
-          end
+        if (application_javascript_path = destination.join("app/javascript/application.js")).exist?
+          insert_into_file application_javascript_path.to_s, %(import "trix"\nimport "@rails/actiontext"\n)
         else
-          say <<~WARNING, :red
-            WARNING: Action Text can't locate your JavaScript bundle to add its package dependencies.
-
-            Add these lines to any bundles:
-
-            require("trix")
-            require("@rails/actiontext")
+          say <<~INSTRUCTIONS, :green
+            You must import the @rails/actiontext and trix JavaScript modules in your application entrypoint.
+          INSTRUCTIONS
+        end
 
-            Alternatively, install and setup the webpacker gem then rerun `bin/rails action_text:install`
-            to have these dependencies added automatically.
-          WARNING
+        if (importmap_path = destination.join("config/importmap.rb")).exist?
+          append_to_file importmap_path.to_s, %(pin "trix"\npin "@rails/actiontext", to: "actiontext.js"\n)
         end
       end
 
       def create_actiontext_files
-        template "actiontext.scss", "app/assets/stylesheets/actiontext.scss"
+        template "actiontext.css", "app/assets/stylesheets/actiontext.css"
+
+        gem_root = "#{__dir__}/../../../.."
 
-        copy_file "#{GEM_ROOT}/app/views/active_storage/blobs/_blob.html.erb",
+        copy_file "#{gem_root}/app/views/active_storage/blobs/_blob.html.erb",
           "app/views/active_storage/blobs/_blob.html.erb"
+
+        copy_file "#{gem_root}/app/views/layouts/action_text/contents/_content.html.erb",
+          "app/views/layouts/action_text/contents/_content.html.erb"
+      end
+
+      def enable_image_processing_gem
+        if (gemfile_path = Pathname(destination_root).join("Gemfile")).exist?
+          say "Ensure image_processing gem has been enabled so image uploads will work (remember to bundle!)"
+          uncomment_lines gemfile_path, /gem "image_processing"/
+        end
       end
 
       def create_migrations
@@ -53,15 +55,6 @@ module ActionText
       end
 
       hook_for :test_framework
-
-      private
-        GEM_ROOT = "#{__dir__}/../../../.."
-
-        def js_dependencies
-          js_package = JSON.load(Pathname.new("#{GEM_ROOT}/package.json"))
-          js_package["peerDependencies"].merge \
-            js_package["name"] => "^#{js_package["version"]}"
-        end
     end
   end
 end

data/lib/generators/action_text/install/templates/actiontext.css

@@ -0,0 +1,35 @@
+/*
+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+ * inclusion directly in any other asset bundle and remove this file.
+ *
+<%- if defined?(Webpacker::Engine) -%>
+ *= require trix/dist/trix
+<%- else -%>
+ *= require trix
+<% end -%>
+*/
+
+/*
+ * We need to override trix.css’s image gallery styles to accommodate the
+ * <action-text-attachment> element we wrap around attachments. Otherwise,
+ * images in galleries will be squished by the max-width: 33%; rule.
+*/
+.trix-content .attachment-gallery > action-text-attachment,
+.trix-content .attachment-gallery > .attachment {
+  flex: 1 0 33%;
+  padding: 0 0.5em;
+  max-width: 33%;
+}
+
+.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {
+  flex-basis: 50%;
+  max-width: 50%;
+}
+
+.trix-content action-text-attachment .attachment {
+  padding: 0 !important;
+  max-width: 100% !important;
+}

data/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@rails/actiontext",
-  "version": "6.1.3-1",
+  "version": "7.0.0-alpha1",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
+  "type": "module",
   "files": [
     "app/javascript/actiontext/*.js"
   ],
@@ -21,9 +22,18 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": "^6.0.0-alpha"
+    "@rails/activestorage": "7.0.0-alpha"
   },
   "peerDependencies": {
-    "trix": "^1.2.0"
+    "trix": "^1.3.1"
+  },
+  "devDependencies": {
+    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@rollup/plugin-commonjs": "^19.0.1",
+    "rollup": "^2.35.1",
+    "trix": "^1.3.1"
+  },
+  "scripts": {
+    "build": "rollup --config rollup.config.js"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 6.1.3.1
+  version: 7.0.0.alpha1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -94,17 +94,22 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.md
+- app/assets/javascripts/actiontext.js
+- app/assets/javascripts/trix.js
+- app/assets/stylesheets/trix.css
 - app/helpers/action_text/content_helper.rb
 - app/helpers/action_text/tag_helper.rb
 - app/javascript/actiontext/attachment_upload.js
 - app/javascript/actiontext/index.js
+- app/models/action_text/encrypted_rich_text.rb
 - app/models/action_text/record.rb
 - app/models/action_text/rich_text.rb
 - app/views/action_text/attachables/_missing_attachable.html.erb
 - app/views/action_text/attachables/_remote_image.html.erb
 - app/views/action_text/attachment_galleries/_attachment_gallery.html.erb
-- app/views/action_text/content/_layout.html.erb
+- app/views/action_text/contents/_content.html.erb
 - app/views/active_storage/blobs/_blob.html.erb
+- app/views/layouts/action_text/contents/_content.html.erb
 - db/migrate/20180528164100_create_action_text_tables.rb
 - lib/action_text.rb
 - lib/action_text/attachable.rb
@@ -118,6 +123,7 @@ files:
 - lib/action_text/attachments/trix_conversion.rb
 - lib/action_text/attribute.rb
 - lib/action_text/content.rb
+- lib/action_text/encryption.rb
 - lib/action_text/engine.rb
 - lib/action_text/fixture_set.rb
 - lib/action_text/fragment.rb
@@ -130,7 +136,7 @@ files:
 - lib/action_text/trix_attachment.rb
 - lib/action_text/version.rb
 - lib/generators/action_text/install/install_generator.rb
-- lib/generators/action_text/install/templates/actiontext.scss
+- lib/generators/action_text/install/templates/actiontext.css
 - lib/rails/generators/test_unit/install_generator.rb
 - lib/rails/generators/test_unit/templates/fixtures.yml
 - lib/tasks/actiontext.rake
@@ -140,10 +146,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.3.1/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.3.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.3.1/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha1/actiontext
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -152,14 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Rich text framework.

data/app/views/action_text/content/_layout.html.erb

@@ -1,3 +0,0 @@
-<div class="trix-content">
-  <%= render_action_text_content(content) %>
-</div>

data/lib/generators/action_text/install/templates/actiontext.scss

@@ -1,36 +0,0 @@
-//
-// Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
-// the trix-editor content (whether displayed or under editing). Feel free to incorporate this
-// inclusion directly in any other asset bundle and remove this file.
-//
-//= require trix/dist/trix
-
-// We need to override trix.css’s image gallery styles to accommodate the
-// <action-text-attachment> element we wrap around attachments. Otherwise,
-// images in galleries will be squished by the max-width: 33%; rule.
-.trix-content {
-  .attachment-gallery {
-    > action-text-attachment,
-    > .attachment {
-      flex: 1 0 33%;
-      padding: 0 0.5em;
-      max-width: 33%;
-    }
-
-    &.attachment-gallery--2,
-    &.attachment-gallery--4 {
-      > action-text-attachment,
-      > .attachment {
-        flex-basis: 50%;
-        max-width: 50%;
-      }
-    }
-  }
-
-  action-text-attachment {
-    .attachment {
-      padding: 0 !important;
-      max-width: 100% !important;
-    }
-  }
-}