comfortable_mexican_sofa 1.8.1 → 1.8.2

data/README.md

@@ -14,6 +14,12 @@ Features
 * [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Revisions)
 * [Great extendable admin interface](https://github.com/comfy/comfortable-mexican-sofa/wiki/Reusing-sofa%27s-admin-area) built with [Bootstrap](http://twitter.github.com/bootstrap/), [CodeMirror](http://codemirror.net/) and [WYSIHTML5](http://xing.github.com/wysihtml5/)
 
+Installation for Rails 4
+------------------------
+For Rails 4 apps feel free to use [2.0.0.beta1](https://github.com/comfy/comfortable-mexican-sofa/tree/2.0) release.
+
+    gem 'comfortable_mexican_sofa', '~> 2.0.0.beta1'
+
 Installation
 ------------
 Add gem definition to your Gemfile:
@@ -70,4 +76,4 @@ Twitter: [@GroceryBagHead](http://twitter.com/#!/GroceryBagHead)
 
 ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE) 
 
-Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
+Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)

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

@@ -1,6 +1,6 @@
 #= require jquery
 #= require jquery_ujs
-#= require jquery-ui
+#= require jquery.ui.all
 #= require comfortable_mexican_sofa/lib/bootstrap
 #= require comfortable_mexican_sofa/lib/codemirror
 #= require comfortable_mexican_sofa/lib/wysihtml5

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

@@ -1,3 +1,4 @@
+//= require jquery.ui.all
 //= require comfortable_mexican_sofa/lib/bootstrap
 //= require comfortable_mexican_sofa/lib/codemirror
 //= require comfortable_mexican_sofa/lib/bootstrap-wysihtml5

data/comfortable_mexican_sofa.gemspec

@@ -16,13 +16,14 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   
-  s.add_dependency 'rails',          '>= 3.1.0'
-  s.add_dependency 'formatted_form', '>= 2.1.0'
-  s.add_dependency 'active_link_to', '>= 1.0.0'
-  s.add_dependency 'paperclip',      '>= 3.4.0'
-  s.add_dependency 'redcarpet',      '>= 2.2.0'
-  s.add_dependency 'jquery-rails',   '>= 2.2.0'
-  s.add_dependency 'haml-rails',     '>= 0.3.0'
-  s.add_dependency 'sass-rails',     '>= 3.1.0'
-  s.add_dependency 'coffee-rails',   '>= 3.1.0'
+  s.add_dependency 'rails',           '>= 3.1.0'
+  s.add_dependency 'formatted_form',  '>= 2.1.0'
+  s.add_dependency 'active_link_to',  '>= 1.0.0'
+  s.add_dependency 'paperclip',       '>= 3.4.0'
+  s.add_dependency 'redcarpet',       '>= 2.2.0'
+  s.add_dependency 'jquery-rails',    '>= 3.0.0'
+  s.add_dependency 'jquery-ui-rails', '>= 4.0.0'
+  s.add_dependency 'haml-rails',      '>= 0.3.0'
+  s.add_dependency 'sass-rails',      '>= 3.1.0'
+  s.add_dependency 'coffee-rails',    '>= 3.1.0'
 end

data/db/migrate/01_create_cms.rb

@@ -103,7 +103,8 @@ class CreateCms < ActiveRecord::Migration
       t.text      :data,        text_limit
       t.datetime  :created_at
     end
-    add_index :cms_revisions, [:record_type, :record_id, :created_at]
+    add_index :cms_revisions, [:record_type, :record_id, :created_at],
+      :name => 'index_cms_revisions_on_rtype_and_rid_and_created_at'
     
     # -- Categories ---------------------------------------------------------
     create_table :cms_categories, :force => true do |t|

data/lib/comfortable_mexican_sofa/engine.rb

@@ -6,6 +6,7 @@ require 'active_link_to'
 require 'paperclip'
 require 'redcarpet'
 require 'jquery-rails'
+require 'jquery-ui-rails'
 require 'haml-rails'
 require 'sass-rails'
 require 'coffee-rails'

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -1,8 +1,8 @@
 module ComfortableMexicanSofa::Fixtures
   
   def self.import_all(to_site, from_folder = nil, force_import = false)
-    import_layouts  to_site, from_folder, force_import
-    import_pages    to_site, from_folder, force_import
+    import_layouts  to_site, from_folder, nil, true, nil, [], force_import
+    import_pages    to_site, from_folder, nil, true, nil, [], force_import
     import_snippets to_site, from_folder, force_import
   end
   

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

data/lib/generators/comfy/cms/cms_generator.rb

@@ -37,6 +37,13 @@ module Comfy
         directory 'db/cms_fixtures', 'db/cms_fixtures'
       end
       
+      def generate_assets
+        directory 'app/assets/javascripts/comfortable_mexican_sofa/admin',
+          'app/assets/javascripts/comfortable_mexican_sofa/admin'
+        directory 'app/assets/stylesheets/comfortable_mexican_sofa/admin',
+          'app/assets/stylesheets/comfortable_mexican_sofa/admin'
+      end
+      
       def show_readme
         readme 'lib/generators/comfy/cms/README'
       end

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -13,7 +13,6 @@ namespace :comfortable_mexican_sofa do
       from          = ENV['FROM']
       force_reload  = ENV['FORCE'].try(:downcase) != 'false'
 
-      
       puts "Importing CMS Fixtures from Folder [#{from}] to Site [#{to}] ..."
 
       # changing so that logger is going straight to screen

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement