simple_resource 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+0.3.0 (January 15, 2013)
+
+* Devise support
+* Twitter Bootstrap support
+
 0.2.0 (January 15, 2013)
 
 * CanCan support

data/app/controllers/simple_resource/base_controller.rb

@@ -4,7 +4,11 @@ module SimpleResource
       load_and_authorize_resource
 
       rescue_from CanCan::AccessDenied do |exception|
-        redirect_to root_url, alert: exception.message
+        if !current_user && respond_to?(:new_user_session_url)
+          redirect_to new_user_session_url, alert: exception.message
+        else
+          redirect_to root_url, alert: exception.message
+        end
       end
     end
 

data/app/helpers/simple_resource/base_helper.rb

@@ -26,7 +26,7 @@ module SimpleResource
     end
 
     def new_resource_link
-      link_to(new_resource_link_title, new_resource_path)
+      link_to(icon_for(:new) + new_resource_link_title, new_resource_path, class: button_classes_for(:new))
     end
 
     def edit_resource_title
@@ -67,10 +67,10 @@ module SimpleResource
     def link_to_action(action_name, title, path)
       action_name = action_name.to_sym
       if action_name == :delete
-        link_to(t("simple_resource.#{action_name.to_s}", default: title), path,
+        link_to(icon_for(action_name) + t("simple_resource.#{action_name.to_s}", default: title), path, class: button_classes_for(action_name, true),
           method: :delete, confirm: t("simple_resource.messages.delete_confirmation"))
       else
-        link_to(t("simple_resource.#{action_name.to_s}", default: title), path)
+        link_to(icon_for(action_name) + t("simple_resource.#{action_name.to_s}", default: title), path, class: button_classes_for(action_name, true))
       end
     end
 
@@ -82,6 +82,25 @@ module SimpleResource
       html.join("\n").html_safe
     end
 
+    def icon_for(action)
+      return "" if !SimpleResource::Configuration.respond_to?("icon_classes_for_#{action.to_s}")
+      icon_classes = Array.new
+      icon_classes << SimpleResource::Configuration.icon_classes
+      icon_classes << SimpleResource::Configuration.send("icon_classes_for_#{action.to_s}")
+      content_tag(:i, "", class: icon_classes.join(" ").strip).html_safe + " "
+    end
+    
+    def button_classes_for(action, mini = false)
+      button_classes = Array.new
+      button_classes << SimpleResource::Configuration.button_classes
+      button_classes << SimpleResource::Configuration.mini_button_classes if mini
+      button_classes << (
+        SimpleResource::Configuration.respond_to?("button_classes_for_#{action.to_s}") ?
+        SimpleResource::Configuration.send("button_classes_for_#{action.to_s}") :
+        "")
+      button_classes.join(" ").strip
+    end
+
     def controller_namespaces
       namespaces = controller_path.split("/")
       namespaces.pop

data/lib/simple_resource/configuration.rb

@@ -0,0 +1,40 @@
+module SimpleResource
+  module Configuration
+    mattr_accessor :button_classes
+    self.button_classes = "btn"
+    
+    mattr_accessor :mini_button_classes
+    self.mini_button_classes = "btn-mini"
+
+    mattr_accessor :button_classes_for_new
+    self.button_classes_for_new = ""
+    
+    mattr_accessor :button_classes_for_show
+    self.button_classes_for_show = ""
+    
+    mattr_accessor :button_classes_for_edit
+    self.button_classes_for_edit = ""
+    
+    mattr_accessor :button_classes_for_delete
+    self.button_classes_for_delete = "btn-danger"
+
+    mattr_accessor :icon_classes
+    self.icon_classes = ""
+    
+    mattr_accessor :icon_classes_for_new
+    self.icon_classes_for_new = "icon-plus-sign"
+    
+    mattr_accessor :icon_classes_for_show
+    self.icon_classes_for_show = "icon-zoom-in"
+    
+    mattr_accessor :icon_classes_for_edit
+    self.icon_classes_for_edit = "icon-edit"
+    
+    mattr_accessor :icon_classes_for_delete
+    self.icon_classes_for_delete = "icon-trash icon-white"
+
+    def configure
+      yield self if block_given?
+    end
+  end
+end

data/lib/simple_resource/version.rb

@@ -1,3 +1,3 @@
 module SimpleResource
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/simple_resource.rb

@@ -1,6 +1,8 @@
 require "inherited_resources"
+require "simple_resource/configuration"
 require "simple_resource/engine"
 require "simple_resource/version"
 
 module SimpleResource
+  include Configuration
 end

data/spec/helpers/base_helper_spec.rb

@@ -74,12 +74,12 @@ describe SimpleResource::BaseHelper do
 
   describe "#new_resource_link" do
     it "returns default version of new resource link" do
-      helper.new_resource_link.should eq('<a href="/languages/new">New Language</a>')
+      helper.new_resource_link.should eq('<a href="/languages/new" class="btn"><i class="icon-plus-sign"></i> New Language</a>')
     end
 
     it "returns translated version of new resource link" do
       set_locale
-      helper.new_resource_link.should eq('<a href="/languages/new">Uusi Kieli</a>')
+      helper.new_resource_link.should eq('<a href="/languages/new" class="btn"><i class="icon-plus-sign"></i> Uusi Kieli</a>')
       reset_locale
     end 
   end
@@ -176,43 +176,43 @@ describe SimpleResource::BaseHelper do
   describe "#link_to_action" do
     context "with action :show" do
       it "returns show link" do
-        helper.link_to_action(:show, "Show", "/languages/1").should eq('<a href="/languages/1">Show</a>')
+        helper.link_to_action(:show, "Show", "/languages/1").should eq('<a href="/languages/1" class="btn btn-mini"><i class="icon-zoom-in"></i> Show</a>')
       end
       
       it "returns translated show link" do
         set_locale
-        helper.link_to_action(:show, "Näytä", "/languages/1").should eq('<a href="/languages/1">Näytä</a>')
+        helper.link_to_action(:show, "Näytä", "/languages/1").should eq('<a href="/languages/1" class="btn btn-mini"><i class="icon-zoom-in"></i> Näytä</a>')
         reset_locale
       end
     end
     
     context "with action :edit" do
       it "returns edit link" do
-        helper.link_to_action(:edit, "Edit", "/languages/1/edit").should eq('<a href="/languages/1/edit">Edit</a>')
+        helper.link_to_action(:edit, "Edit", "/languages/1/edit").should eq('<a href="/languages/1/edit" class="btn btn-mini"><i class="icon-edit"></i> Edit</a>')
       end
       
       it "returns translated edit link" do
         set_locale
-        helper.link_to_action(:edit, "Muokkaa", "/languages/1/edit").should eq('<a href="/languages/1/edit">Muokkaa</a>')
+        helper.link_to_action(:edit, "Muokkaa", "/languages/1/edit").should eq('<a href="/languages/1/edit" class="btn btn-mini"><i class="icon-edit"></i> Muokkaa</a>')
         reset_locale
       end
     end
     
     context "with action :delete" do
       it "returns delete link" do
-        helper.link_to_action(:delete, "Delete", "/languages/1").should eq('<a href="/languages/1" data-confirm="Are you sure?" data-method="delete" rel="nofollow">Delete</a>')
+        helper.link_to_action(:delete, "Delete", "/languages/1").should eq('<a href="/languages/1" class="btn btn-mini btn-danger" data-confirm="Are you sure?" data-method="delete" rel="nofollow"><i class="icon-trash icon-white"></i> Delete</a>')
       end
       
       it "returns translated delete link" do
         set_locale
-        helper.link_to_action(:delete, "Poista", "/languages/1").should eq('<a href="/languages/1" data-confirm="Oletko varma?" data-method="delete" rel="nofollow">Poista</a>')
+        helper.link_to_action(:delete, "Poista", "/languages/1").should eq('<a href="/languages/1" class="btn btn-mini btn-danger" data-confirm="Oletko varma?" data-method="delete" rel="nofollow"><i class="icon-trash icon-white"></i> Poista</a>')
         reset_locale
       end
     end
     
     context "with custom action" do
       it "returns link to custom action" do
-        helper.link_to_action(:children, "Children", "/languages/1/children").should eq('<a href="/languages/1/children">Children</a>')
+        helper.link_to_action(:children, "Children", "/languages/1/children").should eq('<a href="/languages/1/children" class="btn btn-mini">Children</a>')
       end
     end
   end
@@ -222,10 +222,10 @@ describe SimpleResource::BaseHelper do
 
     it "returns default actions for given resource" do
       collection.each do |resource|
-        expected =  %Q(<a href="/languages/#{resource.id}">Show</a>\n)
-        expected += %Q(<a href="/languages/#{resource.id}/edit">Edit</a>\n)
-        expected += %Q(<a href="/languages/#{resource.id}" data-confirm="Are you sure?")
-        expected += %Q( data-method="delete" rel="nofollow">Delete</a>)
+        expected =  %Q(<a href="/languages/#{resource.id}" class="btn btn-mini"><i class="icon-zoom-in"></i> Show</a>\n)
+        expected += %Q(<a href="/languages/#{resource.id}/edit" class="btn btn-mini"><i class="icon-edit"></i> Edit</a>\n)
+        expected += %Q(<a href="/languages/#{resource.id}" class="btn btn-mini btn-danger" data-confirm="Are you sure?")
+        expected += %Q( data-method="delete" rel="nofollow"><i class="icon-trash icon-white"></i> Delete</a>)
         helper.default_actions_for(resource).should eq(expected)
       end
     end
@@ -315,10 +315,10 @@ describe SimpleResource::BaseHelper do
 
     it "returns actions for given resource in HTML" do
       collection.each do |resource|
-        expected =  %Q(<a href="/languages/#{resource.id}">Show</a>\n)
-        expected += %Q(<a href="/languages/#{resource.id}/edit">Edit</a>\n)
-        expected += %Q(<a href="/languages/#{resource.id}" data-confirm="Are you sure?")
-        expected += %Q( data-method="delete" rel="nofollow">Delete</a>\n)
+        expected =  %Q(<a href="/languages/#{resource.id}" class="btn btn-mini"><i class="icon-zoom-in"></i> Show</a>\n)
+        expected += %Q(<a href="/languages/#{resource.id}/edit" class="btn btn-mini"><i class="icon-edit"></i> Edit</a>\n)
+        expected += %Q(<a href="/languages/#{resource.id}" class="btn btn-mini btn-danger" data-confirm="Are you sure?")
+        expected += %Q( data-method="delete" rel="nofollow"><i class="icon-trash icon-white"></i> Delete</a>\n)
         helper.render_actions_for(resource).should eq(expected)
       end
     end
@@ -337,10 +337,10 @@ describe SimpleResource::BaseHelper do
 
       collection.each do |resource|
         expected += %Q(<tr><td>#{resource.name}</td><td class="actions">)
-        expected += %Q(<a href="/languages/#{resource.id}">Show</a>)
-        expected += %Q(<a href="/languages/#{resource.id}/edit">Edit</a>)
-        expected += %Q(<a href="/languages/#{resource.id}" data-confirm="Are you sure?")
-        expected += %Q( data-method="delete" rel="nofollow">Delete</a>)
+        expected += %Q(<a href="/languages/#{resource.id}" class="btn btn-mini"><i class="icon-zoom-in"></i> Show</a>)
+        expected += %Q(<a href="/languages/#{resource.id}/edit" class="btn btn-mini"><i class="icon-edit"></i> Edit</a>)
+        expected += %Q(<a href="/languages/#{resource.id}" class="btn btn-mini btn-danger" data-confirm="Are you sure?")
+        expected += %Q( data-method="delete" rel="nofollow"><i class="icon-trash icon-white"></i> Delete</a>)
         expected += %Q(</td></tr>)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_resource
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -249,6 +249,7 @@ files:
 - app/views/simple_resource/builders/_simple_form.html.erb
 - config/locales/en.yml
 - lib/simple_resource.rb
+- lib/simple_resource/configuration.rb
 - lib/simple_resource/engine.rb
 - lib/simple_resource/version.rb
 - script/rails
@@ -316,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1479618243370591090
+      hash: 2164673244938550078
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -325,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1479618243370591090
+      hash: 2164673244938550078
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24