qm-acts-as-generic-controller 0.1.0 → 0.1.1

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.1.0"
+    gemspec.version = "0.1.1"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile", "lib/*", "app/views/generic_controller/*" ]
-    gemspec.add_dependency "qui-common-helpers", ">= 0.0.7"
+    gemspec.add_dependency "qui-common-helpers", ">= 0.0.8"
     gemspec.add_dependency "qui-index-table", ">= 0.0.8"
     gemspec.add_dependency "qui-tabs", ">= 0.0.3"
     gemspec.add_dependency "qui-toolbar", ">= 0.0.4"

data/app/views/generic_controller/_index_table.erb

@@ -11,6 +11,7 @@
 <%- end -%>
 
 <%- if defined?(QUI::IndexTable) -%>
+  <%- class_name.generic_actions(:action => :index).size.times{ headers << :oneicon } -%>
 
   <%- headers << :oneicon if has_edit %>
   <%- headers << :oneicon if has_delete %>
@@ -34,12 +35,16 @@
       </td>
     <%- end -%>
 
+    <%- class_name.generic_actions(:action => :index).each do |action| -%>
+      <%= content_tag(:td, send(action[:options][:renderer], { :action => :index, :record => r, :action => action }), :class => "action #{action[:name]}") %>
+    <%- end -%>
+
     <%- if has_edit -%>
-      <td><%= link_to_edit r %></td>
+      <td class="action edit"><%= link_to_edit r %></td>
     <%- end -%>
     
     <%- if has_delete -%>
-      <td><%= link_to_delete r %></td>
+      <td class="action delete"><%= link_to_delete r %></td>
     <%- end -%>
     
     

data/app/views/generic_controller/form.erb

@@ -35,7 +35,7 @@
       <li>
         <%= f.label field[:name] %>
         
-        <%- if field.is_a?(Hash) and field.values.first == :enum -%>
+        <%- if klass.is_enum?(field[:name]) -%>
           <%= f.select field[:name], t("activerecord.enums.#{table_name}.#{field[:name]}").collect{|k,v| [v, k.to_s] }.sort{|x,y| x.last.to_i <=> y.last.to_i }, { :selected => params[table_name] ? params[table_name][field[:name]].to_s : f.object.send(field[:name]).to_s }  %>
           
         <%- elsif klass.generic_field_associations[field[:name]] -%>

data/lib/qm-acts-as-generic-controller-model.rb

@@ -64,9 +64,18 @@ module QM
         end
       
       
+
+        def generic_actions(options = {})
+          @generic_actions ||= {}  
+          if options.has_key? :action
+            @generic_actions[options[:action]] || []
+          else
+            @generic_actions || []
+          end
+        end
       
         def generic_fields(options = {})
-          @generic_fields ||= {}
+          @generic_fields ||= {}  
           if options.has_key? :action
             @generic_fields[options[:action]] || []
           else
@@ -94,6 +103,24 @@ module QM
             @generic_fields[actions.to_sym] << { :name => name.to_sym, :options => options }
           end
         end
+        
+        def has_generic_action_for(actions, name, options = {})
+          options = options.symbolize_keys!
+          @generic_actions ||= {}
+          
+          if actions.is_a? Array
+            actions.each do |action|
+              raise ArgumentError, "action must be one of :index, :show, :form" unless [ :index, :show, :form ].include? action.to_sym
+              @generic_actions[action.to_sym] ||= []
+              @generic_actions[action.to_sym] << { :name => name.to_sym, :options => options }
+            end
+          else
+            raise ArgumentError, "action must be one of :index, :show, :form" unless [ :index, :show, :form ].include? actions.to_sym
+            @generic_actions[actions.to_sym] ||= []
+            @generic_actions[actions.to_sym] << { :name => name.to_sym, :options => options }
+          end
+        
+        end
 
         def has_generic_form_fieldsets(*fieldsets)
           @generic_form_fieldsets = fieldsets.flatten

data/lib/qm-acts-as-generic-controller-view.rb

@@ -13,6 +13,12 @@ module QM
         elsif data.is_a?(Array) and data.first.is_a?(ActiveRecord::Base)
           result = data.collect{ |x| link_to_object(x) }.sort_alphabetical.join(", ")
 
+        elsif options[:record].class.is_enum? options[:field][:name]
+          result = t("activerecord.enums.#{options[:record].class.table_name.singularize}.#{options[:field][:name]}.#{data}")
+          
+        elsif options[:record].class.columns_hash[options[:field][:name].to_s].type == :boolean
+          result = data ? image_tag("tick.png", :alt => t(:"genericController.yesAsBooleanOption")) : ""
+        
         elsif defined?(RFC822) and data.is_a?(String) and data =~ RFC822::EMAIL_REGEXP_WHOLE
           result = link_to data, "mailto:#{data}"
           
@@ -20,9 +26,6 @@ module QM
           result = h data
         end
         
-        
-        puts options.inspect
-        
         result = link_to_object options[:record], result if options[:field][:options][:link_to] == :show
         
         result

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency