refinerycms-wymeditor 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37139f9b534aacb28546c069bf471c5da0ae3319
-  data.tar.gz: 59d724b228ec959354ce3bdd74aecbcee7fc9952
+SHA256:
+  metadata.gz: d2e57348be60d89cf97c865069dbe3e70441b32ad0dab2219fa3789d1252dbe0
+  data.tar.gz: 59a410f674a1ae63a223db7d61c071d36e7c69f9bfbe478fb071b51ba0c9b6e1
 SHA512:
-  metadata.gz: cefe9cda1a62f431b8d605087f8bee10745e7137ef898dea953dc6ffc4f9dc24dc5cc82dffc961fc1dd3ac00acfa21cbaa56b8bbe964334ebd838c242d65bfc2
-  data.tar.gz: 0e5cf462a81e478345ad2d003dae3a65cc27270bca034be463130d4ba494a4690a7c523f87e8fcb0834042045ec537c8b090fd5eff9bd49dc5c58593e743e87b
+  metadata.gz: 30d8608c030b664dc18a3119fb28dcac9e1d21dc7f7908ea0932a72eaca4f9f234a728cc769cd3af6fa2fc296ee060fa9472999159137c5d83da819dc1b4590e
+  data.tar.gz: 1509dcfd0c647cf449a71ca9684b4a9a6bc83a222ca3483553acf25389b0847b0dc27beccdbd73a83d49cbbc3886726438d0e44f8f945cb45d46929f1bc0db50

data/.travis.yml

@@ -17,7 +17,7 @@ notifications:
   webhooks:
     - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 rvm:
-  - 2.4.1
-  - 2.3.3
-  - 2.2.6
+  - 2.6.4
+  - 2.5.6
+  - 2.4.7
 sudo: false

data/app/assets/javascripts/wymeditor/classes.js.erb

@@ -1177,7 +1177,9 @@ WYMeditor.XhtmlSaxListener.prototype.joinRepeatedEntities = function(xhtml)
 
 WYMeditor.XhtmlSaxListener.prototype.removeEmptyTags = function(xhtml)
 {
-  return xhtml.replace(new RegExp('<('+this.block_tags.join("|").replace(/\|td/,'').replace(/\|th/, '')+')>(<br \/>|&#160;|&nbsp;|\\s)*<\/\\1>' ,'g'),'');
+  var tags = this.block_tags.join("|").replace(/\|td/,'').replace(/\|th/, '');
+  var emptyTags = '<(' + tags + ')>(<br \/>|&#160;|&nbsp;|\\s)*<\/\\1>';
+  return xhtml.replace(new RegExp(emptyTags ,'g'),'').trim();
 };
 
 WYMeditor.XhtmlSaxListener.prototype.removeBrInPre = function(xhtml)

data/app/assets/javascripts/wymeditor/lang/zh-CN.js

@@ -42,6 +42,8 @@ WYMeditor.STRINGS['zh-CN'] = {
 	Status: '状态',
 	Source_Code: '源代码',
 	Attachment: '附件',
-	NewParagraph: '新段落'
+	NewParagraph: '新段落',
+	Apply_Style: '应用样式',
+	Insert: '插入'
 };
 

data/app/assets/javascripts/wymeditor/prototypes.js.erb

@@ -556,7 +556,7 @@ WYMeditor.editor.prototype.replaceStrings = function(sVal) {
   var wym = this;
   if(!WYMeditor.STRINGS[wym._options.lang]) {
     try {
-      eval($.ajax({url:wym._options.langPath + wym._options.lang + '.js', async:false}).responseText);
+      eval($.ajax({url:"<%= asset_path("wymeditor/lang/#{I18n.locale}") %>", async:false}).responseText);
     } catch(e) {
       if (WYMeditor.console) {
         WYMeditor.console.error("WYMeditor: error while parsing language file.");

data/app/assets/javascripts/wymeditor/validators.js.erb

@@ -26,7 +26,8 @@ WYMeditor.XhtmlValidator = {
       "accesskey",
       "tabindex",
       "data",
-      "^data-.*"
+      "^data-.*",
+      "^aria-.*"
       ]
     },
     "language":

data/refinerycms-wymeditor.gemspec

@@ -1,23 +1,24 @@
-# Encoding: UTF-8
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
-  s.name              = %q{refinerycms-wymeditor}
-  s.version           = '2.0.0'
-  s.summary           = %q{WYMeditor support for Refinery CMS}
-  s.description       = %q{This extension adds WYMeditor support to Refinery CMS for visual editing.}
-  s.email             = %q{gems@p.arndt.io}
-  s.homepage          = %q{https://manuka.co}
+  s.name              = 'refinerycms-wymeditor'
+  s.version           = '2.1.0'
+  s.summary           = 'WYMeditor support for Refinery CMS'
+  s.description       = 'This extension adds WYMeditor support to Refinery CMS for visual editing.'
+  s.email             = 'gems@p.arndt.io'
+  s.homepage          = 'https://manuka.co'
   s.authors           = ['Philip Arndt']
-  s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
+  s.license           = 'MIT'
+  s.require_paths     = %w[lib]
 
   s.files             = `git ls-files -- '*[^.pem]'`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency    'refinerycms-core', ['>= 4.0.0.dev', '< 5.0']
+  s.add_dependency    'refinerycms-core', ['>= 4.0.0', '< 5.0']
 
-  s.cert_chain  = ['certs/parndt.pem']
-  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  s.cert_chain = ['certs/parndt.pem']
+  if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
   end
 end

data/spec/features/refinery/admin/wymeditor_feature_spec.rb

@@ -8,11 +8,11 @@ describe 'wymeditor', :type => :feature do
       allow(Refinery::I18n).to receive(:frontend_locales).and_return [:en, :ru]
 
       # Create a page in both locales
-      about_page = Globalize.with_locale(:en) do
+      about_page = Mobility.with_locale(:en) do
         Refinery::Page.create :title => 'About'
       end
 
-      Globalize.with_locale(:ru) do
+      Mobility.with_locale(:ru) do
         about_page.title = 'About Ru'
         about_page.save
       end

data/spec/spec_helper.rb

@@ -27,7 +27,8 @@ Capybara.javascript_driver = :chrome
 
 Capybara.configure do |config|
   config.default_max_wait_time = ENV['CAPYBARA_MAX_WAIT_TIME'] || 10 # seconds
-  config.default_driver        = :selenium
+  config.default_driver = :selenium
+  config.server = :webrick
 end
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-wymeditor
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,27 +10,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  2Oqsxsw30MIZnh2Cw/xLRkc1I50luA==
   -----END CERTIFICATE-----
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -38,7 +42,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.dev
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -48,7 +52,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.dev
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -220,8 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: WYMeditor support for Refinery CMS