refinerycms 0.9.6.14 → 0.9.6.15

data/.gitignore

@@ -20,4 +20,7 @@ public/javascripts/cache
 public/stylesheets/cache
 config/database.yml.example
 .yardoc/
-refinerycms.gemspec
+refinerycms.gemspec
+.bundle
+vendor/cache
+*.lock

data/Rakefile

@@ -6,8 +6,8 @@ begin
   require File.join(File.dirname(__FILE__), 'config', 'environment')
 rescue Exception
   # Log the exception to the console/logfile.
-  puts "*** Couldn't load the config/environment file because something went wrong... ***"
-  puts "*** Don't worry, we'll do it the normal way and load in config/boot instead... ***"
+  puts "*** Couldn't load the application's configuration because something went wrong... ***"
+  puts "*** Don't worry, we'll bypass the application's configuration and just boot instead... ***"
 
   # Load up the boot file instead because there's something wrong with the environment.
   require File.join(File.dirname(__FILE__), 'config', 'boot')
@@ -19,52 +19,4 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'tasks/rails'
 
-# Because we use plugins that are shipped via gems, we lose their rake tasks.
-# So here, we find them (if there are any) and include them into rake.
-extra_rake_tasks = []
-if defined?(Refinery) && Refinery.is_a_gem
-  extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake")].sort
-end
-
-# We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
-if $refinery_gem_plugin_lib_paths.present?
-  extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
-end
-
-# Load in any extra tasks that we've found.
-extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }
-
-desc 'Removes trailing whitespace across the entire application.'
-task :whitespace do
-  sh %{find . -name '*.*rb' -exec sed -i '' 's/\t/  /g' {} \\; -exec sed -i '' 's/ *$//g' {} \\; }
-end
-
-# You don't need to worry about this unless you're releasing Refinery gems.
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = %q{refinerycms}
-    s.description = %q{A beautiful open source Ruby on Rails content manager for small business. Easy to extend, easy to use, lightweight and all wrapped up in a super slick UI.}
-    s.summary = %q{A beautiful open source Ruby on Rails content manager for small business.}
-    s.email = %q{info@refinerycms.com}
-    s.homepage = %q{http://refinerycms.com}
-    s.authors = ["Resolve Digital", "David Jones", "Philip Arndt"]
-    s.extra_rdoc_files = %w(readme.md contributors.md license.md VERSION)
-    s.rdoc_options << "--inline-source"
-    s.has_rdoc = true
-  end
-
-  namespace :version do
-    namespace :bump do
-      desc "Bump the application's version by a build version."
-      task :build => [:version_required, :version] do
-        version = Jeweler::VersionHelper.new(Rails.root.to_s)
-        version.update_to(version.major, version.minor, version.patch, ((version.build || 0).to_i + 1))
-        version.write
-        $stdout.puts "Updated version: #{version.to_s}"
-      end
-    end
-  end
-rescue LoadError
-  #puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
+require 'refinery/tasks/refinery'

data/VERSION

@@ -1 +1 @@
-0.9.6.14
+0.9.6.15

data/bin/refinery

@@ -2,48 +2,48 @@
 require 'pathname'
 require 'fileutils'
 
-REFINERY_ROOT = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")) unless defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname)
+refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
 unless (app_path = ARGV.shift).nil? or app_path.length == 0
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
-  RAILS_ROOT = (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2)) ? Dir.getwd : app_path
-  if File.exists? RAILS_ROOT
+  rails_root = (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2)) ? Dir.getwd : app_path
+  if File.exists? rails_root
     if ARGV.include?("--force")
       # remove the contents of the current directory
-      Dir[File.join(RAILS_ROOT, "*")].each {|dir| FileUtils::rm_rf(dir, :secure => true) }
+      Dir[File.join(rails_root, "*")].each {|dir| FileUtils::rm_rf(dir, :secure => true) }
     else
       puts "The path you specified already exists. If you want to override this directory (i.e. delete all the current contents) run this again with --force"
     end
   end
 
-  unless File.exists? RAILS_ROOT and !ARGV.include?("--force")
+  unless File.exists? rails_root and !ARGV.include?("--force")
     # make the application path directory
-    FileUtils::makedirs RAILS_ROOT
+    FileUtils::makedirs rails_root
 
     # copy in all of the relevant directories and root files.
     to_copy = %w(app config db lib public themes script contributors.md license.md Rakefile readme.md VERSION).map do |dir|
-      REFINERY_ROOT.join(dir).to_s
+      refinery_root.join(dir).to_s
     end
-    FileUtils::cp_r to_copy, RAILS_ROOT, :verbose => false
+    FileUtils::cp_r to_copy, rails_root, :verbose => false
 
     # ensure lib/refinery_initializer.rb doesn't make it in.
-    FileUtils::rm File.join(%W(#{RAILS_ROOT} lib refinery_initializer.rb)) if File.exists?(File.join(%W(#{RAILS_ROOT} lib refinery_initializer.rb)))
+    FileUtils::rm File.join(%W(#{rails_root} lib refinery_initializer.rb)) if File.exists?(File.join(%W(#{rails_root} lib refinery_initializer.rb)))
 
     # add in the config files
     for config in %w(database amazon_s3 rackspace_cloudfiles)
-      FileUtils::move File.join(%W(#{RAILS_ROOT} config #{config}.yml.example)), File.join(%W(#{RAILS_ROOT} config #{config}.yml))
+      FileUtils::move File.join(%W(#{rails_root} config #{config}.yml.example)), File.join(%W(#{rails_root} config #{config}.yml))
 
       # figure out the app name from the install path and swap out your_local_xxx with this name.
-      unless RAILS_ROOT == "/" or RUBY_PLATFORM =~ /mswin/
-        app_name = RAILS_ROOT.split(File::SEPARATOR).last
+      unless rails_root == "/" or RUBY_PLATFORM =~ /mswin/
+        app_name = rails_root.split(File::SEPARATOR).last
         # read in the file and split up the lines
-        lines = File.open(File.join(%W(#{RAILS_ROOT} config #{config}.yml)), "r").read.split("\n")
+        lines = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "r").read.split("\n")
         lines.each do |line|
           line.gsub!("your_local_#{config}", "#{app_name}_development")
           line.gsub!("your_test_#{config}", "#{app_name}_test")
           line.gsub!("your_production_#{config}", "#{app_name}_production")
         end
         # write the new content into the file.
-        File.open(File.join(%W(#{RAILS_ROOT} config #{config}.yml)), "w").puts(lines.join("\n"))
+        File.open(File.join(%W(#{rails_root} config #{config}.yml)), "w").puts(lines.join("\n"))
       end
     end
 
@@ -53,24 +53,24 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     3.times { new_digest << Digest::SHA1.hexdigest("--refinery--#{Time.now.to_s}--#{rand(10000000)}--") }
 
     # read in the file and split up the lines
-    app_config_file = File.exist?(File.join(%W(#{RAILS_ROOT} config application.rb))) ? "application.rb" : "environment.rb"
-    lines = File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "r").read.split("\n")
+    app_config_file = File.exist?(File.join(%W(#{rails_root} config application.rb))) ? "application.rb" : "environment.rb"
+    lines = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read.split("\n")
     lines.each do |line|
       match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
       line.gsub!(match, new_digest) unless match.nil?
     end
     # write the new content into the file.
-    File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "w").puts(lines.join("\n"))
+    File.open(File.join(%W(#{rails_root} config #{app_config_file})), "w").puts(lines.join("\n"))
 
   	puts "\n---------"
-  	puts "Refinery successfully installed in '#{RAILS_ROOT}'!\n\n"
+  	puts "Refinery successfully installed in '#{rails_root}'!\n\n"
 
     # update core script files with symlinks.
-    system "refinery-update-core #{RAILS_ROOT} --from-refinery-installer"
+    system "refinery-update-core #{rails_root} --from-refinery-installer"
 
     puts "=== ACTION REQUIRED ==="
     puts "\nNow run these commands:"
-    puts "\ncd #{RAILS_ROOT}"
+    puts "\ncd #{rails_root}"
     puts "rake db:setup"
     puts "rake gems:install"
     puts "\nruby script/server"

data/bin/refinery-override

@@ -2,16 +2,16 @@
 require 'pathname'
 require 'fileutils'
 
-REFINERY_ROOT = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")) unless defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname)
+refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
 unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
   if ((app_path = ARGV.shift).nil? or app_path.length <= 2) and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or !is_current_dir or is_current_dir < 2)
-    RAILS_ROOT = Pathname.new(Dir.getwd)
+    rails_root = Pathname.new(Dir.getwd)
   else
-    RAILS_ROOT = Pathname.new(app_path)
+    rails_root = Pathname.new(app_path)
   end
 
-  if RAILS_ROOT.exists?
+  if rails_root.exists?
     # figure out what to override
     override_parts = override_path.downcase.split('/').compact.collect {|part| part if part.length > 0 }.compact
     admin = ""
@@ -31,11 +31,11 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
 
     # copy the controller
     unless controller_with_admin =~ /\*(\*)?/ and !action.nil?
-      refinery_controllers = Dir[REFINERY_ROOT.join("vendor", "plugins", "**", "app", "controllers", "#{controller_with_admin}_controller.rb")]
+      refinery_controllers = Dir[refinery_root.join("vendor", "plugins", "**", "app", "controllers", "#{controller_with_admin}_controller.rb")]
       if refinery_controllers.compact.any? # the controllers may not exist.
         refinery_controllers.each do |refinery_controller|
           # make the directories
-          FileUtils.mkdir_p(copy_to = RAILS_ROOT.join("app" "controllers", admin))
+          FileUtils.mkdir_p(copy_to = rails_root.join("app" "controllers", admin))
           FileUtils.cp(refinery_controller, copy_to)
         end
       else
@@ -46,7 +46,7 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
     # copy the action, if it exists
     unless action.nil? or action.length == 0
       # get all the matching files
-      looking_for = REFINERY_ROOT.join("vendor", "plugins", "**", "app", "views", controller_with_admin.split('/'), "#{action}*.erb")
+      looking_for = refinery_root.join("vendor", "plugins", "**", "app", "views", controller_with_admin.split('/'), "#{action}*.erb")
       action_files = Dir[looking_for]
 
       # copy in the action template
@@ -55,8 +55,8 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
         action_file_dir = action_file_path.split('/')
         action_file_dir.pop # get rid of the file.
 
-        FileUtils.mkdir_p(RAILS_ROOT.join("app", "views", action_file_dir))
-        FileUtils.cp action_file, RAILS_ROOT.join("app", "views", action_file_path)
+        FileUtils.mkdir_p(rails_root.join("app", "views", action_file_dir))
+        FileUtils.cp action_file, rails_root.join("app", "views", action_file_path)
       end
     else
       puts "Note: No action was specified."

data/bin/refinery-update-core

@@ -1,72 +1,79 @@
 #!/usr/bin/env ruby
 require 'pathname'
 require 'fileutils'
-REFINERY_ROOT = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")) unless defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname)
-RAILS_ROOT = ARGV.first unless defined? RAILS_ROOT
-unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
+refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
+rails_root = (defined?(RAILS_ROOT) ? RAILS_ROOT : ARGV.first)
+unless rails_root.nil? or rails_root.length == 0
   # ensure asset directories exist.
   dirs = [%w(public stylesheets), %w(public javascripts), %w(db migrate)]
-  FileUtils::makedirs dirs.map {|dir| File.join(RAILS_ROOT, dir) }
+  FileUtils::makedirs dirs.map {|dir| File.join(rails_root, dir) }
 
   # copy in the new assets.
   assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(VERSION)]
 	assets.each do |asset|
-	  FileUtils::rm_rf File.join(RAILS_ROOT, asset), :secure => true # ensure the destination is clear.
-	  FileUtils::cp_r File.join(REFINERY_ROOT, asset), File.join(RAILS_ROOT, asset) # copy the new assets into the project.
+	  FileUtils::rm_rf File.join(rails_root, asset), :secure => true # ensure the destination is clear.
+	  FileUtils::cp_r File.join(refinery_root, asset), File.join(rails_root, asset) # copy the new assets into the project.
   end
 
   # copy in any new migrations.
-  FileUtils::cp Dir[File.join(%W(#{REFINERY_ROOT} db migrate *.rb))], File.join(%W(#{RAILS_ROOT} db migrate))
+  FileUtils::cp Dir[File.join(%W(#{refinery_root} db migrate *.rb))], File.join(%W(#{rails_root} db migrate))
 
   # replace rakefile.
-  FileUtils::cp File.join(%W(#{REFINERY_ROOT} Rakefile)), File.join(%W(#{RAILS_ROOT} Rakefile))
+  FileUtils::cp File.join(%W(#{refinery_root} Rakefile)), File.join(%W(#{rails_root} Rakefile))
 
   # replace the preinitializer.
-  FileUtils::cp File.join(%W(#{REFINERY_ROOT} config preinitializer.rb)), File.join(%W(#{RAILS_ROOT} config preinitializer.rb))
+  FileUtils::cp File.join(%W(#{refinery_root} config preinitializer.rb)), File.join(%W(#{rails_root} config preinitializer.rb))
+
+  # copy the lib/refinery directory in
+  FileUtils::cp_r File.join(%W(#{refinery_root} lib refinery)), File.join(rails_root, "lib")
+
+  # get current secret key
+  if !File.exist?(File.join(%W(#{rails_root} config application.rb)))
+    lines = File.open(File.join(%W(#{rails_root} config environment.rb)), "r").read.split("\n")
+  else
+    lines = File.open(File.join(%W(#{rails_root} config application.rb)), "r").read.split("\n")
+  end
+  secret_key = ""
+  lines.each do |line|
+    match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
+    secret_key = match unless match.nil?
+  end
 
 	# read in the config files
-	if File.exist?(File.join(%W(#{RAILS_ROOT} config application.rb)))
-	  FileUtils::cp File.join(%W(#{REFINERY_ROOT} config environment.rb)), File.join(%W(#{RAILS_ROOT} config environment.rb))
+	if File.exist?(File.join(%W(#{rails_root} config application.rb)))
+	  FileUtils::cp File.join(%W(#{refinery_root} config environment.rb)), File.join(%W(#{rails_root} config environment.rb))
   else
-    # update secret key if environment still exists
-    lines = File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "r").read.split("\n")
-    secret_key = ""
-    lines.each do |line|
-      match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
-      secret_key = match unless match.nil?
-    end
     # write the new content into the file.
-    FileUtils::cp File.join(%W(#{REFINERY_ROOT} config application.rb)), File.join(%W(#{RAILS_ROOT} config application.rb))
+    FileUtils::cp File.join(%W(#{refinery_root} config application.rb)), File.join(%W(#{rails_root} config application.rb))
 
-    app_rb_lines = File.open(File.join(%W(#{RAILS_ROOT} config application.rb)), "r").read.split("\n")
+    app_rb_lines = File.open(File.join(%W(#{rails_root} config application.rb)), "r").read.split("\n")
     app_rb_lines.each do |line|
       match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
       line.gsub!(match, secret_key) unless match.nil?
     end
 
     # write the new content into the file.
-    File.open(File.join(%W(#{RAILS_ROOT} config application.rb)), "w").puts(app_rb_lines.join("\n"))
+    File.open(File.join(%W(#{rails_root} config application.rb)), "w").puts(app_rb_lines.join("\n"))
 
-    FileUtils::cp File.join(%W(#{REFINERY_ROOT} config environment.rb)), File.join(%W(#{RAILS_ROOT} config environment.rb))
+    FileUtils::cp File.join(%W(#{refinery_root} config environment.rb)), File.join(%W(#{rails_root} config environment.rb))
   end
 
   app_config_file = "application.rb"
 
-	app_config = File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "r").read
-	environment_updated = false
+	app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read
 
-  # backup app's environment.rb
+  # backup app's config file and replace it, if required.
+	environment_updated = false
   matcher = /(#===REFINERY REQUIRED GEMS===)(.+?)(#===REFINERY END OF REQUIRED GEMS===)/m
   unless (app_refinery_gems_section = app_config.scan(matcher).join("")).length == 0
-    # read in the config file in the gem
-  	refinery_config = File.open(File.join(%W(#{REFINERY_ROOT} config #{app_config_file})), "r").read
-  	FileUtils.cp File.join(%W(#{RAILS_ROOT} config #{app_config_file})), File.join(%W(#{RAILS_ROOT} config #{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb))
+    # backup the config file.
+  	FileUtils.cp File.join(%W(#{rails_root} config #{app_config_file})), File.join(%W(#{rails_root} config #{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb))
 
-    # write the new content into the file.
-    File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "w").puts(app_config.gsub!(
-  	  app_refinery_gems_section,
-  	  refinery_config.scan(matcher).join("")
-  	))
+    # copy the new config file.
+    FileUtils.cp File.join(%W(#{refinery_root} config #{app_config_file})), File.join(%W(#{rails_root} config #{app_config_file}))
+    
+    # Write the secret key back into the file.
+    
 
   	environment_updated = true
 	end
@@ -75,7 +82,7 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
 	  puts "---------"
 	  puts "Copied new Refinery core assets."
 	  if environment_updated
-  	  puts "I've made a backup of your current config/#{app_config_file} file as it has been updated with the latest Refinery RubyGem requirements."
+  	  puts "I've made a backup of your current config/#{app_config_file} file as it has been updated with the latest Refinery requirements."
   	  puts "The backup is located at config/#{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb incase you need it."
     end
 	  puts ""

data/config/application.rb

@@ -1,88 +1,29 @@
-if defined?(Rails::Application) # e.g. Rails 3
-  module Refinery
-    class Application < Rails::Application
-      config.action_controller.session = {
-        :session_key => '_refinery_session',
-        :secret      => 'eec8fffc3637c05895f8e6a355179eaad0003ac5617e5368955baf7989e1faca4d8ab37140d690c20b05d5815609b7c680c644277b6a892be316a85c6596d75c'
-      }
-    end
-
-    def gem_version
-      #"0.9.6.14"
-    end
-  end
-else
-  # Be sure to restart your server when you modify this file
-
-  # Uncomment below to force Rails into production mode when
-  # you don't control web/app server and can't set it the proper way
-  # ENV['RAILS_ENV'] ||= 'production'
-
-  # Specifies gem version of Rails to use when vendor/rails is not present
-  RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
-  # Freeze to a specific version of refinerycms when running as a gem
-  # REFINERY_GEM_VERSION = '0.9.6.14' unless defined? REFINERY_GEM_VERSION
-
-  # Bootstrap the Rails environment, frameworks, and default configuration
-  require File.join(File.dirname(__FILE__), 'boot')
-
-  # require the refinery initializer.
-  require Refinery.root.join("lib", "refinery_initializer").to_s
-
-  Refinery::Initializer.run do |config|
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-    # See Rails::Configuration for more options.
-
-    # Only load the plugins named here, in the order given. By default, all plugins
-    # in vendor/plugins are loaded in alphabetical order.
-    # :all can be used as a placeholder for all plugins not explicitly named
-    # Loading gem plugins that other plugins may rely on first.
-    config.plugins = [ :friendly_id, :will_paginate, :aasm, :all ]
-
-    # Add additional load paths for your own custom dirs
-    # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-    # Force all environments to use the same logger level
-    # (by default production uses :info, the others :debug)
-    # config.log_level = :debug
-
-    # Your secret key for verifying cookie session data integrity.
-    # If you change this key, all old sessions will become invalid!
-    # Make sure the secret is at least 30 characters and all random,
-    # no regular words or you'll be exposed to dictionary attacks.
-    config.action_controller.session = {
-      :session_key => '_refinery_session',
-      :secret      => 'eec8fffc3637c05895f8e6a355179eaad0003ac5617e5368955baf7989e1faca4d8ab37140d690c20b05d5815609b7c680c644277b6a892be316a85c6596d75c'
-    }
-
-    # Use the database for sessions instead of the cookie-based default,
-    # which shouldn't be used to store highly confidential information
-    # (create the session table with 'rake db:sessions:create')
-    # config.action_controller.session_store = :active_record_store
-
-    # Use SQL instead of Active Record's schema dumper when creating the test database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Activate observers that should always be running
-    # config.active_record.observers = :cacher, :garbage_collector
-
-    # Make Active Record use UTC-base instead of local time
-    # config.active_record.default_timezone = :utc
-    #
-
-    #===REFINERY REQUIRED GEMS===
-    config.gem "bundler", :version => ">= 0.9.4"
-    config.gem "rake", :version => ">= 0.8.3", :lib => "rake"
-    config.gem "friendly_id", :version => ">= 2.3.2", :lib => "friendly_id"
-    config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate"
-    config.gem "rails", :version => ">= 2.3.5", :lib => "rails"
-    config.gem "aasm", :version => ">= 2.1.3", :lib => "aasm"
-    config.gem "slim_scrooge", :version => ">= 1.0.5", :lib => "slim_scrooge"
-    config.gem "hpricot", :version => ">= 0.8.1", :lib => "hpricot"
-    #===REFINERY END OF REQUIRED GEMS===
-  end
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+
+# Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
+REFINERY_GEM_VERSION = '0.9.6.15' unless defined? REFINERY_GEM_VERSION
+
+# Boot Rails
+require File.join(File.dirname(__FILE__), 'boot')
+
+# Here we load in Refinery to do the rest of the heavy lifting.
+# Refinery is setup in config/preinitializer.rb
+require Refinery.root.join("lib", "refinery_initializer").cleanpath.to_s
+
+# Boot with Refinery. Most configuration is handled by Refinery.
+# Anything you specify here that Refinery specified internally will override Refinery.
+Refinery::Initializer.run do |config|
+  # Settings in config/environments/* take precedence over those specified here.
+  # Application configuration should go into files in config/initializers
+  # -- all .rb files in that directory are automatically loaded.
+  # See Rails::Configuration for more options.
+
+  config.action_controller.session = {
+    :session_key => '_refinery_session',
+    :secret      => 'eec8fffc3637c05895f8e6a355179eaad0003ac5617e5368955baf7989e1faca4d8ab37140d690c20b05d5815609b7c680c644277b6a892be316a85c6596d75c'
+  }
+
+  # Specify your application's gem requirements here. See the example below:
+  # config.gem "refinerycms-portfolio", :lib => "portfolio", :version => "~> 0.9.3.7"
 end