rows_controller 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c1a2d58050cec8273532a04b600e01a0660d19b
-  data.tar.gz: d6fb8fa93464f760c36b88b5234346b016f37e64
+  metadata.gz: 308a225c28bf1ea9ad3fdd9c2ab5da6a84432574
+  data.tar.gz: 92655caa6f8cac627066921b8845052c12faea9d
 SHA512:
-  metadata.gz: 123dc690a1d8a8d827a5e82a44569e3964889f3b6bee90c2363bfbdf1eb4f76480e31fe5a3556145cb9166075a4a55b19b5a2b75363c1eb38fd5f4c7c819d5cc
-  data.tar.gz: 918ebe33e38ea1b4b5abb69de8400e873e4351739788437f0cc2b57b252e6bbb1b4c2fac83ac02919485337fb2dd4383b332c2429b3e69a3d68c77e801c07097
+  metadata.gz: 15bd3f3928c8ac9af4114d35d46b190af2278ed72292e23817c272574c5b69bff123ba118e106e50702815fabf5664017b970be66a5e0aeaeb1e6fd95b78aaf8
+  data.tar.gz: 71b004b2703c3010b5d5ccbbfcec489275d76ac4fa1d4ed8d7c623141afcde5f846edae450472e762ee91bd0fbfe9bde73c42f52811f305f58098d6e6450bc96

data/README.md

@@ -70,6 +70,12 @@ be changed by e.g.:
 The model class can be retrieved with the helper model_class.
 
 
+Rails 5
+-------
+
+This gem is intended for Rails 5.
+Older Rails versions may use "gem 'rows_controller', '= 2.0.8'".
+
 Rails 4
 -------
 

data/app/controllers/rows_controller.rb

@@ -13,6 +13,7 @@ class RowsController < ApplicationController
   include Rows::Utils
 
   def self.model_class(model_class = nil)
+    @_model_class ||= nil
     @_model_class = model_class  unless model_class.nil?
     @_model_class
   end

data/app/controllers/rows_controller.rb.bak

@@ -0,0 +1,88 @@
+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/resources.rb

@@ -13,11 +13,11 @@ module Rows::Resources
   end
 
   def resources
-    @rows || set_resources
+    @rows ||= set_resources
   end
 
   def resource
-    @row || set_resource
+    @row ||= set_resource
   end
 
  private
@@ -38,6 +38,7 @@ module Rows::Resources
 
   def resource_update
     if Rails::VERSION::MAJOR >= 4
+#      return true  unless params[model_symbol]
       resource.update(resource_params)
     else
       resource.update_attributes(resource_params)
@@ -61,7 +62,7 @@ module Rows::Resources
   # Never trust parameters from the scary internet, only allow the white list through.
   def resource_params
     permits = resource_whitelist
-    if Rails::VERSION::MAJOR > 3
+    if params.respond_to?(:require)
       params.require(model_symbol).permit(permits)
     else
       pars = params[model_symbol] || {}

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/version.rb

@@ -1,3 +1,3 @@
 module Rows
-  VERSION = "2.0.8"
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rows_controller
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -35,6 +35,7 @@ files:
 - README.md
 - Rakefile
 - 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
@@ -56,10 +57,9 @@ files:
 - lib/rows/locales/en.yml
 - lib/rows/model.rb
 - 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
 homepage: https://github.com/matique/rows_controller
 licenses:
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: RowsController DRYs your controllers.

data/lib/rows/utils.rb.bak

@@ -1,19 +0,0 @@
-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'.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.bak

@@ -1,3 +0,0 @@
-module Rows
-  VERSION = "2.0.7"
-end