refinerycms 0.9.7.8 → 0.9.7.9

data/.gitignore

@@ -36,6 +36,9 @@ index/**/*
 # NetBeans
 nbproject
 
+# Eclipse
+.project
+
 # Redcar
 .redcar
 tags
@@ -61,4 +64,4 @@ capybara-*html
 config/database.yml
 config/amazon_s3.yml
 config/rackspace_cloudfiles.yml
-#===END OF REMOVED DURING REFINERY GEM INSTALL===
+#===END OF REMOVED DURING REFINERY GEM INSTALL===

data/Gemfile

@@ -45,7 +45,7 @@ end
 
 #===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.8'
+# gem 'refinerycms',    '= 0.9.7.9'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:

data/bin/refinery-upgrade-096-to-097

@@ -3,7 +3,12 @@ require 'pathname'
 require 'fileutils'
 require 'yaml'
 
-refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
+refinery_root = if defined?(REFINERY_ROOT) and (REFINERY_ROOT.is_a?(Pathname)
+  REFINERY_ROOT
+else
+  Pathname.new(File.expand_path(File.dirname(__FILE__) << "/.."))
+end
+
 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.
   if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))
@@ -19,8 +24,12 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
   end
   puts "--------Updating--------\n\n"
 
-  FileUtils::cp refinery_root.join('Gemfile').to_s, rails_root.join('Gemfile').to_s, :verbose => true
-  FileUtils::cp refinery_root.join('config', 'preinitializer.rb').to_s, rails_root.join('config', 'preinitializer.rb').to_s, :verbose => true
+  FileUtils::cp refinery_root.join('Gemfile').to_s,
+                rails_root.join('Gemfile').to_s,
+                :verbose => true
+  FileUtils::cp refinery_root.join('config', 'preinitializer.rb').to_s,
+                rails_root.join('config', 'preinitializer.rb').to_s,
+                :verbose => true
 
   # try to figure out the database adapter..
   db_adapter = 'sqlite3'
@@ -49,28 +58,36 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
   end
 
   # write the new content into the file.
-  app_gemfile = File.open(File.join(%W(#{rails_root} Gemfile)), "w")
+  app_gemfile = rails_root.join('Gemfile').open('w')
   app_gemfile.puts(lines.join("\n"))
   app_gemfile.close
 
   # backup the config file.
   app_config_file = 'application.rb'
-  FileUtils.cp rails_root.join('config', app_config_file).cleanpath.to_s, rails_root.join('config', "#{app_config_file.gsub('.rb', '')}.autobackupbyrefineryupgrade.rb").cleanpath.to_s, :verbose => true
+  FileUtils.cp rails_root.join('config', app_config_file).cleanpath.to_s,
+               rails_root.join('config', "#{app_config_file.gsub('.rb', '')}.autobackupbyrefineryupgrade.rb").cleanpath.to_s,
+               :verbose => true
 
   # copy the new config file.
-  FileUtils.cp refinery_root.join('config', app_config_file).cleanpath.to_s, rails_root.join('config', app_config_file).cleanpath.to_s, :verbose => true
-
-  unless File.exist?(rails_root.join('config', 'settings.rb'))
-    FileUtils.cp refinery_root.join('config', 'settings.rb').cleanpath.to_s, rails_root.join('config', 'settings.rb').cleanpath.to_s, :verbose => true
+  FileUtils.cp refinery_root.join('config', app_config_file).cleanpath.to_s,
+               rails_root.join('config', app_config_file).cleanpath.to_s,
+               :verbose => true
+
+  unless (rails_config_settings = rails_root.join('config', 'settings.rb')).exist?
+    FileUtils.cp refinery_root.join('config', 'settings.rb').cleanpath.to_s,
+                 rails_config_settings.to_s,
+                 :verbose => true
   end
 
   unless (aai_config_file = rails_root.join('config', 'acts_as_indexed_config.rb')).exist?
-    FileUtils::cp refinery_root.join('config', 'acts_as_indexed_config.rb').to_s, aai_config_file.to_s, :verbose => true
+    FileUtils::cp refinery_root.join('config', 'acts_as_indexed_config.rb').to_s,
+                  aai_config_file.to_s,
+                  :verbose => true
   end
 
   # update routes files
   puts "\nNow I'm verifying and updating your routing in your files and your plugins...\n"
-  Dir[rails_root.join('**', 'config', 'routes.rb')].map{|f| Pathname.new(f)}.each do |routes_file|
+  Dir[rails_root.join('**', 'config', 'routes.rb').to_s].map{|f| Pathname.new(f)}.each do |routes_file|
     open_routes_file = routes_file.open('r')
     lines = open_routes_file.read.split("\n")
     original_lines = lines.dup
@@ -103,11 +120,11 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
 
   if rails_root.join('config', 'database.yml').exist?
     puts "\n\nUpdating some core refinery files..\n"
-    puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' refinery:update from_installer=true")
+    puts (cmd="rake -f '#{rails_root.join('Rakefile')}' refinery:update from_installer=true")
     puts `cd '#{rails_root}' && #{cmd}`
 
     puts "\n\nMigrating your database..\n"
-    puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' db:migrate")
+    puts (cmd="rake -f '#{rails_root.join('Rakefile')}' db:migrate")
     puts `cd '#{rails_root}' && #{cmd}`
   else
     puts "\nYour config/database.yml file is missing so I can't run a task that is required."

data/bin/refinerycms

@@ -11,7 +11,12 @@ rescue LoadError
   exit
 end
 
-refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
+refinery_root = if defined?(REFINERY_ROOT) and REFINERY_ROOT.is_a?(Pathname)
+  REFINERY_ROOT
+else
+  Pathname.new(File.expand_path(File.dirname(__FILE__) << "/.."))
+end
+
 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.
   if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))
@@ -19,11 +24,12 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
   else
     rails_root = app_path =~ /^\// ? app_path : File.expand_path(File.join(Dir.getwd, app_path.gsub(/^\.\//, '')))
   end
+  rails_root = Pathname.new(rails_root.to_s)
 
-  if File.directory?(rails_root)
+  if rails_root.directory?
     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[rails_root.join('*').to_s].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
@@ -40,8 +46,12 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     FileUtils::cp_r to_copy.compact, rails_root, :verbose => false
 
     # 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)))
+    if (initializer=rails_root.join('lib', 'refinery_initializer.rb')).exist?
+      FileUtils::rm initializer.to_s
+    end
+    if (gemspec = rails_root.join('lib', 'gemspec.rb')).exist?
+      FileUtils::rm gemspec.to_s
+    end
 
     # copy the appropriate database adapter as specified (or not)
     db_adapter = 'sqlite3'
@@ -51,17 +61,19 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
         db_adapter = arg_parts.last if arg_parts.first == '--database'
       end
     end
-    FileUtils::cp File.join(%W(#{rails_root} config database.yml.#{db_adapter})), File.join(%W(#{rails_root} config database.yml.example))
+    FileUtils::cp rails_root.join('config', "database.yml.#{db_adapter}").to_s,
+                  rails_root.join('config', 'database.yml.example').to_s
 
     # add in the config files
     %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))
+      FileUtils::move rails_root.join('config', "#{config}.yml.example").to_s,
+                      rails_root.join('config', "#{config}.yml").to_s
 
       # 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.to_s == "/" or RUBY_PLATFORM =~ /mswin/
+        app_name = rails_root.to_s.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 = rails_root.join('config', "#{config}.yml").open('r').read.split("\n")
         lines.each do |line|
           line.gsub!("your_local_#{config}", "#{app_name}_development")
           line.gsub!("your_test_#{config}", "#{app_name}_test")
@@ -69,7 +81,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
           line.gsub!("your_production_#{config}", "#{app_name}_production")
         end
         # write the new content into the file.
-        config_file = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "w")
+        config_file = rails_root.join('config', "#{config}.yml").open('w')
         config_file.puts(lines.join("\n"))
         config_file.close
       end
@@ -81,15 +93,15 @@ 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 = rails_root.join('config', 'application.rb').exist? ? "application.rb" : "environment.rb"
+    lines = rails_root.join('config', app_config_file).open('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 config file.
-    app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "w")
+    app_config = rails_root.join('config', app_config_file).open('w')
     app_config.puts(lines.join("\n"))
     app_config.close
 
@@ -109,7 +121,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     end
 
     # write the new content into the file.
-    app_gemfile = File.open(File.join(%W(#{rails_root} Gemfile)), "w")
+    app_gemfile = rails_root.join('Gemfile').open('w')
     app_gemfile.puts(lines.join("\n"))
     app_gemfile.close
 
@@ -117,9 +129,9 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     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
+    rails_gitignore = rails_root.join('.gitignore').open('w')
+    rails_gitignore.puts(ignore_content)
+    rails_gitignore.close
 
     puts "\n---------"
     puts "Refinery successfully installed in '#{rails_root}'!\n\n"
@@ -130,11 +142,11 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     puts `cd '#{rails_root}' && #{cmd}`
 
     puts "\n\nSetting up your development database..\n"
-    puts "Running: " + (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' db:setup")
+    puts "Running: " + (cmd="rake -f '#{rails_root.join('Rakefile')}' db:setup")
     puts `cd '#{rails_root}' && #{cmd}`
 
     puts "\n\nUpdating some core refinery files..\n"
-    puts "Running: " + (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' refinery:update from_installer=true")
+    puts "Running: " + (cmd="rake -f '#{rails_root.join('Rakefile')}' refinery:update from_installer=true")
     puts `cd '#{rails_root}' && #{cmd}`
     # end automation..
 

data/changelog.md

@@ -1,3 +1,17 @@
+## 0.9.7.9 [30 July 2010]
+
+- Added a theme generator to create the basic file structure of a new theme. [David Jones](http://github.com/djones) and [Levi Cole](http://github.com/levicole)
+- Renamed ``script/generate refinery`` to ``script/generate refinery_plugin``. [David Jones](http://github.com/djones)
+- Add deprecation notice to ``script/generate refinery``. [David Jones](http://github.com/djones)
+- Updated documentation to reflect new generator changes. [David Jones](http://github.com/djones)
+- Added tests for both plugin and theme generators. [David Jones](http://github.com/djones) and [Levi Cole](http://github.com/levicole)
+- Refactored the ``refinerycms`` & ``refinery-upgrade-097-to-097`` tasks to make better use of Pathname. [Philip Arndt](http://github.com/parndt)
+- Added more cucumber features and tagged existing ones. [Philip Arndt](http://github.com/parndt), [James Fiderlick](http://github.com/jamesfid) and [Steven Heidel](http://github.com/stevenheidel)
+- Removed mysterious ``page_translations`` table if you had it. [Philip Arndt](http://github.com/parndt)
+- Added workaround for tests that involve dialogues. [Uģis Ozols](http://github.com/ugisozols)
+- Added as default the ability for forms to know whether they are inside a modal / dialog. [Philip Arndt](http://github.com/parndt)
+- [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.8...0.9.7.9)
+
 ## 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)

data/db/migrate/20100729221735_remove_page_translations_if_present.rb

@@ -0,0 +1,12 @@
+class RemovePageTranslationsIfPresent < ActiveRecord::Migration
+  def self.up
+    begin
+      drop_table :page_translations
+    rescue
+      puts "-- page_translations did not exist, all is well."
+    end
+  end
+
+  def self.down
+  end
+end

data/db/schema.rb

@@ -12,20 +12,17 @@
 ActiveRecord::Schema.define(:version => 20100708014636) do
 
   create_table "images", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "content_type"
-    t.string   "filename"
-    t.string   "thumbnail"
-    t.integer  "size"
-    t.integer  "width"
-    t.integer  "height"
-    t.string   "image_type"
+    t.string   "image_mime_type"
+    t.string   "image_name"
+    t.integer  "image_size"
+    t.integer  "image_width"
+    t.integer  "image_height"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "image_uid",       :null => false
+    t.string   "image_ext"
   end
 
-  add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
-
   create_table "inquiries", :force => true do |t|
     t.string   "name"
     t.string   "email"
@@ -101,12 +98,13 @@ ActiveRecord::Schema.define(:version => 20100708014636) do
   add_index "refinery_settings", ["name"], :name => "index_refinery_settings_on_name"
 
   create_table "resources", :force => true do |t|
-    t.string   "content_type"
-    t.string   "filename"
-    t.integer  "size"
-    t.integer  "parent_id"
+    t.string   "file_mime_type"
+    t.string   "file_name"
+    t.integer  "file_size"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "file_uid",       :null => false
+    t.string   "file_ext"
   end
 
   create_table "roles", :force => true do |t|
@@ -136,7 +134,7 @@ ActiveRecord::Schema.define(:version => 20100708014636) do
     t.integer "position"
   end
 
-  add_index "user_plugins", ["name"], :name => "index_user_plugins_on_name"
+  add_index "user_plugins", ["name"], :name => "index_user_plugins_on_title"
   add_index "user_plugins", ["user_id", "name"], :name => "index_unique_user_plugins", :unique => true
 
   create_table "users", :force => true do |t|

data/features/refinery/create_inquiries.feature

@@ -0,0 +1,40 @@
+@inquiries @inquiries-create
+Feature: Create Inquiries
+  In order to contact the website owner
+  I want to create an inquiry
+  
+  Background:
+    Given A Refinery user exists
+    And I have no inquiries
+    And I have a page titled "Contact Us" with a custom url "/contact"
+    And I have a page titled "Thank You" with a custom url "/contact/thank_you"
+  
+  Scenario: Contact page
+    When I go to the contact page
+    Then I should see "Name *"
+    And I should see "Email *"
+    And I should see "Phone"
+    And I should see "Message *" 
+  
+  Scenario: Create a valid inquiry
+    When I go to the contact page
+    And I fill in "Name *" with "Philip"
+    And I fill in "Email *" with "phil@refinerycms.com"
+    And I fill in "Message *" with "It sure is good to have a functional test coverage."
+    And I press "Send"
+    Then I should be on the contact thank you page
+    And I should see "Thank You"
+    And I should see "received your inquiry"
+    And I should see "Return to the home page"
+    And I should have 1 inquiries
+    
+  Scenario: Create an invalid inquiry
+    When I go to the contact page
+    And I press "Send"
+    Then I should be on the contact create page
+    And I should see "Name can't be blank"
+    And I should not see "Email can't be blank"
+    And I should see "Email is invalid"
+    And I should not see "Phone can't be blank"
+    And I should see "Message can't be blank"
+    And I should have 0 inquiries

data/features/refinery/dashboard.feature

@@ -1,4 +1,38 @@
+@dashboard
 Feature: Dashboard
   In order to see recent changes to my website
   As an administrator
-  I want to use the dashboard
+  I want to use the dashboard
+  
+  Background:
+    Given I am a logged in refinery user
+  
+  Scenario: Translation options available
+    When I go to the Dashboard
+    Then I should see "English Change Language"
+    
+  Scenario: Change Language to Slovenian and back to English
+    When I go to the dashboard
+    And I follow "English Change Language"
+    And I follow "Slovenian"
+    Then I should be on the dashboard
+    And I should see "Slovenian Spremeni Jezik"
+    And I should not see "Switch to your website"
+    # Back to English
+    When I follow "Slovenian Spremeni Jezik"
+    And I follow "English"
+    Then I should be on the dashboard
+    And I should see "Switch to your website"
+    And I should not see "Spremeni Jezik"
+    
+  Scenario: Upload an Image Button
+    
+  Scenario: Add New Page Button
+    When I go to the dashboard
+    And I follow "Add a new page"
+    Then I should be on the new page form
+    When I fill in "Title" with "Page test from Dashboard"
+    And I press "Save"
+    Then I should be on the dashboard
+    And I should see "'Page test from Dashboard' was successfully created."
+    And I should see "Page test from dashboard page was created"

data/features/refinery/manage_files.feature

@@ -1,4 +1,45 @@
+@files @files-manage
 Feature: Manage Files
   In order to control the content on my website
   As an administrator
-  I want to create and manage files
+  I want to create and manage files
+  
+  Background:
+    Given I am a logged in refinery user
+    
+  Scenario: Create Valid File
+    Given I have no files
+    When I go to the list of files
+    And I follow "Upload New File"
+    When I attach the file at "features/uploads/refinery_is_awesome.txt"
+    And I press "Save"
+    Then the file "refinery_is_awesome.txt" should have uploaded successfully
+    And I should have 1 file
+    
+  Scenario: Edit Existing File
+    Given I have no files
+    When I upload the file at "features/uploads/refinery_is_awesome.txt"
+    Then I go to the list of files
+    And I follow "Edit this file"
+    And I attach the file at "features/uploads/beach.jpeg"
+    And I press "Save"
+    Then the file "beach.jpeg" should have uploaded successfully
+    And I should have 1 file
+    
+  Scenario: Download Existing File
+    Given I have no files
+    When I upload the file at "features/uploads/refinery_is_awesome.txt"
+    Then I go to the list of files
+    And I follow "Download this file"
+    Then I should see "http://www.refineryhq.com/"
+    
+  Scenario: Files Delete
+    #The 'follow "Remove this file forever" line is failing -- needs fixed.
+    #Given I have no files
+    #When I upload the file at "features/uploads/refinery_is_awesome.txt"
+    #Then I go to the list of files
+    #And I follow "Remove this file forever"
+    #And I press "OK"
+    #Then I should see "Flash message here.. not in place?"
+    #And I should have 0 files
+