casein 3.1.1 → 3.1.2

data/PUBLIC_VERSION.yml

@@ -1,4 +1,4 @@
 major: 3
 minor: 1
-patch: 1
+patch: 2
 build: 

data/README.rdoc

@@ -199,7 +199,7 @@ All of the standard Rails form helpers are available, but the Casein versions ar
   casein_file_field form, model, object_name, attribute, options = {}
   casein_hidden_field form, model, attribute, options = {}
 
-For more information on each function, check the casein_helper.rb file within the project. The method parameters are typically the same as the Rails form tag helpers. There are some extra Casein options that can be passed through as part of the options hash:
+For more information on each function, check the app/helpers/casein/casein_helper.rb file within the project. The method parameters are typically the same as the Rails form tag helpers. There are some extra Casein options that can be passed through as part of the options hash:
 
   :casein_label – by default the humanized version of the database field name is used as the label, but this will override it with a string of your choice.
   :casein_button_label – available in casein_radio_button and casein_check_box. Used to give individual buttons their labels.

data/app/helpers/casein/casein_helper.rb

@@ -45,7 +45,16 @@ module Casein
   	    contents = truncate(contents, :length => options[:casein_truncate], :omission => "...")
   	  end
 	  
-    	link_to "#{contents}", link
+    	link_to "#{contents}".html_safe, link, options
+    end
+    
+    def casein_table_cell_no_link contents, options = {}
+	  
+  	  if options.key? :casein_truncate
+  	    contents = truncate(contents, :length => options[:casein_truncate], :omission => "...")
+  	  end
+	  
+    	"<div class='noLink'>#{contents}</div>".html_safe
     end
 	
   	def casein_show_icon icon_name

data/lib/generators/casein/scaffold/templates/controller.rb

@@ -49,7 +49,7 @@ module Casein
     end
  
     def destroy
-      @<%= singular_name %> = <%= class_name %>.find_by_id params[:id]
+      @<%= singular_name %> = <%= class_name %>.find params[:id]
 
       @<%= singular_name %>.destroy
       flash[:notice] = '<%= singular_name.humanize.capitalize %> has been deleted'

data/lib/generators/casein/scaffold/templates/views/_table.html.erb

@@ -6,7 +6,7 @@
 		<% end %><th>&nbsp;</th>
 	</tr>
 	
-	<%% @<%= plural_name %>.each_with_index do |<%= singular_name %>, index| %>
+	<%% <%= plural_name %>.each_with_index do |<%= singular_name %>, index| %>
 		<tr class="<%%= 'even' if index.modulo(2) == 0 %> hover">
 			<% attributes.each do |attribute| %><td><%%= casein_table_cell_link <%= singular_name %>.<%= attribute.name %>, casein_<%= singular_name %>_path(<%= singular_name %>) %></td>
 			<% end %><td class="delete">

data/lib/generators/casein/scaffold/templates/views/index.html.erb

@@ -2,7 +2,7 @@
 
 <h2><%= plural_name.humanize.capitalize %></h2>
 
-<%%= render :partial => 'casein/<%= plural_name %>/table' %>
+<%%= render :partial => 'casein/<%= plural_name %>/table', :locals => { :<%= plural_name %> => @<%= plural_name %> } %>
 
 <%%= will_paginate @<%= plural_name %> %>
 

data/lib/generators/casein/update/templates/public/casein/stylesheets/elements.css

@@ -118,7 +118,7 @@
 	text-decoration: none;
 }
 
-#content .itemList td.noLink {
+#content .itemList td div.noLink {
 	padding: 9px 8px 7px 8px;
 }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casein
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Russell Quinn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +02:00
+date: 2010-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency