editorial_logic 1.1.1 → 1.1.2

data/Gemfile

@@ -18,11 +18,9 @@ group :test do
   gem 'angry-pickle'
   gem 'be_valid_asset'
   gem 'capybara'
-  gem 'cucumber', '0.8.5'
   gem 'cucumber-rails'
   gem 'database_cleaner'
   gem 'faker'
-  gem 'gherkin'
   gem 'launchy'
   gem 'machinist_mongo', :require => 'machinist/mongoid'
   gem 'metric_fu'

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/app/views/admin/managed_contents/_faq_fields.html.erb

@@ -9,7 +9,6 @@
       <%= f.text_field :summary -%>
       <%= f.text_field :keywords -%>
       <%= f.text_field :breadcrumbs -%>
-      <%= f.text_field :title -%>
       <%= f.text_field :subheader, :label => 'Header' -%>
     </div>
     <br style="clear: both;" />

data/app/views/managed_contents/show.html.erb

@@ -3,7 +3,7 @@
 
 <%- if @content.has_sections? -%>
   <%= render '/sections/contents' -%>
-  <h2><%= @content.headline -%></h2>
+  <h2><%= @content.headline_short -%></h2>
   <h3><%= @section.headline -%></h3>
   <%= @section.content.html_safe -%>
 <%- else -%>
@@ -31,4 +31,4 @@
 <%- end -%>
 
 <%= link_to 'Download PDF', "#{@content.humanize_path.gsub(/\/$/,'.pdf')}", :class => :button if @content.publication.pdf_enabled -%>
-<%= link_to 'Back', @content.publication.humanize_path, :class => :button -%>
+<%= link_to 'Back', @content.publication.humanize_path, :class => :button -%>

data/config/routes.rb

@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-
   class PublicationConstraint
     def initialize; end
     def matches?(request)
@@ -15,20 +14,20 @@ Rails.application.routes.draw do
   end
 
   constraints(TestingConstraint.new) do
-    root :to => 'admin:publications#index'
+    root :to => 'admin:publications#index', :via => :get
   end
 
   constraints(PublicationConstraint.new) do
-    match ':publication_slug/', :to => 'publications#show'
-    match ':publication_slug/feed', :to => 'publications#feed', :format => [:rss]
-    match ':publication_slug/:content_slug/:section_slug', :to => 'sections#show'
-    match ':publication_slug/:content_slug/:filename', :to => 'managed_contents#show'
-    match '/:publication_slug/:content_slug', :to => 'managed_contents#show'
+    get ':publication_slug/', :to => 'publications#show'
+    get ':publication_slug/feed', :to => 'publications#feed', :format => [:rss]
+    get ':publication_slug/:content_slug/:section_slug', :to => 'sections#show'
+    get ':publication_slug/:content_slug/:filename', :to => 'managed_contents#show'
+    get '/:publication_slug/:content_slug', :to => 'managed_contents#show'
   end
 
   namespace :admin do
-    match 'publications/:publication_id/managed_contents/reorder', :to => 'managed_contents#reorder', :as => 'publication_reorder_managed_contents'
-    match 'publications/:publication_id/managed_contents/:managed_content_id/sections/reorder', :to => 'sections#reorder', :as => 'publication_managed_content_reorder_sections'
+    put 'publications/:publication_id/managed_contents/reorder', :to => 'managed_contents#reorder', :as => 'publication_reorder_managed_contents'
+    put 'publications/:publication_id/managed_contents/:managed_content_id/sections/reorder', :to => 'sections#reorder', :as => 'publication_managed_content_reorder_sections'
     resources :publications do
       resources :managed_contents do
         collection do
@@ -43,5 +42,4 @@ Rails.application.routes.draw do
   resources :publications, :only => :show do
     resources :managed_contents, :only => :show
   end
-
 end

data/editorial_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{editorial_logic}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Bantik}]
-  s.date = %q{2011-07-12}
+  s.date = %q{2011-07-27}
   s.description = %q{An engine for enabling managed content, including articles, blogs, FAQs and glossaries.}
   s.email = %q{corey@seologic.com}
   s.files = [

data/features/support/env.rb

@@ -26,17 +26,6 @@ require 'database_cleaner/cucumber'
 Capybara.default_selector = :css
 Capybara.save_and_open_page_path = Rails.root + 'tmp'
 
-# If you set this to false, any error raised from within your app will bubble
-# up to your step definition and out to cucumber unless you catch it somewhere
-# on the way. You can make Rails rescue errors and render error pages on a
-# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
-#
-# If you set this to true, Rails will rescue all errors and render error
-# pages, more or less in the same way your application would behave in the
-# default production environment. It's not recommended to do this for all
-# of your scenarios, as this makes it hard to discover errors in your application.
-ActionController::Base.allow_rescue = false
-
 # How to clean your database when transactions are turned off. See
 # http://github.com/bmabey/database_cleaner for more info.
 DatabaseCleaner.strategy = :truncation

data/spec/controllers/admin/managed_contents_controller_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::ManagedContentsController do
-  render_views
-
   before :all do
     Publication.destroy_all
     @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')

data/spec/controllers/admin/publications_controller_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::PublicationsController do
-  render_views
-
   before :all do
     Publication.destroy_all
     @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')

data/spec/controllers/managed_contents_controller_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe ManagedContentsController do
-  render_views
-
   before :all do
     Publication.destroy_all
     @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')

data/spec/controllers/publications_controller_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe PublicationsController do
-  render_views
-
   before :all do
     Publication.destroy_all
     @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: editorial_logic
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 Z
+date: 2011-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext