refinerycms 0.9.7.7 → 0.9.7.8

data/.gitignore

@@ -1,7 +1,7 @@
 # Rails
 .bundle
 db/*.sqlite3
-log/*.log
+*.log
 tmp/**/*
 
 # Documentation
@@ -56,8 +56,9 @@ tags
 # Capybara Bug
 capybara-*html
 
+#===REMOVED DURING REFINERY GEM INSTALL===
 # Development Specific
-# REMOVE IF UPLOADING TO SERVER
 config/database.yml
 config/amazon_s3.yml
-config/rackspace_cloudfiles.yml
+config/rackspace_cloudfiles.yml
+#===END OF REMOVED DURING REFINERY GEM INSTALL===

data/Gemfile

@@ -21,27 +21,31 @@ gem 'acts_as_indexed', '= 0.6.3', :require => 'acts_as_indexed'
 gem 'authlogic',       '= 2.1.5', :require => 'authlogic'
 gem 'friendly_id',     '= 3.0.6', :require => 'friendly_id'
 gem 'rails',           '= 2.3.8'
-gem 'rmagick',         '~> 2.12.2'
+gem 'rmagick',         '~> 2.12.0'
 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 'test-unit',      '= 1.2.3'
   gem 'capybara'
-  gem 'factory_girl'
   gem 'database_cleaner'
+  gem 'cucumber-rails'
+  gem 'cucumber'
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'spork' unless RUBY_PLATFORM =~ /mswin|mingw/
   gem 'launchy'
+  gem 'gherkin'
+  gem 'factory_girl'
+  gem 'ruby-prof'
 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.6'
+# gem 'refinerycms',    '= 0.9.7.8'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:

data/Rakefile

@@ -15,4 +15,4 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'tasks/rails'
 
-require 'refinery/tasks/refinery'
+require 'tasks/refinery'

data/bin/refinerycms

@@ -34,7 +34,7 @@ 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 *.md Rakefile .gitignore config.ru asdas).map do |dir|
+    to_copy = %w(app config db lib public themes script *.md Rakefile config.ru).map do |dir|
       (new_file_path = refinery_root.join(dir)).exist? ? new_file_path.to_s : nil
     end
     FileUtils::cp_r to_copy.compact, rails_root, :verbose => false
@@ -113,12 +113,20 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     app_gemfile.puts(lines.join("\n"))
     app_gemfile.close
 
