forge-cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2E0ZmQxYzgyNTY4NjcxYjgyYjI4NjIwYjI1YWQxMDM4ZmY5NWM0MA==
-  data.tar.gz: !binary |-
-    ZmUzNTkyNDFlM2VjZjU5MTEwOGUzZmMwNWFiMjg1NTc1NTFjZTZjYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWRkOWQ0Y2U1MmZkMzdhMmIwMDFkODU4NzNiMTQyMGUwMDk3ZDdlOGFlMmVh
-    YjBjMGIxMDcyZjUxMWM2NmQ5ZDFiMTU0MjFlY2JlMjdiNjdlNWJkZDFjZGRj
-    OTE1OGIzZmE3OTU4NmUwM2U0YmYzYWU4Mzg4NTA1M2I2MzhmZWU=
-  data.tar.gz: !binary |-
-    MzhhMDJkOTVjYmJhMzg0N2UwM2QxODE0ZDVmNTNlYTRkOTg4OTA3NmRiNWU3
-    ZDM2YzU1NGIyNGJkZWExODcwMDVkNDNmOWEyYWVmMDZlMjE4NmI5ZDZhNDk4
-    ZmE2OGNiZWMwNjc2ZTBjOTI4MDRjMDVlYjBlYjZiNWMxMTc5MDE=
+SHA1:
+  metadata.gz: 16721f143f0e604495334b8a0328f7ebbd7ba313
+  data.tar.gz: f934a88b7e53918deff60fdacabcf75e96e6757c
+SHA512:
+  metadata.gz: 7d779b0f9d3ffc0594ffcbeb93a451f95d2a27299b9045de51907ea95d86c8c0aeb1d582d7b421188fdb433001cc34a679004f3f845cdba63f5ad6162d92cb9d
+  data.tar.gz: c5e889439dcecb7aafc4e25fae58f57b1e865512a98692b0178cc40a37b19e319a71d822769dbd741d752546b816c081993402b98db02973a14eded0d5effeda

data/bin/cucumber

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'cucumber' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('cucumber', 'cucumber')

data/bin/erubis

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('erubis', 'erubis')

data/bin/htmldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rack', 'rackup')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rdoc

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'rdoc')

data/bin/ri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'ri')

data/bin/sprockets

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'sprockets' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('sprockets', 'sprockets')

data/bin/thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('thor', 'thor')

data/bin/tilt

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tilt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('tilt', 'tilt')

data/bin/tt

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('treetop', 'tt')

data/lib/forge-cli/modules/base/manifest.yml

@@ -133,5 +133,23 @@ files:
   - 'db/help/pages_index.help'
   - 'db/help/pages_new.help'
 
+  # Tests
+  - 'features/support'
+  - 'features/step_definitions/web_steps.rb'
+  - 'features/authentication.feature'
+  - 'spec/controllers/forge/pages_controller_spec.rb'
+  - 'spec/controllers/forge/users_controller_spec.rb'
+  - 'spec/controllers/contact_controller_spec.rb'
+  - 'spec/controllers/sessions_controller_spec.rb'
+  - 'spec/integration/pages_spec.rb'
+  - 'spec/models/comment_spec.rb'
+  - 'spec/models/help_topic_spec.rb'
+  - 'spec/models/reorderable_spec.rb'
+  - 'spec/support'
+  - 'spec/spec_helper.rb'
+  - 'spec/fixtures/pages.yml'
+  - 'spec/fixtures/roles.yml'
+  - 'spec/fixtures/users.yml'
+
 migrations:
   - create_base_forge

data/lib/forge-cli/modules/base/routes.rb

@@ -3,11 +3,10 @@ resources :comments, :only => [:create, :destroy]
 namespace :forge do
 end
 
-devise_for :users, :controllers => { :sessions => "sessions" }
+devise_for :users, :skip => [:registrations], :controllers => { :sessions => "sessions" }
 devise_scope :user do
   get "/login" => "devise/sessions#new"
   get "/logout" => "sessions#destroy"
-  get "/register" => "devise/registrations#new"
 end
 
 match "/sitemap", :controller => 'index', :action => 'sitemap', :via => :get

data/lib/forge-cli/modules/events/routes.rb

@@ -1,4 +1,9 @@
-resources :events
+resources :events, :only => [:index, :show] do
+  collection do
+    patch :preview
+    post  :preview
+  end
+end
 if Forge.config.events.try(:display) == :calendar
   match 'events/:year/:month' => 'events#index', :via => :get
 end

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/forge/Gemfile

@@ -23,6 +23,8 @@ group :test do
   gem 'shoulda-matchers', '~> 2.0.0'
   gem 'spork', '~> 0.9.0.rc'
   gem 'zentest-without-autotest', '4.4.0'
+  gem 'cucumber-rails', :require => false
+  gem 'database_cleaner'
 end
 
 group :darwin do

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

@@ -42,4 +42,15 @@ class EventsController < ApplicationController
       format.mobile { render :template => 'mobile/event' }
     end
   end
+
+  def preview
+    @event = Event.new(params[:event])
+    # call the private methods that cause the timestamps to be set properly
+    @event.send(:set_starts_at)
+    @event.send(:set_ends_at)
+    unless @event.published?
+      flash.now[:warning] = "This event is not yet published and will not appear on your live website."
+    end
+    render :action => :show
+  end
 end

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

@@ -17,7 +17,7 @@ class PagesController < ApplicationController
     @page = Page.new(params[:page])
     @page_title = @page.seo_title.blank? ? @page.title : @page.seo_title
     unless @page.published?
-      flash[:warning] = "This page is not yet published and will not appear on your live website."
+      flash.now[:warning] = "This page is not yet published and will not appear on your live website."
     end
     render :action => :show
   end

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

@@ -23,7 +23,7 @@ class ProductsController < ApplicationController
   end
 
   def preview
-    flash[:notice] = "Please note that product images do not appear in previews."
+    flash.now[:notice] = "Please note that product images do not appear in previews."
     @product = Product.new(params[:product])
     render :action => :show
   end

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

@@ -1,15 +1,3 @@
-- content_for :scripts do
-  :javascript
-    $(function() {
-      $('.preview').click(function(e) {
-        for ( instance in CKEDITOR.instances )
-          CKEDITOR.instances[instance].updateElement();
-        var vals = $('form').serialize();
-        window.open('/posts/preview?' + vals);
-        e.preventDefault();
-      })
-    })
-
 = error_messages_for :dispatch
 
 = form_for [:forge, @dispatch] do |f|
@@ -23,5 +11,4 @@
   #item-list-bottom
     .float-right
       Everything look good?
-      = button_link "Preview", "javascript:;", :class => "preview button"
       = button_link "Save", "javascript:;", :class => "submit button"

data/lib/forge/app/views/forge/events/_form.html.haml

@@ -19,19 +19,22 @@
         }
       });
 
-      $('.preview').click(function() {
+      $('.preview').click(function(e) {
         for ( instance in CKEDITOR.instances )
           CKEDITOR.instances[instance].updateElement();
-
-        var form = $('form');
-        var vals = form.serialize();
-        var old_action = form.attr('action');
-        form.attr({action: '/events/preview', target: '_blank'}).submit();
-        form.attr({action: old_action, target: ''});
-
         e.preventDefault();
-      })
-    })
+        // store the action
+        var form = $(this).closest('form');
+        var action = $(form).attr("action");
+        // rewrite the target and action
+        $(form).attr("target", "_blank");
+        $(form).attr("action", "/events/preview");
+        $(form).submit();
+        // put things back the way they were
+        $(form).removeAttr("target");
+        $(form).attr("action", action);
+      });
+    });
 
 = error_messages_for :event
 
@@ -53,4 +56,5 @@
   #item-list-bottom
     .float-right
       Everything look good?
+      = button_link "Preview", "javascript:;", :class => "preview button"
       = button_link "Save", "javascript:;", :class => "submit button"

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

@@ -51,8 +51,8 @@
           = f.datetime_widget :created_at, :label => "Publication Date", :explanation => "When should this post go live?"
 
         .column.main.last
-          = f.cktext_area :excerpt, :width => '100%', :height => '100px;', :label => "Compose & Format Your Excerpt"
-          = f.cktext_area :content, :width => '100%', :height => '400px;', :label => "Compose & Format Your Post"
+          = f.cktext_area :excerpt, :ckeditor => { :width => '100%', :height => '100px;' }, :label => "Compose & Format Your Excerpt"
+          = f.cktext_area :content, :label => "Compose & Format Your Post"
         .spacer
 
     #seo=render :partial => "forge/shared/seo_fields", :locals => {:f => f}

data/lib/forge/app/views/forge/products/_form.html.haml

@@ -2,11 +2,17 @@
   :javascript
     $(function() {
       $('.preview').click(function(e) {
-        for ( instance in CKEDITOR.instances )
-          CKEDITOR.instances[instance].updateElement();
-        var vals = $('form').serialize();
-        window.open('/products/preview?' + vals);
         e.preventDefault();
+        // store the action
+        var form = $(this).closest('form');
+        var action = $(form).attr("action");
+        // rewrite the target and action
+        $(form).attr("target", "_blank");
+        $(form).attr("action", "/products/preview");
+        $(form).submit();
+        // put things back the way they were
+        $(form).removeAttr("target");
+        $(form).attr("action", action);
       });
 
       $('#tabs').tabs();

data/lib/forge/config/routes.rb

@@ -21,7 +21,8 @@ Forge3::Application.routes.draw do
   # really need all of the standard views and actions.
   resources :products, :only => [:index, :show] do
     collection do
-      get :preview
+      patch  :preview
+      post   :preview
     end
   end
 
@@ -67,8 +68,12 @@ Forge3::Application.routes.draw do
   resources :comments, :only => [:create, :destroy]
   #resources :galleries # we don't seem to have a galleries controller
 
-  resources :events, :only => [:index, :show]
-
+  resources :events, :only => [:index, :show] do
+    collection do
+      patch :preview
+      post  :preview
+    end
+  end
   if Forge.config.events.try(:display) == :calendar
     match 'events/:year/:month' => 'events#index', :via => :get
   end