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

data/Rakefile

@@ -9,9 +9,10 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.18"
+    gemspec.version = "0.1.0"
     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-index-table", ">= 0.0.8"
     gemspec.add_dependency "qui-tabs", ">= 0.0.3"
     gemspec.add_dependency "qui-toolbar", ">= 0.0.4"
     gemspec.add_dependency "rfc822"

data/app/views/generic_controller/_index_table.erb

@@ -1,13 +1,13 @@
 <%- records ||= instance_variable_get("@#{@controller.class.to_s.demodulize.gsub("Controller", "").tableize}") -%>
 <%- class_name ||= @controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize -%>
 
-<%- headers = class_name.generic_fields.collect{|x| x.is_a?(Hash) ? ".#{x.keys.first}".to_sym : ".#{x}".to_sym} -%>
+<%- headers = class_name.generic_fields(:action => :index).collect{ |x| x[:options][:index_header] || ".#{x[:name]}".to_sym } -%>
 <%- controller_name = "#{defined?(section) ? "#{section.to_s.camelize}::" : ""}#{class_name.to_s.pluralize}".tableize %>
 <%- has_edit = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(controller_name, "edit") }.compact.size > 0 %>
 <%- has_delete = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(controller_name, "destroy") }.compact.size > 0 %>
 
 <%- if defined?(QM::ActsAsWorkflow) and class_name.is_workflow? -%>
-  <%- headers << :"#{section}.workflow.common.indexTableHeader" -%>
+  <%- headers << :"workflow.common.indexTableHeader" -%>
 <%- end -%>
 
 <%- if defined?(QUI::IndexTable) -%>
@@ -16,8 +16,14 @@
   <%- headers << :oneicon if has_delete %>
   
   <%- index_table records, :headers => headers, :class_name => class_name do |r| %>
-    <%- class_name.generic_fields.each do |field| -%>
-      <td><%= render :partial => "generic_controller/data", :locals => { :record => r, :field => field } %></td>
+    <%- class_name.generic_fields(:action => :index).each do |field| -%>
+      <td>
+        <%- if field[:options].has_key? :renderer -%>
+          <%= send(field[:options][:renderer], { :record => r, :field => field, :action => :index }) %>
+        <%- else -%>
+          <%= generic_renderer(:index, { :record => r, :field => field }) %>
+        <%- end -%>
+      </td>
     <%- end -%>
 
     <%- if defined?(QM::ActsAsWorkflow) and class_name.is_workflow? -%>

data/app/views/generic_controller/form.erb

@@ -14,65 +14,58 @@
   <%- end -%>
     
   <ol>
-  <%- klass.generic_fields.each do |field| -%>
-    <%- if field.is_a? Hash -%>
-      <%- attribute_name = field.keys.first.to_sym -%>
-    <%- else -%>
-      <%- attribute_name = field.to_sym -%>
-    <%- end -%>
-    
-
-    <%- is_association = klass.generic_field_associations[attribute_name].present? -%>
-    <%- association = klass.generic_field_associations[attribute_name] if is_association -%>
+  <%- klass.generic_fields(:action => :form).each do |field| -%>
+    <%- is_association = klass.generic_field_associations[field[:name]].present? -%>
+    <%- association = klass.generic_field_associations[field[:name]] if is_association -%>
     <%- is_writable = (not is_association or (is_association and not association[:readonly])) -%>
     <%- if is_writable -%>
       <%- if is_association -%>
-        <%- if klass.generic_field_associations[attribute_name][:kind] == :has_many or klass.generic_field_associations[attribute_name][:kind] == :has_and_belongs_to_many -%>
-          <%- is_accessible = klass.attr_accessible.include?("#{attribute_name.to_s.singularize}_ids") -%>
-        <%- elsif klass.generic_field_associations[attribute_name][:kind] == :belongs_to -%>
+        <%- if klass.generic_field_associations[field[:name]][:kind] == :has_many or klass.generic_field_associations[field[:name]][:kind] == :has_and_belongs_to_many -%>
+          <%- is_accessible = klass.attr_accessible.include?("#{field[:name].to_s.singularize}_ids") -%>
+        <%- elsif klass.generic_field_associations[field[:name]][:kind] == :belongs_to -%>
           <%- is_accessible = klass.attr_accessible.include?(association[:foreign_key].to_s) -%>
         <%- end -%>
       <%- else -%>
-        <%- is_accessible = klass.attr_accessible.include?(attribute_name.to_s) -%>
+        <%- is_accessible = klass.attr_accessible.include?(field[:name].to_s) -%>
       <%- end -%>
     <%- end -%>
 
     
     <%- if is_accessible -%>
       <li>
-        <%= f.label attribute_name %>
+        <%= f.label field[:name] %>
         
         <%- if field.is_a?(Hash) and field.values.first == :enum -%>
-          <%= f.select attribute_name, t("activerecord.enums.#{table_name}.#{attribute_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][attribute_name].to_s : f.object.send(attribute_name).to_s }  %>
+          <%= 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[attribute_name] -%>
-          <%- if klass.generic_field_associations[attribute_name][:kind] == :belongs_to -%>
+        <%- elsif klass.generic_field_associations[field[:name]] -%>
+          <%- if klass.generic_field_associations[field[:name]][:kind] == :belongs_to -%>
             <%= multiple_select :kind => :radio, :field => field, :record => record %>
             
-          <%- elsif klass.generic_field_associations[attribute_name][:kind] == :has_and_belongs_to_many or klass.generic_field_associations[attribute_name][:kind] == :has_many-%>
+          <%- elsif klass.generic_field_associations[field[:name]][:kind] == :has_and_belongs_to_many or klass.generic_field_associations[field[:name]][:kind] == :has_many-%>
             <%= multiple_select :kind => :check, :field => field, :record => record  %>
 
           <%- end -%>
           
         <%- else -%> 
-          <%- case record.column_for_attribute(attribute_name).type -%>
+          <%- case record.column_for_attribute(field[:name]).type -%>
             <%- when :text -%>
-              <%= f.text_area attribute_name, :rows => 5, :cols => 60 %>
+              <%= f.text_area field[:name], :rows => 5, :cols => 60 %>
             <%- when :date, :datetime -%>
-              <%= f.calendar_date_select attribute_name %>
+              <%= f.calendar_date_select field[:name] %>
             <%- when :boolean -%>
               <span class="boolean">
-                <%= f.radio_button attribute_name, "1", { :checked => params[table_name] && params[table_name].has_key?(attribute_name) ? params[table_name][attribute_name] == "1" : f.object.send(attribute_name) == true } %><%= f.label attribute_name, t(:"genericController.yesAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{attribute_name}_1" } %>
-                <%= f.radio_button attribute_name, "0", { :checked => params[table_name] && params[table_name].has_key?(attribute_name) ? params[table_name][attribute_name] == "0" : f.object.send(attribute_name) == false } %><%= f.label attribute_name, t(:"genericController.noAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{attribute_name}_0" } %>
+                <%= f.radio_button field[:name], "1", { :checked => params[table_name] && params[table_name].has_key?(field[:name]) ? params[table_name][field[:name]] == "1" : f.object.send(field[:name]) == true } %><%= f.label field[:name], t(:"genericController.yesAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{field[:name]}_1" } %>
+                <%= f.radio_button field[:name], "0", { :checked => params[table_name] && params[table_name].has_key?(field[:name]) ? params[table_name][field[:name]] == "0" : f.object.send(field[:name]) == false } %><%= f.label field[:name], t(:"genericController.noAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{field[:name]}_0" } %>
               </span>
 
             <%- else -%>
             
-              <%- if record.respond_to?(attribute_name) and record.respond_to?("#{attribute_name}_file_name") and record.respond_to?("#{attribute_name}_content_type") -%>
-                <%= f.file_field attribute_name %>
+              <%- if record.respond_to?(field[:name]) and record.respond_to?("#{field[:name]}_file_name") and record.respond_to?("#{field[:name]}_content_type") -%>
+                <%= f.file_field field[:name] %>
               
               <%- else -%>
-                <%= f.text_field attribute_name %>
+                <%= f.text_field field[:name] %>
               <%- end -%>
           <%- end -%>
         <%- end -%>

data/app/views/generic_controller/index.erb

@@ -17,7 +17,7 @@
   <%- content_tag(:div, :class => "index_scopes") do -%>
     <%- form_tag params, :method => :get do  -%>
       <%- class_name.named_scopes.each do |identifier, options| -%>
-        <%- if options.has_key?(:generic) and options[:generic] == true -%>
+        <%- if options.is_a?(Hash) and options.has_key?(:generic) and options[:generic] == true -%>
           <%= check_box_tag "scopes[]", identifier, params[:scopes] && params[:scopes].include?(identifier.to_s), :id => "scope_#{class_name}_#{identifier}" %>
           <%= label_tag "scope_#{class_name}_#{identifier}", t(:"#{section}.scopes.#{class_name.to_s.tableize.singularize}.#{identifier}") %>
         <%- end -%>

data/app/views/generic_controller/show.erb

@@ -13,16 +13,16 @@
 
 <%- description = capture do -%>
   <dl>
-    <%- klass.generic_fields.each do |field| -%>
-      <%- if field.is_a? Hash -%>
-        <%- attribute_name = field.keys.first.to_sym -%>
-      <%- else -%>
-        <%- attribute_name = field.to_sym -%>
-      <%- end -%>
-
-      <dt><%= h klass.human_attribute_name attribute_name %></dt>
-
-      <dd><%= render :partial => "generic_controller/data", :locals => { :record => record, :field => field } %></dd>
+    <%- klass.generic_fields(:action => :show).each do |field| -%>
+      <dt><%= h klass.human_attribute_name field[:name] %></dt>
+
+      <dd>
+        <%- if field[:options].has_key? :renderer -%>
+          <%= send(field[:options][:renderer], { :record => record, :field => field, :action => :show }) %>
+        <%- else -%>
+          <%= generic_renderer(:show, { :record => record, :field => field }) %>
+        <%- end -%>      
+      </dd>
     <%- end -%>
   </dl>
 <%- end -%>

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

@@ -8,7 +8,7 @@ module QM
 
       module ClassMethods
         def generic_field_associations
-          @generic_field_associations  
+          @generic_field_associations || {}
         end
         
         def has_many(association_id, options = {}, &extension)
@@ -46,7 +46,7 @@ module QM
 
         def generic_named_scopes
           scopes = {}
-          named_scopes.each{ |i, o| scopes[i] = o if o.has_key?(:generic) and o[:generic] }
+          named_scopes.each{ |i, o| scopes[i] = o if o.is_a? Hash and o.has_key?(:generic) and o[:generic] } # TODO creating generic named_scopes with lambdas
           scopes
         end
         
@@ -65,16 +65,34 @@ module QM
       
       
       
-        def generic_fields
-          @generic_fields || []
+        def generic_fields(options = {})
+          @generic_fields ||= {}
+          if options.has_key? :action
+            @generic_fields[options[:action]] || []
+          else
+            @generic_fields || []
+          end
         end
 
         def generic_form_fieldsets
           @generic_form_fieldsets
         end
-        
-        def has_generic_fields(*fields)
-          @generic_fields = fields.flatten
+
+        def has_generic_field_for(actions, name, options = {})
+          options = options.symbolize_keys!
+          @generic_fields ||= {}
+          
+          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_fields[action.to_sym] ||= []
+              @generic_fields[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_fields[actions.to_sym] ||= []
+            @generic_fields[actions.to_sym] << { :name => name.to_sym, :options => options }
+          end
         end
 
         def has_generic_form_fieldsets(*fieldsets)

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

@@ -1,6 +1,33 @@
 module QM
   module ActsAsGenericController
     module ViewIncludes
+      def generic_renderer(action, options = {})
+
+        data = options[:record].send options[:field][:name]
+        
+        result = ""
+        
+        if data.is_a?(ActiveRecord::Base)
+          result = link_to_object options[:record].send(options[:field][:name])
+
+        elsif data.is_a?(Array) and data.first.is_a?(ActiveRecord::Base)
+          result = data.collect{ |x| link_to_object(x) }.sort_alphabetical.join(", ")
+
+        elsif defined?(RFC822) and data.is_a?(String) and data =~ RFC822::EMAIL_REGEXP_WHOLE
+          result = link_to data, "mailto:#{data}"
+          
+        else
+          result = h data
+        end
+        
+        
+        puts options.inspect
+        
+        result = link_to_object options[:record], result if options[:field][:options][:link_to] == :show
+        
+        result
+      end
+    
       def multiple_select(options = {})
         options.symbolize_keys!
         options[:item] ||= {}
@@ -9,11 +36,7 @@ module QM
         @multiple_select_count += 1 
 
         if options.has_key?(:field) and not options[:field].nil? and options.has_key?(:record) and options[:record].is_a? ActiveRecord::Base
-          if options[:field].is_a? Hash 
-            attribute_name = options[:field].keys.first.to_sym 
-          else 
-            attribute_name = options[:field].to_sym 
-          end 
+          attribute_name = options[:field][:name]
 
           klass = options[:record].class 
           table_name = klass.to_s.tableize.singularize 
@@ -27,7 +50,7 @@ module QM
             allow_nil ||= options[:record].column_for_attribute(klass.generic_field_associations[attribute_name][:foreign_key]).null 
           end
           
-          if klass.respond_to? :limit_for_user and defined?(current_user)
+          if klass.generic_field_associations[attribute_name][:class_name].respond_to? :limit_for_user and defined?(current_user)
             collection = klass.generic_field_associations[attribute_name][:class_name].limit_for_user(current_user)
           else
             collection = klass.generic_field_associations[attribute_name][:class_name].all 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 18
-  version: 0.0.18
+  version: 0.1.0
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: qui-tabs
+  name: qui-index-table
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 0
+        - 8
+        version: 0.0.8
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: qui-tabs
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 3
         version: 0.0.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: qui-toolbar
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +81,11 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rfc822
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +95,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sort_alphabetical
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +109,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: calendar_date_select
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,7 +123,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: "qM: generates generic controller actions and views"
 email: marcin@saepia.net
 executables: []
@@ -119,7 +135,6 @@ extra_rdoc_files:
 files: 
 - MIT-LICENSE
 - Rakefile
-- app/views/generic_controller/_data.erb
 - app/views/generic_controller/_index_table.erb
 - app/views/generic_controller/_multiple_select.erb
 - app/views/generic_controller/form.erb

data/app/views/generic_controller/_data.erb

@@ -1,26 +0,0 @@
-<%- if field.is_a? Hash -%>
-  <%- attribute_name = field.keys.first.to_sym -%>
-<%- else -%>
-  <%- attribute_name = field.to_sym -%>
-<%- end -%>
-
-<%- data = record.send attribute_name -%>
-    
-<%- if data.is_a?(ActiveRecord::Base) -%>
-  <%= link_to_object record.send(field) %>
-
-<%- elsif data.is_a?(Array) and data.first.is_a?(ActiveRecord::Base) -%>
-  <%= data.collect{ |x| link_to_object(x) }.sort_alphabetical.join(", ") %>
-
-<%- elsif field.is_a?(Hash) and field.values.first == :link_to_show -%>
-  <%= link_to_object record, data %>
-
-<%- elsif field.is_a?(Hash) and field.values.first == :enum -%>
-  <%= h record.enum_human_value attribute_name  %>
-
-<%- elsif data.is_a?(String) and data =~ RFC822::EMAIL_REGEXP_WHOLE -%>
-  <%= link_to data, "mailto:#{data}" %>
-  
-<%- else -%>
-  <%= h data %>
-<%- end -%>