refinerycms-core 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/app/assets/javascripts/refinery/admin.js.erb +1 -1
  2. data/app/assets/stylesheets/refinery/refinery.css.scss +4 -4
  3. data/app/views/refinery/_content_page.html.erb +4 -1
  4. data/app/views/refinery/_html_tag.html.erb +1 -1
  5. data/config/initializers/will_paginate_monkeypatch.rb +2 -0
  6. data/lib/generators/refinery/cms/cms_generator.rb +16 -10
  7. data/lib/generators/refinery/engine/templates/Rakefile +1 -1
  8. data/lib/generators/refinery/engine/templates/db/seeds.rb +2 -2
  9. data/lib/refinery/version.rb +1 -1
  10. data/refinerycms-core.gemspec +0 -1
  11. data/spec/lib/generators/refinery/cms/cms_generator_spec.rb +1 -1
  12. metadata +4 -4
data/app/assets/javascripts/refinery/admin.js.erb CHANGED
@@ -608,7 +608,7 @@ var page_options = {
608
608
  page_options.tabs.find('> ul li a').corner('top 5px');
609
609
 
610
610
  $('#new_page_part_dialog').dialog('close');
611
- }
611
+ }, 'html'
612
612
  );
613
613
  }else{
614
614
  alert("A content section with that title already exists, please choose another.");
data/app/assets/stylesheets/refinery/refinery.css.scss CHANGED
@@ -1567,8 +1567,8 @@ a.information:hover {
1567
1567
  padding-bottom: 6px;
1568
1568
  }
1569
1569
 
1570
- @import 'refinery/site_bar';
1571
- @import 'refinery/ui';
1572
- @import 'refinery/submenu';
1573
- @import 'refinery/tooltips';
1570
+ @import 'site_bar';
1571
+ @import 'ui';
1572
+ @import 'submenu';
1573
+ @import 'tooltips';
1574
1574
  @import 'wymeditor/skins/refinery/skin';
data/app/views/refinery/_content_page.html.erb CHANGED
@@ -1,2 +1,5 @@
1
- <%= render_content_page(@page, {:hide_sections => local_assigns[:hide_sections], :can_use_fallback => !local_assigns[:show_empty_sections] && !local_assigns[:remove_automatic_sections]}) %>
1
+ <%= render_content_page(@page, {
2
+ :hide_sections => local_assigns[:hide_sections],
3
+ :can_use_fallback => !local_assigns[:show_empty_sections] && !local_assigns[:remove_automatic_sections]
4
+ }) %>
2
5
  <%= render :partial => '/refinery/draft_page_message' unless @page.nil? or @page.live? -%>
data/app/views/refinery/_html_tag.html.erb CHANGED
@@ -3,4 +3,4 @@
3
3
  <!--[if IE 7 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie7"> <![endif]-->
4
4
  <!--[if IE 8 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie8"> <![endif]-->
5
5
  <!--[if IE 9 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie9"> <![endif]-->
6
- <!--[if (gt IE 9)|!(IE)]> <html lang="<%= ::I18n.locale %>" class="no-js"> <![endif]-->
6
+ <!--[if (gt IE 9)|!(IE)]><!--> <html lang="<%= ::I18n.locale %>" class="no-js"> <!--<![endif]-->
data/config/initializers/will_paginate_monkeypatch.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require "will_paginate/view_helpers/action_view"
2
+
1
3
  module WillPaginate
2
4
  module ActionView
3
5
  class LinkRenderer < ViewHelpers::LinkRenderer
data/lib/generators/refinery/cms/cms_generator.rb CHANGED
@@ -2,14 +2,18 @@ module Refinery
2
2
  class CmsGenerator < Rails::Generators::Base
3
3
  source_root Pathname.new(File.expand_path('../templates', __FILE__))
4
4
 
5
- class_option :update, :type => :boolean, :aliases => nil, :group => :runtime,
6
- :desc => "Update an existing Refinery CMS based application"
5
+ class_option :update, :type => :boolean, :aliases => nil, :group => :runtime,
6
+ :desc => "Update an existing Refinery CMS based application"
7
7
  class_option :fresh_installation, :type => :boolean, :aliases => nil, :group => :runtime, :default => false,
8
- :desc => "Allow Refinery to remove default Rails files in a fresh installation"
9
- class_option :heroku, :type => :string, :default => nil, :group => :runtime, :banner => 'APP_NAME',
10
- :desc => "Deploy to Heroku after the generator has run."
11
- class_option :stack, :type => :string, :default => 'cedar', :group => :runtime,
12
- :desc => "Specify which Heroku stack you want to use. Requires --heroku option to function."
8
+ :desc => "Allow Refinery to remove default Rails files in a fresh installation"
9
+ class_option :heroku, :type => :string, :default => nil, :group => :runtime, :banner => 'APP_NAME',
10
+ :desc => "Deploy to Heroku after the generator has run."
11
+ class_option :stack, :type => :string, :default => 'cedar', :group => :runtime,
12
+ :desc => "Specify which Heroku stack you want to use. Requires --heroku option to function."
13
+ class_option :skip_db, :type => :boolean, :default => false, :aliases => nil, :group => :runtime,
14
+ :desc => "Skip over any database creation, migration or seeding."
15
+ class_option :skip_migrations, :type => :boolean, :default => false, :aliases => nil, :group => :runtime,
16
+ :desc => "Skip over installing or running migrations."
13
17
 
14
18
  def generate
15
19
  start_pretending?
@@ -159,8 +163,10 @@ gem 'pg'
159
163
  end
160
164
 
161
165
  def migrate_database!
162
- rake 'railties:install:migrations'
163
- rake 'db:create db:migrate'
166
+ unless self.options[:skip_migrations]
167
+ rake 'railties:install:migrations'
168
+ rake 'db:create db:migrate' unless self.options[:skip_db]
169
+ end
164
170
  end
165
171
 
166
172
  def mount!
@@ -211,7 +217,7 @@ gem 'pg'
211
217
  end
212
218
 
213
219
  def seed_database!
214
- rake 'db:seed'
220
+ rake 'db:seed' unless self.options[:skip_db] || self.options[:skip_migrations]
215
221
  end
216
222
 
217
223
  def start_pretending?
data/lib/generators/refinery/engine/templates/Rakefile CHANGED
@@ -9,7 +9,7 @@ ENGINE_PATH = File.dirname(__FILE__)
9
9
  APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
10
10
 
11
11
  if File.exists?(APP_RAKEFILE)
12
- load 'rails/tasks/extension.rake'
12
+ load 'rails/tasks/engine.rake'
13
13
  end
14
14
 
15
15
  require "refinerycms-testing"
data/lib/generators/refinery/engine/templates/db/seeds.rb CHANGED
@@ -16,8 +16,8 @@ if defined?(::Refinery::Page) && ::Refinery::Page.where(:link_url => url).empty?
16
16
  :deletable => false,
17
17
  :menu_match => "^#{url}(\/|\/.+?|)$"
18
18
  )
19
- Refinery::Pages.default_parts.each do |default_page_part|
20
- page.parts.create(:title => default_page_part, :body => nil)
19
+ Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
20
+ page.parts.create(:title => default_page_part, :body => nil, :position => index)
21
21
  end
22
22
  end
23
23
  <% end %>
data/lib/refinery/version.rb CHANGED
@@ -2,7 +2,7 @@ module Refinery
2
2
  class Version
3
3
  @major = 2
4
4
  @minor = 0
5
- @tiny = 1
5
+ @tiny = 2
6
6
  @build = nil
7
7
 
8
8
  class << self
data/refinerycms-core.gemspec CHANGED
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
19
19
 
20
20
  s.files = `git ls-files`.split("\n")
21
21
  s.test_files = `git ls-files -- spec/*`.split("\n")
22
- s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
23
22
 
24
23
  s.add_dependency 'acts_as_indexed', '~> 0.7.7'
25
24
  s.add_dependency 'friendly_id', '~> 4.0.1'
data/spec/lib/generators/refinery/cms/cms_generator_spec.rb CHANGED
@@ -9,7 +9,7 @@ module Refinery
9
9
 
10
10
  before(:each) do
11
11
  prepare_destination
12
- run_generator
12
+ run_generator %w[--skip-db --skip-migrations]
13
13
  end
14
14
 
15
15
  specify do
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms-core
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 11
5
5
  prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
- - 1
10
- version: 2.0.1
9
+ - 2
10
+ version: 2.0.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Philip Arndt
@@ -18,7 +18,7 @@ autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
20
 
21
- date: 2012-03-06 00:00:00 Z
21
+ date: 2012-03-15 00:00:00 Z
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency
24
24
  prerelease: false