rows_controller 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2cc798e5dc9ded7fb4cdc3c602b7ae710b909bb7f36d1d472ba438cd4c0706
-  data.tar.gz: 192b9b6d5425a63ce8b856dfe51776594ea9b94e9da27917ced430df2f165ba8
+  metadata.gz: 3c53fee168bd4d0d8a093e355c28e23c860f6a93b6b18bdcbc4a514bd590ada3
+  data.tar.gz: 38047665206377aa534418e0bb866548e7facd23a05953a19a6b2d75ff3497ff
 SHA512:
-  metadata.gz: be0bbd12361d9e729911efa4c719f64dad136cf6dfc9f3fbcafb558452ddb08e600ad2ef9b4765c7f6724d671750621a69db3d8b29f6dfda9665eaeda78e6a5c
-  data.tar.gz: c2c164ce9de789f45b1b1620bddaa7ef5c35afef64eaf22c0c67ca40ea482918fd759833706dec5ea4080190e8d33f39579bb8919aa33a2dc0f7532c7ba71732
+  metadata.gz: 3ad3fa4eb527976a1a7693093b314bf82579ba1da6e0423c97b679b4a45c588642ed041eb3c7bf69e8619302c780c1fecd70033087be6b16fe2810dc1bf90cf2
+  data.tar.gz: 430fbdeec449cbb5de02eb3f228616fb8dda569e9a469838f23b9295c8f75af1f32664c23558733e80f9733bf1d93c45013ef487d6db28afc582dd24827febc7

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/model.rb.bak

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

@@ -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.1.3'
+  VERSION = '2.2.0'
 end

data/lib/rows/version.rb.bak

@@ -0,0 +1,3 @@
+module Rows
+  VERSION = '2.1.3'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rows_controller
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-28 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,21 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
-- Appraisals
-- Gemfile
-- Gemfile.lock
 - MIT-LICENSE
-- NOTES
 - README.md
-- Rakefile
-- app/controllers/.keep
 - app/controllers/rows_controller.rb
+- app/controllers/rows_controller.rb.bak
 - app/controllers/rows_ext_controller.rb
-- app/views/.keep
 - app/views/rows/_form.slim
 - app/views/rows/_list.slim
 - app/views/rows/_list_footer.slim
@@ -89,109 +79,17 @@ files:
 - app/views/rows/show.slim
 - app/views/shared/_error_explanation.slim
 - app/views/shared/_show_flash.slim
-- bin/rails
-- gemfiles/rails_4.2.0.gemfile
-- gemfiles/rails_4.2.4.gemfile
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.2.gemfile
 - lib/rows/engine.rb
 - 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
 - lib/rows_controller.rb
-- rows_controller.gemspec
-- script/rails
-- test/.watchr
-- test/controllers/order/items_controller_test.rb
-- test/controllers/orders_test.rb
-- test/controllers/rows_controller_test.rb
-- test/controllers/rows_ext_controller_test.rb
-- test/dummy3/Rakefile
-- test/dummy3/app/controllers/application_controller.rb
-- test/dummy3/app/controllers/order/items_controller.rb
-- test/dummy3/app/controllers/orders_controller.rb
-- test/dummy3/app/models/order.rb
-- test/dummy3/app/models/order/item.rb
-- test/dummy3/app/views/layouts/application.html.erb
-- test/dummy3/app/views/order/items/_form.html.erb
-- test/dummy3/app/views/orders/_form.html.erb
-- test/dummy3/config.ru
-- test/dummy3/config/application.rb
-- test/dummy3/config/boot.rb
-- test/dummy3/config/database.yml
-- test/dummy3/config/environment.rb
-- test/dummy3/config/environments/development.rb
-- test/dummy3/config/environments/production.rb
-- test/dummy3/config/environments/test.rb
-- test/dummy3/config/initializers/secret_token.rb
-- test/dummy3/config/initializers/session_store.rb
-- test/dummy3/config/initializers/wrap_parameters.rb
-- test/dummy3/config/routes.rb
-- test/dummy3/db/migrate/001_create_orders.rb
-- test/dummy3/db/migrate/002_create_order_items.rb
-- test/dummy3/db/schema.rb
-- test/dummy3/script/rails
-- test/dummy4/Rakefile
-- test/dummy4/app/controllers/application_controller.rb
-- test/dummy4/app/controllers/order/items_controller.rb
-- test/dummy4/app/controllers/orders_controller.rb
-- test/dummy4/app/models/order.rb
-- test/dummy4/app/models/order/item.rb
-- test/dummy4/app/views/layouts/application.html.erb
-- test/dummy4/app/views/order/items/_form.html.erb
-- test/dummy4/app/views/orders/_form.html.erb
-- test/dummy4/bin/bundle
-- test/dummy4/bin/rails
-- test/dummy4/bin/rake
-- test/dummy4/bin/setup
-- test/dummy4/config.ru
-- test/dummy4/config/application.rb
-- test/dummy4/config/boot.rb
-- test/dummy4/config/database.yml
-- test/dummy4/config/environment.rb
-- test/dummy4/config/environments/development.rb
-- test/dummy4/config/environments/production.rb
-- test/dummy4/config/environments/test.rb
-- test/dummy4/config/initializers/cookies_serializer.rb
-- test/dummy4/config/initializers/filter_parameter_logging.rb
-- test/dummy4/config/initializers/session_store.rb
-- test/dummy4/config/initializers/wrap_parameters.rb
-- test/dummy4/config/routes.rb
-- test/dummy4/config/secrets.yml
-- test/dummy4/db/migrate/001_create_orders.rb
-- test/dummy4/db/migrate/002_create_order_items.rb
-- test/dummy4/db/schema.rb
-- test/dummy4/log/.keep
-- test/dummy5/Rakefile
-- test/dummy5/app/controllers/application_controller.rb
-- test/dummy5/app/controllers/order/items_controller.rb
-- test/dummy5/app/controllers/orders_controller.rb
-- test/dummy5/app/models/application_record.rb
-- test/dummy5/app/models/order.rb
-- test/dummy5/app/models/order/item.rb
-- test/dummy5/app/views/layouts/application.html.erb
-- test/dummy5/app/views/order/items/_form.html.erb
-- test/dummy5/app/views/orders/_form.html.erb
-- test/dummy5/bin/rails
-- test/dummy5/config.ru
-- test/dummy5/config/application.rb
-- test/dummy5/config/boot.rb
-- test/dummy5/config/database.yml
-- test/dummy5/config/environment.rb
-- test/dummy5/config/environments/test.rb
-- test/dummy5/config/routes.rb
-- test/dummy5/config/secrets.yml
-- test/dummy5/config/spring.rb
-- test/dummy5/db/migrate/001_create_orders.rb
-- test/dummy5/db/migrate/002_create_order_items.rb
-- test/dummy5/db/schema.rb
-- test/dummy5/log/.keep
-- test/fixtures/order/items.yml
-- test/fixtures/orders.yml
-- test/test_helper.rb
 homepage: http://matique.de
 licenses:
 - MIT
@@ -216,92 +114,4 @@ rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: RowsController DRYs your controllers.
-test_files:
-- test/.watchr
-- test/controllers/order/items_controller_test.rb
-- test/controllers/orders_test.rb
-- test/controllers/rows_controller_test.rb
-- test/controllers/rows_ext_controller_test.rb
-- test/dummy3/Rakefile
-- test/dummy3/app/controllers/application_controller.rb
-- test/dummy3/app/controllers/order/items_controller.rb
-- test/dummy3/app/controllers/orders_controller.rb
-- test/dummy3/app/models/order.rb
-- test/dummy3/app/models/order/item.rb
-- test/dummy3/app/views/layouts/application.html.erb
-- test/dummy3/app/views/order/items/_form.html.erb
-- test/dummy3/app/views/orders/_form.html.erb
-- test/dummy3/config.ru
-- test/dummy3/config/application.rb
-- test/dummy3/config/boot.rb
-- test/dummy3/config/database.yml
-- test/dummy3/config/environment.rb
-- test/dummy3/config/environments/development.rb
-- test/dummy3/config/environments/production.rb
-- test/dummy3/config/environments/test.rb
-- test/dummy3/config/initializers/secret_token.rb
-- test/dummy3/config/initializers/session_store.rb
-- test/dummy3/config/initializers/wrap_parameters.rb
-- test/dummy3/config/routes.rb
-- test/dummy3/db/migrate/001_create_orders.rb
-- test/dummy3/db/migrate/002_create_order_items.rb
-- test/dummy3/db/schema.rb
-- test/dummy3/script/rails
-- test/dummy4/Rakefile
-- test/dummy4/app/controllers/application_controller.rb
-- test/dummy4/app/controllers/order/items_controller.rb
-- test/dummy4/app/controllers/orders_controller.rb
-- test/dummy4/app/models/order.rb
-- test/dummy4/app/models/order/item.rb
-- test/dummy4/app/views/layouts/application.html.erb
-- test/dummy4/app/views/order/items/_form.html.erb
-- test/dummy4/app/views/orders/_form.html.erb
-- test/dummy4/bin/bundle
-- test/dummy4/bin/rails
-- test/dummy4/bin/rake
-- test/dummy4/bin/setup
-- test/dummy4/config.ru
-- test/dummy4/config/application.rb
-- test/dummy4/config/boot.rb
-- test/dummy4/config/database.yml
-- test/dummy4/config/environment.rb
-- test/dummy4/config/environments/development.rb
-- test/dummy4/config/environments/production.rb
-- test/dummy4/config/environments/test.rb
-- test/dummy4/config/initializers/cookies_serializer.rb
-- test/dummy4/config/initializers/filter_parameter_logging.rb
-- test/dummy4/config/initializers/session_store.rb
-- test/dummy4/config/initializers/wrap_parameters.rb
-- test/dummy4/config/routes.rb
-- test/dummy4/config/secrets.yml
-- test/dummy4/db/migrate/001_create_orders.rb
-- test/dummy4/db/migrate/002_create_order_items.rb
-- test/dummy4/db/schema.rb
-- test/dummy4/log/.keep
-- test/dummy5/Rakefile
-- test/dummy5/app/controllers/application_controller.rb
-- test/dummy5/app/controllers/order/items_controller.rb
-- test/dummy5/app/controllers/orders_controller.rb
-- test/dummy5/app/models/application_record.rb
-- test/dummy5/app/models/order.rb
-- test/dummy5/app/models/order/item.rb
-- test/dummy5/app/views/layouts/application.html.erb
-- test/dummy5/app/views/order/items/_form.html.erb
-- test/dummy5/app/views/orders/_form.html.erb
-- test/dummy5/bin/rails
-- test/dummy5/config.ru
-- test/dummy5/config/application.rb
-- test/dummy5/config/boot.rb
-- test/dummy5/config/database.yml
-- test/dummy5/config/environment.rb
-- test/dummy5/config/environments/test.rb
-- test/dummy5/config/routes.rb
-- test/dummy5/config/secrets.yml
-- test/dummy5/config/spring.rb
-- test/dummy5/db/migrate/001_create_orders.rb
-- test/dummy5/db/migrate/002_create_order_items.rb
-- test/dummy5/db/schema.rb
-- test/dummy5/log/.keep
-- test/fixtures/order/items.yml
-- test/fixtures/orders.yml
-- test/test_helper.rb
+test_files: []