diff --git a/Gemfile b/Gemfile index 62a99858..b3a598b5 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '3.0.9' gem 'warden' gem 'devise', '1.3.4' -gem 'devise_cas_authenticatable', :git => 'git://github.com/Bushido/devise_cas_authenticatable.git' +gem 'devise_bushido_authenticatable', '1.0.0.alpha10' gem 'mongoid', '~> 2.0.2' gem 'bson_ext', '~> 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 921859b7..ba4da898 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,15 +8,6 @@ GIT orm_adapter (~> 0.0.3) rest-client (>= 1.6.1) -GIT - remote: git://github.com/Bushido/devise_cas_authenticatable.git - revision: 0e5a949fba02629b4ee18a59c0ff410cea523829 - specs: - devise_cas_authenticatable (1.0.0.alpha10) - devise - devise (>= 1.0.6) - rubycas-client (>= 2.2.1) - GIT remote: git://github.com/floehopper/mocha.git revision: d03843e763f4e5ceadb66bcb4c530d6c5d0cb293 @@ -115,6 +106,10 @@ GEM bcrypt-ruby (~> 2.1.2) orm_adapter (~> 0.0.3) warden (~> 1.0.3) + devise_bushido_authenticatable (1.0.0.alpha10) + devise + devise (>= 1.0.6) + rubycas-client (>= 2.2.1) diff-lcs (1.1.2) dragonfly (0.9.4) rack @@ -309,7 +304,7 @@ DEPENDENCIES delayed_job (= 2.1.4) delayed_job_mongoid (= 1.0.2) devise (= 1.3.4) - devise_cas_authenticatable! + devise_bushido_authenticatable (= 1.0.0.alpha10) dragonfly (~> 0.9.1) factory_girl_rails fog (= 0.8.2) diff --git a/app/helpers/admin/content_types_helper.rb b/app/helpers/admin/content_types_helper.rb index d51b3ee1..023ae832 100644 --- a/app/helpers/admin/content_types_helper.rb +++ b/app/helpers/admin/content_types_helper.rb @@ -59,7 +59,7 @@ module Admin::ContentTypesHelper if types.size > MAX_DISPLAYED_CONTENTS sliced = types[MAX_DISPLAYED_CONTENTS, types.size - MAX_DISPLAYED_CONTENTS] - html = admin_submenu_item('...', '#', :i18n => false) do + html = admin_content_menu_item('...', '#', :i18n => false) do yield(sliced) end diff --git a/config/mongoid.yml b/config/mongoid.yml index b81cd544..f717797a 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -9,8 +9,8 @@ defaults: &defaults development: <<: *defaults - # database: locomotive_dev - database: locomotive_cas_dev + database: locomotive_dev + # database: locomotive_cas_dev test: <<: *defaults diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index f6ac7c72..733b188a 100644 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -2,69 +2,70 @@ lib = File.expand_path('../lib/', __FILE__) $:.unshift lib unless $:.include?(lib) -require "locomotive/version" +require 'locomotive/version' Gem::Specification.new do |s| - s.name = "locomotive_cms" + s.name = 'locomotive_cms' s.version = Locomotive::VERSION s.platform = Gem::Platform::RUBY - s.authors = ["Didier Lafforgue"] - s.email = ["didier@nocoffee.fr"] - s.homepage = "http://locomotiveapp.org" - s.summary = "A Next Generation Sexy CMS for Rails3" - s.description = "Locomotive is a next generation CMS system with sexy admin tools, liquid templating, and inline editing powered by mongodb and rails3" + s.authors = ['Didier Lafforgue'] + s.email = ['didier@nocoffee.fr'] + s.homepage = 'http://locomotiveapp.org' + s.summary = 'A Next Generation Sexy CMS for Rails3' + s.description = 'Locomotive is a next generation CMS system with sexy admin tools, liquid templating, and inline editing powered by mongodb and rails3' - s.required_rubygems_version = ">= 1.3.6" - s.rubyforge_project = "nowarning" + s.required_rubygems_version = '>= 1.3.6' + s.rubyforge_project = 'nowarning' - s.add_dependency "rails", ">= 3.0.9" - s.add_dependency "warden" - s.add_dependency "devise", "1.3.4" - s.add_dependency "mongoid", "2.0.2" - s.add_dependency "bson_ext", "~> 1.3.0" - s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.7" - s.add_dependency "will_paginate" + s.add_dependency 'rails', '>= 3.0.9' + s.add_dependency 'warden' + s.add_dependency 'devise', '1.3.4' + s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10' + s.add_dependency 'mongoid', '2.0.2' + s.add_dependency 'bson_ext', '~> 1.3.0' + s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7' + s.add_dependency 'will_paginate' - s.add_dependency "haml", "3.1.2" - s.add_dependency "sass", "3.1.2" - s.add_dependency "locomotive_liquid", "2.2.2" - s.add_dependency "formtastic", "~> 1.2.3" - s.add_dependency "inherited_resources", "~> 1.1.2" - s.add_dependency "cells" + s.add_dependency 'haml', '3.1.2' + s.add_dependency 'sass', '3.1.2' + s.add_dependency 'locomotive_liquid', '2.2.2' + s.add_dependency 'formtastic', '~> 1.2.3' + s.add_dependency 'inherited_resources', '~> 1.1.2' + s.add_dependency 'cells' - s.add_dependency "json_pure", "1.5.1" - s.add_dependency "bushido" - s.add_dependency "heroku", "1.19.1" + s.add_dependency 'json_pure', '1.5.1' + s.add_dependency 'bushido' + s.add_dependency 'heroku', '1.19.1' - s.add_dependency "rmagick", "2.12.2" - s.add_dependency "carrierwave", "~> 0.5.5" - s.add_dependency "dragonfly", "~> 0.9.1" - s.add_dependency "rack-cache" + s.add_dependency 'rmagick', '2.12.2' + s.add_dependency 'carrierwave', '~> 0.5.5' + s.add_dependency 'dragonfly', '~> 0.9.1' + s.add_dependency 'rack-cache' - s.add_dependency "custom_fields", "1.0.0.beta.21" - s.add_dependency "cancan", "~> 1.6.0" - s.add_dependency "fog", "0.8.2" - s.add_dependency "mimetype-fu" - s.add_dependency "actionmailer-with-request" - s.add_dependency "httparty", ">= 0.6.1" - s.add_dependency "RedCloth", "4.2.7" - s.add_dependency "delayed_job", "2.1.4" - s.add_dependency "delayed_job_mongoid", "1.0.2" - s.add_dependency "rubyzip" - s.add_dependency "locomotive_jammit-s3" + s.add_dependency 'custom_fields', '1.0.0.beta.21' + s.add_dependency 'cancan', '~> 1.6.0' + s.add_dependency 'fog', '0.8.2' + s.add_dependency 'mimetype-fu' + s.add_dependency 'actionmailer-with-request' + s.add_dependency 'httparty', '>= 0.6.1' + s.add_dependency 'RedCloth', '4.2.7' + s.add_dependency 'delayed_job', '2.1.4' + s.add_dependency 'delayed_job_mongoid', '1.0.2' + s.add_dependency 'rubyzip' + s.add_dependency 'locomotive_jammit-s3' - s.files = Dir[ "Gemfile", - "{app}/**/*", - "{config}/**/*", - "{lib}/**/*", - "{public}/stylesheets/admin/**/*", "{public}/javascripts/admin/**/*", "{public}/images/admin/**/*", - "{vendor}/**/*"] + s.files = Dir[ 'Gemfile', + '{app}/**/*', + '{config}/**/*', + '{lib}/**/*', + '{public}/stylesheets/admin/**/*', '{public}/javascripts/admin/**/*', '{public}/images/admin/**/*', + '{vendor}/**/*'] s.require_path = 'lib' s.extra_rdoc_files = [ - "LICENSE", - "README.textile" + 'LICENSE', + 'README.textile' ] end