rows_controller 2.2.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c53fee168bd4d0d8a093e355c28e23c860f6a93b6b18bdcbc4a514bd590ada3
-  data.tar.gz: 38047665206377aa534418e0bb866548e7facd23a05953a19a6b2d75ff3497ff
+  metadata.gz: 1ea282f99f4fadad36a5d7973f85373cde5d0a99bd4693b73ba4bb7022966d74
+  data.tar.gz: bff51320262e2bcc2853abf0825a4887177755af61d32340e07c38cd321f1a93
 SHA512:
-  metadata.gz: 3ad3fa4eb527976a1a7693093b314bf82579ba1da6e0423c97b679b4a45c588642ed041eb3c7bf69e8619302c780c1fecd70033087be6b16fe2810dc1bf90cf2
-  data.tar.gz: 430fbdeec449cbb5de02eb3f228616fb8dda569e9a469838f23b9295c8f75af1f32664c23558733e80f9733bf1d93c45013ef487d6db28afc582dd24827febc7
+  metadata.gz: 6fc50f5cedbd36b6fc06c3bb71e489543629b0c9cc88b7fc7044d111d74d2f612189b0f6f686047975ecb8006a4acb4eb7e41a2cb77d01409e656d0b8eb1118f
+  data.tar.gz: 265a469734b8be2a4b6e1087470e0cdbc284b3d32de4591ee229c9ee0993fbe27487512ff10be84d52c76b35279bd80f37f0e512ebd47dd0f7370246a3f0ad17

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009-2018 Dittmar Krall http://matique.de
+Copyright (c) 2012-2020 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

@@ -26,8 +26,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 +70,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 +124,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 +137,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/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 ||
+                      params[:controller].singularize.camelize.constantize
   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.gsub(%r{/}, '_')
+    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,16 +51,18 @@ 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)
@@ -67,14 +70,13 @@ module Rows::Resources
     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
+        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,3 +1,12 @@
+# rubocop: disable all
+
 module Rows
-  VERSION = '2.2.0'
+  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

@@ -1,3 +1,11 @@
+# rubocop: disable all
+
 module Rows
-  VERSION = '2.1.3'
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rows_controller
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.3
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-29 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: YourController < RowsController ( < ApplicationController).
 email:
 - dittmar.krall@matique.de
@@ -62,7 +104,6 @@ files:
 - MIT-LICENSE
 - README.md
 - app/controllers/rows_controller.rb
-- app/controllers/rows_controller.rb.bak
 - app/controllers/rows_ext_controller.rb
 - app/views/rows/_form.slim
 - app/views/rows/_list.slim
@@ -83,9 +124,7 @@ files:
 - lib/rows/locales/de.yml
 - lib/rows/locales/en.yml
 - lib/rows/model.rb
-- lib/rows/model.rb.bak
 - lib/rows/resources.rb
-- lib/rows/resources.rb.bak
 - lib/rows/utils.rb
 - lib/rows/version.rb
 - lib/rows/version.rb.bak
@@ -109,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: RowsController DRYs your controllers.

data/app/controllers/rows_controller.rb.bak

@@ -1,88 +0,0 @@
-require 'rows/resources'
-require 'rows/model'
-require 'rows/utils'
-
-class RowsController < ApplicationController
-  helper_method :set_resource, :set_resources, :resource, :resources
-  helper_method :resource_columns, :resource_format
-  helper_method :model_class, :model_name
-  helper_method :model_symbol, :model_symbol_plural
-
-  include Rows::Model
-  include Rows::Resources
-  include Rows::Utils
-
-  def self.model_class(model_class = nil)
-    @_model_class ||= nil
-    @_model_class = model_class  unless model_class.nil?
-    @_model_class
-  end
-
-  # GET /:resources[.json]
-  def index
-    set_resources
-  end
-
-  # GET /:resource/:id[.json]
-  def show
-    set_resource
-  end
-
-  # GET /:resource/new
-  def new
-    resource_new
-  end
-
-  # GET /:resource/:id/edit
-  def edit
-    set_resource
-  end
-
-  # POST /:resources[.json]
-  def create
-    create_update(:resource_create, 'created')
-  end
-
-  # PATCH/PUT /:resources/:id[.json]
-  def update
-    set_resource
-    create_update(:resource_update, 'updated')
-  end
-
-  # DELETE /:resources/:id[.json]
-  def destroy
-    set_resource
-    resource_destroy
-    flash[:notice] = t('ui.destroyed', model: model_name).html_safe  unless request.xhr?
-    respond_to do |format|
-      format.html { redirect_to action: :index }
-      format.js   { render template: 'rows/destroy', layout: false }
-      format.json { head :no_content }
-    end
-  end
-
- private
-  def create_update(which, msg)
-    respond_to do |format|
-      if self.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
-	  end
-	}
-	format.json { render action: 'show',
-			status: msg == 'created' ? :created : :ok,
-			location: resource }
-      else  ## failed
-	format.html { render action: msg == 'created' ? :new : :edit }
-	format.json { render json: resource.errors,
-			     status: :unprocessable_entity }
-      end
-    end
-  end
-
-end

data/lib/rows/model.rb.bak

@@ -1,30 +0,0 @@
-module Rows::Model
-
-  def model_class
-    @_model_class  ||= self.class.model_class ||
-		       params[:controller].singularize.camelize.constantize
-  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_name.underscore.gsub( %r{/}, '_' )
-  end
- end
-
-  def model_symbol_plural
-    @_model_symbol_plural ||= model_symbol.pluralize
-  end
-
-end

data/lib/rows/resources.rb.bak

@@ -1,80 +0,0 @@
-module Rows::Resources
-
-  def set_resources(rows = nil)
-    rows ||= model_class.all
-    instance_variable_set("@#{model_symbol_plural}", rows)
-    @rows = rows
-  end
-
-  def set_resource(row = nil)
-    row ||= model_class.find_by_id(params[:id].to_i)
-    instance_variable_set("@#{model_symbol}", row)
-    @row = row
-  end
-
-  def resources
-    @rows ||= set_resources
-  end
-
-  def resource
-    @row ||= set_resource
-  end
-
- private
-# 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_create
-    resource_new
-    resource.save
-  end
-
-  def resource_update
-    if Rails::VERSION::MAJOR >= 4
-#      return true  unless params[model_symbol]
-      resource.update(resource_params)
-    else
-      resource.update_attributes(resource_params)
-    end
-  end
-
-  def resource_destroy
-    resource.destroy
-  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
-
-  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.
-  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
-    end
-  end
-
-end