Merge upstream changes.

.gitignore

@@ -0,0 +1,2 @@
+spec/dummy
+Gemfile.lock

Gemfile

@@ -7,6 +7,7 @@ gem "refinerycms-testing"
 
 gem 'sqlite3'
 gem 'pry'
+gem 'listen'
 
 group :development, :test do
   gem 'selenium-webdriver', '~> 3.0'

bin/rails

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+begin
+  load File.join(File.expand_path('../../',  __FILE__), 'spec/dummy/bin/rails')
+rescue LoadError => load_error
+  warn "No dummy Rails application found! \n" \
+       "To create one in spec/dummy, please run: \n\n" \
+       "    rake refinery:testing:dummy_app"
+end

lib/refinery/tinymce.rb

@@ -1,6 +1,7 @@
 module Refinery
   module Tinymce
     require 'refinery/tinymce/engine'
+    require 'refinery/tinymce/configuration'
 
     class << self
       def root

lib/refinery/tinymce/configuration.rb

@@ -0,0 +1,9 @@
+module Refinery
+  module Tinymce
+    include ActiveSupport::Configurable
+
+    config_accessor :extra_plugins
+
+    self.extra_plugins = []
+  end
+end

lib/refinery/tinymce/engine.rb

@@ -21,6 +21,7 @@ class Engine < ::Rails::Engine
           tinymce/plugins/stylebuttons/*
           tinymce/plugins/refineryimage/*
           tinymce/plugins/refinerylink/*
+          refinery/tinymce_manifest.js
         )
       end
 

refinerycms-tinymce.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency    'refinerycms-core', '~> 4.0.3'
+  s.add_dependency    'refinerycms-core', '>= 3.0.0'
 end