refinerycms 0.9.8.4 → 0.9.8.5

data/Gemfile

@@ -36,7 +36,7 @@ gem 'sqlite3-ruby',             :require => 'sqlite3'
 gem 'refinerycms',              :path => '.'
 
 # Specify additional Refinery CMS Engines here (all optional):
-gem 'refinerycms-inquiries',    '~> 0.9.8.7'
+gem 'refinerycms-inquiries',    '~> 0.9.8.8'
 # gem 'refinerycms-news',       '~> 0.9.9'
 # gem 'refinerycms-portfolio',  '~> 0.9.8'
 # gem 'refinerycms-theming',    '~> 0.9.8'

data/changelog.md

@@ -1,3 +1,12 @@
+## 0.9.8.5 [unreleased]
+* Fixed an issue with the engine generator that was putting a comma in the wrong place breaking the call to ``crudify``. [Maarten Hoogendoorn](http://github.com/moretea)
+* Made the delete messages consistent. [Uģis Ozols](http://github.com/ugisozols)
+* ``zh-CN`` was overriding en locale in core locale file, fixed. [Philip Arndt](http://github.com/parndt)
+* Changed verbiage from created to added, create to add as it describes it better for things like images. [Philip Arndt](http://github.com/parndt)
+* ``image_fu`` no longer gives you the width and height of the image due to performance problems. [Philip Arndt](http://github.com/parndt) and [David Jones](http://github.com/djones)
+* Implemented a standardised API for the engine generator. The core now includes a standard engine install generator. Engines generate a readme file explaining how to build an engine as a gem. [David Jones](http://github.com/djones)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.4...0.9.8.5)
+
 ## 0.9.8.4 [17 September 2010]
 * Recursive deletion of page parts. [primerano](http://github.com/primerano)
 * Move around the default pages. [Philip Arndt](http://github.com/parndt)
@@ -32,7 +41,7 @@
 * Better use of dragonfly resizing. [Philip Arndt](http://github.com/parndt)
 * Partial Latvian translation. [Uģis Ozols](http://github.com/ugisozols)
 * Review Portugese translation. [Kivanio Barbosa](http://github.com/kivanio)
-* Bugfix with wymeditor in the engine generator. [Karmen Blake]
+* Bugfix with wymeditor in the engine generator. [Karmen Blake](http://github.com/kblake)
 * Split ``application_helper`` into smaller, more usable files. [Philip Arndt](http://github.com/parndt)
 * Move features and specs to each engine directory. [Philip Arndt](http://github.com/parndt)
 * Bugfixes to ensure that reordering works under ``awesome_nested_set``. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt)

data/todo.md

@@ -1,33 +1,14 @@
 # Todos required for 0.9.9 release
 
-## Engine API
-
-Responsible person: ``djones``
-
-rails g refinery_engine does the following things:
-
-- Creates what it does now
-- Creates a gemspec with the gem name of "refinerycms-#{engine_name}"
-- Puts the gem in the Gemfile
-- Copies db files to the vendor/engines/engine_name/db folder ONLY
-- Creates a generator in lib/generators which will install the db to the right place
-- Creates a public, spec, and features empty folders
-- Creates lib/tasks as a template
-- Maybe some sort of README on how to release your gem open source
-
-Then the process will be:
-
-### To create a fully releasable engine
-
-    rails g refinery_engine events name:string date:date picture:image
-
-### To install the plugin into your app
+## Solid Test Coverage
 
-    rails g refinerycms_events
-    bundle install
-    rake db:migrate
+Responsible person: ``VGoff``, ``hubble``
 
-And then when it's released all new refinerycms- gems will have the same install process. Yippee!
+* Add more Cucumber features for the whole of Refinery.
+* Add RSpec for the whole of Refinery, particularly:
+  - User, User engine and User mailer
+  - Inquiry mailer
+  - Refinery settings
 
 ## Internet Explorer 7+ Support
 
@@ -35,19 +16,10 @@ Responsible person: ``parndt``
 
 * WYMEditor and the dialogs are the weakest areas right now.
 
-Responsible person: ``stevenheidel``, ``djones``
+Responsible person: ``stevenheidel``, ``djones``, ``everyone``
 
 * Finding and filing issues found in IE
 
-## Solid Test Coverage
-
-Responsible person: ``VGoff``
-
-* Add more Cucumber features for the whole of Refinery.
-* Add RSpec for the whole of Refinery, particularly:
-  - User, User plugin and User mailer
-  - Inquiry mailer and Inquiry setting
-
 ## I18n support
 
 * Check all the views for missing translations

data/vendor/refinerycms/authentication/config/locales/en.yml

@@ -13,10 +13,10 @@ en:
         blank_password_keeps_current: Leaving password blank keeps the current password
         enable_all: enable all
       index:
-        create_new_user: Create New User
+        create_new_user: Add New User
       user:
         email_user: Email this user
-        preview: (%{who}) created %{created_at}
+        preview: (%{who}) added %{created_at}
   sessions:
     login_successful: Logged in successfully
     new:

data/vendor/refinerycms/authentication/config/locales/zh-CN.yml

@@ -10,14 +10,14 @@ zh-CN:
         blank_password_keeps_current: Leaving password blank keeps the current password
         enable_all: enable all
       index:
-        create_new_user: Create New User
-        no_users_yet:  There are no users yet. Click "Create New User" to add your first user.
+        create_new_user: Add New User
+        no_users_yet:  There are no users yet. Click "Add New User" to add your first user.
       user:
         confirm_delete_message: "Are you sure you want to delete '%{who}'?"
         confirm_delete_title: Remove this user forever
         edit_user: Edit this user
         email_user: Email this user
-        preview: (%{who}) created %{created_at}
+        preview: (%{who}) added %{created_at}
   sessions:
     login_successful: Logged in successfully
     login_failed: Sorry, your password or username was incorrect.
@@ -51,7 +51,7 @@ zh-CN:
     please_activate: Please activate your new account
     activated: Your account has been activated!
     activated_email: "%{who}, your account has been activated. You may now start adding your plugins:"
-    account_created: Your account has been created.
+    account_created: Your account has been added.
     user_name: Username %{name}
     password: Password %{password}
     visit_url: "Visit this url to activate your account:"

data/vendor/refinerycms/authentication/features/manage_users.feature

@@ -34,14 +34,14 @@ Feature: Manage Users
     Given I have a user named "resolve"
     And I am a logged in refinery user
     When I go to the list of users
-    And I follow "Create New User"
+    And I follow "Add New User"
     And I fill in "Login" with "cucumber"
     And I fill in "Email" with "green@cucumber.com"
     And I fill in "Password" with "greenandjuicy"
     And I fill in "Password confirmation" with "greenandjuicy"
     And I press "Save"
     Then I should be on the list of users
-    And I should see "cucumber was successfully created."
+    And I should see "cucumber was successfully added."
     And I should see "cucumber (green@cucumber.com)"
 
   Scenario: Edit User

data/vendor/refinerycms/core/config/locales/en.yml

@@ -21,9 +21,9 @@ en:
         cancel: Cancel
   refinery:
     crudify:
-      created: %{what} was successfully created.
+      created: %{what} was successfully added.
       updated: %{what} was successfully updated.
-      destroyed: %{what} was successfully destroyed.
+      destroyed: %{what} was successfully removed.
   shared:
     site_bar:
       log_out: Log out
@@ -35,8 +35,8 @@ en:
       form_actions:
         save: Save
         cancel: Cancel
-        cancel_lose_changes: Cancelling will lose all changes you've made here
-        delete: Delete
+        cancel_lose_changes: If you cancel you will lose any changes you have made here
+        delete: Remove
         previous: Previous
         next: Next
         close: Close
@@ -57,7 +57,7 @@ en:
         results_for: Search results for '%{query}'
         no_results: Sorry, no results found
       delete:
-        message: Are you sure you want to delete '%{title}'?
+        message: Are you sure you want to remove '%{title}'?
       error_messages:
         problems_in_following_fields: There were problems with the following fields
       help: help

data/vendor/refinerycms/core/config/locales/zh-CN.yml

@@ -1,4 +1,4 @@
-en:
+zh-CN:
   welcome:
     there_are_no_users: "There are no users yet, so we'll set you up first."
     remember_admin_location: "Remember your Refinery admin area is at:"
@@ -16,7 +16,7 @@ en:
     reorder: "Reorder %{what}"
     reorder_done: "Done Reordering %{what}"
     crudify:
-      created: "%{what} was successfully created."
+      created: "%{what} was successfully added."
       updated: "%{what} was successfully updated."
       destroyed: "%{what} was successfully destroyed."
   shared:

data/vendor/refinerycms/core/engines.md

@@ -1,10 +1,10 @@
-# Extending Refinery with Plugins
+# Extending Refinery with Engines
 
 ## Introduction
 
 __Refinery is designed to be easily extended so you can quickly customise your Refinery site to manage new areas you want to add to your site. If you see something you want to customise, the chances are you can customise it.__
 
-The main way of extending Refinery is through adding new plugins to your app. By default you can edit pages in Refinery's backend, but how do you add a new section to manage like products?
+The main way of extending Refinery is through adding new engines to your app. By default you can edit pages in Refinery's backend, but how do you add a new section to manage like products?
 
 ## The Refinery Generator
 
@@ -30,10 +30,15 @@ This will output the help on how to use the generator. To generate the new secti
 
     rails generate refinery_engine product title:string description:text image:image brochure:resource
 
-The generator will output a list of files it generated. You'll notice there is a new plugin that has been added in ``vendor/plugins/products``. This is where both the backend and front end files are held for this new products area.
+The generator will output a list of files it generated. You'll notice there is a new engine that has been added in ``vendor/engines/products``. This is where both the backend and front end files are held for this new products area.
 
-A new database migration has been added to add the products table in so run:
+Engines are treated like gems. When you generate a new engine it adds the gem dependency for this engine to the end of your ``Gemfile``. Because your ``Gemfile`` has changed you now need to run:
 
+    bundle install
+    
+When the products engine was generated a products generator was also created. This installs any migrations and seeds into your Rails app. Here's how to finish off the install
+
+    rails generate refinerycms_products
     rake db:migrate
 
 Start up your app by running ``ruby script/server`` go to [http://localhost:3000](http://localhost:3000) and you'll see instantly a new menu item called "products". Click on that and you'll see there are no products yet.
@@ -42,11 +47,11 @@ Now go to the backend of your site by visiting [http://localhost:3000/refinery](
 
 Now you have a fully managed products section in Refinery, nice.
 
-If you want to modify your generated plugin you need to understand the basic structure of how they work.
+If you want to modify your generated engine you need to understand the basic structure of how they work.
 
-## The Structure of a Plugin
+## The Structure of an Engine
 
-Think of a plugin in Refinery as a small Rails app or an "engine". Plugins have a structure that is extremely similar to a Rails app. Here's an example of Refinery's pages plugin (located in Refinery's ``vendor/plugins/pages/`` folder)
+Think of a engine in Refinery as a small Rails app. Engines have a structure that is extremely similar to a Rails app. Here's an example of Refinery's pages engine (located in Refinery's ``vendor/refinerycms/pages/`` folder)
 
     pages
       |- app
@@ -91,23 +96,23 @@ This bit is important. It's where all the controllers are held to manage pages i
 
     end
 
-This single controller allows us to create, read, update and delete pages in the backend. With a little bit of Refinery magic we utilise the [crudify mixin](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/crud.md) which gives us all of these regular features out of the box.
+This single controller allows us to create, read, update and delete pages in the backend. With a little bit of Refinery magic we utilise the [crudify mixin](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/core/crud.md) which gives us all of these regular features out of the box.
 
-How crudify works is an entire topic of it's own. Checkout the [crudify documentation](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/crud.md) to get an insight into how that works.
+How crudify works is an entire topic of it's own. Checkout the [crudify documentation](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/core/crud.md) to get an insight into how that works.
 
 ### app/views and app/helpers
 
-Works exactly the same as ``app/views`` and ``app/helpers`` in a normal Rails app. You just put the views and helpers related to this plugin in here instead of in your actual main app directory.
+Works exactly the same as ``app/views`` and ``app/helpers`` in a normal Rails app. You just put the views and helpers related to this engine in here instead of in your actual main app directory.
 
 ### config/routes.rb
 
-Works exactly the same as ``config/routes.rb`` in your app except this routes file only loads the routes for this plugin.
+Works exactly the same as ``config/routes.rb`` in your app except this routes file only loads the routes for this engine.
 
 ### rails/init.rb
 
-This file runs when your site is started up. All is does is registers this plugin with Refinery so it knows that it exists, how to handle it in the Refinery admin menu and how to render recent activity on the Dashboard (see "Getting your Plugin to Report Activity in the Dashboard")
+This file runs when your site is started up. All is does is registers this engine with Refinery so it knows that it exists, how to handle it in the Refinery admin menu and how to render recent activity on the Dashboard (see "Getting your Engine to Report Activity in the Dashboard")
 
-NOTE: The latest version of Refinery requires that you only specify a plugin.name. plugin.title & plugin.description will be looked up by the I18n system.
+NOTE: The latest version of Refinery requires that you only specify a engine.name. plugin.title & plugin.description will be looked up by the I18n system.
 
 # pages/lib/pages.rb
     Refinery::Plugin.register do |plugin|
@@ -130,11 +135,11 @@ NOTE: The latest version of Refinery requires that you only specify a plugin.nam
           title: Pages
           description: Manage content pages
 
-## Getting your Plugin to Report Activity in the Dashboard
+## Getting your Engine to Report Activity in the Dashboard
 
-Recent activity reporting is built right in, so all you need to do is follow the convention below and your plugin will start showing up in the recent activity list of the Dashboard.
+Recent activity reporting is built right in, so all you need to do is follow the convention below and your engine will start showing up in the recent activity list of the Dashboard.
 
-In our example above we showed the use of ``plugin.activity`` for the pages plugin.
+In our example above we showed the use of ``plugin.activity`` for the pages engine.
 
     Refinery::Plugin.register do |plugin|
       plugin.name = "pages"

data/vendor/refinerycms/core/features/search.feature

@@ -20,7 +20,7 @@ Feature: Search
       |page    |testitem|pages         |
       |inquiry |testitem|inquiries     |
       |inquiry |testitem|spam inquiries|
-      |refinery setting|Test Item|refinery settings|
+      |setting |testitem|settings      |
 
   # This will only run when resources engine is installed.
   @search-file
@@ -55,3 +55,5 @@ Feature: Search
       |files    |files         |
       |inquiries|inquiries     |
       |inquiries|spam inquiries|
+      |settings |settings      |
+

data/vendor/refinerycms/core/features/step_definitions/core_steps.rb

@@ -44,7 +44,7 @@ Then %r`not be allowed to log in$` do
 end
 
 Then %r`be redirected to login$` do
-  request.request_uri.should == login_path
+  request.fullpath.should == login_path
 end
 
 Then /^"([^\"]*)" can log in$/ do |name|

data/vendor/refinerycms/core/lib/core.rb

@@ -7,6 +7,8 @@ require 'dragonfly'
 require 'friendly_id'
 require 'truncate_html'
 require 'will_paginate'
+require 'rails/generators'
+require 'rails/generators/migration'
 
 module Refinery
   autoload :Plugin,  File.expand_path('../refinery/plugin', __FILE__)
@@ -73,4 +75,78 @@ module Refinery
       end
     end
   end
+  
+  module Generators
+    # The core engine installer streamlines the installation of custom generated
+    # engines. It takes the migrations and seeds in your engine and moves them
+    # into the rails app db directory, ready to migrate.
+    class EngineInstaller < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      def self.engine_name(name = nil)
+        @engine_name = name unless name.nil?
+        @engine_name
+      end
+      
+      # Implement the required interface for Rails::Generators::Migration.
+      # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+      # can be removed once this issue is fixed:
+      # # https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
+      def self.next_migration_number(dirname)
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+      
+      def generate
+        Dir.glob(File.expand_path(File.join(self.class.source_root, '../db/**/**'))).each do |path|
+          unless File.directory?(path)
+            if path =~ /.*migrate.*/
+              migration_template path, Rails.root.join("db/migrate/create_#{self.class.engine_name}")
+            else
+              template path, Rails.root.join("db/seeds/#{self.class.engine_name}.rb")
+            end
+          end
+        end
+        
+        puts "------------------------"
+        puts "Now run:"
+        puts "rake db:migrate"
+        puts "------------------------"
+      end
+    end
+  end
+
 end
+
+
+
+
+# Below is a hack until this issue:
+# https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
+# is fixed on the Rails project.
+
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+require 'rails/generators/active_model'
+require 'active_record'
+
+module ActiveRecord
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+      include Rails::Generators::Migration
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        if ActiveRecord::Base.timestamped_migrations
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        else
+          "%.3d" % next_migration_number
+        end
+      end
+    end
+  end
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/refinery_engine_generator.rb

@@ -9,7 +9,8 @@ class RefineryEngineGenerator < Rails::Generators::NamedBase
 
   def generate
     unless attributes.empty?
-      Dir.glob(File.expand_path('../templates/**/**', __FILE__)).each do |path|
+      Dir.glob(File.expand_path('../templates/**/**', __FILE__), File::FNM_DOTMATCH).each do |path|
+        # ignore directories which are created automatically by template()
         unless File.directory?(path)
           template path, plugin_path_for(path)
         end
@@ -24,6 +25,7 @@ class RefineryEngineGenerator < Rails::Generators::NamedBase
         puts "------------------------"
         puts "Now run:"
         puts "bundle install"
+        puts "rails generate refinerycms_#{plural_name}"
         puts "rake db:migrate"
         puts "------------------------"
       elsif self.behavior == :revoke
@@ -39,56 +41,9 @@ protected
 
   def plugin_path_for(path)
     path = path.gsub(File.dirname(__FILE__) + "/templates/", "vendor/engines/#{plural_name}/")
+  
     path = path.gsub("plural_name", plural_name)
     path = path.gsub("singular_name", singular_name)
-    path = path.gsub(".migration", '')
-
-    # hack can be removed after issue is fixed
-    unless self.behavior == :revoke
-     next_migration_number = ActiveRecord::Generators::Base.next_migration_number(File.dirname(__FILE__))
-    else
-      if (migrations = Dir[Rails.root.join('db', 'migrate', "*create_#{plural_name}*.rb").to_s]).any?
-        next_migration_number = migrations.first.split('/').last.split('_').first
-      else
-        next_migration_number = ''
-      end
-    end
-    path = path.gsub("migration_number", next_migration_number.to_s)
-
-    # replace our local db path with the app one instead.
-    path = path.gsub("/db/", "/../../../db/")
   end
 
-end
-
-
-
-
-
-
-# Below is a hack until this issue:
-# https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
-# is fixed on the Rails project.
-
-require 'rails/generators/named_base'
-require 'rails/generators/migration'
-require 'rails/generators/active_model'
-require 'active_record'
-
-module ActiveRecord
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
-      include Rails::Generators::Migration
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
-    end
-  end
-end
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/controllers/admin/plural_name_controller.rb

@@ -1,7 +1,7 @@
 class Admin::<%= class_name.pluralize %>Controller < Admin::BaseController
 
-  crudify :<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>
-  , :title_attribute => '<%= title.name %>'
+  crudify :<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>,
+          :title_attribute => '<%= title.name %>'
 <% end %>
 
 end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/plural_name/index.html.erb

@@ -2,9 +2,7 @@
   <ul id="<%= plural_name %>">
     <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
       <li>
-        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
-        .<%= title.name %>
-      <% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
+        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
       </li>
     <%% end %>
   </ul>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/plural_name/show.html.erb

@@ -1,7 +1,5 @@
 <%% content_for :body_content_title do %>
-  <%%= @<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
-  .<%= title.name %>
-<% end %> %>
+  <%%= @<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% end %> %>
 <%% end %>
 
 <%% content_for :body_content_left do %>
@@ -24,9 +22,7 @@
   <ul id="<%= plural_name %>">
     <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
       <li>
-        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
-        .<%= title.name %>
-      <% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
+        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
       </li>
     <%% end %>
   </ul>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  shared:
+    admin:
+      image_picker:
+        image: image
   plugins:
     <%= class_name.pluralize.underscore.downcase %>:
       title: <%= plural_name.titleize %>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb

@@ -10,6 +10,6 @@ page = Page.create(
   :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
   :menu_match => "^/<%= plural_name %>(\/|\/.+?|)$"
 )
-RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |default_page_part|
+Page.default_parts.each do |default_page_part|
   page.parts.create(:title => default_page_part, :body => nil)
-end
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/generators/refinerycms_plural_name_generator.rb

@@ -0,0 +1,6 @@
+class Refinerycms<%= class_name.pluralize %> < Refinery::Generators::EngineInstaller
+  
+  source_root File.expand_path('../../', __FILE__)
+  engine_name "<%= plural_name %>"
+  
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/plural_name.rb

@@ -3,6 +3,10 @@ require 'refinery'
 module Refinery
   module <%= class_name.pluralize %>
     class Engine < Rails::Engine
+      initializer "static assets" do |app|
+        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+      end
+      
       config.after_initialize do
         Refinery::Plugin.register do |plugin|
           plugin.name = "<%= class_name.pluralize.underscore.downcase %>"

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/tasks/plural_name.rake

@@ -0,0 +1,13 @@
+namespace :refinery do
+  
+  namespace :<%= plural_name %> do
+    
+    # call this task my running: rake refinery:<%= plural_name %>:my_task
+    # desc "Description of my task below"
+    # task :my_task => :environment do
+    #   # add your logic here
+    # end
+  
+  end
+  
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/readme.md

@@ -0,0 +1,10 @@
+# <%= plural_name.titleize %> engine for Refinery CMS.
+
+## How to build this engine as a gem
+
+    cd vendor/engines/<%= plural_name %>
+    gem build refinerycms-<%= plural_name %>.gempspec
+    gem install refinerycms-<%= plural_name %>.gem
+    
+    # Sign up for a http://rubygems.org/ account and publish the gem
+    gem push refinerycms-<%= plural_name %>.gem

data/vendor/refinerycms/core/lib/refinery/crud.rb

@@ -126,6 +126,7 @@ module Refinery
               flash.notice = t('refinery.crudify.destroyed',
                                :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
             end
+
             redirect_to #{options[:redirect_to_url]}
           end
 

data/vendor/refinerycms/core/lib/refinery/helpers/image_helper.rb

@@ -22,12 +22,13 @@ module Refinery
       # <%= image_fu @model.image, '200x200' %> or with no thumbnail: <%= image_fu @model.image %>
       def image_fu(image, geometry = nil, options={})
         if image.present?
-          # call rails' image tag function with default alt, width and height options.
+          # call rails' image tag function with default alt tag.
           # if any other options were supplied these are merged in and can replace the defaults.
-          image_tag((thumbnail = image.thumbnail(geometry)).url, {
+          # if the geomtry is nil, then we know the image height and width already.
+          image_tag(image.thumbnail(geometry).url, {
             :alt => image.respond_to?(:title) ? image.title : image.image_name,
-            :width => thumbnail.width,
-            :height => thumbnail.height
+            :width => (image.image_width if geometry.nil?),
+            :height => (image.image_height if geometry.nil?)
           }.merge(options))
         end
       end

data/vendor/refinerycms/core/lib/refinery/helpers/site_bar_helper.rb

@@ -16,7 +16,7 @@ module Refinery
                    elsif defined?(@page) and @page.present? and !@page.home?
                      edit_admin_page_url(@page, :only_path => true)
                    else
-                     (request.fullpath.to_s == '/') ? admin_root_url(:only_path => true) : "/admin#{request.request_uri}/edit"
+                     (request.fullpath.to_s == '/') ? admin_root_url(:only_path => true) : "/admin#{request.fullpath}/edit"
                    end rescue admin_root_url(:only_path => true))
         end
       end

data/vendor/refinerycms/core/public/javascripts/refinery/admin.js

@@ -307,7 +307,7 @@ init_tooltips = function(args){
       $(element).attr('tooltip', $(element).attr('title'));
     }
     // wipe clean the title on any children too.
-    $(element).add($(element).children('img')).attr('title', null);
+    $(element).add($(element).children('img')).removeAttr('title');
   });
 }
 

data/vendor/refinerycms/core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1262,22 +1262,30 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
     // wrap the current selection with a funky span.
     if (this._selected_image == null)
     {
-      if ((selected == null || selected.tagName.toLowerCase() == WYMeditor.P) && wym._iframe.contentWindow.getSelection) {
+      if (selected != null && selected.tagName.toLowerCase() != WYMeditor.A && wym._iframe.contentWindow.getSelection) {
         // Fixes webkit issue where it would not paste at cursor.
         selection = wym._iframe.contentWindow.getSelection();
-        selected_html = $(selected).html();
+        selected_html = $(selected).html().replace(' ', ' ');
 
-        if ((selection.focusOffset - selection.anchorOffset) > 1) {
-          new_html = selected_html.substring(0, selection.anchorOffset)
+        if ((offset = selected_html.indexOf(selection.focusNode.textContent)) == -1) {
+          offset = 0;
+        }
+        focus = offset + selection.focusOffset;
+        anchor = offset + selection.anchorOffset;
+        length = (focus - anchor);
+
+        if (length > 1) {
+          new_html = selected_html.substring(0, anchor)
                      + "<span id='replace_me_with_" + this._current_unique_stamp + "'>"
-                     + selected_html.substring(selection.anchorOffset, selection.focusOffset)
+                     + selected_html.substring(anchor, focus)
                      + "</span>"
-                     + selected_html.substring(selection.focusOffset);
+                     + selected_html.substring(focus);
         } else {
-          new_html = selected_html.substring(0, selection.focusOffset)
+          new_html = selected_html.substring(0, focus)
                      + "<span id='replace_me_with_" + this._current_unique_stamp + "'></span>"
-                     + selected_html.substring(selection.focusOffset);
+                     + selected_html.substring(focus);
         }
+        new_html = new_html.replace('  ', '&nbsp;');
 
         $(selected).html(new_html);
       } else {

data/vendor/refinerycms/dashboard/config/locales/en.yml

@@ -21,4 +21,4 @@ en:
   updated:
     'with_article "the"': updated
   created:
-    'with_article "the"': created
+    'with_article "the"': added

data/vendor/refinerycms/dashboard/config/locales/zh-CN.yml

@@ -20,4 +20,4 @@ zh-CN:
   updated:
     'with_article "the"': updated
   created:
-    'with_article "the"': created
+    'with_article "the"': added

data/vendor/refinerycms/dashboard/features/dashboard.feature

@@ -16,7 +16,7 @@ Feature: Dashboard
     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' was successfully added."
     And I should have 1 page
 
   Scenario: Update a Page Button

data/vendor/refinerycms/images/config/locales/en.yml

@@ -18,8 +18,8 @@ en:
         current_image: Current Image
         maximum_image_size: The maximum image size is %{megabytes} megabytes.
       index:
-        create_new_image: Create New Image
-        no_images_yet: There are no images yet. Click "Create New Image" to add your first image.
+        create_new_image: Add New Image
+        no_images_yet: There are no images yet. Click "Add New Image" to add your first image.
         view:
           switch_to: Switch to %{view_name} view
           list: list

data/vendor/refinerycms/images/config/locales/zh-CN.yml

@@ -15,8 +15,8 @@ zh-CN:
         current_image: Current Image
         maximum_image_size: The maximum image size is %{megabytes} megabytes.
       index:
-        create_new_image: Create New Image
-        no_images_yet: There are no images yet. Click "Create New Image" to add your first image.
+        create_new_image: Add New Image
+        no_images_yet: There are no images yet. Click "Add New Image" to add your first image.
         view:
           switch_to: Switch to %{view_name} view
           list: list

data/vendor/refinerycms/images/features/manage_images.feature

@@ -11,7 +11,7 @@ Feature: Manage Images
   @images-create
   Scenario: Create Valid Image
     When I go to the list of images
-    And I follow "Create New Image"
+    And I follow "Add New Image"
     And I attach the image at "beach.jpeg"
     And I press "Save"
     Then the image "beach.jpeg" should have uploaded successfully
@@ -23,10 +23,10 @@ Feature: Manage Images
 
   Scenario: Create Invalid Image (format)
     When I go to the list of images
-    And I follow "Create New Image"
+    And I follow "Add New Image"
     And I attach the image at "refinery_is_awesome.txt"
     And I press "Save"
-    Then I should not see "successfully created"
+    Then I should not see "successfully added"
     And I should have 0 images
 
   @images-edit
@@ -44,5 +44,5 @@ Feature: Manage Images
     When I upload the image at "beach.jpeg"
     When I go to the list of images
     And I follow "Remove this image forever"
-    Then I should see "'Beach' was successfully destroyed. "
+    Then I should see "'Beach' was successfully removed."
     And I should have 0 images

data/vendor/refinerycms/images/lib/images.rb

@@ -5,6 +5,29 @@ require 'refinery'
 module Refinery
   module Images
     class Engine < Rails::Engine
+      initializer 'fix-tempfile-not-closing-with-dragonfly-images' do |app|
+        # see http://github.com/markevans/dragonfly/issues#issue/18/comment/415807
+        require 'tempfile'
+        class Tempfile
+
+          def unlink
+            # keep this order for thread safeness
+            begin
+              if File.exist?(@tmpname)
+                closed? or close
+                File.unlink(@tmpname)
+              end
+              @@cleanlist.delete(@tmpname)
+              @data = @tmpname = nil
+              ObjectSpace.undefine_finalizer(self)
+            rescue Errno::EACCES
+              # may not be able to unlink on Windows; just ignore
+            end
+          end
+
+        end
+      end
+
       initializer 'images-with-dragonfly' do |app|
         app_images = Dragonfly[:images]
         app_images.configure_with(:rmagick)

data/vendor/refinerycms/pages/config/locales/en.yml

@@ -40,7 +40,7 @@ en:
       form_new_page_parts:
         title: Title
       form_page_parts:
-        create_content_section: Create content section
+        create_content_section: Add content section
         delete_content_section: Delete content section
       form_advanced_options:
         toggle_advanced_options: Click to access meta tag settings and menu options
@@ -71,10 +71,10 @@ en:
         meta_description_title: Meta description
         meta_description_help: Enter a concise two or three sentences describing what this page is about.
       index:
-        create_new_page: Create New Page
+        create_new_page: Add New Page
         reorder_pages: Reorder Pages
         reorder_pages_done: Done Reordering Pages
-        no_pages_yet: There are no pages yet. Click "Create New Page" to add your first page.
+        no_pages_yet: There are no pages yet. Click "Add New Page" to add your first page.
   activerecord:
     models:
       page: page

data/vendor/refinerycms/pages/config/locales/ru.yml

@@ -43,7 +43,7 @@ ru:
         toggle_advanced_options: Click to access meta tag settings and menu options
         parent_page: Родительская страница
         title: Заголовок
-        create_content_section: Create content section
+        create_content_section: Add content section
         delete_content_section: Delete content section
         advanced_options: Дополнительная настройка
         explain_page_different_title: "Если вы хотите, чтобы страница имела заголовок, отличный от того, что в меню или в заголовке браузера, введите его здесь."
@@ -55,7 +55,7 @@ ru:
           text: Текст
           image: Изображение
         custom_url: Custom URL
-        custom_url_explanation: "Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page. <br/> Note: This URL must point to a location that exists; a new one will not be created."
+        custom_url_explanation: "Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page. <br/> Note: This URL must point to a location that exists; a new one will not be added."
         draft: Черновик
         show_in_menu_title: Показ в меню
         show_in_menu_description: Отображать эту страницу в меню сайта
@@ -81,7 +81,7 @@ ru:
         meta_description_help: "Введите два-три коротких предложения, описывающих страницу."
         js:
           content_section:
-            create: Create Content Section
+            create: Add Content Section
             already_exists: "A content section with that title already exists, please choose another."
             title_empty: "You have not entered a title for the content section, please enter one."
             confirm_delete: "This will remove the content section {{section_name}} when the page is saved and erase all content that has been entered into it, Are you sure?"
@@ -90,7 +90,7 @@ ru:
         reorder_pages: Изменить порядок страниц
         reorder_pages_done: Сохранить такой порядок страниц
         sorry_no_results: Sorry! There are no results found.
-        no_pages_yet: There are no pages yet.  Click "Create New Page" to add your first page.
+        no_pages_yet: There are no pages yet.  Click "Add New Page" to add your first page.
   activerecord:
     attributes:
       page:

data/vendor/refinerycms/pages/config/locales/zh-CN.yml

@@ -36,7 +36,7 @@ zh-CN:
       form_new_page_parts:
         title: Title
       form_page_parts:
-        create_content_section: Create content section
+        create_content_section: Add content section
         delete_content_section: Delete content section
       form_advanced_options:
         toggle_advanced_options: Click to access meta tag settings and menu options
@@ -69,7 +69,7 @@ zh-CN:
         create_new_page: ������ҳ��
         reorder_pages: Reorder Pages
         reorder_pages_done: Done Reordering Pages
-        no_pages_yet: There are no pages yet. Click "Create New Page" to add your first page.
+        no_pages_yet: There are no pages yet. Click "Add New Page" to add your first page.
   activerecord:
     models:
       page: page

data/vendor/refinerycms/pages/features/manage_pages.feature

@@ -16,15 +16,15 @@ Feature: Manage Pages
 
   Scenario: Create Valid Page
     When I go to the list of pages
-    And I follow "Create New Page"
+    And I follow "Add New Page"
     And I fill in "Title" with "Pickles are Cucumbers Soaked in Evil"
     And I press "Save"
-    Then I should see "'Pickles are Cucumbers Soaked in Evil' was successfully created."
+    Then I should see "'Pickles are Cucumbers Soaked in Evil' was successfully added."
     And I should have 1 page
 
   Scenario: Create Invalid Page (without title)
     When I go to the list of pages
-    And I follow "Create New Page"
+    And I follow "Add New Page"
     And I press "Save"
     Then I should see "Title can't be blank"
     And I should have 0 pages
@@ -32,7 +32,7 @@ Feature: Manage Pages
   Scenario: Create Duplicate Page
     Given I only have pages titled Home, About
     When I go to the list of pages
-    And I follow "Create New Page"
+    And I follow "Add New Page"
     And I fill in "Title" with "About"
     And I press "Save"
     Then I should have 3 pages
@@ -42,6 +42,6 @@ Feature: Manage Pages
     Given I only have a page titled "test"
     When I go to the list of pages
     And I follow "Remove this page forever"
-    Then I should see "'test' was successfully destroyed."
+    Then I should see "'test' was successfully removed."
     And I should have 0 pages
     And I should have 0 page_parts

data/vendor/refinerycms/pages/features/step_definitions/page_steps.rb

@@ -18,6 +18,7 @@ end
 
 Given /^I (only )?have a page titled "([^"]*)"$/ do |only, title|
   Page.delete_all if only
+  PagePart.delete_all if only
   page = Page.create(:title => title)
   page.parts << PagePart.new(:title => 'testing', :position => 0)
   page

data/vendor/refinerycms/refinery.rb

@@ -28,7 +28,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 8
-    @build = 4
+    @build = 5
 
     class << self
       attr_reader :major, :minor, :tiny, :build

data/vendor/refinerycms/resources/features/manage_files.feature

@@ -35,5 +35,5 @@ Feature: Manage Files
     When I upload the file at "refinery_is_awesome.txt"
     And I go to the list of files
     And I follow "Remove this file forever"
-    Then I should see "'Refinery Is Awesome' was successfully destroyed."
+    Then I should see "'Refinery Is Awesome' was successfully removed."
     And I should have 0 files

data/vendor/refinerycms/resources/lib/resources.rb

@@ -5,6 +5,29 @@ require 'refinery'
 module Refinery
   module Resources
     class Engine < Rails::Engine
+      initializer 'fix-tempfile-not-closing-with-dragonfly-resources' do |app|
+        # see http://github.com/markevans/dragonfly/issues#issue/18/comment/415807
+        require 'tempfile'
+        class Tempfile
+
+          def unlink
+            # keep this order for thread safeness
+            begin
+              if File.exist?(@tmpname)
+                closed? or close
+                File.unlink(@tmpname)
+              end
+              @@cleanlist.delete(@tmpname)
+              @data = @tmpname = nil
+              ObjectSpace.undefine_finalizer(self)
+            rescue Errno::EACCES
+              # may not be able to unlink on Windows; just ignore
+            end
+          end
+
+        end
+      end
+
       initializer 'resources-with-dragonfly' do |app|
         app_resources = Dragonfly[:resources]
         app_resources.configure_with(:rmagick)

data/vendor/refinerycms/settings/config/locales/en.yml

@@ -8,7 +8,7 @@ en:
       delete: Remove this setting forever
       edit: Edit this setting
       index:
-        new: Create new setting
+        new: Add new setting
         empty_set: There are no settings yet.
         create_first: Click '%{link}' to add your first setting.
       form:

data/vendor/refinerycms/settings/features/step_definitions/setting_steps.rb

@@ -1,8 +1,8 @@
-Given /^I have no (refinery )?settings$/ do
+Given /^I have no (?:|refinery )settings$/ do
   RefinerySetting.delete_all
 end
 
-Given /^I (only )?have a (refinery )?setting titled "([^"]*)"$/ do |only, refinery, title|
+Given /^I (only )?have a (?:|refinery )setting titled "([^"]*)"$/ do |only, title|
   RefinerySetting.delete_all if only
 
   RefinerySetting.set(title.to_s.gsub(' ', '').underscore.to_sym, nil)

data/vendor/refinerycms/settings/features/support/paths.rb

@@ -3,7 +3,7 @@ module NavigationHelpers
     module Settings
       def path_to(page_name)
         case page_name
-        when /the list of (refinery )?settings/
+        when /the list of (?:|refinery )settings/
           admin_refinery_settings_path
         else
           nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 4
-  version: 0.9.8.4
+  - 5
+  version: 0.9.8.5
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +12:00
+date: 2010-09-21 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -374,9 +374,12 @@ files:
 - vendor/refinerycms/core/lib/generators/refinery_engine/templates/config/locales/nb.yml
 - vendor/refinerycms/core/lib/generators/refinery_engine/templates/config/locales/nl.yml
 - vendor/refinerycms/core/lib/generators/refinery_engine/templates/config/routes.rb
-- vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/migrate/migration_number_create_plural_name.rb
+- vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/migrate/create_plural_name.rb
 - vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb
+- vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/generators/refinerycms_plural_name_generator.rb
 - vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/plural_name.rb
+- vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/tasks/plural_name.rake
+- vendor/refinerycms/core/lib/generators/refinery_engine/templates/readme.md
 - vendor/refinerycms/core/lib/generators/refinery_engine/templates/refinerycms-plural_name.gemspec
 - vendor/refinerycms/core/lib/refinery/activity.rb
 - vendor/refinerycms/core/lib/refinery/admin_base_controller.rb