forge-cli 0.0.18 → 0.1.0

data/lib/forge/doc/update_to_rails4_notes.md

@@ -0,0 +1,15 @@
+* had to run 'bundle update' to get everything cleared out
+
+High Priority To-Do:
+
+* I haven't run any of the tests yet, so that may be a big ugly surprise too!
+
+Notes:
+
+* use the local version of Forge to create new Forge sites - from the root folder, run:
+  be bin/forge new NAME_OF_APP MODULE_LIST
+  e.g:
+  be bin/forge new testapp events,ecommerce
+  be bin/forge new testapp banners,dispatches,ecommerce,events,galleries,posts,subscribers,videos
+
+

data/lib/forge/lib/assets/javascripts/forge/features/help.js.erb

@@ -6,7 +6,8 @@ FORGE.features.help = {
     $('a#help_toggle').on('click', self.toggle);
     $('#help-content').on('click', 'a', self.navigate);
     $('#help-pane').on('click', 'a#close-help', self.toggle);
-    $(document).on('click', '#search-help', self.search);
+    $(document).on('click', '#help-search', self.search);
+    // $('#help-search').on('click', self.search);
   },
 
   load: function () {
@@ -111,11 +112,11 @@ FORGE.features.help = {
     $.ajax({
       url: '/forge/help/search',
       data: {'q': query},
-      success: function(data) {
-        $('#help-content').html(data);
+      complete: function(data) {
+        $('#help-content').html(data.responseText);
         var newHeight = $('#help-pane').height();
         $('#content-frame').animate({height: newHeight}, 1150, 'easeOutQuint');
       }
-    });
+    }, 'html');
   }
 };

data/lib/forge/lib/assets/javascripts/forge/forge_manifest.js.erb

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
 //= require jquery.radioSlider
 //= require jquery.debounce
 //= require jquery.equalHeights
@@ -19,4 +19,4 @@
 
 $(function() {
   FORGE.init();
-});
+});

data/lib/forge/lib/assets/stylesheets/forge/forge.ui.css.scss

@@ -38,7 +38,7 @@
 ----------------------------------*/
 
 /* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 998; }
 
 
 /*
@@ -291,7 +291,8 @@
  *
  * http://docs.jquery.com/UI/Dialog#theming
  */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; z-index: 999; }
+.ui-dialog button.ui-button.ui-dialog-titlebar-close { background: none; border: 0;}
 .ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 0px; height: 18px; }
