rows_controller 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f9954a9ae20610991b324e71feb9919bda9b7d
-  data.tar.gz: 6e175282d743d493a3d6799df84f5716eb5a1c62
+  metadata.gz: e56282b6de1f22ebb0cecd4c277d4ec0d84615a0
+  data.tar.gz: 14bb4f2ce1ea1b8e0be466f50a9e6276e5280c9c
 SHA512:
-  metadata.gz: cf4b93b51d181c35c938e12a458faaadd64dc0d53703bfa053ef49f8162d627718758c30ee00d29c19f6bea0cc0e8bc059b1ba772100e33d131cf94c5d9fed0a
-  data.tar.gz: 0417c1c32c5972b5a2f113dc62ca3ff2c25262de82d82c19b1880fc15a16f0e3e28ac784997e0b2a90e7438057c3e8c2bfb15593e246076d06e10c0ff8f31cfe
+  metadata.gz: 89ecd8099220b7c9423234a52df31f0999e1cddc0be6c9e212101169ddce0dcbfe1a3f32f0864fb680ed82fa15f4543c6db76f9f8140c9224602049757328a03
+  data.tar.gz: 1a8c3b8aea0840dd7d027e8330a862a73b291d6ae9e9e117adc6c93af0365bc9ef27ad5fc961a62fb132e01125dbc23dcd4a92a493c218541cac07f99f13b5b9

data/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env rake
+
 require "rubygems"
 
 begin
@@ -6,7 +8,10 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+rails_version = `rails -v`.strip
+rails_version =~ /Rails (\d*)\./
+dir = "dummy#{$1}"
+APP_RAKEFILE = File.expand_path("../test/#{dir}/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'
@@ -16,7 +21,6 @@ Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  puts "Ruby version: #{RUBY_VERSION}"
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'

data/lib/rows/model.rb

@@ -5,6 +5,7 @@ module Rows::Model
 		       params[:controller].singularize.camelize.constantize
   end
 
+ if Rails::VERSION::MAJOR > 3
   def model_name
     @_model_name   ||= model_class.model_name.name
   end
@@ -12,9 +13,18 @@ module Rows::Model
   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_class.model_name.plural
+    @_model_symbol_plural ||= model_symbol.pluralize
   end
 
 end

data/lib/rows/resources.rb

@@ -61,12 +61,13 @@ module Rows::Resources
   # Never trust parameters from the scary internet, only allow the white list through.
   def resource_params
     permits = resource_whitelist
-    if params.respond_to?(:require)
+    if Rails::VERSION::MAJOR > 3
       params.require(model_symbol).permit(permits)
     else
       pars = params[model_symbol] || {}
       pars.keys.each { |x|
-	unless permits.include?(x) || permits.include?({x.to_sym => []})
+	x = x.to_sym
+	unless permits.include?(x) || permits.include?({x => []})
 	  pars.delete(x)
 	  p "** WARNING: model <#{model_name}> dropping params <#{x}>"
 	end

data/lib/rows/version.rb

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

data/lib/rows/version.rb.bak

@@ -1,3 +1,3 @@
 module Rows
-  VERSION = "2.0.4"
+  VERSION = "2.0.6"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rows_controller
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !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).
@@ -35,7 +35,6 @@ 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
@@ -86,3 +85,4 @@ signing_key:
 specification_version: 4
 summary: RowsController DRYs your controllers.
 test_files: []
+has_rdoc: 

data/app/controllers/rows_controller.rb.bak

@@ -1,89 +0,0 @@
-require 'rows/resources'
-require 'rows/model'
-require 'rows/utils'
-
-class RowsController < ApplicationController
-  if defined?(before_action)
-    before_action :set_resource, only: [:show, :edit, :update, :destroy]
-  else
-    before_filter :set_resource, only: [:show, :edit, :update, :destroy]
-  end
-
-  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 = model_class  unless model_class.nil?
-    @_model_class
-  end
-
-  # GET /:resources[.json]
-  def index
-    set_resources
-  end
-
-  # GET /:resource/:id[.json]
-  def show
-  end
-
-  # GET /:resource/new
-  def new
-    resource_new
-  end
-
-  # GET /:resource/:id/edit
-  def edit
-  end
-
-  # POST /:resources[.json]
-  def create
-    create_update(:resource_create, 'created')
-  end
-
-  # PATCH/PUT /:resources/:id[.json]
-  def update
-    create_update(:resource_update, 'updated')
-  end
-
-  # DELETE /:resources/:id[.json]
-  def destroy
-    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