tinymce-rails 4.0.28 → 4.0.28.1

data/lib/tinymce/rails/engine.rb

@@ -1,7 +1,7 @@
 module TinyMCE::Rails
   class Engine < ::Rails::Engine
     config.tinymce = ActiveSupport::OrderedOptions.new
-    
+
     # Set an explicit base path for TinyMCE assets (usually defaults to /assets/tinymce)
     config.tinymce.base = nil
 
@@ -20,15 +20,14 @@ module TinyMCE::Rails
     end
 
     def self.default_base
-      File.join(Rails.application.config.action_controller.asset_host || "",
-                relative_url_root || "",
+      File.join(asset_host || "", relative_url_root || "",
                 Rails.application.config.assets.prefix || "/",
                 "tinymce")
     end
-    
+
     def self.relative_url_root
       config = Rails.application.config
-      
+
       if config.respond_to?(:relative_url_root)
         config.relative_url_root
       else
@@ -36,5 +35,20 @@ module TinyMCE::Rails
         config.action_controller.relative_url_root
       end
     end
+
+    def self.asset_host
+      host = Rails.application.config.action_controller.asset_host
+      
+      if host.respond_to?(:call)
+        # Callable asset hosts cannot be supported during
+        # precompilation as there is no request object
+        nil
+      elsif host =~ /%d/
+        # Load all TinyMCE assets from the first asset host
+        host % 0
+      else
+        host
+      end
+    end
   end
 end

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "4.0.28"
+    VERSION = "4.0.28.1"
     TINYMCE_VERSION = "4.0.28"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinymce-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.28
+  version: 4.0.28.1
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -134,7 +134,8 @@ files:
 - vendor/assets/javascripts/tinymce/tinymce.jquery.js
 - vendor/assets/javascripts/tinymce/tinymce.js
 homepage: https://github.com/spohlenz/tinymce-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []