forge-cli 0.0.10 → 0.0.11

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

@@ -17,7 +17,7 @@ class HostedPaymentController < ApplicationController
   private
 
     def disallow_if_payment_is_integrated
-      if Forge::Settings[:integrated_payments]
+      if Forge.config.ecommerce.payments == :integrated
         redirect_to "/integrated_payment/billing" and return false
       end
     end

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

@@ -28,7 +28,7 @@ class IntegratedPaymentController < ApplicationController
   private
 
     def disallow_if_payment_is_hosted
-      if !Forge::Settings[:integrated_payments]
+      if Forge.config.ecommerce.payments == :hosted
         redirect_to "/hosted_payment/billing" and return false
       end
     end

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

@@ -119,7 +119,7 @@ private
   end
 
   def redirect_to_payment
-    if Forge::Settings[:integrated_payments]
+    if Forge.config.ecommerce.payments == :integrated
       redirect_to integrated_payment_billing_path
     else
       redirect_to hosted_payment_billing_path

data/lib/forge/app/form_builders/forge_form_builder.rb

@@ -82,9 +82,9 @@ class ForgeFormBuilder < ActionView::Helpers::FormBuilder
     end
 
     def internationalize_content(generator, method_name, content, options = {})
-      if Forge::Settings[:languages]
+      if Forge.config.languages
         content = content_tag(:div, content, :class => "i18n en")
-        Forge::Settings[:languages].each do |lang_title, lang|
+        Forge.config.languages.each do |lang_title, lang|
           content += content_tag(:div, self.send(generator, method_name, options, lang, lang_title), :class => "i18n #{lang}")
         end
         content = framed_content(content, options)

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

@@ -99,9 +99,9 @@ module FormHelper
   end
 
   def language_switcher(table)
-    if Forge::Settings[:languages]
+    if Forge.config.languages
       if I18nLookup.fields[:tables][table]
-        select_tag "current_language", options_for_select([["English", "en"]] + Forge::Settings[:languages].map {|k, v| [k.to_s.titleize, v]})
+        select_tag "current_language", options_for_select([["English", "en"]] + Forge.config.languages.map {|k, v| [k.to_s.titleize, v]})
       end
     end
   end

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

@@ -17,6 +17,10 @@ class Event < ActiveRecord::Base
   validates_format_of :ends_at_time, :with => /\d{1,2}:\d{2}[AaPp][Mm]/i, :message => "must be a valid 12-hour time.", :allow_nil => true
   validates_format_of :ends_at_date, :with => /\d{4}\-\d{1,2}\-\d{2}/, :message => "must match format of YYYY-MM-DD", :allow_nil => true
 
+  def to_param
+    "#{id}-#{title.parameterize}"
+  end
+
   def self.on(year, month=nil, day=nil)
     time = Time.mktime(year, month, day)
     delta = day ? 1.day : month ? 1.month : year ? 1.year : fail

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

@@ -87,7 +87,7 @@ class Order < ActiveRecord::Base
   def shipping
     amount = 0.0
     # raise "A valid shipping address must exist in order to calculate the shipping" if self.shipping_address.blank? || !self.shipping_address.valid?
-    if Forge::Settings[:flat_rate_shipping]
+    if Forge.config.ecommerce.flat_rate_shipping
       amount = self.line_items.inject(0.0) { |sum, line_item| sum += (line_item.quantity * line_item.product.flat_rate_shipping) }
     elsif self.shipping_cost
       amount = self.shipping_cost
@@ -134,7 +134,7 @@ class Order < ActiveRecord::Base
       )
 
       # Run functions to get cost estimates
