Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: refinery/refinerycms
...
head fork: refinery/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 29 files changed
  • 0 commit comments
  • 4 contributors
Showing with 180 additions and 157 deletions.
  1. +2 −2 Gemfile
  2. +54 −54 Gemfile.lock
  3. +3 −3 authentication/refinerycms-authentication.gemspec
  4. +1 −1  base/lib/base/refinery.rb
  5. +1 −1  base/lib/refinery/version.rb
  6. +2 −2 base/refinerycms-base.gemspec
  7. +9 −0 changelog.md
  8. +1 −1  config/initializers/devise.rb
  9. +4 −1 core/app/views/shared/_menu.html.erb
  10. +13 −10 core/app/views/shared/_menu_branch.html.erb
  11. +1 −1  core/lib/gemspec.rb
  12. +6 −0 core/lib/generators/refinerycms_generator.rb
  13. +5 −2 core/lib/generators/templates/.gitignore
  14. +17 −14 core/lib/generators/templates/app/views/sitemap/index.xml.builder
  15. +2 −0  core/lib/generators/templates/config/initializers/devise.rb
  16. +18 −11 core/lib/refinery/crud.rb
  17. +3 −6 core/lib/tasks/refinery.rake
  18. +1 −1  core/public/stylesheets/refinery/refinery.css
  19. +5 −5 core/refinerycms-core.gemspec
  20. +3 −3 dashboard/refinerycms-dashboard.gemspec
  21. +3 −3 images/refinerycms-images.gemspec
  22. +0 −6 lib/refinery.rb
  23. +4 −0 lib/refinerycms.rb
  24. +3 −3 pages/refinerycms-pages.gemspec
  25. +10 −10 refinerycms.gemspec
  26. +3 −3 resources/refinerycms-resources.gemspec
  27. +3 −3 settings/refinerycms-settings.gemspec
  28. +0 −6 testing/config/initializers/accessible_attributes.rb
  29. +3 −5 testing/refinerycms-testing.gemspec
View
4 Gemfile
@@ -29,12 +29,12 @@ end
# REFINERY CMS ================================================================
# Anything you put in here will be overridden when the app gets updated.
-# gem 'refinerycms', '~> 0.9.9.17'
+# gem 'refinerycms', '~> 0.9.9.18'
group :development, :test do
# To use refinerycms-testing, uncomment it (if it's commented out) and run 'bundle install'
# Then, run 'rails generate refinerycms_testing' which will copy its support files.
- gem 'refinerycms-testing', '~> 0.9.9.17'
+ gem 'refinerycms-testing', '~> 0.9.9.18'
end
# END REFINERY CMS ============================================================
View
108 Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- refinerycms (0.9.9.17)
+ refinerycms (0.9.9.18)
bundler (~> 1.0)
- refinerycms-authentication (= 0.9.9.17)
- refinerycms-base (= 0.9.9.17)
- refinerycms-core (= 0.9.9.17)
- refinerycms-dashboard (= 0.9.9.17)
- refinerycms-images (= 0.9.9.17)
- refinerycms-pages (= 0.9.9.17)
- refinerycms-resources (= 0.9.9.17)
- refinerycms-settings (= 0.9.9.17)
- refinerycms-authentication (0.9.9.17)
+ refinerycms-authentication (= 0.9.9.18)
+ refinerycms-base (= 0.9.9.18)
+ refinerycms-core (= 0.9.9.18)
+ refinerycms-dashboard (= 0.9.9.18)
+ refinerycms-images (= 0.9.9.18)
+ refinerycms-pages (= 0.9.9.18)
+ refinerycms-resources (= 0.9.9.18)
+ refinerycms-settings (= 0.9.9.18)
+ refinerycms-authentication (0.9.9.18)
devise (~> 1.2.0)
- refinerycms-core (= 0.9.9.17)
- refinerycms-base (0.9.9.17)
- refinerycms-core (0.9.9.17)
+ refinerycms-core (= 0.9.9.18)
+ refinerycms-base (0.9.9.18)
+ refinerycms-core (0.9.9.18)
acts_as_indexed (~> 0.7)
friendly_id_globalize3 (~> 3.2.1)
globalize3 (>= 0.1.0.beta)
moretea-awesome_nested_set (~> 1.4)
- rails (~> 3.0.7.rc1)
+ rails (~> 3.0.7.rc2)
rdoc (>= 2.5.11)
- refinerycms-base (= 0.9.9.17)
+ refinerycms-base (= 0.9.9.18)
refinerycms-generators (~> 1.0)
- refinerycms-settings (= 0.9.9.17)
+ refinerycms-settings (= 0.9.9.18)
truncate_html (~> 0.5)
will_paginate (~> 3.0.pre)
- refinerycms-dashboard (0.9.9.17)
- refinerycms-core (= 0.9.9.17)
- refinerycms-images (0.9.9.17)
+ refinerycms-dashboard (0.9.9.18)
+ refinerycms-core (= 0.9.9.18)
+ refinerycms-images (0.9.9.18)
dragonfly (~> 0.8.2)
rack-cache (>= 0.5.3)
- refinerycms-core (= 0.9.9.17)
- refinerycms-pages (0.9.9.17)
- refinerycms-core (= 0.9.9.17)
+ refinerycms-core (= 0.9.9.18)
+ refinerycms-pages (0.9.9.18)
+ refinerycms-core (= 0.9.9.18)
seo_meta (~> 1.0.4)
- refinerycms-resources (0.9.9.17)
+ refinerycms-resources (0.9.9.18)
dragonfly (~> 0.8.2)
rack-cache (>= 0.5.3)
- refinerycms-core (= 0.9.9.17)
- refinerycms-settings (0.9.9.17)
- refinerycms-base (= 0.9.9.17)
- refinerycms-testing (0.9.9.17)
+ refinerycms-core (= 0.9.9.18)
+ refinerycms-settings (0.9.9.18)
+ refinerycms-base (= 0.9.9.18)
+ refinerycms-testing (0.9.9.18)
autotest
autotest-notification
autotest-rails
@@ -55,7 +55,7 @@ PATH
json_pure
launchy
rack-test (~> 0.5.6)
- refinerycms-core (= 0.9.9.17)
+ refinerycms-core (= 0.9.9.18)
rspec-rails (~> 2.5)
GEM
@@ -63,12 +63,12 @@ GEM
specs:
ZenTest (4.5.0)
abstract (1.0.0)
- actionmailer (3.0.7.rc1)
- actionpack (= 3.0.7.rc1)
+ actionmailer (3.0.7.rc2)
+ actionpack (= 3.0.7.rc2)
mail (~> 2.2.15)
- actionpack (3.0.7.rc1)
- activemodel (= 3.0.7.rc1)
- activesupport (= 3.0.7.rc1)
+ actionpack (3.0.7.rc2)
+ activemodel (= 3.0.7.rc2)
+ activesupport (= 3.0.7.rc2)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
@@ -76,19 +76,19 @@ GEM
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.7.rc1)
- activesupport (= 3.0.7.rc1)
+ activemodel (3.0.7.rc2)
+ activesupport (= 3.0.7.rc2)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.7.rc1)
- activemodel (= 3.0.7.rc1)
- activesupport (= 3.0.7.rc1)
+ activerecord (3.0.7.rc2)
+ activemodel (= 3.0.7.rc2)
+ activesupport (= 3.0.7.rc2)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.7.rc1)
- activemodel (= 3.0.7.rc1)
- activesupport (= 3.0.7.rc1)
- activesupport (3.0.7.rc1)
+ activeresource (3.0.7.rc2)
+ activemodel (= 3.0.7.rc2)
+ activesupport (= 3.0.7.rc2)
+ activesupport (3.0.7.rc2)
acts_as_indexed (0.7.2)
arel (2.0.9)
autotest (4.4.6)
@@ -137,7 +137,7 @@ GEM
factory_girl (1.3.3)
ffi (1.0.7)
rake (>= 0.8.7)
- friendly_id_globalize3 (3.2.1.1)
+ friendly_id_globalize3 (3.2.1.2)
babosa (~> 0.3.0)
gherkin (2.3.5)
json (>= 1.4.6)
@@ -168,17 +168,17 @@ GEM
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.7.rc1)
- actionmailer (= 3.0.7.rc1)
- actionpack (= 3.0.7.rc1)
- activerecord (= 3.0.7.rc1)
- activeresource (= 3.0.7.rc1)
- activesupport (= 3.0.7.rc1)
+ rails (3.0.7.rc2)
+ actionmailer (= 3.0.7.rc2)
+ actionpack (= 3.0.7.rc2)
+ activerecord (= 3.0.7.rc2)
+ activeresource (= 3.0.7.rc2)
+ activesupport (= 3.0.7.rc2)
bundler (~> 1.0)
- railties (= 3.0.7.rc1)
- railties (3.0.7.rc1)
- actionpack (= 3.0.7.rc1)
- activesupport (= 3.0.7.rc1)
+ railties (= 3.0.7.rc2)
+ railties (3.0.7.rc2)
+ actionpack (= 3.0.7.rc2)
+ activesupport (= 3.0.7.rc2)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
@@ -229,5 +229,5 @@ PLATFORMS
DEPENDENCIES
refinerycms!
refinerycms-i18n (~> 1.0.0)
- refinerycms-testing (~> 0.9.9.17)
+ refinerycms-testing (~> 0.9.9.18)
sqlite3
View
6 authentication/refinerycms-authentication.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-authentication}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Authentication engine for Refinery CMS}
s.description = %q{The default authentication engine for Refinery CMS}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
s.add_dependency 'devise', '~> 1.2.0'
s.files = [
View
2  base/lib/base/refinery.rb
@@ -27,7 +27,7 @@ def root
def roots(engine_name = nil)
if engine_name.nil?
- @roots ||= self.engines.map {|engine| "Refinery::#{engine.camelize}".constantize.root }
+ @roots ||= self.engines.map {|engine| "Refinery::#{engine.camelize}".constantize.root }.uniq
else
unless (engine_name = self.engines.detect{|engine| engine.to_s == engine_name.to_s}).nil?
"Refinery::#{engine_name.camelize}".constantize.root
View
2  base/lib/refinery/version.rb
@@ -3,7 +3,7 @@ class Version
@major = 0
@minor = 9
@tiny = 9
- @build = 17
+ @build = 18
class << self
attr_reader :major, :minor, :tiny, :build
View
4 base/refinerycms-base.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-base}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Base engine for Refinery CMS}
s.description = %q{This provides a base for Refinery CMS which handles things like settings on the Refinery namespace.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
View
9 changelog.md
@@ -1,3 +1,12 @@
+## 0.9.9.18 [16 April 2011]
+
+* Fixed a backward incompatibility. [Josef Šimánek](https://github.com/simi)
+* Reduced calls to `SHOW TABLES` by updating `friendly_id_globalize3`. [Philip Arndt](https://github.com/parndt)
+* Switched `/shared/_menu.html.erb` and `/shared/_menu_branch.html.erb` away from `render :partial` with `:collection`, speeding up menu 12~15%. [Philip Arndt](https://github.com/parndt)
+* Fixed Refinery.root, Fixed generator templates, Added refinerycms-i18n generator to refinerycms generator if i18n is included. [Mark Haylock](https://github.com/mhaylock)
+* Bumped Rails dependency to `~> 3.0.7.rc2`. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.17...0.9.9.18)
+
## 0.9.9.17 [15 April 2011]
* Mass assignment protection implemented. [Andreas König](https://github.com/koa)
View
2  config/initializers/devise.rb
@@ -2,7 +2,7 @@
# Use this hook to configure devise mailer, warden hooks and so forth. The first
# four configuration values can also be set straight in your models.
-Devise.setup do |config|
+::Devise.setup do |config|
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in DeviseMailer.
config.mailer_sender = "please-change-me@config-initializers-devise.com"
View
5 core/app/views/shared/_menu.html.erb
@@ -15,9 +15,11 @@
-%>
<nav id='<%= dom_id %>' class='<%= css %>'>
<ul>
+ <% roots.each_with_index do |menu_branch, index| %>
<%= render :partial => '/shared/menu_branch',
- :collection => roots,
:locals => {
+ :menu_branch => menu_branch,
+ :menu_branch_counter => index,
:hide_children => hide_children,
:sibling_count => (roots.length - 1),
:collection => collection,
@@ -25,6 +27,7 @@
:apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
}
-%>
+ <% end %>
</ul>
</nav>
<% end -%>
View
23 core/app/views/shared/_menu_branch.html.erb
@@ -13,16 +13,19 @@
<%= link_to menu_branch.title, menu_branch.url -%>
<% if children.present? -%>
<ul class='clearfix'>
- <%=
- render :partial => '/shared/menu_branch',
- :collection => children,
- :locals => {
- :apply_css => local_assigns[:apply_css],
- :hide_children => !!hide_children,
- :collection => collection,
- :selected_item => selected_item,
- :sibling_count => children.size - 1
- } -%>
+ <% children.each_with_index do |child, index| %>
+ <%=
+ render :partial => '/shared/menu_branch',
+ :locals => {
+ :menu_branch => child,
+ :menu_branch_counter => index,
+ :apply_css => local_assigns[:apply_css],
+ :hide_children => !!hide_children,
+ :collection => collection,
+ :selected_item => selected_item,
+ :sibling_count => children.size - 1
+ } -%>
+ <% end %>
</ul>
<% end -%>
</li>
View
2  core/lib/gemspec.rb
@@ -26,7 +26,7 @@
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.add_dependency 'globalize3', '>= 0.1.0.beta'
s.add_dependency 'moretea-awesome_nested_set', '~> 1.4'
- s.add_dependency 'rails', '~> 3.0.7.rc1'
+ s.add_dependency 'rails', '~> 3.0.7.rc2'
s.add_dependency 'rdoc', '>= 2.5.11' # helps fix ubuntu
s.add_dependency 'truncate_html', '~> 0.5'
s.add_dependency 'will_paginate', '~> 3.0.pre'
View
6 core/lib/generators/refinerycms_generator.rb
@@ -105,6 +105,12 @@ def generate
}.sort.each do |path|
copy_file path, path.to_s.gsub(self.class.source_root.to_s, Rails.root.to_s)
end
+
+ # Ensure i18n exists and is up to date.
+ if defined?(::Refinery::I18n)
+ require 'generators/refinerycms_i18n_generator'
+ ::RefinerycmsI18n.new.generate
+ end
end
end
View
7 core/lib/generators/templates/.gitignore
@@ -3,12 +3,12 @@
db/*.sqlite3
db/*.sqlite3-journal
*.log
+tmp
tmp/**/*
# Documentation
doc/api
doc/app
-doc/*
.yardoc
.yardopts
@@ -29,7 +29,7 @@ index/**/*
# Refinery Specific
*.tmproj
*.autobackupbyrefinery.*
-/refinerycms-*.gem
+refinerycms-*.gem
.autotest
# Mac
@@ -57,6 +57,9 @@ nbproject
# RubyMine
.idea
+# E-texteditor
+.eprj
+
# Backup
*~
View
31 core/lib/generators/templates/app/views/sitemap/index.xml.builder
@@ -2,21 +2,24 @@ xml.instruct!
xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
- @pages.each do |page|
- # exclude sites that are external to our own domain.
- page_url = if page.url.is_a?(Hash)
- # This is how most pages work without being overriden by link_url
- page.url.merge({:only_path => false})
- elsif page.url.to_s !~ /^http/
- # handle relative link_url addresses.
- "#{request.protocol}#{request.host_with_port}#{page.url}"
- end
+ @locales.each do |locale|
+ ::I18n.locale = locale
+ Page.live.in_menu.includes(:parts).each do |page|
+ # exclude sites that are external to our own domain.
+ page_url = if page.url.is_a?(Hash)
+ # This is how most pages work without being overriden by link_url
+ page.url.merge({:only_path => false})
+ elsif page.url.to_s !~ /^http/
+ # handle relative link_url addresses.
+ [request.protocol, request.host_with_port, page.url].join
+ end
- # Add XML entry only if there is a valid page_url found above.
- xml.url do
- xml.loc url_for(page_url)
- xml.lastmod page.updated_at.to_date
- end if page_url.present?
+ # Add XML entry only if there is a valid page_url found above.
+ xml.url do
+ xml.loc url_for(page_url)
+ xml.lastmod page.updated_at.to_date
+ end if page_url.present? and page.show_in_menu?
+ end
end
end
View
2  core/lib/generators/templates/config/initializers/devise.rb
@@ -1,3 +1,5 @@
+require 'devise'
+
# Use this hook to configure devise mailer, warden hooks and so forth. The first
# four configuration values can also be set straight in your models.
::Devise.setup do |config|
View
29 core/lib/refinery/crud.rb
@@ -2,20 +2,25 @@
# Simply override any methods in your action controller you want to be customised
# Don't forget to add:
# resources :plural_model_name_here
+# or for scoped:
+# scope(:as => 'module_module', :module => 'module_name') do
+# resources :plural_model_name_here
+# end
# to your routes.rb file.
# Full documentation about CRUD and resources go here:
-# -> http://caboo.se/doc/classes/ActionController/Resources.html#M003716
+# -> http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Resources.html#method-i-resources
# Example (add to your controller):
-# crudify :foo, {:title_attribute => 'name'}
+# crudify :foo, {:title_attribute => 'name'} for CRUD on Foo model
+# crudify 'foo/bar', :{title_attribute => 'name'} for CRUD on Foo::Bar model
module Refinery
module Crud
def self.default_options(model_name)
- singular_name = model_name.to_s
- class_name = singular_name.camelize
- plural_name = singular_name.pluralize
+ class_name = model_name.to_s.include?("/") ? "::#{model_name.to_s.camelize}" : model_name.to_s.camelize
this_class = class_name.constantize.base_class
+ singular_name = model_name.to_s.underscore.gsub("/","_")
+ plural_name = singular_name.pluralize
{
:conditions => '',
@@ -23,12 +28,15 @@ def self.default_options(model_name)
:order => ('position ASC' if this_class.table_exists? and this_class.column_names.include?('position')),
:paging => true,
:per_page => false,
- :redirect_to_url => "admin_#{plural_name}_url",
+ :redirect_to_url => "admin_#{model_name.to_s.gsub('/', '_').pluralize}_url",
:searchable => true,
:search_conditions => '',
:sortable => true,
:title_attribute => "title",
- :xhr_paging => false
+ :xhr_paging => false,
+ :class_name => class_name,
+ :singular_name => singular_name,
+ :plural_name => plural_name
}
end
@@ -41,10 +49,9 @@ module ClassMethods
def crudify(model_name, options = {})
options = ::Refinery::Crud.default_options(model_name).merge(options)
-
- class_name = model_name.to_s.camelize
- singular_name = class_name.demodulize.underscore
- plural_name = singular_name.pluralize
+ class_name = options[:class_name]
+ singular_name = options[:singular_name]
+ plural_name = options[:plural_name]
module_eval %(
prepend_before_filter :find_#{singular_name},
View
9 core/lib/tasks/refinery.rake
@@ -132,9 +132,6 @@ namespace :refinery do
desc "Un-crudify a method on a controller that uses crudify"
task :uncrudify => :environment do
if (model_name = ENV["model"]).present? and (action = ENV["action"]).present?
- class_name = model_name.to_s.camelize
- singular_name = class_name.demodulize.underscore
- plural_name = singular_name.pluralize
crud_lines = Refinery.roots('core').join('lib', 'refinery', 'crud.rb').read
if (matches = crud_lines.scan(/(\ +)(def #{action}.+?protected)/m).first).present? and
@@ -146,9 +143,9 @@ namespace :refinery do
crud_method.gsub!('#{options[:redirect_to_url]}', default_crud_options[:redirect_to_url])
crud_method.gsub!('#{options[:conditions].inspect}', default_crud_options[:conditions].inspect)
crud_method.gsub!('#{options[:title_attribute]}', default_crud_options[:title_attribute])
- crud_method.gsub!('#{singular_name}', singular_name)
- crud_method.gsub!('#{class_name}', class_name)
- crud_method.gsub!('#{plural_name}', plural_name)
+ crud_method.gsub!('#{singular_name}', default_crud_options[:singular_name])
+ crud_method.gsub!('#{class_name}', default_crud_options[:class_name])
+ crud_method.gsub!('#{plural_name}', default_crud_options[:plural_name])
crud_method.gsub!('\\#{', '#{')
puts crud_method
View
2  core/public/stylesheets/refinery/refinery.css
@@ -1071,7 +1071,7 @@ ul#page_parts_controls img {
}
#page_part_editors {
clear:left;
- min-height: 446px;
+/* min-height: 446px;*/
}
a#toggle_advanced_options {
background: url('/images/refinery/icons/page_white_gear.png') no-repeat 0px 3px;
View
10 core/refinerycms-core.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-core}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Core engine for Refinery CMS}
s.description = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-base', '= 0.9.9.17'
- s.add_dependency 'refinerycms-settings', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-base', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-settings', '= 0.9.9.18'
s.add_dependency 'refinerycms-generators', '~> 1.0'
s.add_dependency 'acts_as_indexed', '~> 0.7'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.add_dependency 'globalize3', '>= 0.1.0.beta'
s.add_dependency 'moretea-awesome_nested_set', '~> 1.4'
- s.add_dependency 'rails', '~> 3.0.7.rc1'
+ s.add_dependency 'rails', '~> 3.0.7.rc2'
s.add_dependency 'rdoc', '>= 2.5.11' # helps fix ubuntu
s.add_dependency 'truncate_html', '~> 0.5'
s.add_dependency 'will_paginate', '~> 3.0.pre'
View
6 dashboard/refinerycms-dashboard.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-dashboard}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Dashboard engine for Refinery CMS}
s.description = %q{The dashboard is usually the first engine the user sees in the backend of Refinery CMS. It displays useful information and contains links to common functionality.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -71,5 +71,5 @@ Gem::Specification.new do |s|
'refinerycms-dashboard.gemspec'
]
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
end
View
6 images/refinerycms-images.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-images}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Images engine for Refinery CMS}
s.description = %q{Handles all image upload and processing functionality in Refinery CMS.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
'spec/uploads/beach.jpeg'
]
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
6 lib/refinery.rb
@@ -1,7 +1 @@
-require 'pathname'
-
require File.expand_path('../refinerycms', __FILE__)
-
-# Override Refinery.root
-# Must come after requiring 'refinerycms'
-Refinery.root = Pathname.new(File.expand_path('../../', __FILE__))
View
4 lib/refinerycms.rb
@@ -1,3 +1,7 @@
require 'refinerycms-base'
require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)
+
+# Override Refinery.root
+# Must come after requiring 'refinerycms-base'
+Refinery.root = Pathname.new(File.expand_path('../../', __FILE__))
View
6 pages/refinerycms-pages.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-pages}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Pages engine for Refinery CMS}
s.description = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -117,6 +117,6 @@ Gem::Specification.new do |s|
'spec/models/page_spec.rb'
]
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
s.add_dependency 'seo_meta', '~> 1.0.4'
end
View
20 refinerycms.gemspec
@@ -2,9 +2,9 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.description = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
s.add_dependency 'bundler', '~> 1.0'
# Refinery CMS
- s.add_dependency 'refinerycms-authentication', '= 0.9.9.17'
- s.add_dependency 'refinerycms-base', '= 0.9.9.17'
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
- s.add_dependency 'refinerycms-dashboard', '= 0.9.9.17'
- s.add_dependency 'refinerycms-images', '= 0.9.9.17'
- s.add_dependency 'refinerycms-pages', '= 0.9.9.17'
- s.add_dependency 'refinerycms-resources', '= 0.9.9.17'
- s.add_dependency 'refinerycms-settings', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-authentication', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-base', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-dashboard', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-images', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-pages', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-resources', '= 0.9.9.18'
+ s.add_dependency 'refinerycms-settings', '= 0.9.9.18'
s.files = [
'.gitignore',
View
6 resources/refinerycms-resources.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-resources}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Resources engine for Refinery CMS}
s.description = %q{Handles all file upload and processing functionality in Refinery CMS.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
'spec/uploads/refinery_is_awesome.txt'
]
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
6 settings/refinerycms-settings.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-settings}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Settings engine for Refinery CMS}
s.description = %q{The default settings engine that is required by Refinery CMS core. Adds programmer creatable, user editable settings for each engine.}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -83,5 +83,5 @@ Gem::Specification.new do |s|
'spec/models/refinery_setting_spec.rb'
]
- s.add_dependency 'refinerycms-base', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-base', '= 0.9.9.18'
end
View
6 testing/config/initializers/accessible_attributes.rb
@@ -1,6 +0,0 @@
-# Call attr_accessible for all Models in Testing.
-# So all mass assignment access to Models in tests fails if attr_accessible
-# is not correct set
-class ActiveRecord::Base
- attr_accessible
-end
View
8 testing/refinerycms-testing.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-testing}
- s.version = %q{0.9.9.17}
+ s.version = %q{0.9.9.18}
s.summary = %q{Testing plugin for Refinery CMS}
s.description = %q{This plugin adds the ability to run cucumber and rspec against the RefineryCMS gem while inside a RefineryCMS project}
- s.date = %q{2011-04-15}
+ s.date = %q{2011-04-16}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.18'
# RSpec
s.add_dependency 'rspec-rails', '~> 2.5'
@@ -40,8 +40,6 @@ Gem::Specification.new do |s|
'.rspec',
'config',
'config/cucumber.yml',
- 'config/initializers',
- 'config/initializers/accessible_attributes.rb',
'features',
'features/step_definitions',
'features/step_definitions/web_steps.rb',

No commit comments for this range

Something went wrong with that request. Please try again.