forge-cli 0.0.18 → 0.1.0

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

@@ -1,4 +1,8 @@
 class PostCategory < ActiveRecord::Base
   has_and_belongs_to_many :posts
   validates_uniqueness_of :title
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

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

@@ -1,8 +1,8 @@
 class Product < ActiveRecord::Base
   # Scopes and Inclusions
   include Forge::Reorderable
-  default_scope :order => 'products.list_order ASC'
-  scope :published, :conditions => ["published = ?", true]
+  default_scope { order('products.list_order ASC') }
+  scope :published, -> { where(published: true) }
 
   # Relationships
   has_many :images, :class_name => "ProductImage"
@@ -17,6 +17,8 @@ class Product < ActiveRecord::Base
   validates_presence_of :short_description, :description, :if => :published
   validates_numericality_of :price, :flat_rate_shipping, :weight, :width, :height, :depth, :greater_than_or_equal_to => 0.00
 
+  # open up everything for mass assignment
+  attr_protected
 
   # for when the product is used in the cart or in an order hash
   def quantity

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

@@ -1,6 +1,6 @@
 class ProductCategory < ActiveRecord::Base
   include Forge::Reorderable
-  default_scope :order => 'product_categories.list_order'
+  default_scope { order('product_categories.list_order') }
   before_destroy :validate_destroy
   has_many :products
   belongs_to :sale
@@ -9,6 +9,9 @@ class ProductCategory < ActiveRecord::Base
 
   validates_presence_of :title
 
+  # open up everything for mass assignment
+  attr_protected
+
   def validate_destroy
     products.count < 1
   end

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

@@ -4,4 +4,8 @@ class ProductImage < ActiveRecord::Base
   
   validates_attachment_presence :image
   validates_attachment_content_type :image, :content_type => ['image/gif', 'image/png', 'image/jpeg', 'image/jpg', 'image/pjpeg']
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

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

@@ -1,6 +1,6 @@
 class Province < ActiveRecord::Base
   # Scopes, Attrs, Etc.
-  default_scope order("title ASC")
+  default_scope { order("title ASC") }
 
   # Relationships
   belongs_to :country
@@ -10,6 +10,9 @@ class Province < ActiveRecord::Base
   # Validations
   validates_presence_of :title, :code
   validates_uniqueness_of :title, :code
+
+  # open up everything for mass assignment
+  attr_protected
   
   def self.options_for_select(options={})
     options[:add_blank] ||= false

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

@@ -4,10 +4,13 @@ class QueuedDispatch < ActiveRecord::Base
   belongs_to :subscriber
   
   # Scopes
-  scope :queued, where('sent_at IS NULL')
-  scope :sent, where("sent_at IS NOT NULL")
-  scope :failed, where("failed_attempts > ?", 0)
-  scope :opened, where("opened_at IS NOT NULL")
+  scope :queued, -> { where('sent_at IS NULL') }
+  scope :sent, -> { where("sent_at IS NOT NULL") }
+  scope :failed, -> { where("failed_attempts > ?", 0) }
+  scope :opened, -> { where("opened_at IS NOT NULL") }
+
+  # open up everything for mass assignment
+  attr_protected
   
   # Action Methods
   def send!

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

@@ -1,3 +1,6 @@
 class Role < ActiveRecord::Base
   has_and_belongs_to_many :users
+  validates :title, presence: true
+  attr_accessible :title
+
 end

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

@@ -5,6 +5,8 @@ class Sale < ActiveRecord::Base
   validates_presence_of :title, :description, :start, :end
   validates_numericality_of :value
 
