refinerycms 0.9.7.8 → 0.9.7.9

data/features/support/env.rb

@@ -57,13 +57,12 @@ def each_run
   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 'database_cleaner'
+  DatabaseCleaner.strategy = :truncation
+
+  require 'fileutils'
+  require 'rails_generator'
+  require 'rails_generator/scripts/generate'
 
   require 'authlogic/test_case'
   Before do

data/features/support/paths.rb

@@ -9,14 +9,38 @@ module NavigationHelpers
     case page_name
 
     when /the home\s?page/
-      root_url
+      root_path
 
     when /the list of pages/
       admin_pages_path
 
+    when /the new page form/
+      new_admin_page_path
+
     when /the list of users/
       admin_users_path
 
+    when /the list of files/
+      admin_resources_path
+
+    when /the list of images/
+      admin_images_path
+
+    when /the contact page/
+      new_inquiry_path
+
+    when /the contact thank you page/
+      thank_you_inquiries_path
+
+    when /the contact create page/
+      inquiries_path
+
+    when /the list of inquiries/
+      admin_inquiries_path
+
+    when /the (d|D)ashboard/
+      admin_dashboard_index_path
+
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #

data/features/uploads/refinery_is_awesome.txt

@@ -0,0 +1 @@
+http://www.refineryhq.com/

data/public/javascripts/refinery/admin.js

@@ -547,7 +547,8 @@ var page_options = {
       modal: true,
       resizable: false,
       autoOpen: false,
-      width: 600
+      width: 600,
+      height: 200
     });
 
     $('#add_page_part').click(function(e){
@@ -591,6 +592,8 @@ var page_options = {
               $('#new_page_part_title').val('');
 
               page_options.tabs.find('> ul li a').corner('top 5px');
+
+              $('#new_page_part_dialog').dialog('close');
             }
           );
         }else{
@@ -599,9 +602,6 @@ var page_options = {
       }else{
         alert("You have not entered a title for the content section, please enter one.");
       }
-
-
-      $('#new_page_part_dialog').dialog('close');
     });
 
     $('#new_page_part_cancel').click(function(e){

data/public/stylesheets/refinery/refinery.css

@@ -765,6 +765,9 @@ label.stripped {
 #inquiry tr:last-child td {
   border-bottom: 0px;
 }
+#inquiry td label.stripped {
+  font-weight: bold;
+}
 body.dialog {
   background: #FFF;
 }
@@ -1221,7 +1224,7 @@ ul#plugins li {
   width:auto;
 }
 #new_page_part_dialog .field {
-  padding: 30px 10px;
+  padding: 0px 10px;
 }
 .hide-overflow {
   overflow: hidden;

data/readme.md

@@ -95,7 +95,7 @@ Mac OS 10.5+ users [this shell install script](http://github.com/maddox/magick-i
 
 Extend Refinery easily by running the Refinery generator
 
-    ruby script/generate refinery
+    ruby script/generate refinery_plugin
 
 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)
 

data/todo.md

@@ -1,24 +1,36 @@
-# Todo
+# Todos required for 1.0 release
 
-What are some of the known things that need to be done?
-
-## Tests
+## Solid Test Coverage
 
+* Add Cucumber for the whole of Refinery. (top priority)
 * Add unit test coverage for user, user plugin and user mailer
 * Add unit test coverage for inquiry mailer and inquiry setting
 * Add functional tests for the whole of Refinery.
-* Add Cucumber for the whole of Refinery. (MOST IMPORTANT)
 * Add RSpec for the whole of Refinery.
 
-# Rails 3.0 Support
+## Rails 3.0 Support
 
 We've started an effort to move to Rails 3.0 - that just needs to be completed.
 
 Join the IRC channel on freenode.net #refinerycms on August 7th to contribute!
 
-# I18n support
+## I18n support
 
 * Check all the views for missing translations
 * Translate models and model attributes used in forms (Rails 2.3.8 supports translation form labels!)
 * Javascript messages etc:
-  - http://github.com/fnando/i18n-js
+  - http://github.com/fnando/i18n-js
+* Add in i18n support for the front-end as well
+
+## Plugin API
+
+* Install process, update process, copying assets to public
+* All these things should be made standard so that it is easier for plugin authors
+* Most plugins should be packaged as gems for ease
+* Standardize the naming (refinerycms-[plugin_name]), most do this already but there are a few exceptions
+
+# Internet Explorer 7+ Support
+
+* WYMEditor and the dialogs are the weakest areas right now.
+
+# Organise a party and media for 1.0 release

data/vendor/plugins/authentication/app/models/user.rb

@@ -35,7 +35,7 @@ class User < ActiveRecord::Base
 
   has_and_belongs_to_many :roles
   has_many :plugins, :class_name => "UserPlugin", :order => "position ASC"
-  has_friendly_id :login, :use_slug => false
+  has_friendly_id :login, :use_slug => true
 
   def plugins=(plugin_names)
     unless self.new_record? # don't add plugins when the user_id is NULL.

data/vendor/plugins/dashboard/app/views/admin/dashboard/index.rss.builder

@@ -0,0 +1,26 @@
+xml.instruct! :xml, :version => "1.0"
+xml.rss :version => "2.0", "xmlns:atom" => "http://www.w3.org/2005/Atom" do
+  xml.channel do
+    # Required to pass W3C validation.
+    xml.atom :link, nil, {
+      :href => admin_dashboard_index_url(:format => 'rss'),
+      :rel => 'self', :type => 'application/rss+xml'
+    }
+
+    # Feed basics.
+    xml.title             "Refinery Updates"
+    xml.description       "See the recent activity on your Refinery site."
+    xml.link              admin_dashboard_index_url(:format => 'rss')
+
+    # Recent activity.
+    @recent_activity.each do |change|
+      xml.item do
+        xml.title         change.class
+        #xml.link          link
+        xml.description   activity_message_for change
+        #xml.pubDate       date.to_s(:rfc822)
+        #xml.guid          unique
+      end
+    end
+  end
+end

data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb

@@ -6,7 +6,8 @@
   <span class='actions'>
     <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
                 :class => "cancel confirm-delete",
-                :title => t('.remove_inquiry', :name => inquiry.name) -%>
+                :title => t('.title'),
+                :'data-confirm' => t('.remove_inquiry', :name => inquiry.name) -%>
 
     <%= link_to refinery_icon_tag('zoom.png'), admin_inquiry_url(inquiry),
                 :title => t('.read_inquiry') -%>

data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb

@@ -9,7 +9,7 @@
   <table id='inquiry'>
     <tr>
       <td>
-        <strong><%= t('.to') %></strong>
+        <label class='stripped'><%= t('.to') %></label>
       </td>
       <td>
         <%= t('.the_customer_making_inquiry') %>
@@ -17,7 +17,7 @@
     </tr>
     <tr>
       <td>
-        <strong><%= t('.from') %></strong>
+        <label class='stripped'><%= t('.from') %></label>
       </td>
       <td>
         <%= "#{RefinerySetting[:site_name]} &lt;no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}&gt;" %>
@@ -25,7 +25,7 @@
     </tr>
     <tr>
       <td>
-        <strong><%= t('.subject') %></strong>
+        <label class='stripped'><%= t('.subject') %></label>
       </td>
       <td>
         <%= link_to InquirySetting.confirmation_subject.value, edit_admin_inquiry_setting_url(InquirySetting.confirmation_subject),
@@ -34,10 +34,14 @@
     </tr>
     <tr>
       <td valign='top'>
-        <strong><%= t('.message') %></strong>
+        <%= f.label :value, t('.message'),
+                    :class => 'stripped' %>
       </td>
       <td>
-        <%= f.text_area :value, :cols => "100", :rows => "5", :class => 'widest' %><br/>
+        <%= f.text_area :value,
+                        :rows => "5",
+                        :class => 'widest' %>
+        <br/>
         <em><%= t('.note') %></em>
       </td>
     </tr>

data/vendor/plugins/inquiries/config/locales/en.yml

@@ -27,7 +27,7 @@ en:
         move_inquiry_to_open: Move this inquiry to open
         read_inquiry: Read the inquiry
         remove_inquiry: "Are you sure you want to delete the inquiry from '{{name}}'?"
-        title: Remove this inquiry forever.
+        title: Remove this inquiry forever
         said: said
         mark_as_spam: Mark as spam
         mark_as_ham: Move to inbox
@@ -54,7 +54,7 @@ en:
         spam: Spam
         spam_yes: 'yes'
         inquiry: Inquiry
-        title: Remove this inquiry forever.
+        title: Remove this inquiry forever
     inquiry_settings:
       update:
         updated: "'{{setting}}' was successfully updated."

data/vendor/plugins/inquiries/config/routes.rb

@@ -1,10 +1,20 @@
 ActionController::Routing::Routes.draw do |map|
-  map.new_inquiry '/contact', :controller => 'inquiries', :action => 'new'
-  map.thank_you_inquiries '/contact/thank_you', :controller => 'inquiries', :action => 'thank_you'
-  map.resources :inquiries, :collection => {:thank_you => :get}
+  map.new_inquiry '/contact',
+                  :controller => 'inquiries',
+                  :action => 'new'
+
+  map.thank_you_inquiries '/contact/thank_you',
+                          :controller => 'inquiries',
+                          :action => 'thank_you'
+
+  map.resources :inquiries,
+                :collection => {:thank_you => :get}
 
   map.namespace(:admin, :path_prefix => 'refinery') do |admin|
-    admin.resources :inquiries, :collection => {:spam => :get}, :member => {:toggle_spam => :get}
+    admin.resources :inquiries,
+                    :collection => {:spam => :get},
+                    :member => {:toggle_spam => :get}
+
     admin.resources :inquiry_settings
   end
 end

data/vendor/plugins/pages/app/controllers/pages_controller.rb

@@ -29,7 +29,9 @@ class PagesController < ApplicationController
       Page.find(params[:id], :include => [:parts, :slugs])
     end
 
-    if @page.try(:live?) or (logged_in? and current_user.authorized_plugins.include?("Pages"))
+    if @page.try(:live?) or
+       (refinery_user? and
+        current_user.authorized_plugins.include?("refinery_pages"))
       # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
       if @page.skip_to_first_child
         first_live_child = @page.children.find_by_draft(false, :order => "position ASC")

data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb

@@ -1,5 +1,5 @@
-<% if ((page_code = RefinerySetting[:analytics_page_code].to_s.strip).present? &&
-        page_code != 'UA-xxxxxx-x') -%>
+<% unless refinery_user? or
+          (page_code = RefinerySetting[:analytics_page_code].to_s.strip) =~ /^(UA-xxxxxx-x)?$/ -%>
   <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '<%= page_code %>']);

data/vendor/plugins/refinery/app/views/shared/_menu.html.erb

@@ -1,17 +1,22 @@
 <%
-cache("#{Refinery.base_cache_key}_#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}_#{request.path}") do
-  if (collection ||= @menu_pages).any?
+  dom_id ||= 'menu'
+  css ||= 'menu'
+  cache_key = [Refinery.base_cache_key]
+  cache_key << RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")
+  cache_key << request.path
+  cache(cache_key.join('_')) do
+    if (collection ||= @menu_pages).any?
 -%>
-    <nav id='<%= dom_id ||= "menu" %>' class='<%= [css ||= "menu", 'clearfix'].join(' ') %>'>
-      <%= render :partial => "/shared/menu_branch",
-                 :collection => collection,
-                 :locals => {
-                   :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
-                   :sibling_count => collection.size - 1
-                 }
-      -%>
-    </nav>
-<%
+      <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
+        <%= render :partial => "/shared/menu_branch",
+                   :collection => collection,
+                   :locals => {
+                     :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
+                     :sibling_count => collection.size - 1
+                   }
+        -%>
+      </nav>
+  <%
+    end
   end
-end
 -%>

data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb

@@ -33,6 +33,9 @@
     delete_url          ||= eval("admin_#{f.object.class.name.underscore}_url(#{f.object.id})")
   end
 -%>
+<input type='hidden' name='modal' value='<%= from_dialog? %>' />
+<input type='hidden' name='dialog' value='<%= from_dialog? %>' />
+
 <div class='form-actions<%= ' form-actions-dialog' if from_dialog? %>'>
   <div class='form-actions-left'>
     <%= submit_tag submit_button_text,

data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb

@@ -1,7 +1,5 @@
 <form method="GET" action="<%= url %>" class="search_form">
   <input id="search" name="search" size="22" type="search" value="<%= params[:search] %>" />
-  <% if from_dialog? %>
-  <input id="dialog" name="dialog" type="hidden" value="true" />
-  <% end %>
+  <input id="dialog" name="dialog" type="hidden" value="<%= from_dialog? %>" />
   <%= submit_tag t('admin.search'), :name => "" %>
 </form>

data/vendor/plugins/refinery/config/locales/en.yml

