rows_controller 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21096738d0ca4096f5740974f764bb27f40f8c37f3ed21144e62918baafc8584
-  data.tar.gz: 602c9204a275821c93c46c4bac941bb06110fe1849d0fbed23a35cbcd5f6dac9
+  metadata.gz: 9ddc0bace86fc0866651fa9a9a7db8e2680954dfca498d1e166ced15c1ad97a7
+  data.tar.gz: 6c1302388c207f4b558754bbccb0fbfd437623cd807d98008ff6a8f8d51e5bcb
 SHA512:
-  metadata.gz: 1527109202ce0a2ec0ff24ef3cd9489a6448fd1b307512bffcb0c98982a12107b4f0357d8f346b40ba78fd0ec66c10e1b62fcd09718341c4a38da1b919c640e6
-  data.tar.gz: 83f3fafe8f046aacff8bc4b809e9f032f231b27e5db90229371c578fcd7d5c310e53eaad35c851e381ecca0e838fb4f1cb1770f8f5a68d1f3d14269537694372
+  metadata.gz: 629d50095b51ab86a72dad57ff842c26c98b08dc58b5237431c5df736d7bc19765adb5cc31eae662b2a15296e9beeb143ec6c94cfe7fb5e6c07e8ed07634ef1e
+  data.tar.gz: 65dd1a78bb87ded0a88abe36524d199aff6db89fe00fea93bebf28188614b85f380b89022f248454b2d86b42f26a5d1b609c47e0cd196041b51d48c1c95890cf

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,7 +70,7 @@ 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

data/app/controllers/rows_controller.rb.bak

@@ -0,0 +1,91 @@
+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
+    unless model_class.nil?
+      @_model_class = model_class
+      @_model_class = model_class.constantize  if model_class.is_a?(String)
+    end
+    @_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/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/controllers/rows_ext_controller.rb.bak

@@ -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/lib/rows/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rows
   class Engine < ::Rails::Engine
   end

data/lib/rows/engine.rb.bak

@@ -0,0 +1,4 @@
+module Rows
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/rows/model.rb

@@ -1,13 +1,15 @@
+# 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
+    @_model_name ||= model_class.model_name.name
   end
 
   def model_symbol
@@ -19,7 +21,7 @@ module Rows::Model
   end
 
   def model_symbol
-    @_model_symbol ||= model_name.underscore.gsub( %r{/}, '_' )
+    @_model_symbol ||= model_name.underscore.gsub(%r{/}, '_')
   end
  end
 

data/lib/rows/model.rb.bak

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rows::Resources
 
   def set_resources(rows = nil)
@@ -52,14 +54,17 @@ module Rows::Resources
   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 }
+
+#    ['id'] + model_class.content_columns.collect { |c| c.name }
+    ['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)
@@ -68,7 +73,7 @@ module Rows::Resources
       pars = params[model_symbol] || {}
       pars.keys.each { |x|
 	x = x.to_sym
-	unless permits.include?(x) || permits.include?({x => []})
+        unless permits.include?(x) || permits.include?({ x => [] })
 	  pars.delete(x)
 	  p "** WARNING: model <#{model_name}> dropping params <#{x}>"
 	end

data/lib/rows/resources.rb.bak

@@ -0,0 +1,80 @@
+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

data/lib/rows/utils.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 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
+           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)
+    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/>')
+
+    x.to_s.gsub(/\r*\n/, '<br/>')
   end
 
 end

data/lib/rows/utils.rb.bak

@@ -0,0 +1,20 @@
+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)
+    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
+
+end

data/lib/rows/version.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Rows
-  VERSION = '2.2.1'     # 2019-02-18
+  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,7 @@
+# frozen_string_literal: true
+
+module Rows
+#  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 @@
+# frozen_string_literal: true
+
 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!

data/lib/rows_controller.rb.bak

@@ -0,0 +1,8 @@
+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.reload!

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rows_controller
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   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
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '12'
 description: YourController < RowsController ( < ApplicationController).
 email:
 - dittmar.krall@matique.de
@@ -62,7 +62,9 @@ files:
 - MIT-LICENSE
 - README.md
 - app/controllers/rows_controller.rb
+- app/controllers/rows_controller.rb.bak
 - app/controllers/rows_ext_controller.rb
+- app/controllers/rows_ext_controller.rb.bak
 - app/views/rows/_form.slim
 - app/views/rows/_list.slim
 - app/views/rows/_list_footer.slim
@@ -79,13 +81,19 @@ files:
 - app/views/shared/_error_explanation.slim
 - app/views/shared/_show_flash.slim
 - lib/rows/engine.rb
+- lib/rows/engine.rb.bak
 - 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/utils.rb.bak
 - lib/rows/version.rb
+- lib/rows/version.rb.bak
 - lib/rows_controller.rb
+- lib/rows_controller.rb.bak
 homepage: http://matique.de
 licenses:
 - MIT