refinerycms 0.9.6.21 → 0.9.6.22

data/VERSION

@@ -1 +1 @@
-0.9.6.21
+0.9.6.22

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.21' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.22' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')
@@ -24,8 +24,8 @@ Refinery::Initializer.run do |config|
     :secret      => 'eec8fffc3637c05895f8e6a355179eaad0003ac5617e5368955baf7989e1faca4d8ab37140d690c20b05d5815609b7c680c644277b6a892be316a85c6596d75c'
   }
 
-  # Specify your application's gem requirements here. See the example below:
-  config.gem "refinerycms-news", :lib => "news", :version => "~> 0.9.7"
+  # Specify your application's gem requirements here. See the examples below:
+  # config.gem "refinerycms-news", :lib => "news", :version => "~> 0.9.7"
   # config.gem "refinerycms-portfolio", :lib => "portfolio", :version => "~> 0.9.3.8"
 end
 

data/config/environments/development.rb

@@ -29,4 +29,4 @@ config.after_initialize do
     (path =~ /app/).nil?
   end
 end
-=end
+=end

data/db/seeds.rb

@@ -7,14 +7,13 @@
   {:name => "image_thumbnails", :value => {
     :dialog_thumb => 'c106x106',
     :grid => 'c135x135',
-    :thumb => '50x50>',
-    :medium => '225x255>',
-    :side_body => '300x500>',
+    :thumb => '50x50',
+    :medium => '225x255',
+    :side_body => '300x500',
     :preview => 'c96x96'
     }
   }].each do |setting|
-  RefinerySetting[setting[:name].to_sym] = setting[:value]
-  RefinerySetting.find_by_name(setting[:name].to_s).update_attributes({:destroyable => false})
+  RefinerySetting.create(:name => setting[:name].to_s, :value => setting[:value], :destroyable => false)
 end
 
 InquirySetting.create(:name => "Confirmation Body", :value => "Thank you for your inquiry %name%,\n\nThis email is a receipt to confirm we have received your inquiry and we'll be in touch shortly.\n\nThanks.", :destroyable => false)
@@ -46,11 +45,25 @@ Page.create(:title => "About Us",
               :body => "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus fringilla nisi a elit. Duis ultricies orci ut arcu. Ut ac nibh. Duis blandit rhoncus magna. Pellentesque semper risus ut magna. Etiam pulvinar tellus eget diam. Morbi blandit. Donec pulvinar mauris at ligula. Sed pellentesque, ipsum id congue molestie, lectus risus egestas pede, ac viverra diam lacus ac urna. Aenean elit.</p>"
             })
 
