trix 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd05f0b81cf9aae8d6c0d1f29431581fcbbf47ca
-  data.tar.gz: f2dc048be340742b3463aa8b45987416e7dfa991
+  metadata.gz: 2ece98d65e59234a3f9d0ec7d73935f8d4d0b4f2
+  data.tar.gz: bc96359cfe7b562cc7c128b79b92f47206f7985a
 SHA512:
-  metadata.gz: 5bec6aed655ce1e6202c826efd7356c339a60c455f7af5d1d40b52a38eb47cd10e3c91a86869ec568cb0c0e8b110a5639f644ecea9495cbdfd1c8b3057faa634
-  data.tar.gz: 9a445c47c83b3647ea21d92df45c494d0c182459e4630b0897589e03a505936526334ac198b008c0521bbbe8c649067328648730fe2066e69bdb3e715f330fe8
+  metadata.gz: a321171c18443d9a262495a5fdedc3eb16292cbd1a56ff9a939c3f7a6ed21f8bf861e911ea968362878913b010644f83a62ee75251538b1409e828b03f2e0452
+  data.tar.gz: eab4fbb25c47d9dacc9ba464df93a34a31f2383c3dd4a073dafe178d5cc0efe2d0d94292946c3961923d49fff8a0d73fcb715a943fd0bfa885f9e5b4e09836b0

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/gemfiles/*.gemfile.lock
+.ruby-version

data/.rubocop_todo.yml

@@ -1,6 +1,41 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-07-16 12:30:37 -0300 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
 Metrics/AbcSize:
-  Enabled: false
+  Max: 22
+
+# Offense count: 10
+# Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 110
+  Max: 104
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 11
+
+# Offense count: 10
+# Configuration parameters: Exclude.
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/formtastic/inputs/trix_editor_input.rb'
+    - 'lib/trix.rb'
+    - 'lib/trix/engine.rb'
+    - 'lib/trix/form.rb'
+    - 'lib/trix/simple_form/trix_editor_input.rb'
+    - 'lib/trix/version.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'spec/trix_editor_helper_spec.rb'

data/.travis.yml

@@ -1,10 +1,14 @@
 language: ruby
 rvm:
-  - 2.2.4
-  - 2.3.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 gemfile:
-  - gemfiles/rails_4.0.gemfile
-  - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_master.gemfile
+matrix:
+  allow_failures:
+    - gemfile: 'gemfiles/rails_master.gemfile'
 before_install: gem install bundler -v 1.11.2

data/Appraisals

@@ -1,18 +1,19 @@
-appraise "rails-4.0" do
-  gem "rails", "~> 4.0.0"
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0"
 end
 
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.0"
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.0"
 end
 
-appraise "rails-4.2" do
-  gem "rails", "~> 4.2.0"
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
 end
 
 appraise "rails-master" do
   gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
+  gem "arel", git: "https://github.com/rails/arel.git", branch: "master"
   %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-    gem lib, git:  "https://github.com/rspec/#{lib}.git", branch:  'master'
+    gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'master'
   end
-end
+end

data/README.md

@@ -41,13 +41,12 @@ forms, just use the `trix_editor` helper:
 f.trix_editor :body
 ```
 
-Or if you are using the [formtastic](https://github.com/justinfrench/formtastic) gem:
+If you are using the [Formtastic](https://github.com/justinfrench/formtastic) gem or the [Simple Form](https://github.com/plataformatec/simple_form) gem, you can do this:
 
 ```ruby
 f.input :body, as: :trix_editor
 ```
 
-
 ## Trix
 
 For the official Trix Github repository, go

data/Rakefile

@@ -8,4 +8,4 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
+task default: %i(rubocop spec)

data/gemfiles/{rails_4.0.gemfile → rails_5.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.0.0"
 
 gemspec :path => "../"

data/gemfiles/{rails_4.1.gemfile → rails_5.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 5.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_master.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", :git => "https://github.com/rails/rails.git", :branch => "master"
+gem "arel", :git => "https://github.com/rails/arel.git", :branch => "master"
 gem "rspec-core", :git => "https://github.com/rspec/rspec-core.git", :branch => "master"
 gem "rspec-expectations", :git => "https://github.com/rspec/rspec-expectations.git", :branch => "master"
 gem "rspec-mocks", :git => "https://github.com/rspec/rspec-mocks.git", :branch => "master"

data/lib/formtastic/inputs/trix_editor_input.rb

@@ -2,8 +2,10 @@ class TrixEditorInput < Formtastic::Inputs::StringInput
   def to_html
     input_wrapping do
       editor_tag_params = {
-        input: input_html_options[:id]
+        input: input_html_options[:id],
+        class: 'trix-content'
       }
+
       editor_tag = template.content_tag('trix-editor', '', editor_tag_params)
       hidden_field = builder.hidden_field(method, input_html_options)
 

data/lib/trix/engine.rb

@@ -4,6 +4,14 @@ module Trix
       ActiveSupport.on_load(:action_view) do
         require 'trix/form'
       end
+
+      if defined? ::SimpleForm
+        require 'trix/simple_form/trix_editor_input'
+
+        ::SimpleForm.setup do |config|
+          config.custom_inputs_namespaces << 'Trix::SimpleForm'
+        end
+      end
     end
   end
 end

data/lib/trix/form.rb

@@ -8,18 +8,18 @@ module TrixEditorHelper
   def trix_editor_tag(name, value = nil, options = {})
     options.symbolize_keys!
 
-    attributes = { class: "formatted_content #{options[:class]}".squish }
-
+    css_class = Array.wrap(options[:class]).join(' ')
+    attributes = { class: "formatted_content trix-content #{css_class}".squish }
     attributes[:autofocus] = true if options[:autofocus]
-    attributes[:placeholder] = options[:placeholder] if options[:placeholder]
-    attributes[:spellcheck] = options[:spellcheck] if options[:spellcheck]
     attributes[:input] = options[:input] || "trix_input_#{TrixEditorHelper.id += 1}"
-    attributes[:toolbar] = options[:toolbar] if options[:toolbar]
+
+    valid_html_options = [:placeholder, :spellcheck, :toolbar, :tabindex]
+    attributes.merge!(options.slice(*valid_html_options))
 
     editor_tag = content_tag('trix-editor', '', attributes)
     input_tag = hidden_field_tag(name, value, id: attributes[:input])
 
-    editor_tag + input_tag
+    input_tag + editor_tag
   end
 end
 

data/lib/trix/simple_form/trix_editor_input.rb

@@ -0,0 +1,12 @@
+module Trix
+  module SimpleForm
+    class TrixEditorInput < ::SimpleForm::Inputs::Base
+      def input(_wrapper_options)
+        editor_tag = template.content_tag('trix-editor', '', input: input_class, class: 'trix-content')
+        hidden_field = @builder.hidden_field(attribute_name, input_html_options)
+
+        template.content_tag('div', editor_tag + hidden_field, class: 'trix-editor-wrapper')
+      end
+    end
+  end
+end

data/lib/trix/version.rb

@@ -1,3 +1,3 @@
 module Trix
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/trix.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'trix/version'
@@ -19,13 +20,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rails'
+  spec.add_runtime_dependency 'rails', ['> 4.1', '< 5.2']
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'formtastic', '~> 3.0'
+  spec.add_development_dependency 'simple_form', '~> 3.5'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-activemodel-mocks'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '0.35.1'
 end