-      shipper = "ActiveMerchant::Shipping::#{MySettings.shipper.underscore.parameterize('_').camelize}".constantize.new(Forge::Settings[Rails.env.to_sym][MySettings.shipper.underscore.parameterize("_").to_sym])
+      shipper = "ActiveMerchant::Shipping::#{MySettings.shipper.underscore.parameterize('_').camelize}".constantize.new(Forge.config.ecommers.shippers[MySettings.shipper.underscore.parameterize("_").to_sym])
       begin
         response = shipper.find_rates(origin, destination, packages)
         # Store all rates, order by price. Return cheapest rate.
@@ -271,7 +271,7 @@ class Order < ActiveRecord::Base
     end
 
     def email_receipt
-      if Forge::Settings[:email_receipt]
+      if Forge.config.ecommerce.email_receipt
         ReceiptMailer.receipt(self).deliver
       end
     end

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

@@ -25,7 +25,7 @@ class OrderTransaction < ActiveRecord::Base
       begin
         # TODO: is eval appropriate in this instance?  I tried Object.const_get but had problems.
         # OPTIMIZE: this is a bit crufty
-        am_setting = Forge::Settings[Rails.env.to_sym][:active_merchant]
+        am_setting = Forge.config.ecommerce.active_merchant
         gateway_class = eval("ActiveMerchant::Billing::" + am_setting[:gateway])
         gateway = gateway_class.new(:login => am_setting[:login], :password => am_setting[:password])
         response = yield gateway

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

@@ -16,6 +16,11 @@ class Post < ActiveRecord::Base
 
   before_save :set_created_at
 
+
+  def to_param
+    "#{id}-#{title.parameterize}"
+  end
+
   def self.submenu
     "posts"
   end

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

@@ -12,26 +12,31 @@ class Video < ActiveRecord::Base
   # Validations
   validates_attachment_presence :video
   validates_presence_of :title
-  
+
   before_update :revert_if_new_upload
 
-  
+
   def video=(filename)
     self.video_file_name = filename.gsub('videos/', '')
   end
-  
+
   def list_title
     published ? title : title + " (Draft)"
   end
-  
-  def encoded_state; read_attribute(:encoded_state) || "unencoded"; end
-  def mobile_encoded_state; read_attribute(:mobile_encoded_state) || "unencoded"; end
-  
+
+  def encoded_state
+    read_attribute(:encoded_state) || "unencoded"
+  end
+
+  def mobile_encoded_state
+    read_attribute(:mobile_encoded_state) || "unencoded"
+  end
+
   def encode(rails_env)
     test = rails_env == "production" ? false : true
     response = Zencoder::Job.create({
-      :api_key => Forge::Settings[:zencoder][:api_key],
-      :input => video.url, 
+      :api_key => Forge.config.videos.zencoder_api_key,
+      :input => video.url,
       :outputs => [web_encode_settings, mobile_encode_settings, thumbnail_settings],
       :test => test,
       :skip_ssl_verify => test
@@ -39,26 +44,26 @@ class Video < ActiveRecord::Base
     self.update_attributes(:encoded_state => "queued", :mobile_encoded_state => "queued", :job_id => response.body["id"]) if response.success?
     response
   end
-  
+
   def encode_notify(output)
     prefix = output[:label] == "web" ? "" : "#{output[:label]}_"
     attrs = {"#{prefix}encoded_state" => output[:state]}
     if output[:state] == "finished"
-      thumb = open(URI.parse("http://s3.amazonaws.com/" + Forge::Settings[:zencoder][:bucket] + "/thumbnails_#{id}/frame_0000.png"))
+      thumb = open(URI.parse("http://s3.amazonaws.com/" + Forge.config.videos.zencoder_bucket + "/thumbnails_#{id}/frame_0000.png"))
       attrs.merge!({"#{prefix}output_url" => output[:url]})
       attrs.merge!({"thumbnail" => thumb}) if thumbnail.url.blank?
     end
     self.update_attributes(attrs)
   end
-    
-  
+
+
   private
     def base_url
-      "http://s3.amazonaws.com/#{Forge::Settings[:zencoder][:bucket]}"
+      "http://s3.amazonaws.com/" + Forge.config.videos.zencoder_bucket
     end
-  
+
     def web_encode_settings
-      { 
+      {
         :label => "web",
         :base_url => base_url,
         :size => "800x450",
@@ -66,7 +71,7 @@ class Video < ActiveRecord::Base
         :notifications => [{:format => "json", :url => "#{MySettings.site_url}/forge/videos/encode_notify"}]
       }
     end
-  
+
     def mobile_encode_settings
       {
         :label => "mobile",
@@ -76,7 +81,7 @@ class Video < ActiveRecord::Base
         :notifications => [{:format => "json", :url => "#{MySettings.site_url}/forge/videos/encode_notify"}]
       }
     end
-  
+
     def thumbnail_settings
       {
         :thumbnails => {
@@ -87,7 +92,7 @@ class Video < ActiveRecord::Base
         }
       }
     end
-    
+
     def revert_if_new_upload
       if video_file_name_changed?
         self.output_url = self.mobile_output_url = ''

data/lib/forge/app/views/forge/dispatches/show.html.haml

@@ -14,8 +14,8 @@
   #overview
     = render :partial => "header", :locals => {:dispatch => @dispatch}
     .inner-form#dispatch-stats
-      .column
-        .grey
+      .column.full
+        .dispatch-animated-bar
           .extendable-inset.deep{:style => "padding: 5px;"}
             #dispatch-progress-sent
               #dispatch-progress-read

data/lib/forge/app/views/forge/help_topics/show.html.haml

@@ -8,10 +8,10 @@
   %ul
     %li= link_to "Embedding Images, Videos, or Documents into Your Content", "/forge/help/embedding"
     %li= link_to "Uploading Assets From Your Computer", "/forge/help/uploading"
-  
+
 
   %h4 Still can't find what you're looking for?
   %p
-    If none of the above was helpful to you, you can #{link_to "browse the help index", "/forge/help"}  
-    = raw(Forge::Settings[:support_instructions_in_help])
-  
+    If none of the above was helpful to you, you can #{link_to "browse the help index", "/forge/help"}
+    = raw(Forge.config.support_instructions_in_help)
+

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

@@ -22,7 +22,7 @@
   #tabs
     %ul.tabbed
       %li= link_to "General Settings", '#general'
-      - if Forge::Settings[:mobile_layout]
+      - if Forge.config.mobile_layout
         %li= link_to "Mobile Settings", '#mobile'
       - if @menu_items.include?("video_feeds")
         %li= link_to "Video Feed Settings", '#video'
@@ -31,7 +31,7 @@
     .spacer
 
     #general= render :partial => "general"
-    - if Forge::Settings[:mobile_layout]
+    - if Forge.config.mobile_layout
       #mobile= render :partial => "mobile"
     - if @menu_items.include?("video_feeds")
       #video= render :partial => "video_feed"

data/lib/forge/app/views/forge/shared/_seo_fields.html.haml

@@ -11,7 +11,7 @@
         %li Be wary of companies offering to get your site "to the top of Google."  No legitimate business will make that claim, and their shady tactics could adversely affect your ranking.
       %br/
 
-      = raw(Forge::Settings[:seo_callout])
+      = raw(Forge.config.seo_callout)
 
   .column.main-small.last
     = f.text_field :seo_title, :class => "title", :style => "width: 100%;", :label => "Title Tag", :explanation => "This is the title that will show on search engine results and in the title bar of a visitor's browser.  By default, this will use the item's title."

data/lib/forge/app/views/forge/shared/menu_items/_subscribers.html.haml

@@ -0,0 +1,8 @@
+- if can?(:index, Subscriber)
+  - item = "subscribers"
+  = forge_menu_item item, forge_subscribers_path, :active => is_active(['subscribers', 'subscriber_groups']), :submenu => true
+  %ul.forge_submenu{ :class => is_active(['subscribers', 'subscriber_groups']) ? "#{item} active" : item }
+    = link_to "Subscribers", forge_subscribers_path, :class => ('active' if is_active('subscribers')) if can?(:index, Subscriber)
+    = link_to "Groups", forge_subscriber_groups_path, :class => ('active' if is_active('subscriber_groups')) if can?(:index, SubscriberGroup)
+
+  .spacer

data/lib/forge/app/views/hosted_payment/_paypal.html.haml

@@ -1,18 +1,18 @@
-- paypal_account = MySettings.ecommerce_live ? Forge::Settings[Rails.env.to_sym][:paypal][:account] : Forge::Settings[:development][:paypal][:account]
+- paypal_account = MySettings.ecommerce_live ? Forge.config.ecommerce.paypal_production[:account] : Forge.config.ecommerce.paypal_sandbox[:account]
 = form_tag ActiveMerchant::Billing::Integrations::Paypal.service_url do
   = hidden_field_tag "business", paypal_account
 
   = hidden_field_tag "cancel_return", "http://" + request.host + "/orders/cancel"
   = hidden_field_tag "notify_url", "http://" + request.host + "/hosted_payment/notify"
   = hidden_field_tag "return", "http://" + request.host + paid_order_path(@cart_order, :key => @cart_order.key)
-    
+
   = hidden_field_tag "redirect_cmd", "_xclick"
   = hidden_field_tag "cmd", "_cart"
   = hidden_field_tag "upload", 1
 
   = hidden_field_tag "charset", "utf-8"
 
-  = hidden_field_tag "currency_code", Forge::Settings[:currency]
+  = hidden_field_tag "currency_code", Forge.config.ecommerce.currency
   = hidden_field_tag "invoice", invoice_number_for_paypal(order)
   = hidden_field_tag "tax_cart", order.tax
   - if MySettings.use_coupons

data/lib/forge/app/views/hosted_payment/billing.html.haml

@@ -1,7 +1,7 @@
 %h2 Pay Securely Online With PayPal
 
-%p 
-  Your data are kept in strict confidence and security.  All prices are in #{Forge::Settings[:currency]}.
+%p
+  Your data are kept in strict confidence and security.  All prices are in #{Forge.config.ecommerce.currency}.
 
 = render :partial => "orders/summary", :locals => { :order => @cart_order }
 

data/lib/forge/app/views/integrated_payment/_credit_card_form.html.haml

@@ -1,4 +1,4 @@
-%table.form{:cellspacing => 0, :width => '100%'}  
+%table.form{:cellspacing => 0, :width => '100%'}
   %tr
     %td.label
       Credit card number
@@ -22,14 +22,14 @@
     %td
       %input{:type => 'submit', :value => 'Pay Now'}
       The charge to your credit card will be
-      = "#{number_to_currency(@cart_order.total_price)} #{Forge::Settings[:currency]}"
+      = "#{number_to_currency(@cart_order.total_price)} #{Forge.config.ecommerce.currency}"
   %tr
     %td.label
     %td{:style => "padding-top: 25px;"}
       %p
         %small
           All prices are in
-          = Forge::Settings[:currency] + "."
+          = Forge.config.ecommerce.currency + "."
           Use of your data is governed by our
           %a{:href => "/security-policy", :target => "_blank" }
             Security Policy

data/lib/forge/app/views/integrated_payment/billing.html.haml

@@ -1,10 +1,10 @@
 %h1 Pay Securely Online With Your Credit Card
 
-%p 
-  Your data are kept in strict confidence and security.  All prices are in #{Forge::Settings[:currency]}.
+%p
+  Your data are kept in strict confidence and security.  All prices are in #{Forge.config.ecommerce.currency}.
 
 %div{:style => "float:left; width:40%;"}
-  %h2 Billing Address 
+  %h2 Billing Address
   = render :partial => "orders/display_address", :locals => { :address => @cart_order.billing_address, :address_type => 'billing_address' }
   = link_to "Edit billing address", orders_checkout_path
 

data/lib/forge/app/views/layouts/application.html.haml

@@ -13,7 +13,7 @@
     = yield :scripts
 
   %body{ :id => params[:controller], :class => params[:action] }
-    = link_to("View Mobile Version", :mobile => 1) if Forge::Settings[:mobile_layout] #&& using_mobile_device?
+    = link_to("View Mobile Version", :mobile => 1) if Forge.config.mobile_layout #&& using_mobile_device?
 
     - if current_user
       .float-right

data/lib/forge/app/views/layouts/forge.html.haml

@@ -58,7 +58,7 @@
         #footer
           © Copyright factor[e] design initiative inc. #{Time.now.year}
           %br/
-          = raw(Forge::Settings[:support_instructions_in_layout])
+          = raw(Forge.config.support_instructions_in_layout)
 
         = link_to '?', '/forge/help', :id => 'help_toggle', :class => 'help-button'
 

data/lib/forge/app/views/orders/paid.html.haml

@@ -1,11 +1,11 @@
 %h1 Thank you!
 
 %p
-  Thank you for your payment. Your transaction has been completed, and a receipt for your purchase has been emailed to you. 
+  Thank you for your payment. Your transaction has been completed, and a receipt for your purchase has been emailed to you.
 
-- unless Forge::Settings[:integrated_payments]
+- unless Forge.config.ecommerce.payments == :integrated
   %p
-    You may log into your account at 
+    You may log into your account at
     %a{:href => "http://www.paypal.com/ca", :target => "_blank"} www.paypal.com/ca
     to view details of this transaction.
 

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

@@ -1,5 +1,5 @@
 # tell Active Shipping to use metric units by default
 ActiveMerchant::Shipping::Package.default_options = { :units => :metric }
-if Forge::Settings[Rails.env.to_sym][:active_merchant]
-  ActiveMerchant::Billing::Base.mode = Forge::Settings[Rails.env.to_sym][:active_merchant][:base_mode].to_sym
+if Forge.config.ecommerce.active_merchant
+  ActiveMerchant::Billing::Base.mode = Forge.config.ecommerce.active_merchant[:base_mode].to_sym
 end

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

@@ -0,0 +1,33 @@
+require 'forge.rb'
+require 'forge/can_be_foreign.rb'
+require 'forge/can_have_comments.rb'
+require 'forge/can_use_asset.rb'
+
+# This configuration block is for config that should bes pecified
+# by the site developer.  There is a Settings module built into Forge
+# where you can expose other settings to your client.
+Forge.configure do |config|
+  # Enable a mobile layout for this website
+  config.mobile_layout = false
+
+  # Set up languages for front-end internationalization
+  # Currently Forge is anglo-centric so you don't need to
+  # specify English.
+  #
+  # config.languages = {
+  #   "French" => :fr,
+  #   "German" => :de
+  #   # etc.
+  # }
+
+  # Print out support instructions for your client
+  # in the bottom right-hand corner of Forge
+  # config.support_instructions_in_layout = File.read("support.html")
+
+  # Print out any additional SEO information you'd like
+  # to display on the SEO tabs of supported modules
+  # config.seo_callout = File.read("seo.html")
+
+  # If you need to add further config options you can add them
+  # in lib/forge.rb as attr_accessors to Forge::Configuration
+end

data/lib/forge/config/routes.rb

@@ -67,10 +67,8 @@ Forge3::Application.routes.draw do
 
   resources :events, :only => [:index, :show]
 
-  if Forge::Settings[:events]
-    if Forge::Settings[:events][:display] == 'calendar'
-      match 'events/:year/:month' => 'events#index', :via => :get
-    end
+  if Forge.config.events.try(:display) == :calendar
+    match 'events/:year/:month' => 'events#index', :via => :get
   end
 
   resources :dispatches, :only => [] do