comfortable_mexican_sofa 1.8.1 → 1.8.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. data/README.md +7 -1
  2. data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee +1 -1
  3. data/app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass +1 -0
  4. data/comfortable_mexican_sofa.gemspec +10 -9
  5. data/db/migrate/01_create_cms.rb +2 -1
  6. data/lib/comfortable_mexican_sofa/engine.rb +1 -0
  7. data/lib/comfortable_mexican_sofa/fixtures.rb +2 -2
  8. data/lib/comfortable_mexican_sofa/version.rb +1 -1
  9. data/lib/generators/comfy/cms/cms_generator.rb +7 -0
  10. data/lib/tasks/comfortable_mexican_sofa.rake +0 -1
  11. metadata +20 -4
data/README.md CHANGED
@@ -14,6 +14,12 @@ Features
14
14
  * [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Revisions)
15
15
  * [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/)
16
16
 
17
+ Installation for Rails 4
18
+ ------------------------
19
+ For Rails 4 apps feel free to use [2.0.0.beta1](https://github.com/comfy/comfortable-mexican-sofa/tree/2.0) release.
20
+
21
+ gem 'comfortable_mexican_sofa', '~> 2.0.0.beta1'
22
+
17
23
  Installation
18
24
  ------------
19
25
  Add gem definition to your Gemfile:
@@ -70,4 +76,4 @@ Twitter: [@GroceryBagHead](http://twitter.com/#!/GroceryBagHead)
70
76
 
71
77
  ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE)
72
78
 
73
- Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
79
+ Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee CHANGED
@@ -1,6 +1,6 @@
1
1
  #= require jquery
2
2
  #= require jquery_ujs
3
- #= require jquery-ui
3
+ #= require jquery.ui.all
4
4
  #= require comfortable_mexican_sofa/lib/bootstrap
5
5
  #= require comfortable_mexican_sofa/lib/codemirror
6
6
  #= require comfortable_mexican_sofa/lib/wysihtml5
data/app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass CHANGED
@@ -1,3 +1,4 @@
1
+ //= require jquery.ui.all
1
2
  //= require comfortable_mexican_sofa/lib/bootstrap
2
3
  //= require comfortable_mexican_sofa/lib/codemirror
3
4
  //= require comfortable_mexican_sofa/lib/bootstrap-wysihtml5
data/comfortable_mexican_sofa.gemspec CHANGED
@@ -16,13 +16,14 @@ Gem::Specification.new do |s|
16
16
  s.platform = Gem::Platform::RUBY
17
17
  s.require_paths = ['lib']
18
18
 
19
- s.add_dependency 'rails', '>= 3.1.0'
20
- s.add_dependency 'formatted_form', '>= 2.1.0'
21
- s.add_dependency 'active_link_to', '>= 1.0.0'
22
- s.add_dependency 'paperclip', '>= 3.4.0'
23
- s.add_dependency 'redcarpet', '>= 2.2.0'
24
- s.add_dependency 'jquery-rails', '>= 2.2.0'
25
- s.add_dependency 'haml-rails', '>= 0.3.0'
26
- s.add_dependency 'sass-rails', '>= 3.1.0'
27
- s.add_dependency 'coffee-rails', '>= 3.1.0'
19
+ s.add_dependency 'rails', '>= 3.1.0'
20
+ s.add_dependency 'formatted_form', '>= 2.1.0'
21
+ s.add_dependency 'active_link_to', '>= 1.0.0'
22
+ s.add_dependency 'paperclip', '>= 3.4.0'
23
+ s.add_dependency 'redcarpet', '>= 2.2.0'
24
+ s.add_dependency 'jquery-rails', '>= 3.0.0'
25
+ s.add_dependency 'jquery-ui-rails', '>= 4.0.0'
26
+ s.add_dependency 'haml-rails', '>= 0.3.0'
27
+ s.add_dependency 'sass-rails', '>= 3.1.0'
28
+ s.add_dependency 'coffee-rails', '>= 3.1.0'
28
29
  end
data/db/migrate/01_create_cms.rb CHANGED
@@ -103,7 +103,8 @@ class CreateCms < ActiveRecord::Migration
103
103
  t.text :data, text_limit
104
104
  t.datetime :created_at
105
105
  end
106
- add_index :cms_revisions, [:record_type, :record_id, :created_at]
106
+ add_index :cms_revisions, [:record_type, :record_id, :created_at],
107
+ :name => 'index_cms_revisions_on_rtype_and_rid_and_created_at'
107
108
 
108
109
  # -- Categories ---------------------------------------------------------
109
110
  create_table :cms_categories, :force => true do |t|
data/lib/comfortable_mexican_sofa/engine.rb CHANGED
@@ -6,6 +6,7 @@ require 'active_link_to'
6
6
  require 'paperclip'
7
7
  require 'redcarpet'
8
8
  require 'jquery-rails'
9
+ require 'jquery-ui-rails'
9
10
  require 'haml-rails'
10
11
  require 'sass-rails'
11
12
  require 'coffee-rails'
data/lib/comfortable_mexican_sofa/fixtures.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module ComfortableMexicanSofa::Fixtures
2
2
 
3
3
  def self.import_all(to_site, from_folder = nil, force_import = false)
4
- import_layouts to_site, from_folder, force_import
5
- import_pages to_site, from_folder, force_import
4
+ import_layouts to_site, from_folder, nil, true, nil, [], force_import
5
+ import_pages to_site, from_folder, nil, true, nil, [], force_import
6
6
  import_snippets to_site, from_folder, force_import
7
7
  end
8
8
 
data/lib/comfortable_mexican_sofa/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ComfortableMexicanSofa
2
- VERSION = "1.8.1"
2
+ VERSION = "1.8.2"
3
3
  end
data/lib/generators/comfy/cms/cms_generator.rb CHANGED
@@ -37,6 +37,13 @@ module Comfy
37
37
  directory 'db/cms_fixtures', 'db/cms_fixtures'
38
38
  end
39
39
 
40
+ def generate_assets
41
+ directory 'app/assets/javascripts/comfortable_mexican_sofa/admin',
42
+ 'app/assets/javascripts/comfortable_mexican_sofa/admin'
43
+ directory 'app/assets/stylesheets/comfortable_mexican_sofa/admin',
44
+ 'app/assets/stylesheets/comfortable_mexican_sofa/admin'
45
+ end
46
+
40
47
  def show_readme
41
48
  readme 'lib/generators/comfy/cms/README'
42
49
  end
data/lib/tasks/comfortable_mexican_sofa.rake CHANGED
@@ -13,7 +13,6 @@ namespace :comfortable_mexican_sofa do
13
13
  from = ENV['FROM']
14
14
  force_reload = ENV['FORCE'].try(:downcase) != 'false'
15
15
 
16
-
17
16
  puts "Importing CMS Fixtures from Folder [#{from}] to Site [#{to}] ..."
18
17
 
19
18
  # changing so that logger is going straight to screen
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: comfortable_mexican_sofa
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.1
4
+ version: 1.8.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-04-24 00:00:00.000000000 Z
13
+ date: 2013-05-31 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -99,7 +99,7 @@ dependencies:
99
99
  requirements:
100
100
  - - ! '>='
101
101
  - !ruby/object:Gem::Version
102
- version: 2.2.0
102
+ version: 3.0.0
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,23 @@ dependencies:
107
107
  requirements:
108
108
  - - ! '>='
109
109
  - !ruby/object:Gem::Version
110
- version: 2.2.0
110
+ version: 3.0.0
111
+ - !ruby/object:Gem::Dependency
112
+ name: jquery-ui-rails
113
+ requirement: !ruby/object:Gem::Requirement
114
+ none: false
115
+ requirements:
116
+ - - ! '>='
117
+ - !ruby/object:Gem::Version
118
+ version: 4.0.0
119
+ type: :runtime
120
+ prerelease: false
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ! '>='
125
+ - !ruby/object:Gem::Version
126
+ version: 4.0.0
111
127
  - !ruby/object:Gem::Dependency
112
128
  name: haml-rails
113
129
  requirement: !ruby/object:Gem::Requirement