guts 1.3.2 → 1.3.3

data/app/views/guts/categories/edit.html.erb

@@ -6,4 +6,4 @@
 
 <div class="row">
   <%= render 'form' %>
-</div>
+</div>

data/app/views/guts/contents/_form.html.erb

@@ -9,6 +9,14 @@
         <% end %>
       </div>
 
+      <% if notice %>
+        <div class="small-12 columns">
+          <div class="callout success notice">
+            <p><%= notice %></p>
+          </div>
+        </div>
+      <% end %>
+
       <% if @content.errors.any? %>
         <div class="small-12 columns">
           <div class="callout warning">
@@ -25,7 +33,7 @@
 
       <div class="small-12 columns">
         <%= f.label :title %>
-        <%= f.text_field :title %>
+        <%= f.text_field :title, required: true %>
       </div>
 
       <% unless @content.new_record? %>

data/app/views/guts/groups/_form.html.erb

@@ -23,9 +23,17 @@
     </div>
   <% end %>
 
+  <% if notice %>
+    <div class="small-12 columns">
+      <div class="callout success notice">
+        <p><%= notice %></p>
+      </div>
+    </div>
+  <% end %>
+
   <div class="small-12 columns">
     <%= f.label :title %>
-    <%= f.text_field :title %>
+    <%= f.text_field :title, required: true %>
   </div>
 
   <% unless @group.new_record? %>

data/app/views/guts/media/_form.html.erb

@@ -1,6 +1,9 @@
 <%= form_for([@object, @medium]) do |f| %>
   <div class="small-12 columns">
     <%= f.submit 'Save', class: 'success button' %>
+    <% unless @medium.new_record? %>
+      <%= link_to 'View', @medium.file.url(:original), class: 'warning hollow button', target: '_blank' %>
+    <% end %>
     <%= link_to 'Back', polymorphic_url([@object, :media]), class: 'secondary hollow button' %>
   </div>
 
@@ -18,13 +21,21 @@
     </div>
   <% end %>
 
+  <% if notice %>
+    <div class="small-12 columns">
+      <div class="callout success notice">
+        <p><%= notice %></p>
+      </div>
+    </div>
+  <% end %>
+
   <div class="small-12 columns">
     <%= f.label :file %>
     <%= f.file_field :file, { class: 'hollow button' } %>
   </div>
   <div class="small-12 columns">
     <%= f.label :title %>
-    <%= f.text_field :title %>
+    <%= f.text_field :title, required: true %>
   </div>
   <div class="small-12 columns">
     <%= f.label :caption %>

data/app/views/guts/metafields/_form.html.erb

@@ -18,9 +18,17 @@
     </div>
   <% end %>
 
+  <% if notice %>
+    <div class="small-12 columns">
+      <div class="callout success notice">
+        <p><%= notice %></p>
+      </div>
+    </div>
+  <% end %>
+
   <div class="small-12 columns">
     <%= f.label :key %>
-    <%= f.text_field :key %>
+    <%= f.text_field :key, required: true %>
   </div>
 
   <div class="small-12 columns">

data/app/views/guts/navigation_items/_form.html.erb

@@ -24,7 +24,7 @@
 
   <div class="small-12 columns">
     <%= f.label :title %>
-    <%= f.text_field :title %>
+    <%= f.text_field :title, required: true %>
   </div>
 
   <div class="small-6 columns">
@@ -41,7 +41,7 @@
   <div class="small-6 columns">
     <%= f.label :value %>
     <%= f.select :navigatable_id, {}, {}, { data: { initial: @navigation_item.new_record? ? nil : @navigation_item.navigatable_id } } %>
-    
+
     <%= f.text_field :custom, { style: 'display: none' } %>
   </div>
 

data/app/views/guts/navigations/_form.html.erb

@@ -24,7 +24,7 @@
 
   <div class="small-12 columns">
     <%= f.label :title %>
-    <%= f.text_field :title %>
+    <%= f.text_field :title, required: true %>
   </div>
 
   <% unless @navigation.new_record? %>

data/app/views/guts/options/_form.html.erb

@@ -18,9 +18,17 @@
     </div>
   <% end %>
 
+  <% if notice %>
+    <div class="small-12 columns">
+      <div class="callout success notice">
+        <p><%= notice %></p>
+      </div>
+    </div>
+  <% end %>
+
   <div class="small-12 columns">
     <%= f.label :key %>
-    <%= f.text_field :key %>
+    <%= f.text_field :key, required: true %>
     <p class="help-text">Keys must be all lowercase with no spaces or special characters (example: facebook_url)</p>
   </div>
 

data/app/views/guts/sites/_form.html.erb

@@ -20,12 +20,12 @@
 
   <div class="small-12 columns">
     <%= f.label :name %>
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
 
   <div class="small-12 columns">
     <%= f.label :domain %>
-    <%= f.text_field :domain %>
+    <%= f.text_field :domain, required: true %>
     <p class="help-text">Example: fr.domain.com</p>
   </div>
 <% end %>

data/app/views/guts/types/_form.html.erb

@@ -23,9 +23,17 @@
     </div>
   <% end %>
 
+  <% if notice %>
+    <div class="small-12 columns">
+      <div class="callout success notice">
+        <p><%= notice %></p>
+      </div>
+    </div>
+  <% end %>
+
   <div class="small-12 columns">
     <%= f.label :title %>
-    <%= f.text_field :title %>
+    <%= f.text_field :title, required: true %>
   </div>
 
   <% unless @type.new_record? %>

data/app/views/guts/users/_form.html.erb

@@ -22,21 +22,29 @@
     </div>
   <% end %>
 
+  <% if notice %>
+    <div class="small-12 columns">
+      <div class="callout success notice">
+        <p><%= notice %></p>
+      </div>
+    </div>
+  <% end %>
+
   <div class="small-12 columns">
     <%= f.label :name %>
     <%= f.text_field :name %>
   </div>
   <div class="small-12 columns">
     <%= f.label :email %>
-    <%= f.email_field :email %>
+    <%= f.email_field :email, required: true %>
   </div>
   <div class="small-12 medium-6 columns">
     <%= f.label :password %>
-    <%= f.password_field :password %>
+    <%= f.password_field :password, required: (@user.new_record? ? true : false) %>
   </div>
   <div class="small-12 medium-6 columns">
     <%= f.label :password_confirmation, 'Confirmation' %>
-    <%= f.password_field :password_confirmation %>
+    <%= f.password_field :password_confirmation, required: (@user.new_record? ? true : false) %>
   </div>
   <div class="small-12 columns">
     <%= f.label :groups %>

data/lib/guts/version.rb

@@ -1,5 +1,5 @@
 # Guts' module namespace
 module Guts
   # Current Guts version
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.3'.freeze
 end

data/test/controllers/guts/categories_controller_test.rb

@@ -23,10 +23,10 @@ module Guts
         post :create, category: { slug: 'cat-test', title: 'Cat Test' }
       end
 
-      assert_redirected_to categories_path
+      assert_redirected_to edit_category_path(assigns(:category))
       assert_equal 'Category was successfully created.', flash[:notice]
     end
-    
+
     test 'should fail to create category and send back to new' do
       post :create, category: { title: '' }
       assert_template 'guts/categories/new'
@@ -44,10 +44,10 @@ module Guts
 
     test 'should update category' do
       patch :update, id: @category, category: { slug: @category.slug, title: @category.title }
-      assert_redirected_to categories_path
+      assert_redirected_to edit_category_path(assigns(:category))
       assert_equal 'Category was successfully updated.', flash[:notice]
     end
-    
+
     test 'should fail to update category and send back to edit' do
       patch :update, id: @category, category: { title: '' }
       assert_template 'guts/categories/edit'

data/test/controllers/guts/contents_controller_test.rb

@@ -13,7 +13,7 @@ module Guts
       assert_response :success
       assert_not_nil assigns(:contents)
     end
-    
+
     test 'should get new' do
       get :new, type: @type.slug
       assert_response :success
@@ -32,15 +32,15 @@ module Guts
              }
       end
 
-      assert_redirected_to contents_path(type: @type.slug)
+      assert_redirected_to edit_content_path(assigns(:content))
       assert flash[:notice].include?('successfully created')
     end
-    
+
     test 'should fail to create content item and send back to new' do
       post :create, type: @type.slug, content: { title: '' }
       assert_template 'guts/contents/new'
     end
-    
+
     test 'should show content' do
       get :show, id: @content
       assert_response :success
@@ -50,10 +50,10 @@ module Guts
       get :edit, id: @content
       assert_response :success
     end
-    
+
     test 'should update content' do
       patch :update, id: @content, content: { slug: @content.slug, title: @content.title }
-      assert_redirected_to contents_path(type: @content.type.slug)
+      assert_redirected_to edit_content_path(assigns(:content))
       assert flash[:notice].include?('successfully updated')
     end
 
@@ -70,7 +70,7 @@ module Guts
       assert_redirected_to contents_path(type: @content.type.slug)
       assert flash[:notice].include?('successfully destroyed')
     end
-    
+
     test 'should allow for custom paginated limit' do
       get :index, per_page: 100, type: @type
       assert_equal 100, assigns(:per_page).to_i

data/test/controllers/guts/groups_controller_test.rb

@@ -23,10 +23,10 @@ module Guts
         post :create, group: { slug: 'group-test', title: 'Group Test' }
       end
 
-      assert_redirected_to groups_path
+      assert_redirected_to edit_group_path(assigns(:group))
       assert_equal 'Group was successfully created.', flash[:notice]
     end
-    
+
     test 'should fail to create group and send back to new' do
       post :create, group: { title: '' }
       assert_template 'guts/groups/new'
@@ -44,10 +44,10 @@ module Guts
 
     test 'should update group' do
       patch :update, id: @group, group: { slug: @group.slug, title: @group.title }
-      assert_redirected_to groups_path
+      assert_redirected_to edit_group_path(assigns(:group))
       assert_equal 'Group was successfully updated.', flash[:notice]
     end
-    
+
     test 'should fail to update group and send back to edit' do
       patch :update, id: @group, group: { title: '' }
       assert_template 'guts/groups/edit'

data/test/controllers/guts/media_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Guts
   class MediaControllerTest < ActionController::TestCase
     include ActionDispatch::Routing::UrlFor
-    
+
     setup do
       @medium     = guts_media :test_file
       @content    = guts_contents :test_page
@@ -16,24 +16,24 @@ module Guts
       assert_response :success
       assert_not_nil assigns(:media)
     end
-    
+
     test 'should get index for friendly' do
       get :index, content_id: @content.id, filable_type: 'Guts::Content'
       assert_response :success
       assert_not_nil assigns(:media)
     end
-    
+
     test 'should get index for non friendly' do
       get :index, user_id: @user.id, filable_type: 'Guts::User'
       assert_response :success
       assert_not_nil assigns(:media)
     end
-    
+
     test 'should get new' do
       get :new, content_id: @content.id, filable_type: 'Guts::Content'
       assert_response :success
     end
-    
+
     test 'should create medium' do
       assert_difference('Medium.count') do
         post :create,
@@ -45,10 +45,10 @@ module Guts
              }
       end
 
-      assert_redirected_to polymorphic_path([@content, :media])
+      assert_redirected_to edit_polymorphic_path([@content, assigns(:medium)])
       assert flash[:notice].include?('successfully created')
     end
-    
+
     test 'should not create medium and send back to new' do
       post :create,
            content_id: @content.id,
@@ -59,7 +59,7 @@ module Guts
 
       assert_template 'guts/media/new'
     end
-    
+
     test 'should show medium' do
       get :show, id: @medium, content_id: @content.id, filable_type: 'Guts::Content'
       assert_response :success
@@ -69,15 +69,15 @@ module Guts
       get :edit, id: @medium, content_id: @content.id, filable_type: 'Guts::Content'
       assert_response :success
     end
-    
+
     test 'should update medium' do
       patch :update,
             id: @medium.id,
             content_id: @content.id,
             filable_type: 'Guts::Content',
             medium: { title: 'Demo Me' }
-      
-      assert_redirected_to polymorphic_path([@content, :media])
+
+      assert_redirected_to edit_polymorphic_path([@content, assigns(:medium)])
       assert flash[:notice].include?('successfully updated')
     end
 
@@ -87,7 +87,7 @@ module Guts
             content_id: @content.id,
             filable_type: 'Guts::Content',
             medium: { title: '' }
-      
+
       assert_template 'guts/media/edit'
     end
 
@@ -99,14 +99,14 @@ module Guts
       assert_redirected_to polymorphic_path([@content, :media])
       assert flash[:notice].include?('successfully destroyed')
     end
-    
+
     test 'should get editor insert' do
       get :editor_insert, id: @medium, content_id: @content.id, filable_type: 'Guts::Content'
       assert_response :success
       assert_template 'guts/media/editor_insert'
       assert_template layout: false
     end
-    
+
     test 'should allow for custom paginated limit' do
       get :index, per_page: 100
       assert_equal 100, assigns(:per_page).to_i

data/test/controllers/guts/metafields_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Guts
   class MetafieldsControllerTest < ActionController::TestCase
     include ActionDispatch::Routing::UrlFor
-    
+
     setup do
       @metafield = guts_metafields :metafield_for_content
       @content   = guts_contents :test_page
@@ -16,18 +16,18 @@ module Guts
       assert_response :success
       assert_not_nil assigns(:metafields)
     end
-    
+
     test 'should get index for non friendly' do
       get :index, user_id: @user.id, fieldable_type: 'Guts::User'
       assert_response :success
       assert_not_nil assigns(:metafields)
     end
-    
+
     test 'should get new' do
       get :new, content_id: @content.id, fieldable_type: 'Guts::Content'
       assert_response :success
     end
-    
+
     test 'should create metafield' do
       assert_difference('Metafield.count') do
         post :create,
@@ -39,10 +39,10 @@ module Guts
              }
       end
 
-      assert_redirected_to polymorphic_path([@content, :metafields])
+      assert_redirected_to edit_polymorphic_path([@content, assigns(:metafield)])
       assert flash[:notice].include?('successfully created')
     end
-    
+
     test 'should not create metafield and send back to new' do
       post :create,
            content_id: @content.id,
@@ -54,8 +54,8 @@ module Guts
 
       assert_template 'guts/metafields/new'
     end
-    
-   
+
+
     test 'should show metafield' do
       get :show, id: @metafield, content_id: @content.id, fieldable_type: 'Guts::Content'
       assert_response :success
@@ -65,15 +65,15 @@ module Guts
       get :edit, id: @metafield, content_id: @content.id, fieldable_type: 'Guts::Content'
       assert_response :success
     end
-    
+
     test 'should update metafield' do
       patch :update,
             id: @metafield.id,
             content_id: @content.id,
             fieldable_type: 'Guts::Content',
             metafield: { key: 'Demo Me' }
-      
-      assert_redirected_to polymorphic_path([@content, :metafields])
+
+      assert_redirected_to edit_polymorphic_path([@content, assigns(:metafield)])
       assert flash[:notice].include?('successfully updated')
     end
 
@@ -83,7 +83,7 @@ module Guts
             content_id: @content.id,
             fieldable_type: 'Guts::Content',
             metafield: { key: '' }
-      
+
       assert_template 'guts/metafields/edit'
     end