Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

haml & couchrest plugins installed

  • Loading branch information...
commit d4d29ac2a66c0665cec367b9f193fd01b6e9f24f 1 parent 23150ea
@Stanley authored
View
2  vendor/plugins/couchrest-rails/init.rb
@@ -1,6 +1,6 @@
require 'couch_rest_rails'
-%w(couchrest json validatable).each do |g|
+%w(couchrest json).each do |g|
begin
require g
rescue LoadError
View
2  vendor/plugins/couchrest-rails/lib/couch_rest_rails/document.rb
@@ -1,7 +1,7 @@
module CouchRestRails
class Document < CouchRest::ExtendedDocument
- include Validatable
+ include CouchRest::Validation
def self.use_database(db)
db = [COUCHDB_CONFIG[:db_prefix], db.to_s, COUCHDB_CONFIG[:db_suffix]].join
View
14 vendor/plugins/haml/init.rb
@@ -1,8 +1,16 @@
begin
require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
rescue LoadError
- require 'haml' # From gem
+ begin
+ require 'haml' # From gem
+ rescue LoadError => e
+ # gems:install may be run to install Haml with the skeleton plugin
+ # but not the gem itself installed.
+ # Don't die if this is the case.
+ raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install')
+ end
end
-# Load Haml and Sass
-Haml.init_rails(binding)
+# Load Haml and Sass.
+# Haml may be undefined if we're running gems:install.
+Haml.init_rails(binding) if defined?(Haml)
Please sign in to comment.
Something went wrong with that request. Please try again.