@@ -302,7 +303,7 @@
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
 .ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; position: absolute; }
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
 /*
  * jQuery UI Tabs @VERSION

data/lib/forge/lib/forge/can_use_asset.rb

@@ -2,8 +2,6 @@ module Forge
   module CanUseAsset
     
     def self.included(mod)
-      mod.send(:include, Sprockets::Helpers::IsolatedHelper)
-      mod.send(:include, Sprockets::Helpers::RailsHelper)
       mod.extend(ClassMethods)
     end
     
@@ -27,13 +25,13 @@ module Forge
             when /image/
               self.send(field.to_sym).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
           
@@ -47,4 +45,4 @@ module Forge
   end
 end
 
-ActiveRecord::Base.send(:include, Forge::CanUseAsset)
+ActiveRecord::Base.send(:include, Forge::CanUseAsset)

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

@@ -35,8 +35,8 @@ module Forge
     end
 
     class EcommerceConfiguration
-      attr_accessor :payments, :flat_rate_shipping, :shippers
-                    :email_receipt, :active_merchant, :paypal_production
+      attr_accessor :payments, :flat_rate_shipping, :shippers,
+                    :email_receipt, :active_merchant, :paypal_production,
                     :paypal_sandbox, :currency
 
       def initialize
@@ -52,4 +52,4 @@ module Forge
       end
     end
   end
-end
+end

data/lib/forge/lib/forge/shared_controller_methods/ecommerce.rb

@@ -1,8 +1,8 @@
 module Forge
   module Controllers
-    module ECommerce
+    module Ecommerce
       def get_cart_order
-        @cart_order = Order.where(:key => cookies[:order_key], :state => "pending").first if cookies[:order_key]
+        @cart_order = Order.where("orders.key = ? AND (orders.state = 'pending' OR orders.state = 'failed')", cookies[:order_key]).first if cookies[:order_key]
       end
 
       def require_addresses_for_checkout
@@ -13,4 +13,4 @@ module Forge
       end
     end
   end
-end
+end

data/lib/forge/lib/generators/forge/scaffold/USAGE

@@ -2,7 +2,7 @@ Description:
     Explain the generator
 
 Example:
-    rails generate forge_scaffold Thing
+    rails generate forge:scaffold Thing
 
     This will create:
         what/will/it/create

data/lib/forge/lib/tasks/forge.rake

@@ -1,11 +1,13 @@
 namespace :forge do
   %w{admin super_admin contributor}.each do |role|
-    desc "Create #{role.humanize} user (#{role}@factore.ca/#{role}) (Or pass it PASSWORD=)"
+    desc "Create #{role.humanize} user (#{role}@example.com/#{role}) (Or pass it PASSWORD=)"
     task("create_#{role}".to_sym => :environment) do
       password = ENV['PASSWORD'].blank? ? role : ENV['PASSWORD']
-      user = User.new(:password => password, :password_confirmation => password, :email => "#{role}@factore.ca")
+      user = User.new
+      user.password = user.password_confirmation = password
+      user.email = "#{role}@example.com"
       user.approved = true
-      user.roles << Role.find_or_create_by_title(role.humanize.titleize)
+      user.roles << Role.find_or_create_by(title: role.humanize.titleize)
       if user.save
         puts "#{role.humanize.titleize} user created with username: #{user.email}, password: #{password}"
       else
@@ -133,13 +135,6 @@ namespace :forge do
     MySettings.flat_rate_shipping = true
   end
 
-
-  desc "Expire cache"
-  task :expire_cache => :environment do
-    ActionController::Base.new.trash_cache
-    puts "Expired Page Cache"
-  end
-
   desc "Get updates from Zencoder"
   task :encode_notify => :environment do
     system "zencoder_fetcher -u http://localhost:3000/forge/videos/encode_notify #{Forge.config.videos.zencoder_api_key}"

data/lib/forge/public/500.html

@@ -20,6 +20,7 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>

data/lib/forge/public/javascripts/ckeditor/config.js

@@ -13,7 +13,6 @@ CKEDITOR.editorConfig = function( config )
   //config.ContextMenu = ['Generic','Anchor','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ;
 
   config.height = '400px';
-  config.width = '600px';
 
   //config.resize_enabled = false;
   //config.resize_maxHeight = 2000;

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: forge-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.18
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -113,9 +100,21 @@ executables:
 - forge
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
+- bin/cucumber
+- bin/erubis
 - bin/forge
+- bin/htmldiff
+- bin/ldiff
+- bin/rackup
+- bin/rake
+- bin/rdoc
+- bin/ri
+- bin/sprockets
+- bin/thor
+- bin/tilt
+- bin/tt
 - lib/forge/app/abilities/video_ability.rb
 - lib/forge/app/assets/javascripts/app.js
 - lib/forge/app/assets/javascripts/application.js
@@ -195,7 +194,6 @@ files:
 - lib/forge/app/models/asset.rb
 - lib/forge/app/models/banner.rb
 - lib/forge/app/models/comment.rb
-- lib/forge/app/models/comment_observer.rb
 - lib/forge/app/models/comment_subscriber.rb
 - lib/forge/app/models/contact.rb
 - lib/forge/app/models/country.rb
@@ -232,7 +230,6 @@ files:
 - lib/forge/app/models/user.rb
 - lib/forge/app/models/video.rb
 - lib/forge/app/models/video_feed.rb
-- lib/forge/app/sweepers/page_sweeper.rb
 - lib/forge/app/views/comment_mailer/comment_notification.html.haml
 - lib/forge/app/views/comments/_comment.html.haml
 - lib/forge/app/views/comments/_form.html.haml
@@ -462,6 +459,7 @@ files:
 - lib/forge/Capfile
 - lib/forge/config/application.rb
 - lib/forge/config/boot.rb
+- lib/forge/config/database.yml.template
 - lib/forge/config/environment.rb
 - lib/forge/config/environments/development.rb
 - lib/forge/config/environments/production.rb
@@ -505,6 +503,7 @@ files:
 - lib/forge/db/migrate/20130405172029_create_order_transactions.rb
 - lib/forge/db/migrate/20130405172030_create_products.rb
 - lib/forge/db/migrate/20130405172031_create_product_categories.rb
+- lib/forge/db/migrate/20130405172031_create_products_tax_rates.rb
 - lib/forge/db/migrate/20130405172032_create_product_images.rb
 - lib/forge/db/migrate/20130405172033_create_provinces.rb
 - lib/forge/db/migrate/20130405172034_create_sales.rb
@@ -513,12 +512,13 @@ files:
 - lib/forge/db/migrate/20130405172037_create_videos.rb
 - lib/forge/db/migrate/20130405172038_create_events.rb
 - lib/forge/db/migrate/20130405172039_create_dispatches.rb
-- lib/forge/db/migrate/20130405172040_create_subscribers copy.rb
+- lib/forge/db/migrate/20130405172040_create_subscribers.rb
 - lib/forge/db/migrate/20130405172041_create_galleries.rb
 - lib/forge/db/schema.rb
 - lib/forge/db/seeds.rb
 - lib/forge/doc/i18n.md
 - lib/forge/doc/README_FOR_APP
+- lib/forge/doc/update_to_rails4_notes.md
 - lib/forge/Gemfile
 - lib/forge/Gemfile.lock
 - lib/forge/Guardfile
@@ -1414,6 +1414,7 @@ files:
 - lib/forge-cli/ability_installer.rb
 - lib/forge-cli/app.rb
 - lib/forge-cli/application_creator.rb
+- lib/forge-cli/controller_module_includer.rb
 - lib/forge-cli/custom_file_copier.rb
 - lib/forge-cli/forge_addon_requirer.rb
 - lib/forge-cli/logo.txt
@@ -1459,9 +1460,10 @@ files:
 - lib/forge-cli/route_installer.rb
 - lib/forge-cli/version.rb
 - lib/forge-cli.rb
-- README.rdoc
+- README.md
 homepage: http://factore.ca/forge-cms
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -1473,21 +1475,19 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: ! 'Forge: A CMS for Rapid Application Development'
+specification_version: 4
+summary: 'Forge: A CMS for Rapid Application Development'
 test_files: []