disguise 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/app/controllers/admin/disguise/themes_controller.rb

@@ -21,7 +21,11 @@ class Admin::Disguise::ThemesController < ApplicationController
   def update
     @theme.update_attributes!(params[:theme])
     respond_to do |format|
-      flash[:notice] = t('disguise.theme_updated')
+      if @theme.name.blank?
+        flash[:notice] = t('disguise.theme_removed')
+      else
+        flash[:notice] = t('disguise.theme_updated')
+      end
       format.html { redirect_to edit_admin_theme_path }
     end
   end

data/app/views/admin/themes/_theme.html.erb

@@ -2,7 +2,7 @@
   <h3><%= theme[:name] %></h3>
   <% form_for @theme, :url => admin_theme_path, :html => { :method => :put } do |f| -%>
   	<%= f.hidden_field :name, :value => theme[:name] %>
-  	<%= image_submit_tag theme[:preview_image] %>
+  	<%= image_submit_tag theme[:preview_image], :id => "#{theme[:name].parameterize}", :name => "#{theme[:name].parameterize}" %>
   	<%= theme[:description] %>
   <% end -%>
   <% if DomainTheme.use_domain_themes? -%>

data/app/views/admin/themes/edit.html.erb

@@ -8,7 +8,7 @@
       <%= render :partial => 'admin/themes/theme', :object => @current_theme %>      
       <% form_for @theme, :url => admin_theme_path, :html => { :method => :put } do |f| -%>
         <%= f.hidden_field :name, :value => '' %>
-        <%= submit_tag t('disguise.remove_all_themes') %>
+        <%= submit_tag t('disguise.remove_all_themes'), :id => 'remove_all_themes', :name => 'remove_all_themes' %>
       <% end -%>
     <% else -%>
       <%= t('disguise.no_current_theme') %>

data/disguise.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{disguise}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-07-21}
+  s.date = %q{2009-07-22}
   s.description = %q{Add themes to your Rails application to easily change the view layer and impress everyone you know}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [

data/locales/en.yml

@@ -15,4 +15,5 @@ en:
     theme_uri_label: Url for Theme
     uris_title: "This theme will be displayed for all the following urls"
     error_creating_domain_theme: "There was a problem adding the url: {{error}}"
-    uri_deleted: "The specified url has been deleted"
+    uri_deleted: "The specified url has been deleted"
+    theme_removed: "All themes have been removed"

data/test/rails_root/test/functional/admin/domain_themes_controller_test.rb

@@ -2,10 +2,9 @@ require File.dirname(__FILE__) + '/../../test_helper'
 
 class Admin::DomainThemesControllerTest < ActionController::TestCase
 
+  tests Admin::DomainThemesController
+  
   def setup
-    @controller = Admin::DomainThemesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @new_uri = 'red.example.com'
   end
   
@@ -35,4 +34,14 @@ class Admin::DomainThemesControllerTest < ActionController::TestCase
     should_redirect_to("edit theme") { edit_admin_theme_path }
   end
   
+  context "DELETE to destroy" do
+    setup do
+      @domain_theme = Factory(:domain_theme)
+      delete :destroy, :id => @domain_theme.to_param
+    end
+    should_set_the_flash_to(I18n.t('disguise.uri_deleted'))
+    should_redirect_to("admin edit theme") { edit_admin_theme_path }
+  end
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: disguise
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -06:00
+date: 2009-07-22 00:00:00 -06:00
 default_executable: 
 dependencies: []