+    # Remove development specific stuff from the .gitinore file
+    ignore_content = refinery_root.join('.gitignore').read
+    ignore_content.gsub!(/#===REMOVED DURING REFINERY GEM INSTALL===.*#===END OF REMOVED DURING REFINERY GEM INSTALL===/m, '')
+
+    File.open(File.join(%W(#{rails_root} .gitignore)), "w") do |f|
+      f.puts(ignore_content)
+    end
+
     puts "\n---------"
     puts "Refinery successfully installed in '#{rails_root}'!\n\n"
 
     # automate..
     puts "Installing gem requirements using bundler..\n"
-    puts "Running: " + (cmd="bundle install --without test")
+    puts "Running: " + (cmd="bundle install")
     puts `cd '#{rails_root}' && #{cmd}`
 
     puts "\n\nSetting up your development database..\n"

data/changelog.md

@@ -1,3 +1,14 @@
+## 0.9.7.8 [23 July 2010]
+
+- Refactored Amazon S3 and gem installation to make it easier to install on Heroku. [Steven Heidel](http://github.com/stevenheidel)
+- Made project more testable. Renamed rake refinery:test_all to rake test:refinery [Philip Arndt](http://github.com/parndt)
+- Documentation improved [David Jones](http://github.com/djones), [Philip Arndt](http://github.com/parndt) and [Steven Heidel](http://github.com/stevenheidel)
+- Installed spork for use with systems that support forking for performance improvements. Doesn't run on Windows. [Philip Arndt](http://github.com/parndt) and [James Fiderlick](http://github.com/jamesfid)
+- Improvements and new translations for Norsk Bokmål localisation. [Ken Paulsen](http://github.com/ken-guru)
+- Ensured that RefinerySetting restrictions work properly using a before_save handler. [Joe Sak](http://github.com/joemsak)
+- Updated jquery-html5-placeholder-shim to latest version. [Amanda Wagener](http://github.com/awagener)
+- [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.7...0.9.7.8)
+
 ## 0.9.7.7 [20 July 2010]
 
 - Fixed an issue in the plugin generator that saw locales being created with singular_name not the interpreted version. [Philip Arndt](http://github.com/parndt) and [Joe Sak](http://github.com/joemsak)

data/config/amazon_s3.yml.example

@@ -1,6 +1,6 @@
 login: &login
-  access_key_id: 
-  secret_access_key: 
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>
 
 development:
   bucket_name: your_local_amazon_s3

data/config/cucumber.yml

@@ -3,6 +3,6 @@ rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
 std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
 %>
-default: <%= std_opts %> features
-wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
+default: --drb <%= std_opts %> features
+wip: --drb --tags @wip:3 --wip features
+rerun: --drb <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/config/environments/cucumber.rb

@@ -21,7 +21,3 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem 'cucumber-rails',   :lib => false, :version => '>=0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
-config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
-config.gem 'capybara',         :lib => false, :version => '>=0.3.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
-

data/config/environments/production.rb

@@ -21,7 +21,7 @@ config.action_controller.perform_caching             = true
 # is going on but without being chatty and therefore slow.
 config.log_level = :info
 
-# Set to true in order to use Amazon's Simple Storage Service on your production machine
+# When true will use Amazon's Simple Storage Service on your production machine
 # instead of the default file system for resources and images
 # Make sure to your bucket info is correct in amazon_s3.yml
-Refinery.s3_backend = false
+Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)

data/config/rackspace_cloudfiles.yml.example

@@ -1,14 +1,15 @@
+login: &login
+  username: <%= ENV['RACKSPACE_USERNAME'] %>
+  api_key: <%= ENV['RACKSPACE_KEY'] %>
+
 development:
-    container_name: your_local_rackspace_cloudfiles
-    username:
-    api_key: 
+  container_name: your_local_rackspace_cloudfiles
+  <<: *login 
 
 test:
-    container_name: your_test_rackspace_cloudfiles
-    username: 
-    api_key: 
+  container_name: your_test_rackspace_cloudfiles
+  <<: *login 
 
 production:
-    container_name: your_production_rackspace_cloudfiles
-    username: 
-    api_key: 
+  container_name: your_production_rackspace_cloudfiles
+  <<: *login 

data/features/refinery/dashboard.feature

@@ -1,4 +1,4 @@
-Feature: Manage Pages
+Feature: Dashboard
   In order to see recent changes to my website
   As an administrator
   I want to use the dashboard

data/features/step_definitions/refinery/core_steps.rb

@@ -0,0 +1,51 @@
+# Login stuff
+Given %r`not logged in$` do
+  visit logout_path
+end
+
+Given %r`(?:log|am logged) in as "([^\"]+)"$` do |login|
+  @my_username = login
+  visit login_path
+  And %Q`enter the username "#{login}"`
+  And %Q`enter the password "#{login}-123"`
+  And "press the login button"
+end
+
+Then 'I should( not)? see a login form' do |negative|
+  expect_opposite_if(negative) do
+    response.should have_tag('form#new_user_session') do
+      field_labeled('Username').should_not be_nil
+      field_labeled('Password', :password).should_not be_nil
+    end
+  end
+end
+
+When %r`enter the username "(.+)"$` do |login|
+  fill_in 'user_session[login]'   , :with => login
+end
+
+When %r`enter the password "(.+)-123"$` do |login|
+  fill_in 'user_session[password]', :with => "#{login}-123"
+end
+
+When %r`press the login button$` do
+  click_button 'Sign In'
+end
+
+Then %r`not be allowed to log in$` do
+  When %Q`log in as "#{@my_username}"`
+  Then 'I should see a login form'
+end
+
+Then %r`be redirected to login$` do
+  request.request_uri.should == login_path
+end
+
+Then /^"([^\"]*)" can log in$/ do |name|
+  user = User.find_by_login!(name)
+  visit login_path
+  When %Q`I enter the username "#{name}"`
+  And %Q`I enter the password "#{name}-123"`
+  And 'I press the login button'
+  Then 'I should not see a login form'
+end

data/features/step_definitions/web_steps.rb

@@ -217,55 +217,3 @@ end
 Then /^show me the page$/ do
   save_and_open_page
 end
-
-# Login stuff
-Given %r`not logged in$` do
-  visit logout_path
-end
-
-Given %r`(?:log|am logged) in as "([^\"]+)"$` do |login|
-  @my_username = login
-  visit login_path
-  And %Q`enter the username "#{login}"`
-  And %Q`enter the password "#{login}-123"`
-  And "press the login button"
-end
-
-Then 'I should( not)? see a login form' do |negative|
-  expect_opposite_if(negative) do
-    response.should have_tag('form#new_user_session') do
-      field_labeled('Username').should_not be_nil
-      field_labeled('Password', :password).should_not be_nil
-    end
-  end
-end
-
-When %r`enter the username "(.+)"$` do |login|
-  fill_in 'user_session[login]'   , :with => login
-end
-
-When %r`enter the password "(.+)-123"$` do |login|
-  fill_in 'user_session[password]', :with => "#{login}-123"
-end
-
-When %r`press the login button$` do
-  click_button 'Sign In'
-end
-
-Then %r`not be allowed to log in$` do
-  When %Q`log in as "#{@my_username}"`
-  Then 'I should see a login form'
-end
-
-Then %r`be redirected to login$` do
-  request.request_uri.should == login_path
-end
-
-Then /^"([^\"]*)" can log in$/ do |name|
-  user = User.find_by_login!(name)
-  visit login_path
-  When %Q`I enter the username "#{name}"`
-  And %Q`I enter the password "#{name}-123"`
-  And 'I press the login button'
-  Then 'I should not see a login form'
-end

data/features/support/env.rb

@@ -4,60 +4,84 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ENV"] ||= "cucumber"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/application')
-
-require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
-require 'cucumber/rails/world'
-require 'cucumber/rails/active_record'
-require 'cucumber/web/tableish'
-
-require 'capybara/rails'
-require 'capybara/cucumber'
-require 'capybara/session'
-require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
-# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
-# order to ease the transition to Capybara we set the default here. If you'd
-# prefer to use XPath just remove this line and adjust any selectors in your
-# steps to use the XPath syntax.
-Capybara.default_selector = :css
-
-# If you set this to false, any error raised from within your app will bubble
-# up to your step definition and out to cucumber unless you catch it somewhere
-# on the way. You can make Rails rescue errors and render error pages on a
-# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
-#
-# If you set this to true, Rails will rescue all errors and render error
-# pages, more or less in the same way your application would behave in the
-# default production environment. It's not recommended to do this for all
-# of your scenarios, as this makes it hard to discover errors in your application.
-ActionController::Base.allow_rescue = false
-
-# If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging
-# a feature or scenario with the @no-txn tag. If you are using Capybara,
-# tagging with @culerity or @javascript will also turn transactions off.
-#
-# If you set this to false, transactions will be off for all scenarios,
-# regardless of whether you use @no-txn or not.
-#
-# Beware that turning transactions off will leave data in your database
-# after each scenario, which can lead to hard-to-debug failures in
-# subsequent scenarios. If you do this, we recommend you create a Before
-# block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = true
-# How to clean your database when transactions are turned off. See
-# http://github.com/bmabey/database_cleaner for more info.
-if defined?(ActiveRecord::Base)
-  begin
-    require 'database_cleaner'
-    DatabaseCleaner.strategy = :truncation
-  rescue LoadError => ignore_if_database_cleaner_not_present
+## This is custom functionality written by Refinery CMS.
+def setup_environment
+  ENV["RAILS_ENV"] ||= "cucumber"
+  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+
+  if RUBY_PLATFORM =~ /mswin/
+    puts "Win32 users may experience cucumber/formatter/unicode errors.  Requirement ommited, see: /features/support/env.rb to re-add."
+  else
+    require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
   end
+  require 'cucumber/rails/world'
+  require 'cucumber/rails/active_record'
+  require 'cucumber/web/tableish'
+
+
+  require 'capybara/rails'
+  require 'capybara/cucumber'
+  require 'capybara/session'
+  require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+  # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
+  # order to ease the transition to Capybara we set the default here. If you'd
+  # prefer to use XPath just remove this line and adjust any selectors in your
+  # steps to use the XPath syntax.
+  Capybara.default_selector = :css
 end
 
-require 'authlogic/test_case'
-Before do
-  activate_authlogic
+def each_run
+  # If you set this to false, any error raised from within your app will bubble
+  # up to your step definition and out to cucumber unless you catch it somewhere
+  # on the way. You can make Rails rescue errors and render error pages on a
+  # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+  #
+  # If you set this to true, Rails will rescue all errors and render error
+  # pages, more or less in the same way your application would behave in the
+  # default production environment. It's not recommended to do this for all
+  # of your scenarios, as this makes it hard to discover errors in your application.
+  ActionController::Base.allow_rescue = false
+
+  # If you set this to true, each scenario will run in a database transaction.
+  # You can still turn off transactions on a per-scenario basis, simply tagging
+  # a feature or scenario with the @no-txn tag. If you are using Capybara,
+  # tagging with @culerity or @javascript will also turn transactions off.
+  #
+  # If you set this to false, transactions will be off for all scenarios,
+  # regardless of whether you use @no-txn or not.
+  #
+  # Beware that turning transactions off will leave data in your database
+  # after each scenario, which can lead to hard-to-debug failures in
+  # subsequent scenarios. If you do this, we recommend you create a Before
+  # block that will explicitly put your database in a known state.
+  Cucumber::Rails::World.use_transactional_fixtures = true
+  # How to clean your database when transactions are turned off. See
+  # http://github.com/bmabey/database_cleaner for more info.
+  if defined?(ActiveRecord::Base)
+    begin
+      require 'database_cleaner'
+      DatabaseCleaner.strategy = :truncation
+    rescue LoadError => ignore_if_database_cleaner_not_present
+    end
+  end
+
+  require 'authlogic/test_case'
+  Before do
+    activate_authlogic
+  end
 end
 
+unless RUBY_PLATFORM =~ /mswin|mingw/
+  require 'spork'
+
+  Spork.prefork do
+    setup_environment
+  end
+
+  Spork.each_run do
+    each_run
+  end
+else
+  setup_environment
+  each_run
+end

data/lib/gemspec.rb

@@ -5,7 +5,7 @@ files = %w( .gitignore .yardopts Gemfile Rakefile *.md public/.htaccess config.r
   files += Dir.glob("#{dir}/**/*")
 end
 
-files.reject!{|f| !File.exist?(f) or f =~ /^(public\/system)|(config\/database.yml$)|(.*\/cache)|(db\/.*\.sqlite3?)|(.+\.rbc)/}
+files.reject!{|f| !File.exist?(f) or f =~ /^(public\/system)|(config\/database.yml$)|(.*\/cache)|(db\/.*\.sqlite3?$)|(\.log$)|(\.rbc$)/}
 
 gemspec = <<EOF
 Gem::Specification.new do |s|

data/lib/tasks/cucumber.rake

@@ -1,13 +1,13 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
 
 unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
 
-vendored_cucumber_bin = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+vendored_cucumber_bin = Dir[Rails.root.join('vendor', '{gems,plugins}', 'cucumber*', 'bin', 'cucumber').to_s].first
 $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
 begin