actiontext 7.0.8.2 → 7.1.0.beta1

data/lib/action_text/trix_attachment.rb

@@ -39,10 +39,10 @@ module ActionText
         end
 
         def typecast_attribute_values(attributes)
-          attributes.map do |key, value|
+          attributes.to_h do |key, value|
             typecast = ATTRIBUTE_TYPES[key] || ATTRIBUTE_TYPES[:default]
             [key, typecast.call(value)]
-          end.to_h
+          end
         end
     end
 

data/lib/action_text/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module ActionText
-  # Returns the currently loaded version of Action Text as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action Text as a +Gem::Version+.
   def self.version
     gem_version
   end

data/lib/action_text.rb

@@ -3,8 +3,13 @@
 require "active_support"
 require "active_support/rails"
 
+require "action_text/version"
+require "action_text/deprecator"
+
 require "nokogiri"
 
+# :markup: markdown
+# :include: actiontext/README.md
 module ActionText
   extend ActiveSupport::Autoload
 
@@ -37,4 +42,18 @@ module ActionText
     autoload :Minification
     autoload :TrixConversion
   end
+
+  class << self
+    def html_document_class
+      return @html_document_class if defined?(@html_document_class)
+      @html_document_class =
+        defined?(Nokogiri::HTML5) ? Nokogiri::HTML5::Document : Nokogiri::HTML4::Document
+    end
+
+    def html_document_fragment_class
+      return @html_document_fragment_class if defined?(@html_document_fragment_class)
+      @html_document_fragment_class =
+        defined?(Nokogiri::HTML5) ? Nokogiri::HTML5::DocumentFragment : Nokogiri::HTML4::DocumentFragment
+    end
+  end
 end

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

@@ -9,8 +9,10 @@ module ActionText
       source_root File.expand_path("templates", __dir__)
 
       def install_javascript_dependencies
-        if Pathname(destination_root).join("package.json").exist?
-          say "Installing JavaScript dependencies", :green
+        say "Installing JavaScript dependencies", :green
+        if using_bun?
+          run "bun add @rails/actiontext trix"
+        elsif using_node?
           run "yarn add @rails/actiontext trix"
         end
       end
@@ -19,7 +21,7 @@ module ActionText
         destination = Pathname(destination_root)
 
         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)
+          insert_into_file application_javascript_path.to_s, %(\nimport "trix"\nimport "@rails/actiontext"\n)
         else
           say <<~INSTRUCTIONS, :green
             You must import the @rails/actiontext and trix JavaScript modules in your application entrypoint.
@@ -66,6 +68,21 @@ module ActionText
         rails_command "railties:install:migrations FROM=active_storage,action_text", inline: true
       end
 
+      def using_js_runtime?
+        @using_js_runtime ||= Pathname(destination_root).join("package.json").exist?
+      end
+
+      def using_bun?
+        # Cannot assume yarn.lock has been generated yet so we look for
+        # a file known to be generated by the jsbundling-rails gem
+        @using_bun ||= using_js_runtime? && Pathname(destination_root).join("bun.config.js").exist?
+      end
+
+      def using_node?
+        # Bun is the only runtime that _isn't_ node.
+        @using_node ||= using_js_runtime? && !Pathname(destination_root).join("bun.config.js").exist?
+      end
+
       hook_for :test_framework
     end
   end

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

@@ -3,11 +3,7 @@
  * 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 -%>
 */
 
 /*

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "7.0.8-2",
+  "version": "7.1.0-beta1",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/assets/javascripts/actiontext.js",
   "type": "module",
@@ -15,21 +15,22 @@
   "bugs": {
     "url": "https://github.com/rails/rails/issues"
   },
-  "author": "Basecamp, LLC",
+  "author": "37signals LLC",
   "contributors": [
     "Javan Makhmali <javan@javan.us>",
     "Sam Stephenson <sstephenson@gmail.com>"
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": ">= 7.0.0-alpha1"
+    "@rails/activestorage": ">= 7.1.0-alpha",
+    "webpack": "^4.17.1"
   },
   "peerDependencies": {
     "trix": "^2.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^11.0.1",
     "@rollup/plugin-commonjs": "^19.0.1",
+    "@rollup/plugin-node-resolve": "^11.0.1",
     "rollup": "^2.35.1",
     "trix": "^2.0.0"
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 7.0.8.2
+  version: 7.1.0.beta1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.2
+        version: 7.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - 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/_content_attachment.html.erb
 - 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
@@ -137,6 +138,7 @@ files:
 - lib/action_text/attachments/trix_conversion.rb
 - lib/action_text/attribute.rb
 - lib/action_text/content.rb
+- lib/action_text/deprecator.rb
 - lib/action_text/encryption.rb
 - lib/action_text/engine.rb
 - lib/action_text/fixture_set.rb
@@ -160,10 +162,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.2/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.8.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.0.beta1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.2/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.0.beta1/actiontext
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -176,11 +178,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.5.10
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Rich text framework.