+  # open up everything for mass assignment
+  attr_protected
 
   # Define the types of sale calculation
   @@sale_types =   {:fixed => "All products in this sale are set to the same price. (e.g. Sale = $5.50: Product A = $5.50, Product B = $5.50",

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

@@ -2,4 +2,8 @@ class Subscriber < ActiveRecord::Base
   validates :email, :presence => true, :uniqueness => true
   has_many :subscriber_group_members
   has_many :groups, :through => :subscriber_group_members, :class_name => "SubscriberGroup" 
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

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

@@ -3,4 +3,8 @@ class SubscriberGroup < ActiveRecord::Base
   validates_uniqueness_of :title
   has_many :subscriber_group_members, :foreign_key => :group_id
   has_many :subscribers, :through => :subscriber_group_members
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

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

@@ -1,4 +1,8 @@
 class SubscriberGroupMember < ActiveRecord::Base
   belongs_to :group, :class_name => "SubscriberGroup", :foreign_key => "group_id"
   belongs_to :subscriber
+
+  # open up everything for mass assignment
+  attr_protected
+
 end

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

@@ -8,7 +8,10 @@ class TaxRate < ActiveRecord::Base
   validate :unique_country_and_province
 
   # the new ActiveAssociation stuff is teh bomb!
-  scope :by_country_and_province, joins(:country).joins("LEFT OUTER JOIN provinces ON tax_rates.province_id = provinces.id").order('countries.title, provinces.title')
+  scope :by_country_and_province, -> { joins(:country).joins("LEFT OUTER JOIN provinces ON tax_rates.province_id = provinces.id").order('countries.title, provinces.title') }
+
+  # open up everything for mass assignment
+  attr_protected
   
   protected
 
@@ -19,7 +22,7 @@ class TaxRate < ActiveRecord::Base
         tax_rates = TaxRate.where(:country_id => self.country_id, :province_id => self.province_id).all
       end
       if tax_rates.size > 0
-          errors.add :base, "A tax rate already exists for this country and province"
+        errors.add :base, "A tax rate already exists for this country and province"
       end
     end
 

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

@@ -1,8 +1,7 @@
 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :avatar, :avatar_asset_id, :avatar_asset_url

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

@@ -15,6 +15,8 @@ class Video < ActiveRecord::Base
 
   before_update :revert_if_new_upload
 
+  # open up everything for mass assignment
+  attr_protected
 
   def video=(filename)
     self.video_file_name = filename.gsub('videos/', '')

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

@@ -3,7 +3,7 @@ class VideoFeed < ActiveRecord::Base
   require 'open-uri'
 
   # Scopes, attachments, etc.
-  default_scope :order => "published_at DESC"
+  default_scope { order("published_at DESC") }
 
   # Validations
   validates_presence_of :video_id, :title, :channel
@@ -83,4 +83,4 @@ class VideoFeed < ActiveRecord::Base
       :source => item.link.split("://")[1].split(".com")[0]
       )
   end
-end
+end

data/lib/forge/app/views/forge/assets/_asset.html.haml

@@ -9,4 +9,4 @@
       = asset.list_title
     .spacer
   .float-left= link_to "Edit", edit_forge_asset_path(asset), :class => ("basic-asset-edit" unless asset.attachment_content_type.match(/video/))
-  .float-right= link_to "Delete", forge_asset_path(asset), :method => :delete, :confirm => "Are you sure?"
+  .float-right= link_to "Delete", forge_asset_path(asset), :method => :delete, :data => { :confirm => "Are you sure?" }

data/lib/forge/app/views/forge/posts/_post.html.haml

@@ -4,7 +4,10 @@
     = "(Draft)" unless post.published?
 
     %br/
-    %small Posted in #{post.post_categories.map(&:title).to_sentence}
+    - if post.post_categories.empty?
+      %small Uncategorized
+    - else
+      %small Posted in #{post.post_categories.map(&:title).to_sentence}
   .item-actions
     .item-info{:style => "width: 137px;"}
       %strong= post.created_at.strftime('%B %e, %Y')
@@ -14,4 +17,4 @@
     = edit_link(post)
     = delete_link(post)
 
-  .spacer
+  .spacer

data/lib/forge/app/views/forge/settings/_ecommerce.html.haml

@@ -32,6 +32,10 @@
     = collection_select(:settings, :shipper, @carriers, :name, :name, {:include_blank => true})
     %hr
 
+    %h3 Tax Rates
+    .explanation
+      = link_to "Click here to manage your tax rates", forge_tax_rates_path
+
     .spacer
 
   .spacer

data/lib/forge/app/views/forge/subscribers/_subscriber.html.haml

@@ -2,11 +2,11 @@
   .item-title
     %strong= link_to subscriber.name, "mailto:#{subscriber.email}"
   .item-actions
-    .item-action.edit{:style => "width: 110px;"}<
+    .item-action.edit
       = link_to image_tag('forge/icons/edit.png', :style => "vertical-align: middle;"), edit_forge_subscriber_path(subscriber)
       %small= link_to "Edit", edit_forge_subscriber_path(subscriber)
     .item-action.last<
       = link_to image_tag('forge/icons/delete.png', :style => "vertical-align: middle;"), forge_subscriber_path(subscriber), :method => :delete, :confirm => "Are you sure?"
       %small= link_to "Delete", forge_subscriber_path(subscriber), :method => :delete, :confirm => "Are you sure?"
   
-  .spacer
+  .spacer

data/lib/forge/app/views/user_mailer/approved.html.haml

@@ -1,3 +1,3 @@
 %p You have received a message!  Reply to this email to get in touch with the person who sent it.
 
-%p You can now #{link_to "log in here", "#{MySettings.full_url}/login"}.
+%p You can now #{link_to "log in here", "#{MySettings.site_url}/login"}.

data/lib/forge/config/application.rb

@@ -3,10 +3,9 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
+  # Require the gems listed in Gemfile, including any gems
+  # you've limited to :test, :development, or :production.
+  Bundler.require(:default, Rails.env)
 end
 
 module Forge3
@@ -22,9 +21,6 @@ module Forge3
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
-    # Activate observers that should always be running.
-    config.active_record.observers = :comment_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'Eastern Time (US & Canada)'
@@ -42,8 +38,6 @@ module Forge3
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters << :password << :password_confirmation << :credit_card
 
-    config.action_controller.page_cache_directory = File.join(Rails.public_path, 'system', 'cache')
-
     config.autoload_paths += [
       File.join(Rails.root, 'lib'),
       File.join(Rails.root, 'app', 'form_builders'),

data/lib/forge/config/database.yml.template

@@ -0,0 +1,30 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: mysql2
+  encoding: utf8
+  database: _development
+  username: 
+  password: 
+  socket: 
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  encoding: utf8
+  database: _test
+  username: 
+  password: 
+  socket: 
+
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: true
+  database: _production
+  pool: 5
+  username: 
+  password: 
+  host: 10.200.113.226

data/lib/forge/config/environments/development.rb

@@ -1,14 +1,14 @@
 Forge3::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
+  # Do not eager load code on boot.
+  config.eager_load = false
+
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -34,10 +34,6 @@ Forge3::Application.configure do
   
   # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 999
 end
 
 ActionMailer::Base.raise_delivery_errors = true

data/lib/forge/config/environments/production.rb

@@ -4,6 +4,12 @@ Forge3::Application.configure do
   # e-commerce sites: uncomment this line once the SSL certificate is in place
   # config.force_ssl = true
 
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true

data/lib/forge/config/environments/test.rb

@@ -1,15 +1,17 @@
 Forge3::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
   # The test environment is used exclusively to run your application's
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/lib/forge/config/initializers/ckeditor.rb

@@ -1,147 +1,19 @@
-module Ckeditor
-  module Utils
-    class << self
-      def escape_single_quotes(str)
-        str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
-      end
-      
-      def parameterize_filename(filename)
-        extension = File.extname(filename)
-        basename = filename.gsub(/#{extension}$/, "")
-        
-        [basename.parameterize('_'), extension].join.downcase
-      end
-      
-      def js_replace(dom_id, options = {})
-        js_options = applay_options(options)
-        js = ["if (CKEDITOR.instances['#{dom_id}']) {CKEDITOR.remove(CKEDITOR.instances['#{dom_id}']);}"]
-        
-        if js_options.blank?
-          js << "CKEDITOR.replace('#{dom_id}');"
-        else
-          js << "CKEDITOR.replace('#{dom_id}', { #{js_options} });"
-        end
-        
-        js.join
-      end
-      
-      def js_fileuploader(uploader_type, options = {})
-        options = { :multiple => true, :element => "fileupload" }.merge(options)
-        
-        case uploader_type.to_s.downcase
-          when "image" then
-            options[:action] = "^EDITOR.config.filebrowserImageUploadUrl"
-            options[:allowedExtensions] = Ckeditor.image_file_types
-          when "flash" then
-            options[:action] = "^EDITOR.config.filebrowserFlashUploadUrl"
-            options[:allowedExtensions] = ["swf"]
-          else
-            options[:action] = "^EDITOR.config.filebrowserUploadUrl"
-            options[:allowedExtensions] = Ckeditor.attachment_file_types
-        end
-        
-        js_options = applay_options(options)
-        
-        "$(document).ready(function(){ new qq.FileUploaderInput({ #{js_options} }); });".html_safe
-      end
-      
-      def applay_options(options)
-        str = []
-        
-        options.each do |key, value|
-          item = case value
-            when String then
-              value.split(//).first == '^' ? value.slice(1..-1) : "'#{value}'"
-            when Hash then 
-              "{ #{applay_options(value)} }"
-            when Array then 
-              arr = value.collect { |v| "'#{v}'" }
-              "[ #{arr.join(',')} ]"
-            else value
-          end
-          
-          str << %Q{"#{key}": #{item}}
-        end
-        
-        str.sort.join(',')
-      end
-      
-      def filethumb(filename)
-        extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
-        image = "#{extname}.gif"
-        source = Ckeditor.root_path.join("vendor/assets/javascripts/ckeditor/filebrowser/images/thumbs")
-        
-        unless File.exists?(File.join(source, image))
-          image = "unknown.gif"
-        end
-        
-        File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
-      end
-    end
-  end
-end
-
-module Ckeditor
-  module Helpers
-    module FormBuilder
-      extend ActiveSupport::Concern
-      
-      def cktext_area(method, options = {})
-        @template.send("cktext_area", @object_name, method, objectify_options(options))
-      end
-    end
-  end
-end
-
-module Ckeditor
-  module Helpers
-    module ViewHelper
-      extend ActiveSupport::Concern
-      
-      def cktext_area_tag(name, content = nil, options = {})
-        element_id = sanitize_to_id(name)
-        options = { :language => I18n.locale.to_s }.merge(options)
-        input_html = { :id => element_id }.merge( options.delete(:input_html) || {} )
-        
-        output_buffer = ActiveSupport::SafeBuffer.new
-        output_buffer << text_area_tag(name, content, input_html)
-        output_buffer << javascript_tag(Utils.js_replace(element_id, options))
-        
-        output_buffer
-      end
-    end
-  end
-end
+# Use this hook to configure ckeditor
+Ckeditor.setup do |config|
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require "ckeditor/orm/active_record"
 
+  # Allowed image file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
 
-module Ckeditor
-  module Helpers
-    module FormHelper
-      extend ActiveSupport::Concern
-      
-      include ActionView::Helpers::TagHelper
-      include ActionView::Helpers::JavaScriptHelper
-      
-      def cktext_area(object_name, method, options = {})
-        options = { :language => I18n.locale.to_s }.merge(options)
-        input_html = (options.delete(:input_html) || {})
-        hash = input_html.stringify_keys
-        
-        instance_tag = ActionView::Base::InstanceTag.new(object_name, method, self, options.delete(:object))
-        instance_tag.send(:add_default_name_and_id, hash)
-        
-        output_buffer = ActiveSupport::SafeBuffer.new
-        output_buffer << instance_tag.to_text_area_tag(input_html)
-        output_buffer << javascript_tag(Utils.js_replace(hash['id'], options))
-        
-        output_buffer
-      end
-    end
-  end
-end
+  # Allowed attachment file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # config.attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "swf"]
 
-ActiveSupport.on_load :action_view do
-  ActionView::Base.send :include, Ckeditor::Helpers::ViewHelper
-  ActionView::Base.send :include, Ckeditor::Helpers::FormHelper
-  ActionView::Helpers::FormBuilder.send :include, Ckeditor::Helpers::FormBuilder
+  # Setup authorization to be run as a before filter
+  # config.authorize_with :cancan
 end