refinerycms 0.9.6.8 → 0.9.6.9

data/VERSION

@@ -1 +1 @@
-0.9.6.8
+0.9.6.9

data/bin/refinery

@@ -51,13 +51,14 @@ 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(%W(#{RAILS_ROOT} config environment.rb)), "r").read.split("\n")
+    app_config_file = File.exist?(File.join(%W(#{RAILS_ROOT} config application.rb))) ? "application.rb" : "environment.rb"
+    lines = File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "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(%W(#{RAILS_ROOT} config environment.rb)), "w").puts(lines.join("\n"))
+    File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "w").puts(lines.join("\n"))
 
   	puts "\n---------"
   	puts "Refinery successfully installed in '#{RAILS_ROOT}'!\n\n"

data/bin/refinery-update-core

@@ -24,18 +24,45 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   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(%W(#{RAILS_ROOT} config environment.rb)), "r").read
+	if File.exist?(File.join(%W(#{RAILS_ROOT} config application.rb)))
+	  FileUtils::cp File.join(%W(#{REFINERY_ROOT} config environment.rb)), File.join(%W(#{RAILS_ROOT} config environment.rb))
+  else
+    # update secret key if environment still exists
+    lines = File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "r").read.split("\n")
+    secret_key = ""
+    lines.each do |line|
+      match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
+      secret_key = match unless match.nil?
+    end
+    # write the new content into the file.
+    FileUtils::cp File.join(%W(#{REFINERY_ROOT} config application.rb)), File.join(%W(#{RAILS_ROOT} config application.rb))
+
+    app_rb_lines = File.open(File.join(%W(#{RAILS_ROOT} config application.rb)), "r").read.split("\n")
+    app_rb_lines.each do |line|
+      match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
+      line.gsub!(match, secret_key) unless match.nil?
+    end
+
+    # write the new content into the file.
+    File.open(File.join(%W(#{RAILS_ROOT} config application.rb)), "w").puts(app_rb_lines.join("\n"))
+
+    FileUtils::cp File.join(%W(#{REFINERY_ROOT} config environment.rb)), File.join(%W(#{RAILS_ROOT} config environment.rb))
+  end
+
+  app_config_file = "application.rb"
+
+	app_config = File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "r").read
 	environment_updated = false
 
   # backup app's environment.rb
   matcher = /(#===REFINERY REQUIRED GEMS===)(.+?)(#===REFINERY END OF REQUIRED GEMS===)/m
   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(%W(#{RAILS_ROOT} config environment.rb)), File.join(%W(#{RAILS_ROOT} config environment.autobackupbyrefinery.rb))
+  	refinery_config = File.open(File.join(%W(#{REFINERY_ROOT} config #{app_config_file})), "r").read
+  	FileUtils.cp File.join(%W(#{RAILS_ROOT} config #{app_config_file})), File.join(%W(#{RAILS_ROOT} config #{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb))
 
     # write the new content into the file.
-    File.open(File.join(%W(#{RAILS_ROOT} config environment.rb)), "w").puts(app_config.gsub!(
+    File.open(File.join(%W(#{RAILS_ROOT} config #{app_config_file})), "w").puts(app_config.gsub!(
   	  app_refinery_gems_section,
   	  refinery_config.scan(matcher).join("")
   	))
@@ -47,8 +74,8 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
 	  puts "---------"
 	  puts "Copied new Refinery core assets."
 	  if environment_updated
-  	  puts "I've made a backup of your current config/environment.rb file as it has been updated with the latest Refinery RubyGem requirements."
-  	  puts "The backup is located at config/environment.autobackupbyrefinery.rb incase you need it."
+  	  puts "I've made a backup of your current config/#{app_config_file} file as it has been updated with the latest Refinery RubyGem requirements."
+  	  puts "The backup is located at config/#{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb incase you need it."
     end
 	  puts ""
 	  puts "=== ACTION REQUIRED ==="

data/config/application.rb

@@ -85,8 +85,5 @@ else
     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===
-
-    # Pull in attachment_fu patch for windows
-    require 'attachment_fu_patch' if RUBY_PLATFORM =~ /mswin/
   end
 end

data/lib/refinery_initializer.rb

@@ -7,3 +7,6 @@ unless REFINERY_ROOT == RAILS_ROOT # e.g. only if we're in a gem.
   require 'refinery'
   require 'refinery/initializer'
 end
+
+# Pull in attachment_fu patch for windows
+require 'refinery/attachment_fu_patch' if RUBY_PLATFORM =~ /mswin/

data/vendor/plugins/pages/app/models/page.rb

@@ -87,7 +87,7 @@ class Page < ActiveRecord::Base
     if self.link_url.present?
       self.link_url =~ /^\// ? {:controller => self.link_url} : self.link_url
     elsif self.to_param.present?
-      {:controller => "pages", :action => "show", :id => self.to_param}
+      {:controller => "/pages", :action => "show", :id => self.to_param}
     end
   end
 

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

@@ -1,8 +1,10 @@
 <%
-  hide_empty_sections ||= !(show_empty_sections ||= false)
-  body_content_title = ((title = yield :body_content_title).present? or hide_empty_sections) ? title : page_title
-  body_content_left = ((body_content_left = yield :body_content_left).present? or hide_empty_sections) ? body_content_left : @page[:body]
-  body_content_right = ((body_content_right = yield :body_content_right).present? or hide_empty_sections) ? body_content_right : @page[:side_body]
+  show_empty_sections ||= false
+
+  body_content_title = ((title = yield :body_content_title).present? or (title.blank? and show_empty_sections)) ? title : page_title
+  body_content_left = ((body_content_left = yield :body_content_left).present? or (body_content_left.blank? and show_empty_sections)) ? body_content_left : @page[:body]
+  body_content_right = ((body_content_right = yield :body_content_right).present? or (body_content_right.blank? and show_empty_sections)) ? body_content_right : @page[:side_body]
+
   extra_body_content_classes = []
   extra_body_content_classes << "no_title" if body_content_title.blank?
   extra_body_content_classes << "no_left" if body_content_left.blank?
@@ -10,17 +12,17 @@
 -%>
 <%= render :partial => "/shared/submenu" if !admin? and (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
 <div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" if extra_body_content_classes.any? %>'>
-<% unless body_content_title.blank? and hide_empty_sections -%>
+<% if body_content_title.present? or show_empty_sections -%>
   <h1 id='body_content_page_title'>
     <%= body_content_title %>
   </h1>
 <% end -%>
-<% unless body_content_left.blank? and hide_empty_sections  -%>
+<% if body_content_left.present? or show_empty_sections -%>
   <div id='body_content_left' class='clearfix'>
     <%= body_content_left %>
   </div>
 <% end -%>
-<% unless body_content_right.blank? and hide_empty_sections  -%>
+<% if body_content_right.present? or show_empty_sections  -%>
   <div id='body_content_right' class='clearfix'>
     <%= body_content_right %>
   </div>

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

@@ -12,10 +12,10 @@ class ThemeServer
     if env["PATH_INFO"] =~ /^\/theme/
       relative_path = env["PATH_INFO"].gsub(/^\/theme\//, '')
 
-      if (file_path = Rails.root.join "themes", RefinerySetting[:theme], relative_path).exist?
+      if (file_path = Rails.root.join("themes", RefinerySetting[:theme], relative_path)).exist?
         # generate an etag for client-side caching.
         etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")
-        unless env["HTTP_IF_NONE_MATCH"] == etag
+        unless (env["HTTP_IF_NONE_MATCH"] == etag and RefinerySetting.find_or_set(:themes_use_etags, false))
           [200, {
                   "Content-Type" => Rack::Mime.mime_type(file_path.extname),
                   "ETag" => etag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.8
+  version: 0.9.6.9
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +13:00
+date: 2010-02-16 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -69,7 +69,6 @@ files:
 - doc/.yardoc/checksums
 - doc/.yardoc/objects/root.dat
 - doc/.yardoc/proxy_types
-- lib/attachment_fu_patch.rb
 - lib/refinery_initializer.rb
 - license.md
 - public/.htaccess
@@ -509,6 +508,7 @@ files:
 - vendor/plugins/refinery/lib/refinery/admin_base_controller.rb
 - vendor/plugins/refinery/lib/refinery/application_controller.rb
 - vendor/plugins/refinery/lib/refinery/application_helper.rb
+- vendor/plugins/refinery/lib/refinery/attachment_fu_patch.rb
 - vendor/plugins/refinery/lib/refinery/base_presenter.rb
 - vendor/plugins/refinery/lib/refinery/form_helpers.rb
 - vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb