refinerycms 0.9.6.34 → 0.9.7

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

@@ -1,5 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-  map.namespace(:admin) do |admin|
+  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
     admin.resources :images, :collection => {:insert => :get}
   end
 end

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

@@ -4,7 +4,7 @@ namespace :images do
   task :regenerate => :environment do
     thumbnails_size = Image.count(:conditions => "parent_id IS NOT NULL")
     puts "Preparing to delete #{thumbnails_size} generated thumbnails"
-        
+
     if Image.destroy_all("parent_id IS NOT null")
       puts "--> #{thumbnails_size} thumbnails deleted"
     else
@@ -16,7 +16,7 @@ namespace :images do
     
     originals.each do |image|
       begin
-        image.save
+        image.rebuild_thumbnails!
       rescue Exception => e  
         puts "--> ERROR image #{image.id} could not be saved because #{e.message}"
       end
@@ -27,19 +27,19 @@ namespace :images do
 
   desc "Update thumbnails. Useful for when you have added new thumbnail sizes and you just need to regenerate those without regenerating all the thumbnails again."
   task :update => :environment do
-		originals = Image.originals
+    originals = Image.originals
 
     puts "Preparing to update #{originals.size} images. This may take a few minutes. Please wait..."
 
     originals.each do |image|
       begin
-        image.save
+        image.rebuild_missing_thumbnails!
       rescue Exception => e  
         puts "--> ERROR image #{image.id} could not be saved because #{e.message}"
       end
     end
 
     puts "Thumbnail update complete."
-	end
-	
+  end
+  
 end

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

@@ -1,8 +1,10 @@
 Refinery::Plugin.register do |plugin|
   plugin.title = "Images"
+  plugin.name = "refinery_images"
+  plugin.directory = "images"
   plugin.description = "Manage images"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/image(_dialog)?s$/
+  plugin.menu_match = /(refinery|admin)\/image(_dialog)?s$/
   plugin.activity = {
     :class => Image,
     :title => 'title',
@@ -11,4 +13,6 @@ Refinery::Plugin.register do |plugin|
     :created_image => "image_add.png",
     :updated_image => "image_edit.png"
   }
+  # this tells refinery where this plugin is located on the filesystem and helps with urls.
+  plugin.directory = directory
 end

data/vendor/plugins/images/readme.md

@@ -0,0 +1,58 @@
+# Images
+
+![Refinery Images](http://refinerycms.com/system/images/0000/0616/images.png)
+
+## About
+
+All Refinery's images are stored in one place, the images plugin. You can customise what sized thumbnails are generated when an image is uploaded.
+
+Images and other file uploads are handled using [attachment_fu](http://github.com/technoweenie/attachment_fu)
+
+## Generating Thumbnails
+
+Refinery lets you generate a range of thumbnails when an image is uploaded so you can output this on a page in an appropriate size.
+
+To specify the sizes of your thumbnails edit the "Image Thumbnails" setting.
+
+This setting is stored as a serialized hash and is directly passed to [attachment_fu](http://github.com/technoweenie/attachment_fu)
+
+Here's what the default looks like
+
+    ---
+    :dialog_thumb: c106x106
+    :preview: c96x96
+    :medium: 225x255>
+    :large: 450x450>
+    :small: 110x110>
+    :grid: c135x135
+
+Refinery requires some of these, so you won't want to delete any, but add new ones to meet your design needs. Each thumbnail is not just a size guide but a [RMagick geometry string](http://www.imagemagick.org/RMagick/doc/imusage.html#geometry) that allows you to define min and max size too.
+
+Refinery also extends the [geometry string](http://www.imagemagick.org/RMagick/doc/imusage.html#geometry) support to allow cropping. Here's some examples
+
+    :grid: c135x135
+
+This will crop (_that's what the "c" stands for_) the grid thumbnail down to ``135x135`` exactly, without stretching the image.
+
+_Note: you will have to restart your web server after changing this setting for the changes to take effect._
+
+## Using a Thumbnail Size in Your Theme or View
+
+Take the default thumbnails above to use the ``:large`` thumbnail I would collect that image out of the database and apply it like this in my view:
+
+    <%= image_fu @image, :large %>
+
+``image_fu`` is a command we have created that automatically adds width and height attributes to the generated image so that web browsers render your pages more smoothly as they know in advance how big an image is going to be before it is fully downloaded.
+
+If I wanted to replace all the images inside a content section without the user having to resize images in the editor then I would use the built in ``content_fu`` command like this in my view:
+
+    <%= content_fu @page[:body], :large %>
+
+``content_fu`` is a command we have created that automatically changes all images with the url /system/images to use a particular thumbnail size. This makes it easy to protect your pages from having gigantic images inserted into them that blow out the design.
+
+## Related Settings
+
+### "Preferred Image View"
+
+Set to ``"grid"`` to get your images to display as a grid of thumbnails
+Set to ``"list"`` to get your images to display as a list with image titles.

data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb

@@ -2,18 +2,27 @@ class Admin::InquiriesController < Admin::BaseController
 
   crudify :inquiry, :title_attribute => "name", :order => "created_at DESC"
 
+  before_filter :get_spam_count, :only => [:index, :spam]
+
   def index
-    @grouped_inquiries = []
+    @grouped_inquiries = group_by_date(Inquiry.ham)
+  end
 
-    Inquiry.all.each do |inquiry|
-      key = inquiry.created_at.strftime("%Y-%m-%d")
-      inquiry_group = @grouped_inquiries.collect{|inquiries| inquiries.last if inquiries.first == key }.flatten.compact << inquiry
-      (@grouped_inquiries.delete_if {|i| i.first == key}) << [key, inquiry_group]
-    end
+  def spam
+    @grouped_inquiries = group_by_date(Inquiry.spam)
   end
 
-  def show
+  def toggle_spam
     find_inquiry
+    @inquiry.toggle!(:spam)
+
+    redirect_to :back
+  end
+
+protected
+
+  def get_spam_count
+    @spam_count = Inquiry.count(:conditions => {:spam => true})
   end
 
 end

data/vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb

@@ -1,16 +1,12 @@
 class Admin::InquirySettingsController < Admin::BaseController
 
-  crudify :inquiry_setting, :title_attribute => "name", :order => 'name ASC'
+  crudify :inquiry_setting, :title_attribute => "name", :order => 'name ASC', :redirect_to_url => "admin_inquiries_url"
 
-  def update
-    @inquiry_setting.update_attributes(params[:inquiry_setting])
+  before_filter :set_url_override?, :only => [:edit]
 
-    if @inquiry_setting.valid?
-      flash[:notice] = "'#{@inquiry_setting.name}' was successfully updated."
-      redirect_to admin_inquiries_url
-    else
-      render :action => 'edit'
-    end
+protected
+  def set_url_override?
+    @url_override = admin_inquiry_setting_url(@inquiry_setting, :dialog => from_dialog?)
   end
 
 end

data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb

@@ -7,7 +7,7 @@ class InquiriesController < ApplicationController
   end
 
   def thank_you
-    @page = Page.find_by_menu_match("^/inquiries/thank_you$", :include => [:parts, :slugs])
+    @page = Page.find_by_link_url("/contact/thank_you", :include => [:parts, :slugs])
   end
 
   def new
@@ -18,16 +18,18 @@ class InquiriesController < ApplicationController
     @inquiry = Inquiry.new(params[:inquiry])
 
     if @inquiry.save
-      begin
-        InquiryMailer.deliver_notification(@inquiry, request)
-      rescue
-        logger.warn "There was an error delivering an inquiry notification.\n#{$!}\n"
-      end
-
-      begin
-        InquiryMailer.deliver_confirmation(@inquiry, request)
-      rescue
-        logger.warn "There was an error delivering an inquiry confirmation:\n#{$!}\n"
+      if @inquiry.ham?
+        begin
+          InquiryMailer.deliver_notification(@inquiry, request)
+        rescue
+          logger.warn "There was an error delivering an inquiry notification.\n#{$!}\n"
+        end
+
+        begin
+          InquiryMailer.deliver_confirmation(@inquiry, request)
+        rescue
+          logger.warn "There was an error delivering an inquiry confirmation:\n#{$!}\n"
+        end
       end
 
       redirect_to thank_you_inquiries_url
@@ -39,7 +41,7 @@ class InquiriesController < ApplicationController
 protected
 
   def find_page
-    @page = Page.find_by_link_url('/inquiries/new', :include => [:parts, :slugs])
+    @page = Page.find_by_link_url('/contact', :include => [:parts, :slugs])
   end
 
 end

data/vendor/plugins/inquiries/app/models/inquiry.rb

@@ -1,13 +1,140 @@
 class Inquiry < ActiveRecord::Base
 
-  validates_presence_of :name
+  validates_presence_of :name, :message
   validates_format_of :email,
-                      :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i,
-                      :message => 'must be valid'
+                      :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
 
-  acts_as_indexed :fields => [:name, :email, :message, :phone],
-                  :index_file => [Rails.root.to_s, "tmp", "index"]
+  acts_as_indexed :fields => [:name, :email, :message, :phone]
 
-  default_scope :order => 'created_at DESC'
+  named_scope :newest, :order => 'created_at DESC'
+
+  named_scope :ham, lambda {{:conditions => {:spam => false}, :order => 'created_at DESC'}}
+  named_scope :spam, lambda {{:conditions => {:spam => true}, :order => 'created_at DESC'}}
+
+  before_validation_on_create :calculate_spam_score
+
+  cattr_accessor :spam_words
+  self.spam_words = %w{
+    -online 4u 4-u acne adipex advicer baccarrat blackjack bllogspot booker buy byob carisoprodol
+    casino chatroom cialis coolhu credit-card-debt cwas cyclen cyclobenzaprine
+    day-trading debt-consolidation discreetordering duty-free dutyfree equityloans fioricet
+    freenet free\s*shipping gambling- hair-loss homefinance holdem incest jrcreations leethal levitra macinstruct
+    mortgagequotes nemogs online-gambling ottawavalleyag ownsthis paxil penis pharmacy phentermine
+    poker poze pussy ringtones roulette shemale shoes -site slot-machine thorcarlson
+    tramadol trim-spa ultram valeofglamorganconservatives viagra vioxx xanax zolus
+  }
+
+  def self.latest(number = 7)
+    newest.find(:all, :limit => number)
+  end
+
+  def ham?
+    not spam?
+  end
+
+  def ham!
+    self.update_attribute(:spam, false)
+  end
+
+  def spam!
+    self.update_attribute(:spam, true)
+  end
+
+protected
+
+  # heavily based off http://github.com/rsl/acts_as_snook
+  # which is based off http://snook.ca/archives/other/effective_blog_comment_spam_blocker
+
+  def score_for_body_links
+    link_count = self.message.to_s.scan(/http:/).size
+    link_count > 2 ? -link_count : 2
+  end
+
+  def score_for_body_length
+    if self.message.to_s.length > 20 and self.message.to_s.scan(/http:/).size.zero?
+      2
+    else
+      -1
+    end
+  end
+
+  def score_for_previous_inquiries
+    current_score = 0
+
+    Inquiry.find(:all, :conditions => {:email => email}).each do |i|
+      if i.spam?
+        current_score -= 1
+      else
+        current_score += 1
+      end
+    end
+
+    current_score
+  end
+
+  def score_for_spam_words
+    current_score = 0
+
+    spam_words.each do |word|
+      regex = /#{word}/i
+      current_score -= 1 if message =~ regex || name =~ regex || phone =~ regex
+    end
+
+    current_score
+  end
+
+  def score_for_suspect_url
+    current_score = 0
+
+    regex = /http:\/\/\S*(\.html|\.info|\?|&|free)/i
+    current_score =- (1 * message.to_s.scan(regex).size)
+  end
+
+  def score_for_suspect_tld
+    regex = /http:\/\/\S*\.(de|pl|cn)/i
+    message.to_s.scan(regex).size * -1
+  end
+
+  def score_for_lame_body_start
+    message.to_s.strip =~ /^(interesting|sorry|nice|cool)/i ? -10 : 0
+  end
+
+  def score_for_author_link
+    name.to_s.scan(/http:/).size * -2
+  end
+
+  def score_for_same_body
+    Inquiry.count(:conditions => {:message => message}) * -1
+  end
+
+  def score_for_consonant_runs
+    current_score = 0
+
+    [name, message, phone, email].each do |field|
+      field.to_s.scan(/[bcdfghjklmnpqrstvwxz]{5,}/).each do |run|
+        current_score =- run.size - 4
+      end
+    end
+
+    current_score
+  end
+
+  def calculate_spam_score
+    score = 0
+    score += score_for_body_links
+    score += score_for_body_length
+    score += score_for_previous_inquiries
+    score += score_for_spam_words
+    score += score_for_suspect_tld
+    score += score_for_lame_body_start
+    score += score_for_author_link
+    score += score_for_same_body
+    score += score_for_consonant_runs
+    self.spam = (score < 0)
+
+    logger.info("spam score was #{score}")
+
+    true
+  end
 
 end

data/vendor/plugins/inquiries/app/models/inquiry_mailer.rb

@@ -1,7 +1,7 @@
 class InquiryMailer < ActionMailer::Base
 
   def confirmation(inquiry, request)
-    subject     "Thank you for your inquiry"
+    subject     InquirySetting.confirmation_subject.value
     recipients  inquiry.email
     from        "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
     reply_to    InquirySetting.notification_recipients.value.split(',').first
@@ -10,7 +10,7 @@ class InquiryMailer < ActionMailer::Base
   end
 
   def notification(inquiry, request)
-    subject     "New inquiry from your website"
+    subject     InquirySetting.notification_subject.value
     recipients  InquirySetting.notification_recipients.value
     from        "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
     sent_on     Time.now

data/vendor/plugins/inquiries/app/models/inquiry_setting.rb

@@ -1,11 +1,60 @@
 class InquirySetting < ActiveRecord::Base
 
   def self.confirmation_body
-    find_or_create_by_name("Confirmation Body")
+    find_or_create_by_name( :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)
+  end
+
+  def self.confirmation_subject
+    find_or_create_by_name( :name => "Confirmation Subject",
+                            :value => "Thank you for your inquiry",
+                            :destroyable => false)
   end
 
   def self.notification_recipients
-    find_or_create_by_name("Notification Recipients")
+    find_or_create_by_name( :name => "Notification Recipients",
+                            :destroyable => false)
+  end
+
+  def self.notification_subject
+    find_or_create_by_name( :name => "Notification Subject",
+                            :value => "New inquiry from your website",
+                            :destroyable => false)
+  end
+
+  def deletable?
+    false
+  end
+
+  # Access method that allows dot notation to work.
+  # Say you had a setting called "site_name". You could access that by going RefinerySetting[:site_name]
+  # but with this you can also access that by going RefinerySettting.site_name
+  def self.method_missing(method, *args)
+    method_name = method.to_s
+    super(method, *args)
+
+  rescue NoMethodError
+    if method_name =~ /=$/
+      self[method_name.gsub('=', '')] = args.first
+    else
+      self[method_name]
+    end
+  end
+
+  def self.find_or_set(name, the_value)
+    find_or_create_by_name(:name => name.to_s, :value => the_value).value
+  end
+
+  def self.[](name)
+    setting = self.find_by_name(name.to_s)
+    setting.value unless setting.nil?
+  end
+
+  def self.[]=(name, value)
+    setting = find_or_create_by_name(name.to_s)
+    setting.value = value
+    setting.save
   end
 
 end