comfortable_mexican_sofa 1.12.1 → 1.12.2

data/db/upgrade_migrations/08_upgrade_to_1_12_0.rb

@@ -17,9 +17,6 @@ class UpgradeTo1120 < ActiveRecord::Migration
     rename_table :cms_blocks,           :comfy_cms_blocks
     rename_table :cms_snippets,         :comfy_cms_snippets
     rename_table :cms_files,            :comfy_cms_files
-    rename_index :cms_revisions,
-      'index_cms_revisions_on_record_type_and_record_id_and_created_at',
-      'index_cms_revisions_on_record_type_id_created'
     rename_table :cms_revisions,        :comfy_cms_revisions
     rename_index :cms_categories,
       'index_cms_categories_on_site_id_and_categorized_type_and_label',

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -88,6 +88,7 @@ class ComfortableMexicanSofa::Configuration
       'es'    => 'Español',
       'pt-BR' => 'Português Brasileiro',
       'zh-CN' => '简体中文',
+      'zh-TW' => '正體中文',
       'ja'    => '日本語',
       'sv'    => 'Svenska',
       'ru'    => 'Русский',
@@ -95,7 +96,9 @@ class ComfortableMexicanSofa::Configuration
       'de'    => 'Deutsch',
       'nl'    => 'Nederlands',
       'it'    => 'Italiano',
-      'da'    => 'Dansk'
+      'da'    => 'Dansk',
+      'cs'    => 'Česky',
+      'nb' => 'Norsk'
     }
     @admin_locale         = nil
     @admin_cache_sweeper  = nil

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.12.1"
+  VERSION = "1.12.2"
 end

data/test/gemfiles/Gemfile.rails.4.0

@@ -6,7 +6,7 @@ gem 'active_link_to',   '>= 1.0.0'
 gem 'paperclip',        '>= 3.4.0'
 gem 'kramdown',         '>= 1.0.0'
 gem 'jquery-rails',     '>= 3.0.0'
-gem 'jquery-ui-rails',  '>= 4.0.0'
+gem 'jquery-ui-rails',  '>= 5.0.0'
 gem 'haml-rails',       '>= 0.3.0'
 gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'

data/test/gemfiles/Gemfile.rails.4.1

@@ -6,7 +6,7 @@ gem 'active_link_to',   '>= 1.0.0'
 gem 'paperclip',        '>= 3.4.0'
 gem 'kramdown',         '>= 1.0.0'
 gem 'jquery-rails',     '>= 3.0.0'
-gem 'jquery-ui-rails',  '>= 4.0.0'
+gem 'jquery-ui-rails',  '>= 5.0.0'
 gem 'haml-rails',       '>= 0.3.0'
 gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'

data/test/gemfiles/Gemfile.rails.master

@@ -6,7 +6,7 @@ gem 'active_link_to',   '>= 1.0.0'
 gem 'paperclip',        '>= 3.4.0'
 gem 'kramdown',         '>= 1.0.0'
 gem 'jquery-rails',     '>= 3.0.0'
-gem 'jquery-ui-rails',  '>= 4.0.0'
+gem 'jquery-ui-rails',  '>= 5.0.0'
 gem 'haml-rails',       '>= 0.3.0'
 gem 'sass-rails',       '>= 4.0.3'
 gem 'coffee-rails',     '>= 3.1.0'

data/test/lib/fixtures_test.rb

@@ -32,7 +32,7 @@ class FixtureTest < ActiveSupport::TestCase
     FileUtils.rm_rf(host_path)
   end
   
-  def test_import_all_with_no_site
+  def test_export_all_with_no_site
     comfy_cms_sites(:default).destroy
     
     assert_exception_raised ActiveRecord::RecordNotFound do
@@ -40,4 +40,4 @@ class FixtureTest < ActiveSupport::TestCase
     end
   end
   
-end
+end

data/test/test_helper.rb

@@ -19,6 +19,7 @@ class ActiveSupport::TestCase
   
   def setup
     reset_config
+    reset_locale
     stub_paperclip
   end
   
@@ -48,6 +49,11 @@ class ActiveSupport::TestCase
     ComfortableMexicanSofa::HttpAuth.password = 'password'
   end
   
+  def reset_locale
+    I18n.default_locale = :en
+    I18n.locale         = :en
+  end
+  
   # Example usage:
   #   assert_has_errors_on @record, :field_1, :field_2
   def assert_has_errors_on(record, *fields)
@@ -106,6 +112,7 @@ class ActionDispatch::IntegrationTest
   def setup
     host! 'test.host'
     reset_config
+    reset_locale
     stub_paperclip
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -374,6 +374,7 @@ files:
 - config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/paperclip.rb
 - config/initializers/secret_token.rb
+- config/locales/cs.yml
 - config/locales/da.yml
 - config/locales/de.yml
 - config/locales/en.yml
@@ -381,12 +382,14 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/nb.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sv.yml
 - config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/cms_fixtures/sample-site/categories/files.yml
 - db/cms_fixtures/sample-site/categories/pages.yml
 - db/cms_fixtures/sample-site/categories/snippets.yml