rows_controller 2.2.1 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21096738d0ca4096f5740974f764bb27f40f8c37f3ed21144e62918baafc8584
-  data.tar.gz: 602c9204a275821c93c46c4bac941bb06110fe1849d0fbed23a35cbcd5f6dac9
+  metadata.gz: c66d74c692d41703b03eeae2e2e0603a145cfd3c0478496c1792e4a4ebf70776
+  data.tar.gz: 4657d006dbff4e84e1ba0806d72e22aebbcd86dc254cb3389208edd05c6d472e
 SHA512:
-  metadata.gz: 1527109202ce0a2ec0ff24ef3cd9489a6448fd1b307512bffcb0c98982a12107b4f0357d8f346b40ba78fd0ec66c10e1b62fcd09718341c4a38da1b919c640e6
-  data.tar.gz: 83f3fafe8f046aacff8bc4b809e9f032f231b27e5db90229371c578fcd7d5c310e53eaad35c851e381ecca0e838fb4f1cb1770f8f5a68d1f3d14269537694372
+  metadata.gz: e117f77fb4a317df03e93e9f92ab72f418418124c305c821a3fafd2bdad6abbe6ea12d09fc303e1479d28930e71cea6b2ea145f77bdee48199d8e28f539380aa
+  data.tar.gz: 5ad9d07738d72d9f688681fe4ffac092082f374f4e4498294bf58481e0c15f5fb2fde06141373a5db61ff343d371a754e62a2b19ba7fd9b26408ab52a5aac933

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009-2018 Dittmar Krall http://matique.de
+Copyright (c) 2012-2021 Dittmar Krall - www.matique.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,6 @@
 RowsController
 ==============
 [![Gem Version](https://badge.fury.io/rb/rows_controller.svg)](https://badge.fury.io/rb/rows_controller)
-[![Build Status](https://travis-ci.org/matique/rows_controller.png?branch=master)](https://travis-ci.org/matique/rows_controller)
 
 DRYs Rails controllers. Imagine replacing that @order by 'resource' in the
 controllers/views and, imho, an area for DRYing appears.
@@ -26,8 +25,8 @@ use:
 
 I.e. RowsController defines all the usual methods (index, show, edit,...).
 
-The methods may be redefined in OrdersController overwriting the
-methods from RowsController.
+The methods may be redefined in OrdersController
+(overwrites methods from RowsController).
 
 Low level methods like 'resources' may be redefined as well.
 An example:
@@ -70,6 +69,12 @@ be changed by e.g.:
 The model class can be retrieved with the helper model_class.
 
 
+Rails 6
+-------
+
+This gem is intended for Rails 6.
+Older Rails versions may use "gem 'rows_controller', '= 2.2.2'".
+
 Rails 5
 -------
 
@@ -118,7 +123,7 @@ As usual:
 
     gem 'rows_controller' # in Gemfile
     bundle
-    ( cd spec/dummy; rake db:create db:migrate )
+    ( cd spec/dummy; rake db:create db:migrate ) # not required for Rails 6
     rake
 
 
@@ -131,4 +136,4 @@ Look for:
 - inherited_resources
 - decent_exposure
 
-Copyright (c) 2009-2017 [Dittmar Krall], released under the MIT license.
+Copyright (c) 2009-2020 [Dittmar Krall], released under the MIT license.

data/app/controllers/rows_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rows/resources'
 require 'rows/model'
 require 'rows/utils'
@@ -56,7 +58,8 @@ class RowsController < ApplicationController
   def destroy
     set_resource
     resource_destroy
-    flash[:notice] = t('ui.destroyed', model: model_name).html_safe  unless request.xhr?
+    msg = t('ui.destroyed', model: model_name).html_safe
+    flash[:notice] = msg  unless request.xhr?
     respond_to do |format|
       format.html { redirect_to action: :index }
       format.js   { render template: 'rows/destroy', layout: false }
@@ -67,14 +70,14 @@ class RowsController < ApplicationController
  private
   def create_update(which, msg)
     respond_to do |format|
-      if self.send(which)
+      if send(which)
 	format.html {
 	  flash[:notice] = t(msg, scope: :ui, model: model_name,
 		  default: "%{model} was successfully #{msg}.").html_safe
 	  if params[:commit] == 'OK'
 	    redirect_to action: :index
 	  else
-	    redirect_to action: 'edit', id: resource.id
+            redirect_to action: 'edit', id: resource.id
 	  end
 	}
 	format.json { render action: 'show',

data/app/controllers/rows_ext_controller.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
+# Extensions
 class RowsExtController < RowsController
 
   def copy
     set_resource resource.dup
     resource.id = nil
     respond_to do |format|
-      format.html { render :action => :new }
+      format.html { render action: :new }
     end
   end
 

data/app/views/rows/_list.slim

@@ -3,6 +3,7 @@ ruby:
   # Column :multi_selection generates a check_box
 
   cnt = 0
+  odd_even = %w[odd even]
 
 table.rows-list
  thead
@@ -12,7 +13,7 @@ table.rows-list
  tbody
   - resources.each do |resource|
    - cnt += 1
-   tr id="row_#{resource.id}" class="#{%w{odd even}.at(cnt % 2)}"
+   tr id="row_#{resource.id}" class="#{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

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

data/app/views/rows/_list_header.slim

@@ -4,4 +4,3 @@
 
 - columns.each do |column|
   th = column == :multi_selection ? '' : t("header.#{column}")
-

data/app/views/rows/_row_buttons.slim

@@ -1,14 +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
+  url = if defined?(current_controller)
+          "/#{current_controller}/#{row.id}"
+        else
+          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.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: {confirm: 'Are you sure?'}, method: :delete

data/app/views/rows/_submit.slim

@@ -10,7 +10,7 @@ ruby:
   left ||= nil
   right ||= nil
 
-div.rows-submit style="width:100%"
+.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

data/app/views/rows/edit.slim

@@ -4,7 +4,8 @@ ruby:
  #   partial 'form' template
 
  content_for(:submit_left) {
-	link_to t('button.back').html_safe, "/#{controller_name}", class: 'button' }
+   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).html_safe
@@ -14,4 +15,4 @@ fieldset class="wide mask" id=model_symbol
   /"/#{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']
+    = render '/rows/submit', right: %w[update OK]

data/app/views/rows/index.slim

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

data/app/views/rows/new.slim

@@ -4,7 +4,8 @@ ruby:
   #   partial 'form' template
 
   content_for(:submit_left) {
-	link_to t('button.back').html_safe, "/#{controller_name}", class: 'button' }
+    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).html_safe
@@ -13,4 +14,4 @@ fieldset.wide class="mask" id=model_symbol
   - @multipart ||= false
   = form_for resource, html: {multipart: @multipart} do |f|
     = render 'form', f: f
-    = render '/rows/submit', right: ['create', 'OK']
+    = render '/rows/submit', right: %w[create OK]

data/app/views/rows/show.slim

@@ -4,9 +4,11 @@ ruby:
   #   partial 'form' template
 
   content_for(:submit_left) {
-	link_to t('button.back').html_safe, url_for(action: :index), class: 'button' }
+    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' }
+    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).html_safe

data/app/views/shared/_error_explanation.slim

@@ -1,9 +1,9 @@
 / # 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:
+- if resource.respond_to?(:errors) && resource.errors.any?
+  #error_explanation
+    h2 #{pluralize(resource.errors.count, 'error')} prohibited this template from being saved:
 
     ul
     - resource.errors.full_messages.each do |msg|

data/lib/rows/engine.rb

@@ -1,3 +1,5 @@
+# rubocop: disable all
+
 module Rows
   class Engine < ::Rails::Engine
   end

data/lib/rows/model.rb

@@ -1,30 +1,30 @@
-module Rows::Model
+# frozen_string_literal: true
 
+module Rows::Model
   def model_class
-    @_model_class  ||= self.class.model_class ||
-		       params[:controller].singularize.camelize.constantize
+    @_model_class ||= self.class.model_class ||
+                      Kernel.const_get(params[:controller].classify)
   end
 
- if Rails::VERSION::MAJOR > 3
-  def model_name
-    @_model_name   ||= model_class.model_name.name
-  end
+  if Rails::VERSION::MAJOR > 3
+    def model_name
+      @_model_name ||= model_class.model_name.name
+    end
 
-  def model_symbol
-    @_model_symbol ||= model_class.model_name.singular
-  end
- else
-  def model_name
-    @_model_name ||= model_class.name
-  end
+    def model_symbol
+      @_model_symbol ||= model_class.model_name.singular
+    end
+  else
+    def model_name
+      @_model_name ||= model_class.name
+    end
 
-  def model_symbol
-    @_model_symbol ||= model_name.underscore.gsub( %r{/}, '_' )
+    def model_symbol
+      @_model_symbol ||= model_name.underscore.tr('/', '_')
+    end
   end
- end
 
   def model_symbol_plural
     @_model_symbol_plural ||= model_symbol.pluralize
   end
-
 end

data/lib/rows/resources.rb

@@ -1,5 +1,6 @@
-module Rows::Resources
+# frozen_string_literal: true
 
+module Rows::Resources
   def set_resources(rows = nil)
     rows ||= model_class.all
     instance_variable_set("@#{model_symbol_plural}", rows)
@@ -21,8 +22,8 @@ module Rows::Resources
   end
 
  private
-# low level resource methods
-# can be monkey patched
+  # low level resource methods
+  # can be monkey patched
   def resource_new
     if params[model_symbol]
       set_resource model_class.new(resource_params)
@@ -38,7 +39,7 @@ module Rows::Resources
 
   def resource_update
     if Rails::VERSION::MAJOR >= 4
-#      return true  unless params[model_symbol]
+      #      return true  unless params[model_symbol]
       resource.update(resource_params)
     else
       resource.update_attributes(resource_params)
@@ -50,31 +51,33 @@ module Rows::Resources
   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 }
+    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(&:name)
   end
 
   def resource_whitelist
     raise "RowsController requires private method 'resource_whitelist' in controller <#{params[:controller]}>"
   end
 
-  # Never trust parameters from the scary internet, only allow the white list through.
+  # Never trust parameters from the scary internet, only allow the
+  # white list through.
   def resource_params
     permits = resource_whitelist
     if params.respond_to?(:require)
       params.require(model_symbol).permit(permits)
     else
       pars = params[model_symbol] || {}
-      pars.keys.each { |x|
-	x = x.to_sym
-	unless permits.include?(x) || permits.include?({x => []})
-	  pars.delete(x)
-	  p "** WARNING: model <#{model_name}> dropping params <#{x}>"
-	end
+      # pars.keys.each { |x|
+      pars.each_key { |x|
+        x = x.to_sym
+        unless permits.include?(x) || permits.include?({x => []})
+          pars.delete(x)
+          p "** WARNING: model <#{model_name}> dropping params <#{x}>"
+        end
       }
       pars
     end
   end
-
 end

data/lib/rows/utils.rb

@@ -1,20 +1,23 @@
-module Rows::Utils
+# frozen_string_literal: true
+# rubocop: disable all
 
-# formatting
+module Rows::Utils
+  # formatting
   def resource_format(x)
     return '--'.html_safe  if x.nil?
+
     bool = x.class == Time || x.class == Date || x.class == DateTime ||
-	   x.class == ActiveSupport::TimeWithZone
-    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.to_s.html_safe         if x.kind_of?(Integer)
+           x.class == ActiveSupport::TimeWithZone
+    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.to_s.html_safe         if x.is_a?(Integer)
     return 'X'.html_safe            if x.class == TrueClass
     return ' '.html_safe       if x.class == FalseClass
     return x.call                   if x.class == Proc
     return '---'.html_safe          if x.empty?
-    str = x.to_s
-    return str.gsub(/\r*\n/, '<br/>')
-  end
 
+    x.to_s.gsub(/\r*\n/, '<br/>')
+  end
 end

data/lib/rows/version.rb

@@ -1,4 +1,13 @@
+# rubocop: disable all
+
 module Rows
-  VERSION = '2.2.1'     # 2019-02-18
-#  VERSION = '2.2.0'
+  VERSION = '3.0.4'     # 2021-06-24
+# VERSION = '3.0.3'     # 2020-07-14
+# VERSION = '3.0.2'     # 2020-04-27
+# VERSION = '3.0.1'     # 2020-03-01
+# VERSION = '3.0.0'     # 2019-10-03
+# VERSION = '2.2.3'     # 2019-10-03
+# VERSION = '2.2.2'     # 2019-05-06
+# VERSION = '2.2.1'     # 2019-02-18
+# VERSION = '2.2.0'
 end

data/lib/rows/version.rb.bak

@@ -0,0 +1,12 @@
+# rubocop: disable all
+
+module Rows
+  VERSION = '3.0.3'     # 2020-07-14
+# VERSION = '3.0.2'     # 2020-04-27
+# VERSION = '3.0.1'     # 2020-03-01
+# VERSION = '3.0.0'     # 2019-10-03
+# VERSION = '2.2.3'     # 2019-10-03
+# VERSION = '2.2.2'     # 2019-05-06
+# VERSION = '2.2.1'     # 2019-02-18
+# VERSION = '2.2.0'
+end

data/lib/rows_controller.rb

@@ -1,8 +1,10 @@
+# rubocop: disable all
+
 require 'rows/engine'
 
 module Rows
 end
 
-I18n.load_path << File.expand_path('../rows/locales/en.yml', __FILE__)
-I18n.load_path << File.expand_path('../rows/locales/de.yml', __FILE__)
+I18n.load_path << File.expand_path('rows/locales/en.yml', __dir__)
+I18n.load_path << File.expand_path('rows/locales/de.yml', __dir__)
 I18n.reload!

metadata

@@ -1,57 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rows_controller
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: YourController < RowsController ( < ApplicationController).
 email:
 - dittmar.krall@matique.de
@@ -85,11 +127,13 @@ files:
 - lib/rows/resources.rb
 - lib/rows/utils.rb
 - lib/rows/version.rb
+- lib/rows/version.rb.bak
 - lib/rows_controller.rb
 homepage: http://matique.de
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/matique/rows_controller
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -105,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: RowsController DRYs your controllers.