refinerycms 0.9.6.12 → 0.9.6.13

data/.gitignore

@@ -20,5 +20,4 @@ public/javascripts/cache
 public/stylesheets/cache
 config/database.yml.example
 .yardoc/
-themes/*
 refinerycms.gemspec

data/Gemfile

@@ -1,13 +1,12 @@
 # Please add your gems above the Refinery required gems here:
 
 #===REFINERY REQUIRED GEMS===
-source "http://gemcutter.org"
+source "http://rubygems.org"
 gem "aasm", ">= 2.1.3", :require => "aasm"
 gem "friendly_id", ">= 2.2.2", :require => "friendly_id"
 gem "hpricot", ">= 0.8.1", :require => "hpricot"
-gem "slim_scrooge", ">= 1.0.3", :require => "slim_scrooge" unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem requirement when windows is running.
+gem "slim_scrooge", ">= 1.0.5", :require => "slim_scrooge"
 gem "will_paginate", ">= 2.3.11", :require => "will_paginate"
 gem "rails", ">= 2.3.5", :require => "rails"
-gem "rubyzip", ">= 0.9.1", :require => "zip/zip"
 gem "rake", ">= 0.8.3", :require => "rake"
 #===REFINERY END OF REQUIRED GEMS===

data/Rakefile

@@ -3,30 +3,44 @@
 
 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', 'environment')
 rescue Exception
+  # Log the exception to the console/logfile.
+  puts "*** Couldn't load the config/environment file because something went wrong. Trace below: ***"
+  puts $!.backtrace
+  puts "\n*** So, we'll attempt to load in config/boot instead... ***"
+
   # Load up the boot file instead because there's something wrong with the environment.
-  require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+  require File.join(File.dirname(__FILE__), 'config', 'boot')
 end
 
+# Require the standard stuff
 require 'rake'
 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 = []
-# When running Refinery from a gem we lose the rake tasks, so add them back in:
-extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake")].sort unless Refinery.root == Rails.root
+if 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:
-extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort} if defined?($refinery_gem_plugin_lib_paths) && !$refinery_gem_plugin_lib_paths.nil?
+if defined?($refinery_gem_plugin_lib_paths) && !$refinery_gem_plugin_lib_paths.nil?
+  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'
+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|
@@ -43,7 +57,7 @@ begin
 
   namespace :version do
     namespace :bump do
-      desc "Bump the gemspec by a build version."
+      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))

data/VERSION

@@ -1 +1 @@
-0.9.6.12
+0.9.6.13

data/bin/refinery

@@ -20,11 +20,11 @@ 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 script contributors.md license.md Rakefile readme.md VERSION).map do |dir|
+    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
     end
     FileUtils::cp_r to_copy, RAILS_ROOT, :verbose => false
-    FileUtils::mkdir File.join(%W(#{RAILS_ROOT} themes))
+
     # 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)))
 

data/config/application.rb

@@ -21,7 +21,7 @@ else
   # 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' unless defined? REFINERY_GEM_VERSION
+  # REFINERY_GEM_VERSION = '0.9.6.13' unless defined? REFINERY_GEM_VERSION
 
   # Bootstrap the Rails environment, frameworks, and default configuration
   require File.join(File.dirname(__FILE__), 'boot')
@@ -78,13 +78,12 @@ else
     #===REFINERY REQUIRED GEMS===
     config.gem "bundler", :version => ">= 0.9.4"
     config.gem "rake", :version => ">= 0.8.3", :lib => "rake"
-    config.gem "rubyzip", :version => ">= 0.9.1", :lib => "zip/zip"
     config.gem "friendly_id", :version => ">= 2.2.2", :lib => "friendly_id"
-    config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gemcutter.org"
+    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", :source => "http://gemcutter.org"
-    config.gem "slim_scrooge", :version => ">= 1.0.3", :lib => "slim_scrooge", :source => "http://gemcutter.org" unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
-    config.gem "hpricot", :version => ">= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
+    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
 end

data/config/preinitializer.rb

@@ -1,10 +1,10 @@
 require 'pathname'
 
 # until Rails 3
-ENV["GEM_HOME"] = File.expand_path('../../vendor/bundler_gems', __FILE__)
+# ENV["GEM_HOME"] = File.expand_path('../../vendor/bundler_gems', __FILE__)
 
 # pick the refinery root path
-rails_root = defined?(Rails.root) ? Rails.root : Pathname.new(RAILS_ROOT)
+rails_root = (defined?(Rails.root) ? Rails.root : Pathname.new(RAILS_ROOT)).cleanpath
 if (non_gem_path = rails_root.join("lib", "refinery_initializer.rb")).exist?
   require non_gem_path.to_s
 else
@@ -14,7 +14,7 @@ else
   elsif ENV.include?("REFINERY_GEM_VERSION")
     ENV["REFINERY_GEM_VERSION"]
   else
-    $1 if rails_root.join("config", "application.rb") =~ /^[^#]*REFINERY_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+    $1 if rails_root.join("config", "application.rb").read =~ /^[^#]*REFINERY_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
   end
 
   if version
@@ -26,8 +26,6 @@ else
   require 'refinery_initializer'
 end
 
-Refinery.root = rails_root unless defined?(Refinery.root) && Refinery.root.is_a?(Pathname)
-
 # Set to true in your environment specific file (e.g. production.rb) to use Amazon's Simple
 # Storage Service instead of the default file system for resources and images
 USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)

data/db/migrate/20100223211536_remove_themes_table.rb

@@ -0,0 +1,17 @@
+class RemoveThemesTable < ActiveRecord::Migration
+  def self.up
+    drop_table :themes
+  end
+
+  def self.down
+    create_table "themes", :force => true do |t|
+      t.integer "size"
+      t.string "content_type"
+      t.string "filename"
+      t.string "title"
+      t.text "description"
+      t.text "license"
+      t.timestamps
+    end
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100204011654) do
+ActiveRecord::Schema.define(:version => 20100223211536) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"
@@ -119,17 +119,6 @@ ActiveRecord::Schema.define(:version => 20100204011654) do
   add_index "slugs", ["name", "sluggable_type", "scope", "sequence"], :name => "index_slugs_on_name_and_sluggable_type_and_scope_and_sequence", :unique => true
   add_index "slugs", ["sluggable_id"], :name => "index_slugs_on_sluggable_id"
 
-  create_table "themes", :force => true do |t|
-    t.integer  "size"
-    t.string   "content_type"
-    t.string   "filename"
-    t.string   "title"
-    t.text     "description"
-    t.text     "licence"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "user_plugins", :force => true do |t|
     t.integer "user_id"
     t.string  "title"

data/db/seeds.rb

@@ -117,13 +117,5 @@ Page.create(:title => "Down for maintenance",
               :body => "<p>Our site is currently down for maintenance. Please try back later.</p>"
             })
 
-# Install default themes.
-Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?
-Dir[Refinery.root.join("themes", "*.zip")].each do |theme|
-  Theme.create(:uploaded_data => {
-    "size" => File.size(theme),
-    "content_type" => "application/zip",
-    "filename" => theme.split('/').last,
-    'tempfile' => File.open(theme)
-  }).read_theme
-end
+# Create a default themes directory.
+Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?

data/lib/refinery_initializer.rb

@@ -1,17 +1,21 @@
 require 'pathname'
-begin
-  require 'vendor/plugins/refinery/lib/refinery'
-rescue LoadError => load_error
-  # We won't be able to load this if we're in the gem as there is no such thing.
+root_directory = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/.."))
+rails_root = ((defined?(Rails.root) && Rails.root.realpath.length > 0) ? Rails.root : Pathname.new(RAILS_ROOT))
+
+if (non_gem_refinery = rails_root.join("vendor", "plugins", "refinery", "lib", "refinery.rb")).exist?
+  require non_gem_refinery.realpath.to_s # this won't exist when using a gem.
+else
+  require root_directory.join("vendor", "plugins", "refinery", "lib", "refinery.rb").realpath.to_s
 end
 
-refinery_root = Pathname.new((defined?(Refinery.root) ? Refinery.root.to_s : File.expand_path(File.dirname(__FILE__) << "/.."))) 
-unless refinery_root == (defined?(Rails.root) ? Rails.root : Pathname.new(RAILS_ROOT)) # e.g. only if we're in a gem.
-  $LOAD_PATH.unshift refinery_root.join("vendor", "plugins").to_s
-  $LOAD_PATH.unshift refinery_root.join("vendor", "plugins", "refinery", "lib").to_s
+# Now we need to set some things that are used by the rest of the application.
+Refinery.root = root_directory.cleanpath
+if (Refinery.is_a_gem = (Refinery.root.realpath != rails_root.realpath))
+  # If Refinery is installed from a gem then we need to load in a few extra files.
+  $LOAD_PATH.unshift Refinery.root.join("vendor", "plugins").to_s
+  $LOAD_PATH.unshift Refinery.root.join("vendor", "plugins", "refinery", "lib").to_s
 
-  require 'refinery'
-  Refinery.root = refinery_root
+  # We also need the refinery initializer when using a gem because this won't be autoloaded.
   require 'refinery/initializer'
 end
 

data/public/javascripts/refinery/admin.js

@@ -583,25 +583,32 @@ var list_reorder = {
   , disable_reordering: function(e) {
     if(e) { e.preventDefault(); }
 
-    serialized = "";
-	  list_reorder.sortable_list.find('> li[id]').each(function(index, li) {
-      if (list_reorder.tree) {
-	      serialized += list_reorder.parse_branch([index], li);
-      }
-      else {
-        serialized += "&sortable_list[]=" + $($(li).attr('id').split('_')).last().get(0);
-      }
-	  });
-	  serialized += "&tree=" + list_reorder.tree + "&authenticity_token=" + encodeURIComponent($('#reorder_authenticity_token').val() + "&continue_reordering=false");
+    if (list_reorder.update_url != null) {
+      serialized = "";
+  	  list_reorder.sortable_list.find('> li[id]').each(function(index, li) {
+        if (list_reorder.tree) {
+  	      serialized += list_reorder.parse_branch([index], li);
+        }
+        else {
+          serialized += "&sortable_list[]=" + $($(li).attr('id').split('_')).last().get(0);
+        }
+  	  });
+  	  serialized += "&tree=" + list_reorder.tree + "&authenticity_token=" + encodeURIComponent($('#reorder_authenticity_token').val() + "&continue_reordering=false");
 
-    $.post(list_reorder.update_url, serialized, function(data) {
-      $(list_reorder.sortable_list.get(0)).html(data);
+      $.post(list_reorder.update_url, serialized, function(data) {
+        $(list_reorder.sortable_list.get(0)).html(data);
 
+        $(list_reorder.sortable_list).removeClass('reordering').sortable('destroy');
+
+        $('#reorder_action_done').hide();
+        $('#reorder_action').show();
+      });
+    } else {
       $(list_reorder.sortable_list).removeClass('reordering').sortable('destroy');
 
       $('#reorder_action_done').hide();
       $('#reorder_action').show();
-    });
+    }
   }
 }
 

data/readme.md

@@ -29,14 +29,14 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 
 Refinery runs using a number of gems which (as of Refinery version 0.9.5.29) are outlined below:
 
-* [rake >= 0.8.3](http://gemcutter.org/gems/rake)
-* [friendly_id >= 2.2.2](http://gemcutter.org/gems/friendly_id)
-* [will_paginate >= 2.3.11](http://gemcutter.org/gems/will_paginate)
-* [rails >= 2.3.5](http://gemcutter.org/gems/rails)
-* [aasm >= 2.1.3](http://gemcutter.org/gems/aasm)
-* [unicode >= 0.1](http://gemcutter.org/gems/unicode)
-* [hpricot >= 0.8.1](http://gemcutter.org/gems/hpricot)
-* [slim_scrooge >= 1.0.3](http://gemcutter.org/gems/slim_scrooge) (_Windows & JRuby users can ignore this one_)
+* [rake >= 0.8.3](http://rubygems.org/gems/rake)
+* [friendly_id >= 2.2.2](http://rubygems.org/gems/friendly_id)
+* [will_paginate >= 2.3.11](http://rubygems.org/gems/will_paginate)
+* [rails >= 2.3.5](http://rubygems.org/gems/rails)
+* [aasm >= 2.1.3](http://rubygems.org/gems/aasm)
+* [unicode >= 0.1](http://rubygems.org/gems/unicode)
+* [hpricot >= 0.8.1](http://rubygems.org/gems/hpricot)
+* [slim_scrooge >= 1.0.5](http://rubygems.org/gems/slim_scrooge)
 
 ### Other dependancies
 
@@ -49,7 +49,7 @@ Mac OS users [shell install script](http://github.com/maddox/magick-installer) w
 
 #### Install the Gem
 
-    gem install refinerycms --source http://gemcutter.org
+    gem install refinerycms
     refinery path/to/project
 
 #### Or, clone Refinery's GIT repository
@@ -164,6 +164,12 @@ Extend Refinery easily by running the Refinery generator
 
 to get help on how to use that. Or read the full documentation on [writing plugins for Refinery](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)
 
+### Run the Tests
+
+If you have installed Refinery using GIT (described above in step 1 of installing Refinery) then you'll be able to run the tests. At your Rails root run:
+
+    rake test
+
 ### What about a portfolio?
 
 Check out the [portfolio plugin gem](http://github.com/resolve/refinery-portfolio)

data/test/fixtures/users.yml

@@ -0,0 +1,16 @@
+quentin:
+  id: 1
+  login: quentin
+  email: quentin@example.com
+  salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
+  crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test
+  created_at: <%%= 5.days.ago.to_s :db %>
+  state: active
+aaron:
+  id: 2
+  login: aaron
+  email: aaron@example.com
+  salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
+  crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test
+  created_at: <%%= 1.days.ago.to_s :db %>
+  state: pending

data/test/functional/dashboard_controller_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'admin/dashboard_controller'
+
+class Admin::DashboardController; def rescue_action(e) raise e end; end
+
+class DashboardControllerTest < ActionController::TestCase
+  
+  fixtures :users
+  
+  def setup
+    @controller = Admin::DashboardController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  def test_should_get_index
+    login_as(:quentin)
+    
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:recent_activity)
+  end
+  
+end

data/test/test_helper.rb

@@ -35,4 +35,9 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
+  
+  def login_as(user)
+    @request.session[:user_id] = user ? users(user).id : nil
+  end
+  
 end

data/themes/demolicious/LICENSE

@@ -0,0 +1,21 @@
+== MIT License
+ 
+Copyright (c) 2005-2009 Resolve Digital Ltd.
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/themes/demolicious/README

@@ -0,0 +1 @@
+Clean simple theme used and provided for free with Refinery. It's used in the demo Refinery site, http://demo.refinerycms.org

data/themes/demolicious/stylesheets/application.css

@@ -0,0 +1,94 @@
+@import url('/stylesheets/refinery/application.css');
+/*  
+    Override default refinery application CSS below. 
+    Formatting applies to all frontend.
+*/
+body {
+    margin: 0px;
+    padding: 0px;
+}
+#body_content {
+    margin-top: 36px;
+}
+#body_content_left {
+    width: 544px;
+}
+#body_content_right {
+    width: 396px;
+}
+#body_content_right img {
+    border: 3px solid #c7c7c7;
+}
+#page {
+    width: 100%;
+    padding: 0px;
+    margin: 0px;
+}
+#body, #header_content, #footer_content {
+    width: 960px;
+    margin: 0px auto;
+}
+#header {
+    background: url('/theme/images/header_background.png') repeat-x;
+}
+#header_content {
+    position: relative;
+    height: 132px;
+}
+#header_content h1, #header_content h1 a {
+    color: #feffff;
+    font-size: 24px;
+    font-weight: normal;
+    left: 0px;
+    text-decoration: none;
+}
+#header_content h1, #header_content #menu {
+    position: absolute;
+    bottom: 30px;
+    margin: 0px;
+}
+#header_content #menu {
+    right: 0px;
+    padding: 0px;
+}
+#menu li {
+    float: left;
+    list-style: none;
+    position: relative;
+}
+#menu li a, #menu li:hover ul li a {
+    color: #969792;
+    display: block;
+    padding: 10px 18px;
+    text-decoration: none;
+    cursor: pointer;
+}
+#menu li.selected a, #menu li:hover a, #menu li a:hover, #menu li ul li a:hover {
+    color: #32322b;
+    background: white;
+}
+#menu li ul {
+    position: absolute;
+    left: -99999px;
+    padding: 0px;
+    margin: 0px;
+    min-width: 140px;
+    max-width: 300px;
+    background: white;
+}
+#menu li ul li {
+    float: left;
+}
+#menu li:hover ul {
+    left: auto;
+}
+#footer {
+    margin-top: 120px;
+    background: url('/theme/images/footer_background.png') repeat-x;
+}
+#footer_content {
+    height: 103px;
+    padding-top: 94px;
+    background: url('/images/refinery/logo.png') 0px 80px no-repeat;
+    text-align: right;
+}