comfortable_mexican_sofa 1.3.0 → 1.3.1

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - rbx
+  - rbx-2.0
+  - ree
+  # - jruby

data/Gemfile

@@ -1,11 +1,11 @@
 source 'http://rubygems.org'
 
 gem 'rails',          '>=3.0.0'
-gem 'active_link_to', '>=0.0.0'
-gem 'paperclip',      '>=2.3.11'
+gem 'active_link_to', '>=0.0.8'
+gem 'paperclip',      '>=2.3.14'
 
 group :development do
-  gem 'sqlite3'
+  # gem 'sqlite3'
 end
 
 group :test do

data/README.md

@@ -1,5 +1,4 @@
-ComfortableMexicanSofa (MicroCMS)
-=================================
+# ComfortableMexicanSofa (MicroCMS) [![Build Status](https://secure.travis-ci.org/twg/comfortable-mexican-sofa.png)](http://travis-ci.org/twg/comfortable-mexican-sofa)
 
 ComfortableMexicanSofa is a tiny and powerful micro CMS for your Rails 3 application. This CMS is a plugin for your application, not the other way around. Implemented as an Engine so installation is no different than for any other plugin out there.
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css

@@ -28,8 +28,8 @@ table {
   width: 100%;
 }
 th, td {
-  min-height: 20px;
-  min-width: 20px;
+  height: 20px;
+  width: 20px;
   border: 1px dotted #ccc;
 }
 

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js

@@ -4,6 +4,10 @@ var cms_wym_options = {
   initSkin:         false,
   lang:             $('meta[name="cms-locale"]').attr('content'),
   
+  basePath:   $('meta[name="cms-js-assets-base-path"]').attr('content') + '/wymeditor/',
+  wymPath:    'disabled',
+  jQueryPath: 'disabled',
+  
   updateSelector:    'form',
   updateEvent:       'submit',
   

data/app/views/layouts/cms_admin/_head.html.erb

@@ -5,6 +5,7 @@
   
   <meta name="cms-admin-path" content="<%= ComfortableMexicanSofa.config.admin_route_prefix %>" />
   <meta name="cms-locale" content="<%= I18n.locale %>" />
+  <meta name="cms-js-assets-base-path" content="<%= ComfortableMexicanSofa.asset_pipeline_enabled?? '/assets' : '/public/javascripts' %>/comfortable_mexican_sofa"/>
   
   <% if ComfortableMexicanSofa.asset_pipeline_enabled? %>
     

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-07-03}
+  s.date = %q{2011-07-08}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".gemtest",
+    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.md",
@@ -270,20 +270,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.0"])
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.11"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.8"])
+      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.14"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<active_link_to>, [">= 0.0.0"])
-      s.add_dependency(%q<paperclip>, [">= 2.3.11"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<active_link_to>, [">= 0.0.8"])
+      s.add_dependency(%q<paperclip>, [">= 2.3.14"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<active_link_to>, [">= 0.0.0"])
-    s.add_dependency(%q<paperclip>, [">= 2.3.11"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<active_link_to>, [">= 0.0.8"])
+    s.add_dependency(%q<paperclip>, [">= 2.3.14"])
   end
 end
 

data/config/environments/production.rb

@@ -12,8 +12,8 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   config.serve_static_assets = false
 
   # Compress both stylesheets and JavaScripts
-  config.assets.js_compressor  = :uglifier
-  config.assets.css_compressor = :scss
+  # config.assets.js_compressor  = :uglifier
+  # config.assets.css_compressor = :scss
 
   # Specifies the header that your server uses for sending files
   # (comment out if your front-end server doesn't support this)

data/test/functional/cms_admin/pages_controller_test.rb

@@ -41,7 +41,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_field_string
-    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label}}')
+    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:string}}')
     get :new, :site_id => cms_sites(:default)
     assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-03 00:00:00.000000000 -04:00
+date: 2011-07-08 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154496160 !ruby/object:Gem::Requirement
+  requirement: &70140585880800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,40 +23,29 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154496160
+  version_requirements: *70140585880800
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &2154495460 !ruby/object:Gem::Requirement
+  requirement: &70140585880320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2154495460
+  version_requirements: *70140585880320
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2154494760 !ruby/object:Gem::Requirement
+  requirement: &70140585875980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *2154494760
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2154494060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2154494060
+  version_requirements: *70140585875980
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -65,7 +54,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gemtest
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -322,7 +311,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 422969780907158311
+      hash: 4527735035333233913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: