forge-cli 0.0.18 → 0.1.0

data/lib/forge/app/controllers/forge/help_topics_controller.rb

@@ -20,8 +20,8 @@ class Forge::HelpTopicsController < ForgeController
     @page_title = "Searching Help for: #{params[:q]}"
     q = params[:q] ? params[:q] : ""
     @help_topics = HelpTopic.where(
-      "content LIKE :q OR title LIKE :q",
-      {:q => q}
+      "LOWER(content) LIKE :q OR LOWER(title) LIKE :q",
+      {:q => q.downcase}
     )
     respond_to do |format|
       format.js { render :layout => false }

data/lib/forge/app/controllers/forge/posts_controller.rb

@@ -69,6 +69,7 @@ class Forge::PostsController < ForgeController
   end
 
   private
+
     def get_collections
       @categories = PostCategory.order(:title)
     end

data/lib/forge/app/controllers/forge/products_controller.rb

@@ -3,10 +3,6 @@ class Forge::ProductsController < ForgeController
   before_filter :get_categories, :except => [:destroy, :reorder]
   load_and_authorize_resource :except => [:edit]
 
-  # TODO: see if we need this stuff
-  # before_filter :prevent_publication, :only => [:update, :create]
-  # cache_sweeper :product_sweeper, :only => [:update, :create, :destroy]
-
   # GET /forge_products
   def index
     # @categories = ProductCategory.find(:all, :order => "list_order ASC")

data/lib/forge/app/controllers/forge/users_controller.rb

@@ -16,7 +16,6 @@ class Forge::UsersController < ForgeController
     @user = User.new
   end
 
-
   def create
     @user = User.new(params[:user])
     @user.role_ids = params[:role_ids]

data/lib/forge/app/controllers/forge_controller.rb

@@ -16,14 +16,15 @@ class ForgeController < ApplicationController
   end
 
   def get_menu_items
-    require 'rails/application/route_inspector'
-
+    # TODO: we're really not supposed to be reading the routes like this
     # Read the routes to find out which partials to load to build the menu
-    inspector = Rails::Application::RouteInspector.new
-    controllers = inspector.collect_routes(Rails.application.routes.routes).select do |route|
-      route[:reqs].match('forge')
+    routes = Rails.application.routes.routes
+    inspector = ActionDispatch::Routing::RoutesInspector.new(routes)
+    formatter = ActionDispatch::Routing::ConsoleFormatter.new
+    controllers = inspector.format(formatter).split("\n").select do |route|
+      route.match('forge')
     end.map do |route|
-      route[:reqs].gsub('forge/', '').gsub(/#.*/, '')
+      route.gsub(/.*\)\s+/,'').gsub("forge/","").gsub(/#.*/, "")
     end
     @menu_items = controllers.reject {|c| c == "index"}.uniq!
   end

data/lib/forge/app/controllers/posts_controller.rb

@@ -1,8 +1,6 @@
 class PostsController < ApplicationController
   before_filter :get_archive_months, :only => [:index, :category, :show]
   before_filter :get_post_categories
-  # TODO: re-enable caching
-  # caches_page :index, :feed
 
   def index
     @page_title = "Latest News"

data/lib/forge/app/controllers/sessions_controller.rb

@@ -1,8 +1,7 @@
 class SessionsController < Devise::SessionsController
   def new
-    resource = build_resource
+    self.resource = resource_class.new(sign_in_params)
     clean_up_passwords(resource)
-    # respond_with_navigational(resource, stub_options(resource)){ render_with_scope :new }
     render :template => "devise/sessions/new"
   end
 
@@ -32,4 +31,4 @@ class SessionsController < Devise::SessionsController
       end
     end
   end
-end
+end

data/lib/forge/app/helpers/forge_helper.rb

@@ -98,8 +98,8 @@ module ForgeHelper
   def action_link(title, link, options = {})
     klass = options[:class] unless options[:class].blank?
     confirmation = options[:confirm] unless options[:confirm].blank?
-    icon_link = link_to(icon_tag(options[:icon]), link, :confirm => confirmation) + "<br />".html_safe if options[:icon]
-    title_link = content_tag(:small, link_to(title, link, :confirm => confirmation))
+    icon_link = link_to(icon_tag(options[:icon]), link, :data => { :confirm => confirmation }) + "<br />".html_safe if options[:icon]
+    title_link = content_tag(:small, link_to(title, link, :data => { :confirm => confirmation }))
     content = icon_link.blank? ? title_link.html_safe  : icon_link.html_safe  + title_link.html_safe
     return content_tag(:div, content.html_safe, :class => "item-action #{klass}")
   end

data/lib/forge/app/models/address.rb

@@ -15,6 +15,9 @@ class Address < ActiveRecord::Base
   validates_presence_of :country_id
   validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
 
+  # open up everything for mass assignment
+  attr_protected
+
   def self.valid_types
     ['billing', 'shipping']
   end

data/lib/forge/app/models/asset.rb

@@ -1,18 +1,17 @@
 class Asset < ActiveRecord::Base
   require 'mime/types'
-  include Sprockets::Helpers::IsolatedHelper
-  include Sprockets::Helpers::RailsHelper
-
 
   acts_as_taggable
   has_attached_file :attachment, :styles => {:thumbnail => "120x108#", :medium => "800x800>"}
   before_attachment_post_process :prevent_pdf_thumbnail
 
-
-  default_scope :order => "assets.created_at DESC"
+  default_scope { order("assets.created_at DESC") }
+  
+  # open up everything for mass assignment
+  attr_protected
 
   def swfupload_file!(data, filename)
-    data.content_type = MIME::Types.type_for(data.original_filename).to_s
+    data.content_type = MIME::Types.type_for(data.original_filename).first.content_type rescue ""
     self.attachment = data
     self.title = filename
   end
@@ -50,13 +49,13 @@ class Asset < ActiveRecord::Base
     when /image/
       attachment.url(:thumbnail)
     when /audio/
-      asset_path "forge/asset-icons/audio.jpg"
+      ActionController::Base.helpers.asset_path "forge/asset-icons/audio.jpg"
     when /excel/
-      asset_path "forge/asset-icons/spreadsheet.jpg"
+      ActionController::Base.helpers.asset_path "forge/asset-icons/spreadsheet.jpg"
     when /pdf/
-      asset_path "forge/asset-icons/pdf.jpg"
+      ActionController::Base.helpers.asset_path "forge/asset-icons/pdf.jpg"
     else
-      asset_path "forge/asset-icons/misc.jpg"
+      ActionController::Base.helpers.asset_path "forge/asset-icons/misc.jpg"
     end
   end
 

data/lib/forge/app/models/banner.rb

@@ -1,11 +1,13 @@
 class Banner < ActiveRecord::Base
   # Scopes, attachments, etc.
   include Forge::Reorderable
-  scope :published, where(:published => true)
+  scope :published, -> { where(:published => true) }
   has_attached_file :photo, :styles => {:banner => "800x800>", :thumbnail => "120x108#"}, :default_style => :banner
   can_use_asset_for :photo
 
   # Validations
   validates_presence_of :title
   validates_attachment_presence :photo
+  # open up everything for mass assignment
+  attr_protected
 end

data/lib/forge/app/models/comment.rb

@@ -11,11 +11,16 @@ class Comment < ActiveRecord::Base
   attr_protected :approved
   attr_accessor :subscribe, :controller
 
-  default_scope :order => "created_at DESC"
-  scope :approved, where(:approved => true).order("created_at ASC")
+  default_scope { order("created_at DESC") }
+  scope :approved, -> { where(:approved => true).order("created_at ASC") }
+
+  # open up everything for mass assignment
+  attr_protected
 
   # Comment/uncomment this to turn off/on moderation
   # before_save :approve
+  
+  after_save :handle_subscribers
 
   def self.create_comment(object, session)
     session.blank? ? Comment.new(:commentable_type => object.class.to_s, :commentable_id => object.id) : Comment.new(session)
@@ -61,4 +66,14 @@ class Comment < ActiveRecord::Base
     return "<div class='errorExplanation' id='errorExplanation'>There were problems with the following fields:<ul>#{errors}<ul></div>"
   end
 
+  private
+
+    def handle_subscribers
+      # create subscriber
+      CommentSubscriber.create(:commentable => self.commentable, :email => self.author_email) if self.subscribe.to_i == 1
+
+      # notify subscribers
+      self.commentable.subscribers.each {|subscriber| CommentMailer.comment_notification(subscriber.email, self).deliver} if self.approved?
+    end
+
 end

data/lib/forge/app/models/comment_subscriber.rb

@@ -3,6 +3,9 @@ class CommentSubscriber < ActiveRecord::Base
   validates_uniqueness_of :email, :scope => [:commentable_id, :commentable_type]
   belongs_to :commentable, :polymorphic => true
   
+  # open up everything for mass assignment
+  attr_protected
+
   def list(object)
     self.where(:commentable_id => object.id, :commentable_type => object.class)
   end

data/lib/forge/app/models/contact.rb

@@ -4,6 +4,9 @@ class Contact
   extend ActiveModel::Naming
 
   attr_accessor :name, :email, :phone, :content, :subject
+  
+  # open up everything for mass assignment
+  attr_protected
 
   validates_presence_of :name
   validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i

data/lib/forge/app/models/country.rb

@@ -1,7 +1,7 @@
 class Country < ActiveRecord::Base
   # Scopes, Attrs, Etc.
-  scope :active, where(:active => true).order("top_of_list DESC, title ASC")
-  scope :alphabetical, order("title ASC")
+  scope :active, -> { where(:active => true).order("top_of_list DESC, title ASC") }
+  scope :alphabetical, -> { order("title ASC") }
 
   # Relationships
   has_many :provinces
@@ -12,6 +12,9 @@ class Country < ActiveRecord::Base
   validates_presence_of :title, :code
   validates_uniqueness_of :title, :code
 
+  # open up everything for mass assignment
+  attr_protected
+
   def self.options_for_select
     Country.active.all.collect { |c| [c.title, c.id] }
   end

data/lib/forge/app/models/dispatch.rb

@@ -12,10 +12,13 @@ class Dispatch < ActiveRecord::Base
 
   validates_presence_of :subject, :content
   
+  # open up everything for mass assignment
+  attr_protected
+
   after_save :update_dispatch_links
   
   def deliver!(group_ids = [])
-    subscribers = group_ids.blank? ? Subscriber.all : SubscriberGroup.find_all_by_id(group_ids).map(&:subscribers).flatten.uniq
+    subscribers = group_ids.blank? ? Subscriber.all : SubscriberGroup.where(id: group_ids).to_a.map(&:subscribers).flatten.uniq
     subscribers.each {|s| 
       qd = QueuedDispatch.create(:subscriber => s, :dispatch => self)
       qd.send!
@@ -57,7 +60,7 @@ class Dispatch < ActiveRecord::Base
       doc = Hpricot(self.content)
       links = doc.search('a')
       links.each_with_index do |link, i|
-        dispatch_link = DispatchLink.find_or_initialize_by_position_and_dispatch_id(i, self.id)
+        dispatch_link = DispatchLink.find_or_initialize_by(position: i, dispatch_id: self.id)
         dispatch_link.uri = link["href"] and dispatch_link.save!
       end
     

data/lib/forge/app/models/dispatch_bounce.rb

@@ -1,2 +1,5 @@
 class DispatchBounce < ActiveRecord::Base
+  # open up everything for mass assignment
+  attr_protected
+
 end

data/lib/forge/app/models/dispatch_link.rb

@@ -2,11 +2,14 @@ class DispatchLink < ActiveRecord::Base
   # Relationships
   belongs_to :dispatch, :foreign_key => :dispatch_id
   has_many :clicks, :class_name => "DispatchLinkClick"
-  default_scope :order => "clicks_count DESC"
+  default_scope { order("clicks_count DESC") }
   
   # Validations
   # validates_presence_of :uri
   # validates_presence_of :dispatch
   # validates_uniqueness_of :position, :scope => :dispatch_id
   
+  # open up everything for mass assignment
+  attr_protected
+
 end

data/lib/forge/app/models/dispatch_link_click.rb

@@ -1,3 +1,7 @@
 class DispatchLinkClick < ActiveRecord::Base
   belongs_to :dispatch_link, :counter_cache => :clicks_count
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

data/lib/forge/app/models/dispatch_open.rb

@@ -1,3 +1,7 @@
 class DispatchOpen < ActiveRecord::Base
-  default_scope :order => "created_at DESC"
+  default_scope { order("created_at DESC") }
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

data/lib/forge/app/models/dispatch_unsubscribe.rb

@@ -2,4 +2,8 @@ class DispatchUnsubscribe < ActiveRecord::Base
   belongs_to :dispatch
   validates_presence_of :email
   validates_uniqueness_of :email, :scope => :dispatch_id
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

data/lib/forge/app/models/event.rb

@@ -1,12 +1,14 @@
 class Event < ActiveRecord::Base
   # Scopes, attachments, etc.
-  scope :published, where(:published => true)
+  scope :published, -> { where(:published => true) }
   scope :upcoming, lambda { { :where => ["ends_at > ?", Time.now], :order => "starts_at" } }
   scope :past, lambda { { :where => ["ends_at < ?", Time.now], :order => "starts_at" } }
 
   attr_accessor :starts_at_date, :starts_at_time, :ends_at_date, :ends_at_time
   before_save :set_starts_at, :set_ends_at
 
+  # open up everything for mass assignment
+  attr_protected
 
   # Validations
   validates_presence_of :title

data/lib/forge/app/models/gallery.rb

@@ -4,8 +4,11 @@ class Gallery < ActiveRecord::Base
   accepts_nested_attributes_for :photos, :allow_destroy => true, :reject_if => lambda { |p| p[:file_asset_id].blank? && p[:id].blank? }
   validates_presence_of :title
   validates_uniqueness_of :title
-  default_scope :order => 'galleries.list_order'
+  default_scope { order('galleries.list_order') }
   
+  # open up everything for mass assignment
+  attr_protected
+
   def self.find_with_photos(id)
     includes(:photos).order('photos.list_order').find(id)
   end

data/lib/forge/app/models/help_topic.rb

@@ -3,7 +3,10 @@ class HelpTopic < ActiveRecord::Base
   validates_format_of :slug, :with => /\A[a-zA-Z0-9_-]+\z/
   validates_uniqueness_of :slug, :scope => :language
   before_save :convert_content_to_html
-  default_scope where(:language => I18n.locale.to_s)
+  default_scope { where(:language => I18n.locale.to_s) }
+
+  # open up everything for mass assignment
+  attr_protected
 
 protected
 

data/lib/forge/app/models/line_item.rb

@@ -24,8 +24,8 @@ class LineItem < ActiveRecord::Base
   # then enumerate through them and add up their rates
   def applicable_tax_rate(billing_address)
     raise "billing address must be an Address" unless billing_address.kind_of? Address
-    applicable_tax_rates = self.product.tax_rates.find_all_by_country_id(billing_address.country_id)
-    applicable_tax_rates += self.product.tax_rates.find_all_by_province_id(billing_address.province_id) if billing_address.province_id
+    applicable_tax_rates = self.product.tax_rates.where(country_id: billing_address.country_id).to_a
+    applicable_tax_rates += self.product.tax_rates.where(province_id: billing_address.province_id).to_a if billing_address.province_id
     # use uniq to ensure we don't charge tax too many times - it's possible to get overlapping rates between a country and its provinces
     applicable_tax_rates.uniq.inject(0.0) { |sum, applicable_tax_rate| sum += applicable_tax_rate.rate }
   end

data/lib/forge/app/models/order.rb

@@ -14,7 +14,7 @@ class Order < ActiveRecord::Base
 
   accepts_nested_attributes_for :line_items, :reject_if => proc { |attributes| attributes['quantity'].blank? }
 
-  scope :not_pending, where("state != 'pending'")
+  scope :not_pending, -> { where("state != 'pending'") }
 
   validates_presence_of :key
   validates_uniqueness_of :key

data/lib/forge/app/models/order_transaction.rb

@@ -2,6 +2,9 @@ class OrderTransaction < ActiveRecord::Base
   belongs_to :order
   serialize :params
 
+  # open up everything for mass assignment
+  attr_protected
+
   class << self
     def authorize(amount, credit_card, options = {})
       process('authorization', amount) do |gw|

data/lib/forge/app/models/page.rb

@@ -2,14 +2,14 @@ class Page < ActiveRecord::Base
   # Scopes, Attrs, Etc.
   acts_as_nested_set
   attr_protected :lft, :rgt
-  default_scope :order => "pages.lft, pages.list_order"
-  scope :published, where(:published => true)
-  scope :find_for_menu, published.where("parent_id IS NULL AND show_in_menu = ?", true).includes(:subpages)
-  scope :top, where(:parent_id => nil)
+  default_scope { order("pages.lft, pages.list_order") }
+  scope :published, -> { where(:published => true) }
+  scope :find_for_menu, -> { published.where("parent_id IS NULL AND show_in_menu = ?", true).includes(:subpages) }
+  scope :top, -> { where(:parent_id => nil) }
 
   # Relationships
   belongs_to :parent, :class_name => "Page", :foreign_key => "parent_id"
-  has_many :subpages, :class_name => "Page", :foreign_key => "parent_id", :dependent => :destroy, :order => "list_order"
+  has_many :subpages, -> { order "list_order" }, :class_name => "Page", :foreign_key => "parent_id", :dependent => :destroy
 
   # Validations
   before_validation :set_slug_and_path

data/lib/forge/app/models/photo.rb

@@ -2,5 +2,9 @@ class Photo < ActiveRecord::Base
   belongs_to :gallery, :class_name => "Gallery", :foreign_key => "gallery_id"
   has_attached_file :file, :styles => {:thumbnail => "120x108#", :medium => "800x600>"}
   can_use_asset_for :file
-  default_scope :order => :list_order
+  default_scope { order(:list_order) }
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

data/lib/forge/app/models/post.rb

@@ -3,7 +3,7 @@ class Post < ActiveRecord::Base
   attr_accessor :created_at_date, :created_at_time
   scope :posted, lambda { where("created_at <= ? AND published = ?", Time.now, true) }
   scope :for_archive, lambda { |year, month| where(Post.for_archive_conditions(year, month)) }
-  default_scope :order => "created_at DESC"
+  default_scope { order("created_at DESC") }
 
   # Relationships
   has_and_belongs_to_many :post_categories
@@ -16,6 +16,8 @@ class Post < ActiveRecord::Base
 
   before_save :set_created_at
 
+  # open up everything for mass assignment
+  attr_protected
 
   def to_param
     "#{id}-#{title.parameterize}"