Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: resolve/refinerycms
...
head fork: resolve/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 21 files changed
  • 0 commit comments
  • 1 contributor
View
4 Gemfile
@@ -23,13 +23,13 @@ gemspec
# REFINERY CMS ================================================================
# Anything you put in here will be overridden when the app gets updated.
-# gem 'refinerycms', '~> 1.0.4'
+# gem 'refinerycms', '~> 1.0.6'
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.
# Finally, run 'rake' to run the tests.
- gem 'refinerycms-testing', '~> 1.0.4'
+ gem 'refinerycms-testing', '~> 1.0.6'
end
# END REFINERY CMS ============================================================
View
70 Gemfile.lock
@@ -1,51 +1,51 @@
PATH
remote: .
specs:
- refinerycms (1.0.5)
+ refinerycms (1.0.6)
bundler (~> 1.0)
- refinerycms-authentication (= 1.0.5)
- refinerycms-base (= 1.0.5)
- refinerycms-core (= 1.0.5)
- refinerycms-dashboard (= 1.0.5)
- refinerycms-images (= 1.0.5)
- refinerycms-pages (= 1.0.5)
- refinerycms-resources (= 1.0.5)
- refinerycms-settings (= 1.0.5)
- refinerycms-authentication (1.0.5)
- devise (~> 1.3.0)
+ refinerycms-authentication (= 1.0.6)
+ refinerycms-base (= 1.0.6)
+ refinerycms-core (= 1.0.6)
+ refinerycms-dashboard (= 1.0.6)
+ refinerycms-images (= 1.0.6)
+ refinerycms-pages (= 1.0.6)
+ refinerycms-resources (= 1.0.6)
+ refinerycms-settings (= 1.0.6)
+ refinerycms-authentication (1.0.6)
+ devise (~> 1.4.3)
friendly_id_globalize3 (~> 3.2.1)
- refinerycms-core (= 1.0.5)
- refinerycms-base (1.0.5)
- refinerycms-core (1.0.5)
+ refinerycms-core (= 1.0.6)
+ refinerycms-base (1.0.6)
+ refinerycms-core (1.0.6)
acts_as_indexed (~> 0.7)
awesome_nested_set (~> 2.0)
friendly_id_globalize3 (~> 3.2.1)
globalize3 (~> 0.1)
rails (~> 3.0.10)
- refinerycms-base (= 1.0.5)
+ refinerycms-base (= 1.0.6)
refinerycms-generators (~> 1.0)
- refinerycms-settings (= 1.0.5)
+ refinerycms-settings (= 1.0.6)
truncate_html (~> 0.5)
will_paginate (~> 3.0.0)
- refinerycms-dashboard (1.0.5)
- refinerycms-core (= 1.0.5)
- refinerycms-images (1.0.5)
+ refinerycms-dashboard (1.0.6)
+ refinerycms-core (= 1.0.6)
+ refinerycms-images (1.0.6)
dragonfly (~> 0.9.0)
rack-cache (>= 0.5.3)
- refinerycms-core (= 1.0.5)
- refinerycms-pages (1.0.5)
+ refinerycms-core (= 1.0.6)
+ refinerycms-pages (1.0.6)
awesome_nested_set (~> 2.0)
friendly_id_globalize3 (~> 3.2.1)
globalize3 (~> 0.1)
- refinerycms-core (= 1.0.5)
+ refinerycms-core (= 1.0.6)
seo_meta (~> 1.1)
- refinerycms-resources (1.0.5)
+ refinerycms-resources (1.0.6)
dragonfly (~> 0.9.0)
rack-cache (>= 0.5.3)
- refinerycms-core (= 1.0.5)
- refinerycms-settings (1.0.5)
- refinerycms-base (= 1.0.5)
- refinerycms-testing (1.0.5)
+ refinerycms-core (= 1.0.6)
+ refinerycms-settings (1.0.6)
+ refinerycms-base (= 1.0.6)
+ refinerycms-testing (1.0.6)
autotest
autotest-notification
autotest-rails
@@ -57,7 +57,7 @@ PATH
json_pure
launchy
rack-test (>= 0.5.6)
- refinerycms-core (= 1.0.5)
+ refinerycms-core (= 1.0.6)
rspec-instafail
rspec-rails (~> 2.6)
@@ -105,7 +105,7 @@ GEM
awesome_nested_set (2.0.1)
activerecord (>= 3.0.0)
babosa (0.3.5)
- bcrypt-ruby (2.1.4)
+ bcrypt-ruby (3.0.0)
builder (2.1.2)
capybara (1.0.1)
mime-types (>= 1.16)
@@ -127,8 +127,8 @@ GEM
cucumber (~> 1.0.0)
nokogiri (>= 1.4.6)
database_cleaner (0.6.7)
- devise (1.3.4)
- bcrypt-ruby (~> 2.1.2)
+ devise (1.4.3)
+ bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
diff-lcs (1.1.3)
@@ -150,8 +150,9 @@ GEM
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
i18n (0.5.0)
- json (1.5.3)
- json_pure (1.5.3)
+ json (1.5.4)
+ json_pure (1.5.4)
+ spruz (~> 0.2.8)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.2.19)
@@ -220,6 +221,7 @@ GEM
simplecov (0.4.2)
simplecov-html (~> 0.4.4)
simplecov-html (0.4.5)
+ spruz (0.2.13)
sqlite3 (1.3.4)
term-ansicolor (1.0.6)
thor (0.14.6)
@@ -242,6 +244,6 @@ DEPENDENCIES
rcov
refinerycms!
refinerycms-i18n (~> 1.0.0)
- refinerycms-testing (~> 1.0.4)
+ refinerycms-testing (~> 1.0.6)
simplecov
sqlite3
View
3  authentication/lib/gemspec.rb
@@ -22,7 +22,8 @@
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
- s.add_dependency 'devise', '~> 1.3.0'
+ s.add_dependency 'activerecord', '~> 3.0.10'
+ s.add_dependency 'devise', '~> 1.4.3'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.files = [
View
7 authentication/refinerycms-authentication.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-authentication}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
s.summary = %q{Authentication engine for Refinery CMS}
s.description = %q{The default authentication engine for Refinery CMS}
s.date = %q{2011-08-31}
@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '= 1.0.5'
- s.add_dependency 'devise', '~> 1.3.0'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
+ s.add_dependency 'activerecord', '~> 3.0.10'
+ s.add_dependency 'devise', '~> 1.4.3'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.files = [
View
2  base/lib/refinery/version.rb
@@ -2,7 +2,7 @@ module Refinery
class Version
@major = 1
@minor = 0
- @tiny = 5
+ @tiny = 6
@build = nil
class << self
View
2  base/refinerycms-base.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-base}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
View
6 changelog.md
@@ -1,3 +1,9 @@
+## 1.0.6 [31 August 2011]
+
+* Added support for Devise `~> 1.4.3`. [Philip Arndt](https://github.com/parndt)
+* Removed dependency on Rails but added dependencies to its components, like activerecord, where they are used. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/1.0.5...1.0.6)
+
## 1.0.5 [31 August 2011]
* jQuery UI updated to `1.8.15` from `1.8.9`. [Uģis Ozols](https://github.com/ugisozols)
View
4 core/lib/gemspec.rb
@@ -2,6 +2,7 @@
require 'pathname'
gempath = Pathname.new(File.expand_path('../../', __FILE__))
require gempath.join('..', 'base', 'lib', 'base', 'refinery')
+rails_version = '3.0.10'
gemspec = <<EOF
# Encoding: UTF-8
@@ -28,7 +29,8 @@
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.add_dependency 'globalize3', '~> 0.1'
s.add_dependency 'awesome_nested_set', '~> 2.0'
- s.add_dependency 'rails', '~> 3.0.10'
+ s.add_dependency 'railties', '~> #{rails_version}'
+ s.add_dependency 'actionmailer', '~> #{rails_version}'
s.add_dependency 'truncate_html', '~> 0.5'
s.add_dependency 'will_paginate', '~> 3.0.0'
View
9 core/refinerycms-core.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-core}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -15,14 +15,15 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-base', '= 1.0.5'
- s.add_dependency 'refinerycms-settings', '= 1.0.5'
+ s.add_dependency 'refinerycms-base', '= 1.0.6'
+ s.add_dependency 'refinerycms-settings', '= 1.0.6'
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'
s.add_dependency 'awesome_nested_set', '~> 2.0'
- s.add_dependency 'rails', '~> 3.0.10'
+ s.add_dependency 'railties', '~> 3.0.10'
+ s.add_dependency 'actionmailer', '~> 3.0.10'
s.add_dependency 'truncate_html', '~> 0.5'
s.add_dependency 'will_paginate', '~> 3.0.0'
View
4 dashboard/refinerycms-dashboard.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-dashboard}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -73,5 +73,5 @@ Gem::Specification.new do |s|
'refinerycms-dashboard.gemspec'
]
- s.add_dependency 'refinerycms-core', '= 1.0.5'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
end
View
1  images/lib/gemspec.rb
@@ -28,6 +28,7 @@
]
s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
+ s.add_dependency 'activerecord', '~> 3.0.10'
s.add_dependency 'dragonfly', '~> 0.9.0'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
5 images/refinerycms-images.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-images}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -96,7 +96,8 @@ Gem::Specification.new do |s|
'spec/uploads/beach.jpeg'
]
- s.add_dependency 'refinerycms-core', '= 1.0.5'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
+ s.add_dependency 'activerecord', '~> 3.0.10'
s.add_dependency 'dragonfly', '~> 0.9.0'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
1  pages/lib/gemspec.rb
@@ -28,6 +28,7 @@
]
s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
+ s.add_dependency 'activerecord', '~> 3.0.10'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.add_dependency 'globalize3', '~> 0.1'
s.add_dependency 'awesome_nested_set', '~> 2.0'
View
5 pages/refinerycms-pages.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-pages}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -120,7 +120,8 @@ Gem::Specification.new do |s|
'spec/models/page_spec.rb'
]
- s.add_dependency 'refinerycms-core', '= 1.0.5'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
+ s.add_dependency 'activerecord', '~> 3.0.10'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
s.add_dependency 'globalize3', '~> 0.1'
s.add_dependency 'awesome_nested_set', '~> 2.0'
View
18 refinerycms.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
@@ -19,14 +19,14 @@ Gem::Specification.new do |s|
s.add_dependency 'bundler', '~> 1.0'
# Refinery CMS
- s.add_dependency 'refinerycms-authentication', '= 1.0.5'
- s.add_dependency 'refinerycms-base', '= 1.0.5'
- s.add_dependency 'refinerycms-core', '= 1.0.5'
- s.add_dependency 'refinerycms-dashboard', '= 1.0.5'
- s.add_dependency 'refinerycms-images', '= 1.0.5'
- s.add_dependency 'refinerycms-pages', '= 1.0.5'
- s.add_dependency 'refinerycms-resources', '= 1.0.5'
- s.add_dependency 'refinerycms-settings', '= 1.0.5'
+ s.add_dependency 'refinerycms-authentication', '= 1.0.6'
+ s.add_dependency 'refinerycms-base', '= 1.0.6'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
+ s.add_dependency 'refinerycms-dashboard', '= 1.0.6'
+ s.add_dependency 'refinerycms-images', '= 1.0.6'
+ s.add_dependency 'refinerycms-pages', '= 1.0.6'
+ s.add_dependency 'refinerycms-resources', '= 1.0.6'
+ s.add_dependency 'refinerycms-settings', '= 1.0.6'
s.files = [
'.gitignore',
View
1  resources/lib/gemspec.rb
@@ -28,6 +28,7 @@
]
s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
+ s.add_dependency 'activerecord', '~> 3.0.10'
s.add_dependency 'dragonfly', '~> 0.9.0'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
5 resources/refinerycms-resources.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-resources}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -89,7 +89,8 @@ Gem::Specification.new do |s|
'spec/uploads/refinery_is_awesome.txt'
]
- s.add_dependency 'refinerycms-core', '= 1.0.5'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
+ s.add_dependency 'activerecord', '~> 3.0.10'
s.add_dependency 'dragonfly', '~> 0.9.0'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
2  settings/lib/gemspec.rb
@@ -21,6 +21,8 @@
s.require_paths = %w(lib)
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
+ s.add_dependency 'activerecord', '~> 3.0.10'
+
s.files = [
'#{%w( **/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(gempath.join(file)) }.flatten.reject{|f|
!f.exist? or f.to_s =~ /\.gem$/ or (f.directory? and f.children.empty?)
View
6 settings/refinerycms-settings.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-settings}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
+ s.add_dependency 'activerecord', '~> 3.0.10'
+
s.files = [
'app',
'app/controllers',
@@ -85,5 +87,5 @@ Gem::Specification.new do |s|
'spec/models/refinery_setting_spec.rb'
]
- s.add_dependency 'refinerycms-base', '= 1.0.5'
+ s.add_dependency 'refinerycms-base', '= 1.0.6'
end
View
1  testing/lib/gemspec.rb
@@ -22,6 +22,7 @@
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
+
# RSpec
s.add_dependency 'rspec-rails', '~> 2.6'
s.add_dependency 'fuubar'
View
5 testing/refinerycms-testing.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-testing}
- s.version = %q{1.0.5}
+ s.version = %q{1.0.6}
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-08-31}
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '= 1.0.5'
+ s.add_dependency 'refinerycms-core', '= 1.0.6'
+
# RSpec
s.add_dependency 'rspec-rails', '~> 2.6'
s.add_dependency 'fuubar'

No commit comments for this range

Something went wrong with that request. Please try again.