refinerycms 0.9.4.3 → 0.9.4.4

data/config/environment.rb

@@ -59,7 +59,7 @@ eval("#{(defined? Refinery::Initializer) ? Refinery::Initializer : Rails::Initia
   # 
 
   config.gem "rake", :version => ">= 0.8.3", :lib => "rake"
-  config.gem "friendly_id", :version => ">= 2.1.4", :lib => "friendly_id"
+  config.gem "friendly_id", :version => ">= 2.2.2", :lib => "friendly_id"
   config.gem "mislav-will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gems.github.com"
   config.gem "rails", :version => ">= 2.3.4", :lib => "rails"
   config.gem "rubyist-aasm", :version => ">= 2.1.1", :lib => "aasm", :source => "http://gems.github.com"

data/config/environments/development.rb

@@ -14,6 +14,4 @@ config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
 
 # Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
-
-ActionMailer::Base.delivery_method = :sendmail
+config.action_mailer.raise_delivery_errors = false

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 => 20090916055243) do
+ActiveRecord::Schema.define(:version => 20091029034951) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"
@@ -49,7 +49,6 @@ ActiveRecord::Schema.define(:version => 20090916055243) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "publish_date"
-    t.text     "blurb"
   end
 
   create_table "page_parts", :force => true do |t|

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 => 10}, 
+  {:name => "activity_show_limit", :value => 25}, 
   {:name => "preferred_image_view", :value => :grid}, 
   {:name => "analytics_page_code", :value => "UA-xxxxxx-x"},
   {:name => "image_thumbnails", :value => {

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

@@ -86,6 +86,10 @@ class User < ActiveRecord::Base
 			end
 		end
 	end
+	
+  def authorized_plugins
+    self.plugins.collect {|p| p.title} | Refinery::Plugins.always_allowed.titles
+  end
 
   def remember_token?
     remember_token_expires_at && Time.now.utc < remember_token_expires_at 

data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb

@@ -9,16 +9,6 @@
 		<%= f.datetime_select :publish_date %>
 	</div>
 	<div class='clearfix' style='width:963px'>
-		<div class='field'>
-			<%= f.label :blurb %>
-			<p>
-				<small>
-					Write something that leads the reader into wanting to read the full article.
-					This should just be a 1 paragraph max intro into the article.
-				</small>
-			</p>
-			<%= f.text_area :blurb, :rows => "5", :class => "wymeditor"%>
-		</div>
 		<div class='field'>
 			<%= f.label :content %>
 			<%= f.text_area :content, :rows => "20", :class => "wymeditor" %>

data/vendor/plugins/news/app/views/news_items/index.html.erb

@@ -9,9 +9,7 @@
 				<p>
 					<small>Published <%= item.publish_date.strftime("%A %d of %B, %Y") %></small>
 				</p>
-				<p>
-					<%= item.blurb %> <%= link_to "Read more", news_item_url(item) %>
-				</p>
+				<%= truncate(item.body, :length => 200, :omission => " ... #{link_to "Read more", news_item_url(item)}", :preserve_html_tags => true) %>
 			<% end %>
 		<% else %>
 			<p><em>Sorry we haven't posted up any news yet.</em></p>

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

@@ -1,20 +1,20 @@
 class PagesController < ApplicationController
 
   def home
-	  @page = Page.find_by_link_url("/", :include => [:parts, :slugs])
-	  error_404 if @page.nil?
+    @page = Page.find_by_link_url("/", :include => [:parts, :slugs])
+    error_404 if @page.nil?
   end
 
-	def show
-	  @page = Page.find(params[:id], :include => [:parts, :slugs])
+  def show
+    @page = Page.find(params[:id], :include => [:parts, :slugs])
 		
-		error_404 unless @page.live?
+    error_404 unless @page.live? or (logged_in? and current_user.authorized_plugins.include?("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")
-			redirect_to first_live_child.url unless first_live_child.nil?
-		end
-	end
+    # 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")
+      redirect_to first_live_child.url unless first_live_child.nil?
+    end
+  end
 
 end

data/vendor/plugins/pages/app/views/pages/show.html.erb

@@ -7,4 +7,9 @@
 	<div id='body_content_right' class='clearfix'>
 		<%= @page[:side_body] %>
 	</div>
-</div>
+</div>
+<% unless @page.live? %>
+	<div style='border: 1px solid #A00027;color: #A00027;background: #FFB1B1;padding:3px 9px;font-weight:bold;width:auto'>
+		This page is NOT live for public viewing.
+	</div>
+<% end %>

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

@@ -1,22 +1,21 @@
 module Refinery
   
-  def self.add_gems
-    ActiveRecord::Base.module_eval do
-  		begin
-  			require 'friendly_id'
-  			require 'will_paginate'
-  			require 'aasm'
-  		rescue LoadError => load_error
-  			# this will stop us running rake gems:install which we don't really want so just trap this error.
-  		end
+  def self.add_gems    
+    ActiveRecord::Base.module_eval do  	  
+      begin
+        require 'friendly_id'
+        require 'will_paginate'
+        require 'aasm'
+      rescue LoadError => load_error
+        # this will stop us running rake gems:install which we don't really want so just trap this error.
+      end
+  		
+      # Stub has_friendly_id. This will get overriden when/if included.
+      # The config will still complain that the gem is missing but this allows it to do so.
+    	def self.has_friendly_id(column, options = {}, &block)
+    	  super if defined? super and table_exists?
+  	  end
   	end
-  	
-  	# Stub has_friendly_id unless it is already included.
-  	# The config will still complain that the gem is missing but this allows it to do so.
-    ActiveRecord::Base.class_eval do
-  	  def self.has_friendly_id(column, options = {}, &block)
-	    end
-	  end unless ActiveRecord::Base.methods.include? 'has_friendly_id'
   end
   
 end

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

@@ -23,7 +23,7 @@ protected
   end
   
   def restrict_plugins
-    Refinery::Plugins.set_active( current_user.plugins.collect {|p| p.title} | Refinery::Plugins.always_allowed.titles ) if current_user.respond_to? :plugins
+    Refinery::Plugins.set_active( current_user.authorized_plugins ) if current_user.respond_to? :plugins
   end
 
 	def restrict_controller

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

@@ -81,4 +81,39 @@ module Refinery::ApplicationHelper
 		image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge!(options)
 	end
 	
+	def truncate(text, *args)
+    truncated = super
+    unless truncated === text
+      options = args.extract_options!
+      if options[:preserve_html_tags]
+        truncated = truncated[0, truncated.length - options[:omission].length]
+        # scan for all HTML tags then the last tag
+        unless (tag_matches = truncated.scan(/<[^<>]{1,}>?/)).empty? or
+          (last_tag = tag_matches.last.gsub(/<|\/|\>/, "").split(" ").first).nil? or
+          last_tag.downcase == "p" or (tag_matches.last.split("<").last.first == "/")
+      
+          # scan until we find the exact tag we're looking for.
+          full_tag = text.scan(Regexp.new("(#{tag_matches.last})([^<]*)(<\/#{last_tag}>)"))[0..2].join("") # 0..2 because it'll be found as 3 tags together.
+          truncated.gsub!(tag_matches.last, full_tag)
+      
+        end
+      
+        truncated = truncated[0, truncated.length-1] if truncated.last == "<" # If a tag almost started, get rid of it.
+
+        # add back on the omission
+        truncated = "#{truncated}#{options[:omission]}"
+
+        # close the paragraph unless it closes already.
+        start_index = truncated.length-"</p>".length-options[:omission].length
+        length = (end_index = options[:omission].length + "</p>".length)
+        unless truncated[start_index, length].downcase == "</p>"
+          truncated = "#{truncated}</p>"
+        end
+      
+      end
+    end
+    
+    truncated
+  end
+	
 end

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

@@ -4,50 +4,50 @@ module Refinery
     def initialize
       @plugins = []
     end
-  
+
     def find_by_title(title)
       self.reject { |plugin| plugin.title != title }.first
     end
-  
+
     def find_by_model(model)
       self.reject { |plugin| plugin.activity.reject {|activity| activity.class != model }.empty? }.first
     end
-    
+
     def find_activity_by_model(model)
       plugin = find_by_model(model)
       plugin.activity.reject {|activity| activity.class != model}.first unless plugin.nil?
     end
-    
+
     def [](title)
       self.find { |plugin| plugin.title == title }
     end
 
-		def self.registered
-		  @registered_plugins ||= self.new
-		end
-		
-		def titles
-			self.collect { |p| p.title }
-		end
-		
-		def in_menu
-			self.reject{ |p| p.hide_from_menu }
-		end
-
-		def self.active
-		  @active_plugins ||= self.new
-		end
-		
-		def self.always_allowed
-			registered.reject { |p| !p.always_allow_access }
-		end
-
-		def self.set_active(titles)
-			active.clear
-		  titles.each do |title|
-		    active << registered[title] if registered[title]
-		  end
-		end
+    def self.registered
+      @registered_plugins ||= self.new
+    end
+
+    def titles
+      self.collect { |p| p.title }
+    end
+
+    def in_menu
+      self.reject{ |p| p.hide_from_menu }
+    end
+
+    def self.active
+      @active_plugins ||= self.new
+    end
+
+    def self.always_allowed
+      registered.reject { |p| !p.always_allow_access }
+    end
+
+    def self.set_active(titles)
+      active.clear
+      titles.each do |title|
+        active << registered[title] if registered[title]
+      end
+    end
 
   end
 end

data/vendor/plugins/refinery/lib/tasks/refinery.rake

@@ -19,7 +19,6 @@ namespace :refinery do
 
     NewsItem.all.each do |ni|
       ni.update_attribute(:body, ni.body.gsub(/\/images\/system\//, "/system/images/"))
-      ni.update_attribute(:blurb, ni.body.gsub(/\/images\/system\//, "/system/images/"))
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.4.3
+  version: 0.9.4.4
 platform: ruby
 authors: 
 - Resolve Digital