refinerycms 0.9.5.30 → 0.9.5.31

data/.yardopts

@@ -1,5 +1,5 @@
 --title "Refinery CMS"
-lib/**/*.rb'
+lib/**/*.rb
 app/**/*.rb
 db/seeds.rb
 config/preinitializer.rb
@@ -15,7 +15,17 @@ vendor/plugins/refinery_settings/**/*.rb
 vendor/plugins/resources/**/*.rb
 vendor/plugins/themes/**/*.rb
 -
-README.rdoc
-LICENSE
-CONTRIBUTORS
-vendor/plugins/themes/themes.rdoc
+readme.md
+vendor/plugins/themes/themes.md
+vendor/plugins/refinery/plugins.md
+vendor/plugins/refinery/crud.md
+vendor/plugins/pages/pages.md
+vendor/plugins/images/images.md
+vendor/plugins/authentication/authentication.md
+vendor/plugins/dashboard/dashboard.md
+vendor/plugins/inquiries/inquiries.md
+vendor/plugins/news/news.md
+vendor/plugins/resources/resources.md
+vendor/plugins/resources/settings.md
+license.md
+contributors.md

data/Rakefile

@@ -36,7 +36,7 @@ begin
     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.rdoc CONTRIBUTORS LICENSE VERSION)
+    s.extra_rdoc_files = %w(readme.md contributors.md license.md VERSION)
     s.rdoc_options << "--inline-source"
     s.has_rdoc = true
   end

data/VERSION

@@ -1 +1 @@
-0.9.5.30
+0.9.5.31

data/bin/refinery

@@ -18,29 +18,29 @@ 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 LICENSE Rakefile README.rdoc).map do |dir|
+    to_copy = %w(app config db lib public script themes contributors.md license.md Rakefile readme.md VERSION).map do |dir|
       File.join REFINERY_ROOT, dir
     end
     FileUtils::cp_r to_copy, RAILS_ROOT, :verbose => false
     # ensure lib/refinery_initializer.rb doesn't make it in.
-    FileUtils::rm File.join(RAILS_ROOT, %w(lib refinery_initializer.rb)) if File.exists?(File.join(RAILS_ROOT, %w(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 ["database", "amazon_s3", "rackspace_cloudfiles"]
-      FileUtils::move File.join(RAILS_ROOT, %W(config #{config}.yml.example)), File.join(RAILS_ROOT, %W(config #{config}.yml))
+    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))
 
       # 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
         # read in the file and split up the lines
-        lines = File.open(File.join(RAILS_ROOT, %W(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(RAILS_ROOT, %W(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
 
@@ -50,13 +50,13 @@ 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
-    lines = File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "r").read.split("\n")
+    lines = File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "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(RAILS_ROOT, %w(config environment.rb)), "w").puts(lines.join("\n"))
+    File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "w").puts(lines.join("\n"))
 
   	puts "\n---------"
   	puts "Refinery successfully installed in '#{RAILS_ROOT}'!\n\n"
@@ -67,8 +67,8 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     puts "=== ACTION REQUIRED ==="
     puts "\nNow run these commands:"
     puts "\ncd #{RAILS_ROOT}"
-    puts "rake gems: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 "You can now see your site running in your browser at http://localhost:3000"

data/bin/refinery-update-core

@@ -15,13 +15,16 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   end
 
   # copy in any new migrations.
-  FileUtils::cp Dir[File.join(REFINERY_ROOT, %w(db migrate *.rb))], File.join(RAILS_ROOT, %w(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(REFINERY_ROOT, %w(Rakefile)), File.join(RAILS_ROOT, %w(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))
 
 	# read in the config files
-	app_config = File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "r").read
+	app_config = File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "r").read
 	environment_updated = false
 
   # backup app's environment.rb
@@ -29,10 +32,10 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   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(REFINERY_ROOT, %w(config environment.rb)), "r").read
-  	FileUtils.cp File.join(RAILS_ROOT, %w(config environment.rb)), File.join(RAILS_ROOT, %w(config environment.autobackupbyrefinery.rb))
+  	FileUtils.cp File.join(%W(#{RAILS_ROOT} config environment.rb)), File.join(%W(#{RAILS_ROOT} config environment.autobackupbyrefinery.rb))
 
     # write the new content into the file.
-    File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "w").puts(app_config.gsub!(
+    File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "w").puts(app_config.gsub!(
   	  app_refinery_gems_section,
   	  refinery_config.scan(matcher).join("")
   	))

data/config/environment.rb

@@ -69,7 +69,7 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
   config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gemcutter.org"
   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 "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"
   #===REFINERY END OF REQUIRED GEMS===
 end

data/config/routes.rb

@@ -1,6 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
 
   # NB: Engine routes are loaded FIRST from Rails v2.3 onward.
+  # These routes are contained within vendor/plugins/engine_name/config/routes.rb
 
   # The priority is based upon order of creation: first created -> highest priority.
   map.root :controller => "pages", :action => "home"

data/contributors.md

@@ -0,0 +1,18 @@
+# Contributors
+
+## Major
+
+* parndt - Philip Arndt, [Resolve Digital](http://www.resolvedigital.co.nz)
+* djones - [David Jones](http://www.d-jones.com), [Resolve Digital](http://www.resolvedigital.co.nz)
+
+## Minor
+
+* ryanwood - [Ryan Wood](http://www.ryanwood.com)
+* hernan - Hernan Fernandez
+* btucker - [Ben Tucker](http://btucker.net)
+* avit - [Andrew Vit](http://avit.ca)
+* stevenheidel - [Steven Heidel](http://www.livingskywebdesign.com)
+* moretea - Maarten Hoogendoorn
+* csessions - [Chris Sessions](http://www.flying-saucer.net)
+
+Want your name here? Help us out in anyway you can. And don't be so scared, we don't expect your code to be perfect the first time round.

data/db/migrate/20100127004649_add_reset_code_to_users.rb

@@ -0,0 +1,9 @@
+class AddResetCodeToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :reset_code, :string
+  end
+
+  def self.down
+    remove_column :users, :reset_code
+  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 => 20100114092849) do
+ActiveRecord::Schema.define(:version => 20100127004649) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"
@@ -157,6 +157,7 @@ ActiveRecord::Schema.define(:version => 20100114092849) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "superuser",                               :default => false
+    t.string   "reset_code"
   end
 
   add_index "users", ["id"], :name => "index_users_on_id"

data/db/seeds.rb

@@ -1,6 +1,6 @@
 [{:name => "site_name", :value => "Company Name"},
   {:name => "new_page_parts", :value => false},
-  {:name => "activity_show_limit", :value => 25},
+  {:name => "activity_show_limit", :value => 18},
   {:name => "preferred_image_view", :value => :grid},
   {:name => "analytics_page_code", :value => "UA-xxxxxx-x"},
 	{:name => "theme", :value => "demolicious"},
@@ -116,3 +116,13 @@ Page.create(:title => "Down for maintenance",
               :title => "body",
               :body => "<p>Our site is currently down for maintenance. Please try back later.</p>"
             })
+
+# Install default themes.
+Dir[File.join(%W(#{REFINERY_ROOT} 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

data/{LICENSE → license.md}

@@ -1,6 +1,6 @@
-== MIT License
+# MIT License
  
-Copyright (c) 2005-2009 Resolve Digital Ltd.
+Copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

data/public/javascripts/admin.js

@@ -0,0 +1,5 @@
+var wymeditorClassesItems = [
+    {name: 'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}
+ ,  {name: 'image-align', rules:['left', 'right'], join: '-'}
+ ,  {name: 'font-size', rules:['small', 'normal', 'large'], join: '-'}
+]

data/public/javascripts/refinery/boot_wym.js

@@ -43,7 +43,7 @@ var wymeditor_boot_options = jQuery.extend({
   , classesItemHtml: "<li><a href='#' name='"+ WYMeditor.CLASS_NAME + "'>"+ WYMeditor.CLASS_TITLE+ "</a></li>"
   , classesItemHtmlMultiple: "<li class='wym_tools_class_multiple_rules'><span>" + WYMeditor.CLASS_TITLE + "</span><ul>{classesItemHtml}</ul></li>"
 
-  , classesItems: [{name:'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}, {name: 'image-align', rules:['left', 'right'], join: '-'}, {name: 'font-size', rules:['small','normal','large'], join: '-'}]
+  , classesItems: wymeditorClassesItems
 
   , containersHtml: "<ul class='wym_containers wym_section'>" + WYMeditor.CONTAINERS_ITEMS + "</ul>"
 

data/public/stylesheets/refinery/refinery.css

@@ -187,6 +187,13 @@ a:hover {
 	margin-top: 12px;
 }
 
+#page_container.login div.forgot_password {
+  float: right;
+
+	margin-top: 11px;
+	margin-right: 3px;
+}
+
 #page_container.login div.remember_me label {
 	display: inline;
 }

data/readme.md

@@ -0,0 +1,161 @@
+# Refinery CMS
+
+An open source Ruby on Rails content management system for small business.
+
+* [Front end live demo ](http://demo.refinerycms.com)
+* [Back end live demo ](http://demo.refinerycms.com/admin)
+
+For more screenshots, example sites & high level information: [http://refinerycms.com](http://refinerycms.com)
+
+![Refinery Dashboard](http://refinerycms.com/system/images/0000/0576/dashboard.png)
+
+## What it's good at?
+
+__Refinery is great for small business sites where the client needs to be able to update their website themselves__ without being bombarded with anything too complicated.
+
+Unlike other content managers, Refinery is truly aimed at the end user making it easy for them to pick up and make changes themselves.
+
+### For developers
+
+Refinery makes it easy to:
+
+* Get a small business site up and running __ridiculously quickly__
+* __Theme and customise__ the look to suit the business
+* __Extend with custom plugins__ to do anything Refinery doesn't do out of the box
+* Tries to stick to __"the Rails way"__ as much as possible
+
+## Requirements
+
+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)
+* [slim_scrooge >= 1.0.3](http://gemcutter.org/gems/slim_scrooge)
+* [hpricot >= 0.8.1](http://gemcutter.org/gems/hpricot)
+
+### Other dependancies
+
+* [RMagick](http://github.com/rmagick/rmagick) - [Install docs](http://rmagick.rubyforge.org/install-faq.html) or for
+Mac OS users [this install script](http://github.com/maddox/magick-installer) will be easier.
+
+## Installing and Setting Up Refinery
+
+### 1. Get the Refinery code
+
+#### Install the Gem
+
+    gem install refinerycms --source http://gemcutter.org
+    refinery /path/to/project
+
+#### Or, clone Refinery's Git repository
+
+    git clone git://github.com/resolve/refinerycms.git mynewsite.com
+    cd ./mynewsite.com
+    git remote rm origin
+    git remote add origin git@github.com:you/yournewsite.git
+    mv ./config/database.yml.example ./config/database.yml
+
+### 2. Configuration
+
+Firstly, edit ``config/database.yml`` to reflect your database server details.
+
+Next create your database and fill it with Refinery's default data:
+
+    rake db:setup
+
+After your database exists, you'll need to install the gems that Refinery depends on. You can do this by running:
+
+    rake gems:install
+
+### 3. Starting up your site
+
+    ruby script/server
+
+Now visit [http://localhost:3000](http://localhost:3000) and your site should be running.
+
+You will be prompted to setup your first user.
+
+## Help and Developer Documentation
+
+* [Google Group Discussion](http://groups.google.com/group/refinery-cms)
+* [Developer/API documentation](http://api.refinerycms.org)
+* [Developer video - 26 mins](http://refinerycms.com/pages/for-developers)
+* [IRC Channel](irc://irc.freenode.net/refinerycms)
+
+## Setting Up on Heroku
+
+If you're using [Heroku](http://heroku.com/) you will want to put
+
+    USE_S3_BACKEND = true
+  
+in your ``config/production.rb`` file.
+
+## Updating to the latest Refinery
+
+### When using the gem
+
+Simply run the command:
+
+    refinery-update-core /path/to/project/root/
+
+and the up-to-date core files will be copied from the latest gem into your project.
+
+### When using Git
+
+You can update by running these commands:
+
+    git remote add refinerycms git://github.com/resolve/refinerycms.git
+    git pull refinerycms master
+
+This will pull in all of the updated files in the project and may result in some merge conflicts which you will need to resolve.
+
+## What comes included with Refinery
+
+### [Pages](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/pages/pages.md)
+
+* Easily edit and manage pages with a [WYSIWYG visual editor](http://www.wymeditor.org/)
+* Manage you site's structure
+
+### [Images](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/images/images.md) & [Resources](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/resources/resources.md)
+
+* Easily upload and insert images
+* Upload and link to resources like PDF documents
+
+### [Inquiries](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/inquiries/inquiries.md)
+
+* Collect inquiries from a contact form
+* Manage your inquiries and be notified when new ones come in
+
+### [News](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/news/news.md)
+
+* Post news about your company and update your visitors
+
+### [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery_settings/settings.md)
+
+* Manage the behaviour of Refinery
+
+### [Dashboard](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/dashboard/dashboard.md)
+
+* Get an overview of what has been updated recently
+  
+### ...Want more?
+
+Extend Refinery easily by running the Refinery generator
+
+    ruby script/generate refinery
+  
+to get help on how to use that.
+
+### What about a portfolio?
+
+Check out the [portfolio plugin gem](http://github.com/resolve/portfolio)
+
+## License
+
+Refinery is released under the MIT license and is copyright (c) 2005-2009 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
+
+A copy of the MIT license can be found in the license.md file.

data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb

@@ -3,7 +3,6 @@ class Admin::UsersController < Admin::BaseController
   crudify :user, :order => 'login', :title_attribute => 'login', :conditions => "state = 'active'"
 
   # Protect these actions behind an admin login
-  # before_filter :admin_required, :only => [:suspend, :unsuspend, :destroy, :purge]
   before_filter :find_user, :except => [:new, :create]
   before_filter :load_available_plugins, :only => [:new, :create, :edit, :update]
 
@@ -55,34 +54,8 @@ class Admin::UsersController < Admin::BaseController
     end
   end
 
-  def suspend
-    @user.suspend!
-    redirect_to admin_users_path
-  end
-
-  def unsuspend
-    @user.unsuspend!
-    redirect_to admin_users_path
-  end
-
-  def destroy
-    @user.delete!
-    @user.destroy
-    flash[:notice] = "'#{@user.login}' was successfully deleted."
-    redirect_to admin_users_path
-  end
-
-  def purge
-    @user.destroy
-    redirect_to admin_users_path
-  end
-
 protected
 
-  def find_user
-    @user = User.find(params[:id])
-  end
-
   def can_create_public_user
     User.count == 0
   end