snippets are good
Oleg
committed Jun 22, 2011
commit 22bccb42eb97b49a142459649718553a9a33f492
Showing 6
changed files with
43 additions
and 43 deletions
app/controllers/cms_admin/snippets_controller.rb
+13
-14
| @@ | @@ -1,11 +1,11 @@ |
| class CmsAdmin::SnippetsController < CmsAdmin::BaseController | |
| - | before_filter :build_cms_snippet, :only => [:new, :create] |
| - | before_filter :load_cms_snippet, :only => [:edit, :update, :destroy] |
| + | before_filter :build_snippet, :only => [:new, :create] |
| + | before_filter :load_snippet, :only => [:edit, :update, :destroy] |
| def index | |
| - | return redirect_to :action => :new if @cms_site.snippets.count == 0 |
| - | @cms_snippets = @cms_site.snippets.all(:order => 'label') |
| + | return redirect_to :action => :new if @site.snippets.count == 0 |
| + | @snippets = @site.snippets.all(:order => 'label') |
| end | |
| def new | |
| @@ | @@ -17,38 +17,37 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController |
| end | |
| def create | |
| - | # raise @cms_snippet.to_yaml |
| - | @cms_snippet.save! |
| + | @snippet.save! |
| flash[:notice] = 'Snippet created' | |
| - | redirect_to :action => :edit, :id => @cms_snippet |
| + | redirect_to :action => :edit, :id => @snippet |
| rescue ActiveRecord::RecordInvalid | |
| flash.now[:error] = 'Failed to create snippet' | |
| render :action => :new | |
| end | |
| def update | |
| - | @cms_snippet.update_attributes!(params[:cms_snippet]) |
| + | @snippet.update_attributes!(params[:snippet]) |
| flash[:notice] = 'Snippet updated' | |
| - | redirect_to :action => :edit, :id => @cms_snippet |
| + | redirect_to :action => :edit, :id => @snippet |
| rescue ActiveRecord::RecordInvalid | |
| flash.now[:error] = 'Failed to update snippet' | |
| render :action => :edit | |
| end | |
| def destroy | |
| - | @cms_snippet.destroy |
| + | @snippet.destroy |
| flash[:notice] = 'Snippet deleted' | |
| redirect_to :action => :index | |
| end | |
| protected | |
| - | def build_cms_snippet |
| - | @cms_snippet = @cms_site.snippets.new(params[:cms_snippet]) |
| + | def build_snippet |
| + | @snippet = @site.snippets.new(params[:snippet]) |
| end | |
| - | def load_cms_snippet |
| - | @cms_snippet = @cms_site.snippets.find(params[:id]) |
| + | def load_snippet |
| + | @snippet = @site.snippets.find(params[:id]) |
| rescue ActiveRecord::RecordNotFound | |
| flash[:error] = 'Snippet not found' | |
| redirect_to :action => :index | |
app/views/cms_admin/snippets/_form.html.erb
+2
-2
| @@ | @@ -2,10 +2,10 @@ |
| <%= render :partial => 'cms_admin/uploads/index' %> | |
| <% end %> | |
| - | <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %> |
| + | <%= form.text_field :label, :id => (@snippet.new_record?? 'slugify' : nil) %> |
| <%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %> | |
| <%= form.text_area :content, :class => 'code' %> | |
| <%= form.simple_field nil, nil, :class => 'submit_element' do %> | |
| - | <%= form.submit @cms_snippet.new_record?? 'Create Snippet' : 'Update Snippet', :disable_builder => true %> |
| + | <%= form.submit @snippet.new_record?? 'Create Snippet' : 'Update Snippet', :disable_builder => true %> |
| <% end %> | |
| \ No newline at end of file | |
app/views/cms_admin/snippets/edit.html.erb
+3
-3
| @@ | @@ -1,10 +1,10 @@ |
| - | <%= link_to span_tag(pluralize(@cms_snippet.revisions.count, 'revision')), cms_admin_snippet_revisions_path(@cms_snippet), :class => 'big button' %> |
| + | <%= link_to span_tag(pluralize(@snippet.revisions.count, 'revision')), cms_admin_site_snippet_revisions_path(@site, @snippet), :class => 'big button' %> |
| <h1> Editing Snippet </h1> | |
| <% content_for :right_column do %> | |
| - | <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_snippet %> |
| + | <%= render :partial => 'cms_admin/sites/mirrors', :object => @snippet %> |
| <% end %> | |
| - | <%= cms_form_for @cms_snippet, :url => {:action => :update} do |form| %> |
| + | <%= cms_form_for @snippet, :as => :snippet, :url => {:action => :update} do |form| %> |
| <%= render :partial => 'form', :object => form %> | |
| <% end %> | |
| \ No newline at end of file | |
app/views/cms_admin/snippets/index.html.erb
+7
-7
| @@ | @@ -1,4 +1,4 @@ |
| - | <%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big button' %> |
| + | <%= link_to span_tag('Create New Snippet'), new_cms_admin_site_snippet_path(@site), :class => 'big button' %> |
| <h1>Snippets</h1> | |
| <% content_for :right_column do %> | |
| @@ | @@ -6,18 +6,18 @@ |
| <% end %> | |
| <ul class='list'> | |
| - | <% @cms_snippets.each do |cms_snippet| %> |
| - | <li id='cms_snippet_<%= cms_snippet.id %>'> |
| + | <% @snippets.each do |snippet| %> |
| + | <li id='cms_snippet_<%= snippet.id %>'> |
| <div class='item'> | |
| <div class='icon'></div> | |
| <div class='action_links'> | |
| - | <%= link_to 'Edit', edit_cms_admin_snippet_path(cms_snippet) %> |
| - | <%= link_to 'Delete', cms_admin_snippet_path(cms_snippet), :method => :delete, :confirm => 'Are you sure?' %> |
| + | <%= link_to 'Edit', edit_cms_admin_site_snippet_path(@site, snippet) %> |
| + | <%= link_to 'Delete', cms_admin_site_snippet_path(@site, snippet), :method => :delete, :confirm => 'Are you sure?' %> |
| </div> | |
| <div class='label'> | |
| - | <%= link_to cms_snippet.label, edit_cms_admin_snippet_path(cms_snippet) %> |
| + | <%= link_to snippet.label, edit_cms_admin_site_snippet_path(@site, snippet) %> |
| <div class='sublabel'> | |
| - | <%= link_to cms_snippet.slug, edit_cms_admin_snippet_path(cms_snippet) %> |
| + | <%= link_to snippet.slug, edit_cms_admin_site_snippet_path(@site, snippet) %> |
| </div> | |
| </div> | |
| </div> | |
app/views/cms_admin/snippets/new.html.erb
+1
-1
| @@ | @@ -1,5 +1,5 @@ |
| <h1> New Snippet </h1> | |
| - | <%= cms_form_for @cms_snippet, :url => {:action => :create} do |form| %> |
| + | <%= cms_form_for @snippet, :as => :snippet, :url => {:action => :create} do |form| %> |
| <%= render :partial => 'form', :object => form %> | |
| <% end %> | |
| \ No newline at end of file | |
test/functional/cms_admin/snippets_controller_test.rb
+17
-16
| @@ | @@ -3,38 +3,39 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__)) |
| class CmsAdmin::SnippetsControllerTest < ActionController::TestCase | |
| def test_get_index | |
| - | get :index |
| + | get :index, :site_id => cms_sites(:default) |
| assert_response :success | |
| - | assert assigns(:cms_snippets) |
| + | assert assigns(:snippets) |
| assert_template :index | |
| end | |
| def test_get_index_with_no_snippets | |
| Cms::Snippet.delete_all | |
| - | get :index |
| + | get :index, :site_id => cms_sites(:default) |
| assert_response :redirect | |
| assert_redirected_to :action => :new | |
| end | |
| def test_get_new | |
| - | get :new |
| + | site = cms_sites(:default) |
| + | get :new, :site_id => site |
| assert_response :success | |
| - | assert assigns(:cms_snippet) |
| + | assert assigns(:snippet) |
| assert_template :new | |
| - | assert_select 'form[action=/cms-admin/snippets]' |
| + | assert_select "form[action=/cms-admin/sites/#{site.id}/snippets]" |
| end | |
| def test_get_edit | |
| snippet = cms_snippets(:default) | |
| - | get :edit, :id => snippet |
| + | get :edit, :site_id => snippet.site, :id => snippet |
| assert_response :success | |
| - | assert assigns(:cms_snippet) |
| + | assert assigns(:snippet) |
| assert_template :edit | |
| - | assert_select "form[action=/cms-admin/snippets/#{snippet.id}]" |
| + | assert_select "form[action=/cms-admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]" |
| end | |
| def test_get_edit_failure | |
| - | get :edit, :id => 'not_found' |
| + | get :edit, :site_id => cms_sites(:default), :id => 'not_found' |
| assert_response :redirect | |
| assert_redirected_to :action => :index | |
| assert_equal 'Snippet not found', flash[:error] | |
| @@ | @@ -42,7 +43,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase |
| def test_create | |
| assert_difference 'Cms::Snippet.count' do | |
| - | post :create, :cms_snippet => { |
| + | post :create, :site_id => cms_sites(:default), :snippet => { |
| :label => 'Test Snippet', | |
| :slug => 'test-snippet', | |
| :content => 'Test Content' | |
| @@ | @@ -57,7 +58,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase |
| def test_creation_failure | |
| assert_no_difference 'Cms::Snippet.count' do | |
| - | post :create, :cms_snippet => { } |
| + | post :create, :site_id => cms_sites(:default), :snippet => { } |
| assert_response :success | |
| assert_template :new | |
| assert_equal 'Failed to create snippet', flash[:error] | |
| @@ | @@ -66,12 +67,12 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase |
| def test_update | |
| snippet = cms_snippets(:default) | |
| - | put :update, :id => snippet, :cms_snippet => { |
| + | put :update, :site_id => snippet.site, :id => snippet, :snippet => { |
| :label => 'New-Snippet', | |
| :content => 'New Content' | |
| } | |
| assert_response :redirect | |
| - | assert_redirected_to :action => :edit, :id => snippet |
| + | assert_redirected_to :action => :edit, :site_id => snippet.site, :id => snippet |
| assert_equal 'Snippet updated', flash[:notice] | |
| snippet.reload | |
| assert_equal 'New-Snippet', snippet.label | |
| @@ | @@ -80,7 +81,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase |
| def test_update_failure | |
| snippet = cms_snippets(:default) | |
| - | put :update, :id => snippet, :cms_snippet => { |
| + | put :update, :site_id => snippet.site, :id => snippet, :snippet => { |
| :slug => '' | |
| } | |
| assert_response :success | |
| @@ | @@ -92,7 +93,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase |
| def test_destroy | |
| assert_difference 'Cms::Snippet.count', -1 do | |
| - | delete :destroy, :id => cms_snippets(:default) |
| + | delete :destroy, :site_id => cms_sites(:default), :id => cms_snippets(:default) |
| assert_response :redirect | |
| assert_redirected_to :action => :index | |
| assert_equal 'Snippet deleted', flash[:notice] | |