rows_controller 0.4.4 → 1.0.1

data/app/controllers/rows_controller/helpers.rb

@@ -1,48 +1,81 @@
 class RowsController < ApplicationController
+  helper_method :set_resource, :set_resources
+  helper_method :resource, :resources, :resource_columns, :resource_format
+  helper_method :model_class, :model_name, :model_symbol, :model_symbol_plural
 
-  def self.model_class(model_class = nil)
-    @model_class = model_class  unless model_class.nil?
-    @model_class
+# resources/@rows
+  def set_resources(rows = nil)
+    rows ||= model_class.all
+    instance_variable_set("@#{model_symbol_plural}", rows)
+    @rows = rows
   end
 
-  
- protected
-  DATE_FORMAT = '%d.%m.%Y'
+  def set_resource(row = nil)
+    row ||= model_class.find(params[:id].to_i)
+    instance_variable_set("@#{model_symbol}", row)
+    @row = row
+  end
 
-  helper_method :resource, :resources, :columns,
-    :model_class, :model_name, :model_symbol, :model_symbol_plural,
-    :resource_format
+  def resources
+    @rows || set_resources
+  end
 
   def resource
-    return @_resource  if @_resource
-
-    self.resource = begin
-      name = model_symbol
-      if id = params["#{name}_id"] || params[:id]
-	model_class.find_by_id(id).tap do |r|
-	  r.attributes = params[name] unless request.get?
-	end
-      else
-	model_class.new(params[name])
-      end
+    @row || set_resource
+  end
+
+  def resource_columns
+    return model_class.column_headers  if model_class.respond_to?(:column_headers)
+    return ['to_s']  unless model_class.respond_to?(:content_columns)
+    ['id'] + model_class.content_columns.collect{|c| c.name }
+  end
+
+ private
+  def resource_whitelist
+    raise "RowsController requires private method 'resource_whitelist' in controller <#{params[:controller]}>"
+  end
+
+
+ public
+# low level resource methods
+# can be monkey patched
+  def resource_new
+    if params[model_symbol]
+      set_resource model_class.new(resource_params)
+    else
+      set_resource model_class.new
     end
   end
 
-  def resource=(value)
-    @_resource = value
-    instance_variable_set("@#{model_symbol}", value)
-    value
+  def resource_create
+    resource_new
+    resource.save
   end
 
-  def resources
-    return @_resources  if @_resources
-    self.resources = model_class.all
+  def resource_update
+    unless RAILS4
+      resource.update_attributes(resource_params)
+    else
+      resource.update(resource_params)
+    end
+  end
+
+  def resource_destroy
+    resource.destroy
   end
 
-  def resources=(value)
-    @_resources = value
-    instance_variable_set("@#{model_symbol_plural}", value)
-    value
+
+# redirections
+# can be monkey patched
+  def redirect_to_index
+    redirect_to action: 'index'
+  end
+
+
+# dynamic model related methods
+  def self.model_class(model_class = nil)
+    @model_class = model_class  unless model_class.nil?
+    @model_class
   end
 
   def model_class
@@ -62,24 +95,19 @@ class RowsController < ApplicationController
     @_model_symbol_plural ||= model_name.pluralize.underscore
   end
 
-  def columns
-    return model_class.column_headers  if model_class.respond_to?(:column_headers)
-    return ['to_s']  unless model_class.respond_to?(:content_columns)
-    ['id'] + model_class.content_columns.collect{|c| c.name }
-  end
-
+# formatting
   def resource_format(x)
-    x = ''.html_safe  if x.nil?
+    return '--'.html_safe  if x.nil?
     bool = x.class == Time || x.class == Date || x.class == DateTime ||
 	   x.class == ActiveSupport::TimeWithZone
-    return x.strftime(DATE_FORMAT).html_safe  if bool
+    return x.strftime('%d.%m.%Y').html_safe  if bool
+#    return I18n.l(x)                if bool
     return x.to_s.html_safe         if x.class == Fixnum
     return 'X'.html_safe            if x.class == TrueClass
     return '&ensp;'.html_safe       if x.class == FalseClass
     return x.call                   if x.class == Proc
     return '---'.html_safe          if x.empty?
     str = x.to_s
-##    str = UTF8FY.iconv(x.to_s)  if APPLICATION_OPTIONS[:customization] == :dk
     return str.gsub(/\r*\n/, '<br/>')
   end
 

data/app/controllers/rows_ext_controller.rb

@@ -0,0 +1,18 @@
+class RowsExtController < RowsController
+
+  def copy
+    set_resource resource.dup
+    resource.id = nil
+    respond_to do |format|
+      format.html { render :action => :new }
+    end
+  end
+
+  def multi_deletion
+    items = params[:multi_tick] || []
+    items -= ['']
+    items.map { |id|  model_class.find_by_id(id.to_i).destroy }
+    redirect_to :action => :index
+  end
+
+end

data/app/views/rows/_form.slim

@@ -0,0 +1,2 @@
+div style="color:red"
+  | Rendering requires partial '#{model_symbol}/_form.html.erb'

data/app/views/rows/_list.slim

@@ -0,0 +1,18 @@
+ruby:
+  # Requires resources columns
+  # Column :multi_selection generates a check_box
+
+  cnt = 0
+
+table.rows-list
+ thead
+  tr
+   = render 'list_header', columns: columns
+
+ tbody
+  - resources.each do |resource|
+   - cnt += 1
+   tr id="row_#{resource.id}" class="#{%w{odd even}.at(cnt % 2)}"
+    = render 'list_row', resource: resource, columns: columns
+    td
+     = render 'row_buttons', row: resource

data/app/views/rows/_list_footer.slim

@@ -0,0 +1,5 @@
+/ Default list footer presenting a 'Create' button linked to action new.
+/ May be overwriten for e.g. pagination
+
+div.list-footer
+  = link_to t('button.create').html_safe, url_for(action: :new), class: 'button'

data/app/views/rows/_list_header.slim

@@ -0,0 +1,7 @@
+/ Default list header.
+/ Requires columns.
+/ May be overwriten for e.g. pagination and/or sorting.
+
+- columns.each do |column|
+  th = column == :multi_selection ? '' : t("header.#{column}")
+

data/app/views/rows/_list_row.slim

@@ -0,0 +1,10 @@
+ruby:
+  # Requires resource columns
+
+- columns.each do |column|
+ td
+  - case column
+  - when :multi_selection
+    = check_box_tag('multi_selection[]', resource.id)
+  - else
+    = resource_format(resource.send(column))

data/app/views/rows/_row_buttons.slim

@@ -0,0 +1,14 @@
+ruby:
+  # Fills the last column of the list with "buttons".
+  # Requires row current_controller (supplied by Rails)
+  if defined?(current_controller)
+    url = "/#{current_controller}/#{row.id}"
+  else
+    url = url_for row
+  end
+
+= link_to t('button.show').html_safe,   url
+= link_to t('button.edit').html_safe,   url + '/edit'
+= link_to t('button.delete').html_safe, url,
+   remote: true,
+   data: { confirm: 'Are you sure?' }, method: :delete

data/app/views/rows/_submit.slim

@@ -0,0 +1,19 @@
+ruby:
+  # submit links and/or buttons
+  # Requires
+  #   content_for(:submit_<left|right>)
+  #   left|right (links names)
+
+  # left|right must be used inside a form.
+  # The clean content_for variant may be used unbounded.
+
+  left ||= nil
+  right ||= nil
+
+div.rows-submit style="width:100%"
+  input style="display:none" type="submit" name="commit" value="OK"
+  p style="float:left"
+    = render '/rows/submit_part', content: :submit_left, names: left
+  p style="float:right"
+    = render '/rows/submit_part', content: :submit_right, names: right
+  div style="clear:both"

data/app/views/rows/_submit_part.slim

@@ -0,0 +1,4 @@
+= content_for(content)
+- (names || []).each do |name|
+  button.button type="submit" name="commit" value=name
+    = t(name, scope: :button)

data/app/views/rows/edit.slim

@@ -0,0 +1,17 @@
+ruby:
+ # Template for RowsController (edit)
+ # Requires resource model_name model_symbol
+ #   partial 'form' template
+
+ content_for(:submit_left) {
+	link_to t('button.back').html_safe, "/#{controller_name}", class: 'button' }
+
+fieldset class="wide mask" id=model_symbol
+  legend = t('ui.editing', model: model_name)
+  = render '/shared/error_explanation'
+
+  - @multipart ||= false
+  /"/#{controller_name}/update/#{@row.id}"
+  = form_for resource, url: "/#{controller_name}/#{@row.id}", html: {multipart: @multipart} do |f|
+    = render 'form', f: f
+    = render '/rows/submit', right: ['update', 'OK']

data/app/views/rows/index.slim

@@ -0,0 +1,10 @@
+- # Template for RowsController (index)
+- # Requires resources model_name resource_columns
+
+- if resources.length > 0
+  h1  = t('ui.listing', model: model_name)
+  = render '/rows/list', resources: resources, columns: resource_columns
+- else
+  h1 = t('ui.empty_list', model: model_name)
+
+= render 'list_footer'

data/app/views/rows/new.slim

@@ -0,0 +1,16 @@
+ruby:
+  # Template for RowsController (new)
+  # Requires resource model_name model_symbol
+  #   partial 'form' template
+
+  content_for(:submit_left) {
+	link_to t('button.back').html_safe, "/#{controller_name}", class: 'button' }
+
+fieldset.wide class="mask" id=model_symbol
+  legend = t('ui.new', model: model_name)
+  = render '/shared/error_explanation'
+
+  - @multipart ||= false
+  = form_for resource, html: {multipart: @multipart} do |f|
+    = render 'form', f: f
+    = render '/rows/submit', right: ['create', 'OK']

data/app/views/rows/show.slim

@@ -0,0 +1,17 @@
+ruby:
+ # Template for RowsController (show)
+ # Requires resource model_name model_symbol
+ #   partial 'form' template
+
+  content_for(:submit_left) {
+	link_to t('button.back').html_safe, url_for(action: :index), class: 'button' }
+  content_for(:submit_right) {
+	link_to t('button.edit').html_safe, url_for(action: :edit), class: 'button' }
+
+fieldset.show class="wide mask" id=model_symbol
+  legend = t('ui.showing', model: model_name)
+  = render '/shared/error_explanation'
+
+  = form_for resource do |f|
+    = render 'form', f: f
+    = render '/rows/submit'

data/app/views/shared/_error_explanation.slim

@@ -0,0 +1,10 @@
+/ # Generates error messages
+/ # requires resource
+
+- if resource && resource.respond_to?(:errors) && resource.errors.any?
+  div#error_explanation
+    h2 #{pluralize(resource.errors.count, "error")} prohibited this template from being saved:
+
+    ul
+    - resource.errors.full_messages.each do |msg|
+      li = msg

data/app/views/shared/_show_flash.slim

@@ -0,0 +1,9 @@
+/ # Show complete flash
+/ # flash[:notice] are faded out after 5 seconds
+/ # never call this file just 'flash' ==> empties flash
+
+- (flash || {}).each do |key, value|
+  p class="flash_#{key}" = sanitize(value)
+  - if key == :notice
+    javascript:
+      $('.flash_notice').fadeOut(5000, function() { $(this).remove(); });

data/lib/rows_controller.rb

@@ -2,4 +2,5 @@ require 'rows_controller/engine.rb'
 
 require 'active_support/i18n'
 I18n.load_path << File.expand_path('../rows_controller/locales/en.yml', __FILE__)
+I18n.load_path << File.expand_path('../rows_controller/locales/de.yml', __FILE__)
 I18n.reload!

data/lib/rows_controller/locales/de.yml

@@ -0,0 +1,23 @@
+# under construction; see english version
+de:
+
+  ui:
+    created:   '%{model} erstellt.'
+    destroyed: '%{model} gelöscht.'
+    updated:   '%{model} geändert.'
+
+    editing:   'Editiere %{model}'
+    listing:   'Liste %{model}'
+    new:       'Neu %{model}'
+    showing:   'Zeige %{model}'
+
+    empty_list: 'Liste %{model} is leer.'
+
+  button:
+    back:      "Zurück"
+    create:    'Neu'
+    update:    'Speichern'
+    delete:    'Lösche'
+    edit:      'Edititeren'
+    show:      'Zeige'
+    clone:     'Klonen'

data/lib/rows_controller/locales/en.yml

@@ -1,33 +1,22 @@
 en:
-  flash:
-    actions:
-      create:
-        notice: "%{resource_name} was successfully created."
-        alert: ""
-      update:
-        notice: "%{resource_name} was successfully updated."
-        alert: ""
-      destroy:
-        notice: "%{resource_name} was successfully destroyed."
-        alert: "%{resource_name} could not be destroyed."
 
   ui:
-    created: '%{model} created.'
-    deleted: '%{model} deleted.'
-    empty_list: 'List %{model} is empty'
-    listing: 'Listing %{model}'
-    new: 'New %{model}'
-    show: 'Show %{model}'
-    updated: '%{model} updated.'
+    created:   '%{model} created.'
+    destroyed: '%{model} deleted.'
+    updated:   '%{model} updated.'
 
-    create: 'Create'
-    update: 'Update'
+    editing:   'Editing %{model}'
+    listing:   'Listing %{model}'
+    new:       'New %{model}'
+    showing:   'Showing %{model}'
 
-  button:
-    back: 'Back'
-    edit: 'Edit'
-    delete: 'Delete'
-    show: 'Show'
+    empty_list: 'List %{model} is empty'
 
-  header:
-#    to_s: 'Test'
+  button:
+    back:      'Back'
+    create:    'Create'
+    update:    'Update'
+    delete:    'Delete'
+    edit:      'Edit'
+    show:      'Show'
+    clone:     'Clone'

data/lib/rows_controller/version.rb

@@ -1,3 +1,3 @@
 module Rows
-  VERSION = '0.4.4'
+  VERSION = '1.0.1'
 end

data/spec/controllers/orders_spec.rb

@@ -31,6 +31,7 @@ describe OrdersController, ':' do
     get :show, :id => order.id
     subject.send(:resource).should == order
     assigns(:order).should == order
+    assigns(:row).should == order
   end
 
   it 'checking resources' do
@@ -38,6 +39,7 @@ describe OrdersController, ':' do
     subject.send(:resources).should be_a_kind_of(Array)
     assigns(:orders).should be_a_kind_of(Array)
     assigns(:orders).should == Order.all
+    assigns(:rows).should == Order.all
   end
 
   it 'checking model_class' do
@@ -47,6 +49,31 @@ describe OrdersController, ':' do
     subject.send(:model_symbol).should == 'order'
     subject.send(:model_symbol_plural).should == 'orders'
   end
+
+  it 'should update' do
+    put :update, { id: order.id }
+    response.should be_true
+    response.should redirect_to(action: :edit)
+  end
+
+  it 'should update #2' do
+    put :update, { id: order.id, commit: 'OK' }
+    response.should be_true
+    response.should redirect_to(action: :index)
+  end
+
+  it 'should not update' do
+    put :update, { id: order.id, order: {name: 'error'} }
+    response.should be_success
+    response.should render_template('rows/edit')
+  end
+
+  it 'should not create' do
+    post :create, { id: order.id, order: {name: 'error'} }
+    response.should be_success
+    response.should render_template('rows/new')
+  end
+
 end
 
 
@@ -57,9 +84,7 @@ end
 describe CategoriesController do
   it 'checking model_class' do
     get :index
-# both not working, Why?
-#    subject.send(:model_class).should be_a(Order)
-#    subject.send(:model_class).should == Order
+    subject.send(:model_class).should == Order
     subject.send(:model_name).should == 'Order'
     subject.send(:model_symbol).should == 'order'
     subject.send(:model_symbol_plural).should == 'orders'