comfortable_mexican_sofa 1.12.4 → 1.12.5

data/test/gemfiles/Gemfile.rails.4.0

@@ -12,7 +12,6 @@ gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
-gem 'tinymce-rails',    '>= 4.0.0'
 gem 'bootstrap-sass',   '>= 3.2.0'
 gem 'plupload-rails',   '>= 1.2.1'
 

data/test/gemfiles/Gemfile.rails.4.1

@@ -12,7 +12,6 @@ gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
-gem 'tinymce-rails',    '>= 4.0.0'
 gem 'bootstrap-sass',   '>= 3.2.0'
 gem 'plupload-rails',   '>= 1.2.1'
 

data/test/gemfiles/Gemfile.rails.4.2

@@ -12,7 +12,6 @@ gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
-gem 'tinymce-rails',    '>= 4.0.0'
 gem 'bootstrap-sass',   '>= 3.2.0'
 gem 'plupload-rails',   '>= 1.2.1'
 

data/test/gemfiles/Gemfile.rails.master

@@ -12,7 +12,6 @@ gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
-gem 'tinymce-rails',    '>= 4.0.0'
 gem 'bootstrap-sass',   '>= 3.2.0'
 gem 'plupload-rails',   '>= 1.2.1'
 

data/test/generators/cms_assets_generator_test.rb

@@ -6,8 +6,8 @@ class CmsAssetsGeneratorTest < Rails::Generators::TestCase
 
   def test_generator
     run_generator
-    assert_directory 'app/assets/images/comfortable_mexican_sofa'
-    assert_directory 'app/assets/javascripts/comfortable_mexican_sofa'
-    assert_directory 'app/assets/stylesheets/comfortable_mexican_sofa'
+    assert_directory 'app/assets/images/comfy/admin/cms'
+    assert_directory 'app/assets/javascripts/comfy/admin/cms'
+    assert_directory 'app/assets/stylesheets/comfy/admin/cms'
   end
 end

data/test/generators/cms_generator_test.rb

@@ -10,17 +10,13 @@ class CmsGeneratorTest < Rails::Generators::TestCase
     assert_migration 'db/migrate/create_cms.rb'
 
     assert_file 'config/initializers/comfortable_mexican_sofa.rb'
-    assert_file 'config/initializers/mime_types.rb' do |file|
-      mime = "Mime::Type.register 'text/plupload', :plupload unless Mime::Type.lookup_by_extension(:plupload)"
-      assert_match mime, file
-    end
 
     assert_file 'config/routes.rb', read_file('cms/routes.rb')
 
     assert_directory 'db/cms_fixtures'
 
-    assert_file 'app/assets/javascripts/comfortable_mexican_sofa/admin/application.js'
+    assert_file 'app/assets/javascripts/comfy/admin/cms/custom.js.coffee'
 
-    assert_file 'app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css'
+    assert_file 'app/assets/stylesheets/comfy/admin/cms/custom.sass'
   end
 end

data/test/integration/js_variables_test.rb

@@ -0,0 +1,20 @@
+require_relative '../test_helper'
+
+class JsVariablesIntegrationTest < ActionDispatch::IntegrationTest
+
+  def test_redactor_js_variables
+    site = comfy_cms_sites(:default)
+    http_auth :get, comfy_admin_cms_site_pages_path(site)
+    assert_response :success
+
+    js_vars = <<-HTML.strip_heredoc
+      <script>
+        CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(site)}';
+        CMS.locale            = 'en';
+      </script>
+    HTML
+
+    assert response.body.match(js_vars)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.5
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,20 +184,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: tinymce-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -240,30 +226,53 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif
-- app/assets/images/comfortable_mexican_sofa/arrow_right.gif
-- app/assets/images/comfortable_mexican_sofa/checkerboard.gif
-- app/assets/images/comfortable_mexican_sofa/icon_draft.gif
-- app/assets/images/comfortable_mexican_sofa/icon_file.gif
-- app/assets/images/comfortable_mexican_sofa/icon_layout.gif
-- app/assets/images/comfortable_mexican_sofa/icon_move.gif
-- app/assets/images/comfortable_mexican_sofa/icon_page.gif
-- app/assets/images/comfortable_mexican_sofa/icon_site.gif
-- app/assets/images/comfortable_mexican_sofa/icon_snippet.gif
-- app/assets/javascripts/comfortable_mexican_sofa/admin/application.js
-- app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee
-- app/assets/javascripts/comfortable_mexican_sofa/cms/files.js.coffee
-- app/assets/javascripts/comfortable_mexican_sofa/cms/uploader.js.coffee
-- app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.js
-- app/assets/javascripts/comfortable_mexican_sofa/lib/diff.js.coffee
-- app/assets/javascripts/comfortable_mexican_sofa/lib/diff/diff_match_patch.min.js
-- app/assets/javascripts/comfortable_mexican_sofa/lib/diff/pretty_text_diff.min.js
-- app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css
-- app/assets/stylesheets/comfortable_mexican_sofa/application.sass
-- app/assets/stylesheets/comfortable_mexican_sofa/base.sass
-- app/assets/stylesheets/comfortable_mexican_sofa/bootstrap_overrides.sass
-- app/assets/stylesheets/comfortable_mexican_sofa/codemirror_overrides.sass
-- app/assets/stylesheets/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.css
+- app/assets/images/comfy/admin/cms/arrow_bottom.gif
+- app/assets/images/comfy/admin/cms/arrow_right.gif
+- app/assets/images/comfy/admin/cms/checkerboard.gif
+- app/assets/images/comfy/admin/cms/icon_draft.gif
+- app/assets/images/comfy/admin/cms/icon_file.gif
+- app/assets/images/comfy/admin/cms/icon_layout.gif
+- app/assets/images/comfy/admin/cms/icon_move.gif
+- app/assets/images/comfy/admin/cms/icon_page.gif
+- app/assets/images/comfy/admin/cms/icon_site.gif
+- app/assets/images/comfy/admin/cms/icon_snippet.gif
+- app/assets/javascripts/comfy/admin/cms/application.js.coffee
+- app/assets/javascripts/comfy/admin/cms/base.js.coffee
+- app/assets/javascripts/comfy/admin/cms/custom.js.coffee
+- app/assets/javascripts/comfy/admin/cms/files.js.coffee
+- app/assets/javascripts/comfy/admin/cms/lib/bootstrap-datetimepicker.js
+- app/assets/javascripts/comfy/admin/cms/lib/diff.js.coffee
+- app/assets/javascripts/comfy/admin/cms/lib/diff/diff_match_patch.min.js
+- app/assets/javascripts/comfy/admin/cms/lib/diff/pretty_text_diff.min.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/filemanager.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/cs.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/da.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/de.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/es.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/fr.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/it.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ja.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/nb.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/nl.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/pl.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/pt_BR.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ru.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sv.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/zh_CN.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/zh_TW.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/imagemanager.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/table.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/video.js
+- app/assets/javascripts/comfy/admin/cms/uploader.js.coffee
+- app/assets/stylesheets/comfy/admin/cms/application.sass
+- app/assets/stylesheets/comfy/admin/cms/base.sass
+- app/assets/stylesheets/comfy/admin/cms/bootstrap_overrides.sass
+- app/assets/stylesheets/comfy/admin/cms/codemirror_overrides.sass
+- app/assets/stylesheets/comfy/admin/cms/custom.sass
+- app/assets/stylesheets/comfy/admin/cms/lib/bootstrap-datetimepicker.css
+- app/assets/stylesheets/comfy/admin/cms/lib/redactor.css
+- app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass
 - app/controllers/application_controller.rb
 - app/controllers/comfy/admin/cms/base_controller.rb
 - app/controllers/comfy/admin/cms/categories_controller.rb
@@ -383,7 +392,6 @@ files:
 - config/environments/test.rb
 - config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/paperclip.rb
-- config/initializers/plupload.rb
 - config/initializers/secret_token.rb
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -554,6 +562,7 @@ files:
 - test/helpers/cms_helper_test.rb
 - test/integration/access_control_test.rb
 - test/integration/fixtures_test.rb
+- test/integration/js_variables_test.rb
 - test/integration/mirrors_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/routing_test.rb

data/app/assets/javascripts/comfortable_mexican_sofa/admin/application.js

@@ -1 +0,0 @@
-// Overwrite this file in your application /app/assets/javascripts/comfortable_mexican_sofa/admin/application.js

data/app/assets/javascripts/comfortable_mexican_sofa/lib/diff.js.coffee

@@ -1,9 +0,0 @@
-#= require comfortable_mexican_sofa/lib/diff/diff_match_patch.min
-#= require comfortable_mexican_sofa/lib/diff/pretty_text_diff.min
-
-$ ->
-  $("table.diff").prettyTextDiff ->
-    cleanup: true
-    originalContainer:  'tr td.original'
-    changedContainer:   'tr td.changed'
-    diffContainer:      'tr td.diff'

data/app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css

@@ -1 +0,0 @@
-/* Overwrite this file in your application /app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css */

data/app/assets/stylesheets/comfortable_mexican_sofa/application.sass

@@ -1,8 +0,0 @@
-@import "jquery-ui"
-@import "codemirror"
-@import "bootstrap-sprockets"
-@import "bootstrap"
-@import "comfortable_mexican_sofa/lib/bootstrap-datetimepicker"
-@import "comfortable_mexican_sofa/bootstrap_overrides"
-@import "comfortable_mexican_sofa/codemirror_overrides"
-@import "comfortable_mexican_sofa/base"

data/config/initializers/plupload.rb

@@ -1,9 +0,0 @@
-# Set a custom mime type to identify requests from plupload.
-#
-#   respond_to do |format|
-#     format.plupload { render :nothing => true, :status => :created }
-#   end
-
-unless Mime::Type.lookup_by_extension(:plupload)
-  Mime::Type.register 'text/plupload', :plupload
-end