@@ -22,7 +22,7 @@ en:
     crudify:
       created: "{{what}} was successfully created."
       updated: "{{what}} was successfully updated."
-      destroyed: "{{what}} was successfully destroyed"
+      destroyed: "{{what}} was successfully destroyed."
   shared:
     site_bar:
       log_out: Log out

data/vendor/plugins/refinery/lib/crud.rb

@@ -109,7 +109,10 @@ module Crud
         end
 
         def destroy
-          flash.now[:notice] = t('refinery.crudify.destroyed', :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'") if @#{singular_name}.destroy
+          if @#{singular_name}.destroy
+            flash[:notice] = t('refinery.crudify.destroyed',
+                               :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
+          end
           redirect_to #{options[:redirect_to_url]}
         end
 

data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb

@@ -1,70 +1,13 @@
 class RefineryGenerator < Rails::Generator::NamedBase
 
-  def initialize(*runtime_args)
-    super(*runtime_args)
-    $title_name = singular_name.gsub("_", " ").gsub(/\b([a-z])/) { $1.capitalize }
-  end
-
   def banner
-    "Usage: ./script/generate refinery singular_model_name attribute:type [attribute2:type ...]"
+    puts "This generator has been renamed. Please this instead:"
+    puts "ruby script/generate refinery_plugin"
+    exit
   end
 
   def manifest
-    record do |m|
-      # Copy controller, model and migration
-      directories = ["#{plural_name}", "#{plural_name}/app", "#{plural_name}/app/controllers",
-        "#{plural_name}/app/controllers/admin", "#{plural_name}/app/models", "#{plural_name}/app/views",
-        "#{plural_name}/app/helpers", "#{plural_name}/app/views", "#{plural_name}/app/views/admin",
-        "#{plural_name}/config", "#{plural_name}/config/locales", "#{plural_name}/rails"].map { |d| "vendor/plugins/#{d}" }
-
-      directories.each do |dir|
-        m.directory dir
-      end
-
-      m.template "controller.rb", "vendor/plugins/#{plural_name}/app/controllers/admin/#{plural_name}_controller.rb"
-      m.template "model.rb", "vendor/plugins/#{plural_name}/app/models/#{singular_name}.rb"
-      m.template "config/routes.rb", "vendor/plugins/#{plural_name}/config/routes.rb"
-      Dir[File.expand_path(File.dirname(__FILE__) + "/templates/config/locales/*.yml")].each do |yml|
-        yml_filename = yml.split(File::SEPARATOR).last
-        m.template "config/locales/#{yml_filename}", "vendor/plugins/#{plural_name}/config/locales/#{yml_filename}"
-      end
-
-      # Create view directory
-      admin_view_dir = File.join("vendor/plugins/#{plural_name}/app/views/admin", plural_name)
-      m.directory admin_view_dir
-
-      # Copy in all views
-      admin_view_files = ['_form.html.erb', '_sortable_list.html.erb', 'edit.html.erb', 'index.html.erb', 'new.html.erb']
-
-      admin_view_files.each do |view_file|
-        m.template "views/admin/#{view_file}", "#{admin_view_dir}/#{view_file}"
-      end
-
-      m.template "views/admin/_singular_name.html.erb", "#{admin_view_dir}/_#{singular_name}.html.erb"
-
-      # Now for the public views and controller
-      public_dir = File.join("vendor/plugins/#{plural_name}/app/views/", plural_name)
-      m.directory public_dir
-
-      view_files = ['index.html.erb', 'show.html.erb']
-      view_files.each do |view_file|
-        m.template "views/#{view_file}", "#{public_dir}/#{view_file}"
-      end
-
-      m.template "public_controller.rb", "vendor/plugins/#{plural_name}/app/controllers/#{plural_name}_controller.rb"
-
-      # Add in the init file that ties the plugin to the app.
-      m.template "rails/init.rb", "vendor/plugins/#{plural_name}/rails/init.rb"
-
-      m.directory 'db/migrate/'
-      m.directory 'db/seeds/'
-      m.template 'seed.rb', "db/seeds/#{plural_name}.rb"
-      m.migration_template  'migration.rb', 'db/migrate',
-                            :assigns => {:migration_name => "Create#{class_name.pluralize}"},
-                            :migration_file_name => "create_#{singular_name.pluralize}"
-
-      m.readme "MIGRATE"
-    end
+    banner
   end
 
 end