qm-acts-as-generic-controller 0.0.11 → 0.0.12

data/Rakefile

@@ -9,9 +9,11 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.11"
+    gemspec.version = "0.0.12"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile", "lib/*", "app/views/generic_controller/*" ]
     gemspec.add_dependency "qui-common-helpers", ">= 0.0.6"
+    gemspec.add_dependency "qui-tabs", ">= 0.0.3"
+    gemspec.add_dependency "qui-toolbar", ">= 0.0.4"
     gemspec.add_dependency "rfc822"
     gemspec.add_dependency "sort_alphabetical"
     gemspec.add_dependency "calendar_date_select"

data/app/views/generic_controller/_multiple_select.erb

@@ -1,35 +1,3 @@
-<%- @mutliple_select_count ||= 0 -%>
-
-<%- if defined?(field) and defined?(record) -%>
-  <%- if field.is_a? Hash -%>
-    <%- attribute_name = field.keys.first.to_sym -%>
-  <%- else -%>
-    <%- attribute_name = field.to_sym -%>
-  <%- end -%>
-
-  <%- klass = record.class -%>
-  <%- table_name = klass.to_s.tableize.singularize -%>
-
-  <%- if kind == :check -%>
-    <%- field_name = "#{table_name}[#{attribute_name.to_s.singularize}_ids][]" -%>
-    <%- allow_nil = false -%>
-
-  <%- elsif kind == :radio -%>
-    <%- field_name = "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]" -%>
-    <%- allow_nil ||= record.column_for_attribute(klass.generic_field_associations[attribute_name][:foreign_key]).null -%>
-  <%- end -%>
-
-  <%- collection = klass.generic_field_associations[attribute_name][:class_name].all -%>
-
-
-<%- elsif defined?(collection) and defined?(attribute_name) -%>
-  <%- allow_nil ||= false -%>
-  <%- field_name = attribute_name -%>
-
-<%- else -%>
-  <%- raise ArgumentError, "You must pass some variables as locals to generic_controller/multiple_select partial. Possibilities are: 'field' and 'record' for automatic associations, or 'collection' and 'attribute_name' just for displaying a set." -%>
-<%- end -%>
-
 <%- content_tag(:div, :class => "multiple_select", :id => "multiple_select_for_#{attribute_name}") do -%>
   <%- content_tag(:div, :class => "filter") do -%>
     <%= text_field_tag "multiple_select_filter_for_#{attribute_name}", "" %>
@@ -99,26 +67,46 @@
       <%- if kind == :check -%>
         <%- if defined?(record) -%>
           <%- selected = (params[table_name] && params[table_name]["#{attribute_name.to_s.singularize}_ids"] ? params[table_name]["#{attribute_name.to_s.singularize}_ids"].include?(element.id.to_s) : record.send("#{attribute_name.to_s.singularize}_ids").include?(element.id) ) -%>
-        <%- else -%>
+        <%- elsif mode == :activerecord -%>
           <%- selected = params[table_name] && params[table_name].include?(element.id.to_s) -%>
+        <%- else -%>
+          <%- selected = false -%>
         <%- end -%>
           
-        <%= check_box_tag field_name, element.id, selected, :id => "ms#{@mutliple_select_count}_#{table_name}_#{attribute_name}_#{element.id}" %>
+        <%- if mode == :collection and element.is_a? Array -%>
+          <%= check_box_tag field_name, element.last, selected, :id => "ms#{@multiple_select_count}_#{attribute_name}_#{element.last}" %>
+        <%- else -%>
+          <%= check_box_tag field_name, element.id, selected, :id => "ms#{@multiple_select_count}_#{table_name}_#{attribute_name}_#{element.id}" %>
+        <%- end -%>
         
       <%- elsif kind == :radio -%>
-        <%- if defined?(record) -%>
-          <%- selected = (params[table_name] ? params[table_name]["#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]"] == element.id.to_s : record.send(klass.generic_field_associations[attribute_name][:foreign_key]) == element.id) -%>
-        <%- else -%>
-          <%- selected = params[table_name] && params[table_name] == element.id.to_s -%>
+        <%- if mode == :activerecord -%>
+          <%- if defined?(record) -%>
+            <%- selected = (params[table_name] ? params[table_name]["#{klass.generic_field_associations[attribute_name][:foreign_key]}"] == element.id.to_s : record.send(klass.generic_field_associations[attribute_name][:foreign_key]) == element.id) -%>
+          <%- else -%>
+            <%- selected = params[table_name] && params[table_name] == element.id.to_s -%>
+          <%- end -%>
+        <%- elsif mode == :collection -%>
+          <%- if element.is_a? Array -%>
+            <%- selected = params[field_name].to_s == element.last.to_s -%>
+          <%- else -%>
+            <%- selected = false -%>
+          <%- end -%>
         <%- end -%>
         
-        <%= radio_button_tag field_name, element.id, selected, :id => "ms#{@mutliple_select_count}_#{table_name}_#{attribute_name}_#{element.id}" %>
+        <%- if mode == :collection and element.is_a? Array -%>
+          <%= radio_button_tag field_name, element.last, selected, :id => "ms#{@multiple_select_count}_#{attribute_name}_#{element.last}" %>
+        <%- else -%>
+          <%= radio_button_tag field_name, element.id, selected, :id => "ms#{@multiple_select_count}_#{table_name}_#{attribute_name}_#{element.id}" %>
+        <%- end -%>
       <%- end -%>
       
-      <%= label_tag "ms#{@mutliple_select_count}_#{table_name}_#{attribute_name}_#{element.id}", element.link_default_description %>
+      <%- if mode == :collection and element.is_a? Array -%>
+        <%= label_tag "ms#{@multiple_select_count}_#{attribute_name}_#{element.last}", element.first %>
+      <%- else -%>
+        <%= label_tag "ms#{@multiple_select_count}_#{table_name}_#{attribute_name}_#{element.id}", element.link_default_description %>
+      <%- end -%>
     </li>
   <%- end -%>
   </ul>
 <%- end -%>
-
-<%- @mutliple_select_count += 1 -%>

data/app/views/generic_controller/form.erb

@@ -47,10 +47,10 @@
           
         <%- elsif klass.generic_field_associations[attribute_name] -%>
           <%- if klass.generic_field_associations[attribute_name][:kind] == :belongs_to -%>
-            <%= render :partial => "generic_controller/multiple_select", :locals => { :kind => :radio, :field => field, :record => record } %>
+            <%= 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-%>
-            <%= render :partial => "generic_controller/multiple_select", :locals => { :kind => :check, :field => field, :record => record } %>
+            <%= multiple_select :kind => :check, :field => field, :record => record  %>
 
           <%- end -%>
           

data/app/views/generic_controller/show.erb

@@ -1,10 +1,8 @@
-<%- if defined?(QUI::Toolbar) -%>
-  <%- toolbar do |t| -%>
-    <%= t.index %>
-    <%= t.separator %>
-    <%= t.edit %>
-    <%= t.delete %>
-  <%- end -%>
+<%- toolbar do |t| -%>
+  <%= t.index %>
+  <%= t.separator %>
+  <%= t.edit %>
+  <%= t.delete %>
 <%- end -%>
 
 <%- klass = @controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize -%>
@@ -31,13 +29,17 @@
 
 <%- tab_contents = {} -%>
 <%- record.class.generic_field_associations.each do |k,v| -%>
-  <%- if (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and not v[:through] -%>
+  <%- if (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and (v[:generic_create] or not v[:through]) -%>
     <%- tab_contents[k] = capture do -%>
+      <%- if v[:generic_create] -%>
+        <%= link_to t(:"toolbar.create"), url_for([ "new", section, v[:class_name].table_name.singularize ]) + "?#{v[:class_name].table_name.singularize}[#{table_name}_id]=#{record.id}" %>
+      <%- end -%>
+    
       <%= render :partial => "generic_controller/index_table", :locals => { :records => record.send(k), :class_name => v[:class_name] } %>
     <%- end -%>
   <%- end -%>
 <%- end -%>
 
-<%= tabs :tabs => [ { :header => { :text => :"#{section_prefix}tabs.common.description" }, :body => { :text => description } } ] + record.class.generic_field_associations.collect{|k,v| { :header => { :text => t(:"#{section_prefix}tabs.#{table_name}.#{k}") + " (#{record.send(k).count})" }, :body => { :text => tab_contents[k] } } if (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and v[:through] == false and record.send(k).count > 0 }.compact -%>
+<%= tabs :tabs => [ { :header => { :text => :"#{section_prefix}tabs.common.description" }, :body => { :text => description } } ] + record.class.generic_field_associations.collect{|k,v| { :header => { :text => t(:"#{section_prefix}tabs.#{table_name}.#{k}") + " (#{record.send(k).count})" }, :body => { :text => tab_contents[k] } } if (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and v[:through] == false and (record.send(k).count > 0 or v[:generic_create]) }.compact -%>
                     
 

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

@@ -68,7 +68,7 @@ module QM
         end
         
         def new
-          instance_variable_set singular_variable, model.new unless instance_variable_defined?(singular_variable)
+          instance_variable_set singular_variable, model.new(params[singular_variable(true)]) unless instance_variable_defined?(singular_variable)
 
           respond_to do |format|
             format.html
@@ -77,8 +77,7 @@ module QM
         end
 
         def create
-          instance_variable_set(singular_variable, model.new) unless instance_variable_defined?(singular_variable)
-          instance_variable_get(singular_variable).update_attributes params[singular_variable(true)]
+          instance_variable_set(singular_variable, model.new(params[singular_variable(true)])) unless instance_variable_defined?(singular_variable)
 
           respond_to do |format|
             if instance_variable_get(singular_variable).save
@@ -91,7 +90,7 @@ module QM
                 format.xml  { render :xml => instance_variable_get(singular_variable), :status => :created, :location => instance_variable_get(singular_variable) }
               end
             else
-              format.html { render :template => "generic_controller/form" }
+              format.html { render :action => "new" }
               format.xml  { render :xml => instance_variable_get(singular_variable), :status => :unprocessable_entity }
             end
           end

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

@@ -13,14 +13,18 @@ module QM
         
         def has_many(association_id, options = {}, &extension)
           @generic_field_associations ||= {}
-          @generic_field_associations[association_id.to_sym] = { :kind => :has_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present? }
+          @generic_field_associations[association_id.to_sym] = { :kind => :has_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present?, :generic_create => options[:generic_create] || false }
+          
+          options.delete :generic_create
           
           super association_id, options, &extension
         end  
 
         def has_and_belongs_to_many(association_id, options = {}, &extension)
           @generic_field_associations ||= {}
-          @generic_field_associations[association_id.to_sym] = { :kind => :has_and_belongs_to_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present? }
+          @generic_field_associations[association_id.to_sym] = { :kind => :has_and_belongs_to_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present?, :generic_create => options[:generic_create] || false }
+
+          options.delete :generic_create
           
           super association_id, options, &extension
         end  

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

@@ -3,8 +3,54 @@ module QM
     module ViewIncludes
       def multiple_select(options = {})
         options.symbolize_keys!
+
+        @multiple_select_count ||= 0 
+        @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 
+
+          klass = options[:record].class 
+          table_name = klass.to_s.tableize.singularize 
+
+          if options[:kind] == :check 
+            field_name = "#{table_name}[#{attribute_name.to_s.singularize}_ids][]"
+            allow_nil = false 
+
+          elsif options[:kind] == :radio 
+            field_name = "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]"
+            allow_nil ||= options[:record].column_for_attribute(klass.generic_field_associations[attribute_name][:foreign_key]).null 
+          end 
+
+          collection = klass.generic_field_associations[attribute_name][:class_name].all 
+          render :partial => "generic_controller/multiple_select", :locals => { :mode => :activerecord,
+                                                                                :attribute_name => attribute_name, 
+                                                                                :field_name => field_name, 
+                                                                                :allow_nil => allow_nil, 
+                                                                                :kind => options[:kind], 
+                                                                                :klass => klass, 
+                                                                                :table_name => table_name,
+                                                                                :record => options[:record], 
+                                                                                :collection => collection }
+
+
+        elsif options.has_key? :collection and options[:collection].is_a? Array and options.has_key? :field_name and not options[:field_name].nil?
+          render :partial => "generic_controller/multiple_select", :locals => { :mode => :collection,
+                                                                                :field_name => options[:field_name],
+                                                                                :attribute_name => options[:field_name],
+                                                                                :table_name => options[:field_name],
+                                                                                :allow_nil => false, 
+                                                                                :kind => options[:kind], 
+                                                                                :collection => options[:collection] }
+
+        else 
+          raise ArgumentError, "You must pass some variables as multiple_select. Possibilities are: 'field' and 'record' for automatic associations, or 'collection' and 'field_name' just for displaying a set." 
+        end 
               
-        render :partial => "generic_controller/multiple_select", :locals => options 
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,41 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rfc822
+  name: qui-tabs
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
+        version: 0.0.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: qui-toolbar
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rfc822
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +79,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sort_alphabetical
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +93,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: calendar_date_select
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,7 +107,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 description: "qM: generates generic controller actions and views"
 email: marcin@saepia.net
 executables: []