refinerycms 0.9.6.34 → 0.9.7

data/.gitignore

@@ -1,6 +1,6 @@
 public/system/*
 public/themes/*
-log/*.log
+*.log
 tmp/**/*
 .DS_Store
 doc/api
@@ -9,20 +9,21 @@ doc/*
 config/database.yml
 config/amazon_s3.yml
 config/rackspace_cloudfiles.yml
-public/images/system/*
 nbproject
 index/**/*
 db/*.sqlite3
 *.tmproj
 *.autobackupbyrefinery.*
-refinerycms*.gem
+/refinerycms-*.gem
 public/javascripts/cache
 public/stylesheets/cache
-config/database.yml.example
 .yardoc/
 refinerycms.gemspec
-.bundle
 vendor/cache
-*.lock
-callsite_hash.*
-**/*/slim_scrooge/ext/Makefile
+.bundle
+*.rbc
+*.swp
+*.swo
+*~
+capybara-*html
+.idea

data/Gemfile

@@ -0,0 +1,50 @@
+source :rubygems
+
+# Specify the database driver as appropriate for your application (only one is necessary).
+gem 'mysql', :require => 'mysql'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+# Specify your favourite web server (only one).
+#gem 'unicorn', :group => :development
+#gem 'mongrel', :group => :development
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# If you are using s3 you probably want this gem:
+# gem 'aws-s3'
+
+#===REFINERY REQUIRED GEMS===
+gem 'acts_as_indexed', '= 0.6.2', :require => 'acts_as_indexed', :git => 'git://github.com/parndt/acts_as_indexed.git', :branch => 'master'
+gem 'authlogic',       '= 2.1.5', :require => 'authlogic'
+gem 'friendly_id',     '= 3.0.6', :require => 'friendly_id'
+gem 'rails',           '= 2.3.8'
+gem 'rmagick',         '~> 2.13.1'
+gem 'truncate_html',   '= 0.3.2', :require => 'truncate_html'
+gem 'will_paginate',   '= 2.3.14', :require => 'will_paginate'
+
+group :test do
+  gem 'json_pure', :require => 'json/pure', :git => 'git://github.com/parndt/json.git', :branch => 'master'
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'factory_girl'
+  gem 'test-unit', '= 1.2.3'
+
+  gem 'cucumber-rails'
+  gem 'capybara'
+  gem 'factory_girl'
+  gem 'database_cleaner'
+  gem 'launchy'
+end
+#===REFINERY END OF REQUIRED GEMS===
+
+#===REQUIRED FOR REFINERY GEM INSTALL===
+# Leave the gem below disabled (commented out) if you're not using the gem install method.
+#gem 'refinerycms',    '= 0.9.7.dev'
+#===END OF REFINERY GEM INSTALL REQUIREMENTS===
+
+# Bundle gems for certain environments:
+
+# Specify your application's gem requirements here. See the examples below:
+# gem "refinerycms-news", "~> 0.9.7", :require => "news"
+# gem "refinerycms-portfolio", "~> 0.9.3.8", :require => "portfolio"

data/Rakefile

@@ -3,7 +3,7 @@
 
 begin
   # Load up the environment instead of just the boot file because we want all of the tasks available.
-  require File.join(File.dirname(__FILE__), 'config', 'environment')
+  require File.join(File.dirname(__FILE__), 'config', 'application')
 rescue Exception
   # Load up the boot file instead because there's something wrong with the environment (like it's not set up yet).
   require File.join(File.dirname(__FILE__), 'config', 'boot')

data/bin/refinery

@@ -20,16 +20,17 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     FileUtils::makedirs rails_root
 
     # copy in all of the relevant directories and root files.
-    to_copy = %w(app config db lib public themes script license.md Rakefile readme.md VERSION).map do |dir|
+    to_copy = %w(app config db lib public themes script license.md Rakefile readme.md VERSION Gemfile .gitignore).map do |dir|
       refinery_root.join(dir).to_s
     end
     FileUtils::cp_r to_copy, rails_root, :verbose => false
 
-    # ensure lib/refinery_initializer.rb doesn't make it in.
+    # ensure lib/refinery_initializer.rb and lib/gemspec.rb don'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 gemspec.rb)) if File.exists?(File.join(%W(#{rails_root} lib gemspec.rb)))
 
     # add in the config files
-    for config in %w(database amazon_s3 rackspace_cloudfiles)
+    %w(database amazon_s3 rackspace_cloudfiles).each do |config|
       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.
@@ -40,6 +41,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
         lines.each do |line|
           line.gsub!("your_local_#{config}", "#{app_name}_development")
           line.gsub!("your_test_#{config}", "#{app_name}_test")
+          line.gsub!("your_cucumber_#{config}", "#{app_name}_cucumber")
           line.gsub!("your_production_#{config}", "#{app_name}_production")
         end
         # write the new content into the file.
@@ -62,22 +64,31 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     # write the new content into the file.
     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"
+    # read in the Gemfile and write it back out with the refinerycms gem enabled.
+    lines = File.open(File.join(%W(#{rails_root} Gemfile)), "r").read.split("\n")
+    lines.each do |line|
+      line.gsub!("#gem 'refinerycms'", "gem 'refinerycms'")
+    end
+    # write the new content into the file.
+    File.open(File.join(%W(#{rails_root} Gemfile)), "w").puts(lines.join("\n"))
 
-    # update core script files with symlinks.
-    system "refinery-update-core #{rails_root} --from-refinery-installer"
+    puts "\n---------"
+    puts "Refinery successfully installed in '#{rails_root}'!\n\n"
 
+    # output helpful messages.
     puts "=== ACTION REQUIRED ==="
     puts "\nNow run these commands:"
     puts "\ncd #{rails_root}"
+    puts "bundle install"
     puts "rake db:setup"
-    puts "rake gems:install"
-    puts "\nruby script/server"
-    puts "\nThis will install all the required gems, set up your database, and launches the built-in webserver."
+    puts "rake refinery:update"
+    puts "\nunicorn_rails -p3000"
+    puts "or"
+    puts "ruby script/server"
+    puts "\nThis will install all the required gems, set up your database, and launches the  webserver."
     puts "You can now see your site running in your browser at http://localhost:3000"
     puts "\nThanks for installing Refinery, enjoy creating your new application!"
-  	puts "---------\n\n"
+    puts "---------\n\n"
   end
 else
   puts "Please specify the path where you want to install Refinery. i.e. refinery /path/to/project"

data/bin/refinery-update-core

@@ -10,25 +10,41 @@ unless rails_root.nil? or rails_root.length == 0
 
   # copy in the new assets.
   assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(VERSION), %w(public images wymeditor skins refinery), %w(public images refinery), %w(public stylesheets wymeditor skins refinery), %w(public javascripts jquery)]
-	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.
+  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.
   end
 
   # copy in any new migrations.
   FileUtils::cp Dir[File.join(%W(#{refinery_root} db migrate *.rb))], File.join(%W(#{rails_root} db migrate))
 
-  # replace rakefile.
+  # replace rakefile and gemfile.
   FileUtils::cp File.join(%W(#{refinery_root} Rakefile)), File.join(%W(#{rails_root} Rakefile))
+  unless File.exist?(File.join("%W(#{rails_root} Gemfile)"))
+    FileUtils::cp File.join(%W(#{refinery_root} Gemfile)), File.join(%W(#{rails_root} Gemfile))
+  else
+    # TODO only override refinery gems here.
+  end
+
+  # read in the Gemfile and write it back out with the refinerycms gem enabled.
+  lines = File.open(File.join(%W(#{rails_root} Gemfile)), "r").read.split("\n")
+  lines.each do |line|
+    line.gsub!("#gem 'refinerycms'", "gem 'refinerycms'")
+  end
+  # write the new content into the file.
+  File.open(File.join(%W(#{rails_root} Gemfile)), "w").puts(lines.join("\n"))
 
   # replace the preinitializer.
   FileUtils::cp File.join(%W(#{refinery_root} config preinitializer.rb)), File.join(%W(#{rails_root} config preinitializer.rb))
 
+  # replace the boot file.
+  FileUtils::cp File.join(%W(#{refinery_root} config boot.rb)), File.join(%W(#{rails_root} config boot.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)))
+  unless 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")
@@ -40,9 +56,9 @@ unless rails_root.nil? or rails_root.length == 0
     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))
+  # 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))
   else
     # 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))
@@ -65,18 +81,20 @@ unless rails_root.nil? or rails_root.length == 0
 
   app_config_file = "application.rb"
 
-	app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read
+  app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read
 
   # copy new jquery javascripts.
-  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery.js)), File.join(%W(#{rails_root} public javascripts jquery.js))
-  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-ui-1.8.min.js)), File.join(%W(#{rails_root} public javascripts jquery-ui-1.8.min.js))
+  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery.js)), File.join(%W(#{rails_root} public javascripts jquery.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery.js)))
+  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-min.js)), File.join(%W(#{rails_root} public javascripts jquery-min.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery-min.js)))
+  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-ui.js)), File.join(%W(#{rails_root} public javascripts jquery-ui.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery-ui.js)))
+  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-ui-custom-min.js)), File.join(%W(#{rails_root} public javascripts jquery-ui-custom-min.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery-ui-custom-min.js)))
 
   # backup app's config file and replace it, if required.
-	environment_updated = false
+  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
     # 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))
+    FileUtils.cp File.join(%W(#{rails_root} config #{app_config_file})), File.join(%W(#{rails_root} config #{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb))
 
     # 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}))
@@ -84,22 +102,22 @@ unless rails_root.nil? or rails_root.length == 0
     # Write the secret key back into the file.
 
 
-  	environment_updated = true
-	end
+    environment_updated = true
+  end
 
-	unless ARGV.include?("--from-refinery-installer")
-	  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 requirements."
-  	  puts "The backup is located at config/#{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb incase you need it."
+  unless ARGV.include?("--from-refinery-installer")
+    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 requirements."
+      puts "The backup is located at config/#{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb incase you need it."
     end
-	  puts ""
-	  puts "=== ACTION REQUIRED ==="
-	  puts "Please run rake db:migrate to ensure your database is at the correct version."
-	  puts "Please also run rake gems:install to ensure you have the currently specified gems." if environment_updated
-
-	  puts ""
+    puts ""
+    puts "=== ACTION REQUIRED ==="
+    puts "Please run 'rake db:migrate' to ensure your database is at the correct version."
+    puts "Please also run 'rake gems:install' to ensure you have the currently specified gems." if environment_updated
+    puts "It may also be necessary to run 'bundle install' in order to get the latest gems."
+    puts ""
   end
 else
   unless ARGV.include?("--from-refinery-installer")

data/changelog.md

@@ -0,0 +1,313 @@
+===0.9.7 [02 July 2010]
+
+- Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn and Philip Arndt and many others]
+- Marketable URLs, such as /contact [Joshua Davey and Joe Sak].
+- Switched to bundler and rack. [Alex Coles and Philip Arndt]
+- Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel and Philip Arndt]
+- Added spam filtering to contact form [djones]
+- Full Refinery UI redesign [Resolve Digital]
+- User Role support [Amanda Nicholas and Philip Arndt]
+
+===0.9.6.34 [09 May 2010]
+
+- Bugfixes.
+
+===0.9.6.33 [06 May 2010]
+
+- Bugfixes.
+
+===0.9.6.32 [05 May 2010]
+
+- Bugfixes.
+
+===0.9.6.31 [19 April 2010]
+
+- Bugfixes.
+
+===0.9.6.30 [15 April 2010]
+
+- Bugfixes.
+
+===0.9.6.29 [14 April 2010]
+
+- Bugfixes.
+
+===0.9.6.28 [12 April 2010]
+
+- Bugfixes.
+
+===0.9.6.27 [12 April 2010]
+
+- Bugfixes.
+
+===0.9.6.26 [07 April 2010]
+
+- Bugfixes.
+
+===0.9.6.25 [01 April 2010]
+
+- Bugfixes.
+
+===0.9.6.24 [26 March 2010]
+
+- Bugfixes.
+
+===0.9.6.23 [26 March 2010]
+
+- Bugfixes.
+
+===0.9.6.22 [26 March 2010]
+
+- Bugfixes.
+
+===0.9.6.21 [23 March 2010]
+
+- Bugfixes.
+
+===0.9.6.19 [03 March 2010]
+
+- Bugfixes.
+
+===0.9.6.18 [02 March 2010]
+
+- Bugfixes.
+
+===0.9.6.17 [02 March 2010]
+
+- Bugfixes.
+
+===0.9.6.16 [02 March 2010]
+
+- Bugfixes.
+
+===0.9.6.15 [01 March 2010]
+
+- Bugfixes.
+
+===0.9.6.14 [24 February 2010]
+
+- Bugfixes.
+
+===0.9.6.13 [23 February 2010]
+
+- Bugfixes.
+
+===0.9.6.12 [16 February 2010]
+
+- Bugfixes.
+
+===0.9.6.11 [16 February 2010]
+
+- Bugfixes.
+
+===0.9.6.10 [15 February 2010]
+
+- Bugfixes.
+
+===0.9.6.9 [15 February 2010]
+
+- Bugfixes.
+
+===0.9.6.8 [14 February 2010]
+
+- Bugfixes.
+
+===0.9.6.7 [10 February 2010]
+
+- Bugfixes.
+
+===0.9.6.6 [10 February 2010]
+
+- Bugfixes.
+
+===0.9.6.5 [08 February 2010]
+
+- Bugfixes.
+
+===0.9.6.4 [07 February 2010]
+
+- Bugfixes.
+
+===0.9.6.3 [07 February 2010]
+
+- Bugfixes.
+
+===0.9.6.2 [04 February 2010]
+
+- Bugfixes.
+
+===0.9.6.1 [04 February 2010]
+
+- Bugfixes.
+
+===0.9.6 [04 February 2010]
+
+- Minor release.
+
+===0.9.5.31 [27 January 2010]
+
+- Bugfixes.
+
+===0.9.5.30 [24 January 2010]
+
+- Bugfixes.
+
+===0.9.5.29 [23 December 2009]
+
+- Bugfixes.
+
+===0.9.5.28 [17 December 2009]
+
+- Bugfixes.
+
+===0.9.5.27 [16 December 2009]
+
+- Bugfixes.
+
+===0.9.5.26 [13 December 2009]
+
+- Bugfixes.
+
+===0.9.5.25 [09 December 2009]
+
+- Bugfixes.
+
+===0.9.5.24 [08 December 2009]
+
+- Bugfixes.
+
+===0.9.5.23 [07 December 2009]
+
+- Bugfixes.
+
+===0.9.5.22 [07 December 2009]
+
+- Bugfixes.
+
+===0.9.5.21 [06 December 2009]
+
+- Bugfixes.
+
+===0.9.5.20 [03 December 2009]
+
+- Bugfixes.
+
+===0.9.5.19 [30 November 2009]
+
+- Bugfixes.
+
+===0.9.5.18 [29 November 2009]
+
+- Bugfixes.
+
+===0.9.5.16 [26 November 2009]
+
+- Bugfixes.
+
+===0.9.5.15 [22 November 2009]
+
+- Bugfixes.
+
+===0.9.5.14 [19 November 2009]
+
+- Bugfixes.
+
+===0.9.5.13 [18 November 2009]
+
+- Bugfixes.
+
+===0.9.5.12 [18 November 2009]
+
+- Bugfixes.
+
+===0.9.5.11 [18 November 2009]
+
+- Bugfixes.
+
+===0.9.5.10 [17 November 2009]
+
+- Bugfixes.
+
+===0.9.5.9 [16 November 2009]
+
+- Bugfixes.
+
+===0.9.5.8 [15 November 2009]
+
+- Bugfixes.
+
+===0.9.5.7 [09 November 2009]
+
+- Bugfixes.
+
+===0.9.5.6 [09 November 2009]
+
+- Bugfixes.
+
+===0.9.5.5 [08 November 2009]
+
+- Bugfixes.
+
+===0.9.5.4 [04 November 2009]
+
+- Bugfixes.
+
+===0.9.5.3 [04 November 2009]
+
+- Bugfixes.
+
+===0.9.5.2 [04 November 2009]
+
+- Bugfixes.
+
+===0.9.5.1 [03 November 2009]
+
+- Bugfixes.
+
+===0.9.5 [03 November 2009]
+
+- Minor release.
+
+===0.9.4.4 [29 October 2009]
+
+- Bugfixes.
+
+===0.9.4.3 [19 October 2009]
+
+- Bugfixes.
+
+===0.9.4.2 [19 October 2009]
+
+- Bugfixes.
+
+===0.9.4 [15 October 2009]
+
+- Minor release.
+
+===0.9.3 [11 October 2009]
+
+- Minor release.
+
+===0.9.2.2 [08 October 2009]
+
+- Bugfixes.
+
+===0.9.2.1 [08 October 2009]
+
+- Bugfixes.
+
+===0.9.2 [08 October 2009]
+
+- Minor release.
+
+===0.9.1.2 [07 October 2009]
+
+- Bugfixes.
+
+===0.9.1.1 [05 October 2009]
+
+- Bugfixes.
+
+===0.9.1 [04 October 2009]
+
+- Initial public release.