+Page.create(:title => "News",
+            :link_url => "/news",
+            :menu_match => "^/news.*$",
+            :deletable => false,
+            :position => 3).parts.create(
+            {
+              :title => "body",
+              :body => "<p>Want to know the latest? Here's what has been happening.</p>"
+            }).page.parts.create(
+            {
+              :title => "Side Body",
+              :body => "<p>Here we post up the latest about us, along with events and updates you don't want to miss!</p>"
+            })
+
 Page.create(:title => "Contact Us",
             :link_url => "/inquiries/new",
             :menu_match => "^/inquiries.*$",
             :deletable => false,
-            :position => 3).parts.create(
+            :position => 4).parts.create(
             {
               :title => "Body",
               :body => "<p>Get in touch with us. Just use the form below and we'll get back to you as soon as we can.</p>"
@@ -65,7 +78,7 @@ Page.create(:title => "Thank You",
             :show_in_menu => false,
             :deletable => false,
             :position => 0,
-            :parent_id => 3).parts.create(
+            :parent_id => 4).parts.create(
             {
               :title => "Body",
               :body => "<p>We've received your inquiry and will get back to you with a response shortly.</p><p><a href='/'>Return to the home page</a></p>"
@@ -75,7 +88,7 @@ Page.create(:title => "Page not found",
             :menu_match => "^/404$",
             :show_in_menu => false,
             :deletable => false,
-            :position => 4).parts.create(
+            :position => 5).parts.create(
             {
               :title => "Body",
               :body => "<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href='/'>Return to the home page</a></p>"
@@ -84,10 +97,10 @@ Page.create(:title => "Page not found",
 Page.create(:title => "Privacy Policy",
             :deletable => true,
             :show_in_menu => false,
-            :position => 5).parts.create(
+            :position => 6).parts.create(
             {
               :title => "Body",
-              :body => "<p>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>"
+              :body => "<p><strong>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>"
             }).page.parts.create(
             {
               :title => "Side Body",
@@ -97,11 +110,11 @@ Page.create(:title => "Privacy Policy",
 Page.create(:title => "Down for maintenance",
             :menu_match => "^/maintenance$",
             :show_in_menu => false,
-            :position => 6).parts.create(
+            :position => 7).parts.create(
             {
               :title => "Body",
               :body => "<p>Our site is currently down for maintenance. Please try back later.</p>"
             })
 
 # Create a default themes directory.
-Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?
+Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?

data/readme.md

@@ -65,12 +65,10 @@ After your database exists, you'll need to install the gems that Refinery depend
 
     rake gems:install
 
-As of version 0.9.6.21, the news engine was extracted into a separate gem. This is included by default in config/application.rb
-If you don't want this engine on your site, just remove the config.gem line for it in config/application.rb
-If you do want it, please run the following commands to get it up and running:
+As of version 0.9.6.22, the news engine was extracted into a separate gem.
+This is found here:
 
-    script/generate news
-    rake db:migrate
+    http://github.com/resolve/refinerycms-news
 
 Now, news should be up and running.
 

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

@@ -31,7 +31,7 @@ protected
       end
     end
   end
-  
+
   def add_pages_branch_to_parents_list(page)
     list = []
     page.children.each do |child|

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

@@ -1,12 +1,12 @@
 <div class='form-actions'>
-  <%= f.submit 'Save', :id => "#{submit_button_id ||= "submit_button"}", :class => "wymupdate" -%>
+  <%= f.submit "#{submit_button_text ||= 'Save'}", :id => "#{submit_button_id ||= "submit_button"}", :class => "wymupdate" -%>
   <% if (continue_editing ||= false and !f.object.new_record?) -%>
     or
     <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f} -%>
   <% end -%>
   <% unless (hide_cancel ||= from_dialog?) -%>
     or
-    <%= link_to "Cancel",
+    <%= link_to "#{cancel_button_text ||= 'Cancel'}",
                 (cancel_url ||= ((back=url_for(:back)).include?('javascript') ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back)),
                 :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"),
                 :id => "#{cancel_button_id ||= "cancel_button"}",

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

@@ -22,10 +22,18 @@ module Refinery
       super
 
       # add plugin lib paths to the $LOAD_PATH so that rake tasks etc. can be run when using a gem for refinery or gems for plugins.
-      search_for = Regexp.new(File.join(%W(\( #{Refinery.root.join("vendor", "plugins")} \)? .+? lib)))
-      paths = plugins.collect{ |plugin| plugin.load_paths }.flatten.reject{|path| path.scan(search_for).empty? or path.include?('/rails-') }
+      search_for = Regexp.new(Refinery.root.join("vendor", "plugins", ".+?", "lib"))
+
+      # find all the plugin paths
+      paths = plugins.collect{ |plugin| plugin.load_paths }.flatten
+
+      # just use lib paths from Refinery engines
+      paths = paths.reject{|path| path.scan(search_for).empty? or path.include?('/rails-') }
+
+      # reject Refinery lib paths if they're already included in this app.
       paths = paths.reject{ |path| path.include?(Refinery.root.to_s) } unless Refinery.is_a_gem
       paths.uniq!
+
       ($refinery_gem_plugin_lib_paths = paths).each do |path|
         $LOAD_PATH.unshift path
       end

data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb

@@ -1,7 +1,7 @@
 class RefinerySetting < ActiveRecord::Base
 
   validates_presence_of :name
-  validates_uniqueness_of :name
+  #validates_uniqueness_of :name
 
   serialize :value # stores into YAML format
   after_save do |object|

data/vendor/plugins/themes/{app/models → lib}/theme.rb

@@ -1,6 +1,6 @@
 class Theme
 
-  def self.current_theme(request = nil)
+  def self.current_theme(env)
     RefinerySetting[:theme]
   end
 

data/vendor/plugins/themes/lib/theme_server.rb

@@ -9,9 +9,7 @@ class ThemeServer
   end
 
   def call(env)
-    theme = Theme.current_theme(env)
-
-    if env["PATH_INFO"] =~ /^\/theme/
+    if env["PATH_INFO"] =~ /^\/theme/ and (theme = Theme.current_theme(env)).present?
       env["PATH_INFO"].gsub!(/^\/theme\//, '')
       if (file_path = (dir = Rails.root.join("themes", theme)).join(env["PATH_INFO"])).exist?
         etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")
@@ -29,4 +27,4 @@ class ThemeServer
     end
   end
 
-end
+end

data/vendor/plugins/themes/rails/init.rb

@@ -1,35 +1,31 @@
-# Before the application gets setup this will fail badly if there's no database.
-if RefinerySetting.table_exists?
-  # Set up middleware to serve theme files
-  config.middleware.use "ThemeServer"
-
-  ::Refinery::ApplicationController.module_eval do
-
-    # Add or remove theme paths to/from Refinery application
-    before_filter do |controller|
-      # remove any paths relating to any theme.
-      controller.view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
-
-      # add back theme paths if there is a theme present.
-      if (theme = Theme.current_theme(controller.request)).present?
-        # Set up view path again for the current theme.
-        controller.view_paths.unshift Rails.root.join("themes", theme, "views").to_s
-
-        # Ensure that routes within the application are top priority.
-        # Here we grab all the routes that are under the application's view folder
-        # and promote them ahead of any other path.
-        controller.view_paths.select{|p| p.to_s =~ /^app\/views/}.each do |app_path|
-          controller.view_paths.unshift app_path
-        end
+# Set up middleware to serve theme files
+config.middleware.use "ThemeServer"
+
+::Refinery::ApplicationController.module_eval do
+
+  # Add or remove theme paths to/from Refinery application
+  before_filter do |controller|
+    # remove any paths relating to any theme.
+    controller.view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
+
+    # add back theme paths if there is a theme present.
+    if (theme = Theme.current_theme(controller.request.env)).present?
+      # Set up view path again for the current theme.
+      controller.view_paths.unshift Rails.root.join("themes", theme, "views").to_s
+
+      # Ensure that routes within the application are top priority.
+      # Here we grab all the routes that are under the application's view folder
+      # and promote them ahead of any other path.
+      controller.view_paths.select{|p| p.to_s =~ /^app\/views/}.each do |app_path|
+        controller.view_paths.unshift app_path
       end
-
-      # Set up menu caching for this theme or lack thereof
-      RefinerySetting[:refinery_menu_cache_action_suffix] = "#{"#{theme}_" if theme.present?}site_menu"
     end
 
+    # Set up menu caching for this theme or lack thereof
+    RefinerySetting[:refinery_menu_cache_action_suffix] = "#{"#{theme}_" if theme.present?}site_menu" if RefinerySetting.table_exists?
   end
 
-  # Include theme functions into application helper.
-  Refinery::ApplicationHelper.send :include, ThemesHelper
-
 end
+
+# Include theme functions into application helper.
+Refinery::ApplicationHelper.send :include, ThemesHelper

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 21
-  version: 0.9.6.21
+  - 22
+  version: 0.9.6.22
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +13:00
+date: 2010-03-27 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -804,7 +804,7 @@ files:
 - vendor/plugins/slim_scrooge/test/schema/schema.rb
 - vendor/plugins/slim_scrooge/test/setup.rb
 - vendor/plugins/themes/app/helpers/themes_helper.rb
-- vendor/plugins/themes/app/models/theme.rb
+- vendor/plugins/themes/lib/theme.rb
 - vendor/plugins/themes/lib/theme_server.rb
 - vendor/plugins/themes/rails/init.rb
 - vendor/plugins/themes/themes.md