tenon 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1113d2e336c7bb39401c7000d5adf08482d2523
-  data.tar.gz: 502bfd2c4086090b8cb25a3fd66ac84240757ca3
+  metadata.gz: 756d9629ad6ec902635f465f95855733cadada97
+  data.tar.gz: 74971b9e5f7a49503264b97a3db09a2192ad1f9c
 SHA512:
-  metadata.gz: 206b38bca3565c932cd9ed1ca0c9877dc12989dfa558eca04e03c758d318477a925ffbd92d4b0aa1be648d5f32ae814b3ead53f83e7a5dd57e71ebe5fed12687
-  data.tar.gz: 51f8fb44d61453d1016138a075eb135cc9954cceffe188a0d8f8d6b874118b867a5133db7e332298549f2082a892881b1b4a0103defbfead4e2dfc418aae341f
+  metadata.gz: 90e2292261eebe09714988e27131662ab48ded4f1f2116154d73e1983813bf42840940aab6f00b3839d3e34082526b37c4f3865abbdb31a84ed55360bb25ee03
+  data.tar.gz: 32373fc17fda817e1af02640e252dc6058734d4575e70f9d2202155022226eb05cd6d1b09da9e4e3244d93a7e96d503a797d0b3cc55f7667bc9984aa06c12959

data/app/controllers/tenon/resources_controller.rb

@@ -44,7 +44,7 @@ module Tenon
       end
 
       self.resource = resource.decorate
-      respond_with(resource.decorate, location: polymorphic_index_path)
+      respond_with(resource.decorate, location: after_update_path)
     end
 
     def create
@@ -54,7 +54,7 @@ module Tenon
         flash[:notice] = "#{human_name} saved successfully."
         save_item_version if resource.respond_to?(:versions)
       end
-      respond_with(resource.decorate, location: polymorphic_index_path, status: 201)
+      respond_with(resource.decorate, location: after_create_path, status: (201 if resource.valid?))
     end
 
     def destroy
@@ -120,6 +120,18 @@ module Tenon
       singular_name.titleize
     end
 
+    def after_create_path
+      if Tenon.config.after_create_path == :edit && resource.valid?
+        polymorphic_path([:edit, resource])
+      else
+        polymorphic_index_path
+      end
+    end
+
+    def after_update_path
+      after_create_path
+    end
+
     def polymorphic_index_path
       polymorphic_path([klass])
     end

data/config/initializers/tenon.rb

@@ -18,6 +18,11 @@ Tenon.configure do |config|
     }
   }
 
+  # Set the default after_update and after_create path
+  # :edit or :index
+  config.after_update_path = :edit
+  config.after_create_path = :edit
+
   # Set up languages for front-end internationalization
   # Currently Tenon is anglo-centric so you don't need to
   # specify English.

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

data/lib/tenon.rb

@@ -22,6 +22,7 @@ module Tenon
   end
 
   class Configuration
-    attr_accessor :mobile_layout, :languages, :seo_callout, :front_end
+    attr_accessor :mobile_layout, :languages, :seo_callout, :front_end,
+                  :after_create_path, :after_update_path
   end
 end

data/spec/controllers/tenon/posts_controller_spec.rb

@@ -15,6 +15,7 @@ describe Tenon::PostsController do
   before do
     controller.stub(:current_user) { user }
     controller.stub(:polymorphic_index_path) { posts_path }
+    controller.stub(:after_update_path) { posts_path }
   end
 
   describe 'PATCH update' do

data/spec/controllers/tenon/resources_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe Tenon::GalleriesController do
   routes { Tenon::Engine.routes }
 
-  let(:gallery) { double.as_null_object }
+  let(:gallery) { mock_model(Tenon::Gallery).as_null_object }
 
   before do
     controller.stub(:current_user) { user }
@@ -158,7 +158,7 @@ describe Tenon::GalleriesController do
       context 'with a successful save' do
         it 'should redirect to index' do
           post :create, gallery: params
-          expect(response).to redirect_to('/tenon/galleries')
+          expect(response).to redirect_to("/tenon/galleries/#{assigns[:gallery].id}/edit")
         end
       end
     end
@@ -205,7 +205,7 @@ describe Tenon::GalleriesController do
       context 'with a successful save' do
         it 'should redirect to index' do
           patch :update, gallery: params, id: 1
-          expect(response).to redirect_to('/tenon/galleries')
+          expect(response).to redirect_to("/tenon/galleries/#{assigns[:gallery].id}/edit")
         end
 
         it 'should set the flash' do
@@ -216,6 +216,8 @@ describe Tenon::GalleriesController do
     end
 
     describe 'DELETE destroy' do
+      let(:gallery) { double.as_null_object }
+
       before do
         Tenon::Gallery.stub(:find) { gallery }
       end

data/spec/features/tenon/events_spec.rb

@@ -60,7 +60,6 @@ describe 'An admin', js: true do
 
         # Save it
         click_button 'Save'
-        expect(page).to have_content('My Test Event')
         expect(page).to have_content('Event saved successfully.')
       end
     end
@@ -87,7 +86,6 @@ describe 'An admin', js: true do
 
         # Save it
         click_button 'Save'
-        expect(page).to have_content('My Test Event')
         expect(page).to have_content('Event saved successfully.')
       end
     end

data/spec/features/tenon/galleries_spec.rb

@@ -35,7 +35,6 @@ describe 'An admin', js: true do
           fill_in 'gallery[title]', with: 'My Test Gallery'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test Gallery')
         expect(page).to have_content('Gallery saved successfully.')
       end
     end
@@ -76,7 +75,6 @@ describe 'An admin', js: true do
           fill_in 'gallery[title]', with: 'My Test Gallery'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test Gallery')
         expect(page).to have_content('Gallery saved successfully.')
       end
     end

data/spec/features/tenon/pages_spec.rb

@@ -54,7 +54,6 @@ describe 'An admin', js: true do
           fill_in 'page[title]', with: 'My Test Page'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test Page')
         expect(page).to have_content('Page saved successfully.')
       end
     end
@@ -80,7 +79,6 @@ describe 'An admin', js: true do
           fill_in 'page[title]', with: 'My Test Page'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test Page')
         expect(page).to have_content('Page saved successfully.')
       end
     end

data/spec/features/tenon/posts_spec.rb

@@ -50,7 +50,6 @@ describe 'An admin', js: true do
           fill_in 'post[title]', with: 'My Test Post'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test Post')
         expect(page).to have_content('Post saved successfully.')
       end
     end
@@ -75,7 +74,6 @@ describe 'An admin', js: true do
           fill_in 'post[title]', with: 'My Test Post'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test Post')
         expect(page).to have_content('Post saved successfully.')
       end
     end

data/spec/features/tenon/tenon_callouts_spec.rb

@@ -58,7 +58,6 @@ describe 'An admin', js: true do
           fill_in 'tenon_callout[button_text]', with: 'Go!'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test TenonCallout')
         expect(page).to have_content('Tenon Callout saved successfully.')
       end
     end
@@ -83,7 +82,6 @@ describe 'An admin', js: true do
           fill_in 'tenon_callout[title]', with: 'My Test TenonCallout'
           click_button 'Save'
         end
-        expect(page).to have_content('My Test TenonCallout')
         expect(page).to have_content('Tenon Callout saved successfully.')
       end
     end

data/spec/features/tenon/users_spec.rb

@@ -53,7 +53,6 @@ describe 'An admin', js: true do
           fill_in 'user[password_confirmation]', with: 'password123'
           click_button 'Save'
         end
-        expect(page).to have_content('test@user.com')
         expect(page).to have_content('User saved successfully.')
       end
     end
@@ -80,7 +79,6 @@ describe 'An admin', js: true do
           fill_in 'user[email]', with: 'test@user.com'
           click_button 'Save'
         end
-        expect(page).to have_content('test@user.com')
         expect(page).to have_content('User saved successfully.')
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1366,7 +1366,6 @@ files:
 - spec/features/tenon/assets_spec.rb
 - spec/features/tenon/comments_spec.rb
 - spec/features/tenon/contacts_spec.rb
-- spec/features/tenon/events/events_form_spec.rb
 - spec/features/tenon/events_spec.rb
 - spec/features/tenon/galleries_spec.rb
 - spec/features/tenon/pages_spec.rb
@@ -1480,7 +1479,6 @@ test_files:
 - spec/features/tenon/assets_spec.rb
 - spec/features/tenon/comments_spec.rb
 - spec/features/tenon/contacts_spec.rb
-- spec/features/tenon/events/events_form_spec.rb
 - spec/features/tenon/events_spec.rb
 - spec/features/tenon/galleries_spec.rb
 - spec/features/tenon/pages_spec.rb

data/spec/features/tenon/events/events_form_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-include RequestHelpers
-
-describe 'Using the event form', js: true do
-  let!(:admin) { create(:admin) }
-
-  before do
-    login(admin)
-  end
-
-  context 'when doing everything right' do
-    it 'should save the event' do
-      visit new_event_path
-      fill_in 'event[title]', with: 'My Test Event'
-
-      # Manually testing the datepickers is outside the scope of this spec
-      page.execute_script("$('#event_starts_at').val('#{Time.now}')")
-      page.execute_script("$('#event_ends_at').val('#{Time.now + 1.hour}')")
-
-      # Save it
-      click_button 'Save'
-      expect(page).to have_content('My Test Event')
-      expect(page).to have_content('Event saved successfully.')
-    end
-  end
-
-  context 'when doing something wrong' do
-    it 'should not save the page' do
-      visit new_event_path
-      within('form#new_event') do
-        click_button 'Save'
-      end
-      expect(page).to have_content("Title can't be blank")
-      expect(page).to have_content("Starts at can't be blank")
-      expect(page).to have_content("Ends at can't be blank")
-    end
-  end
-end