rows_controller 0.4.4 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8350895106158002e0b1bd6319c3867cc66f4f1d
+  data.tar.gz: a83f127435c76d5541c453101fc8f3e372694e64
+SHA512:
+  metadata.gz: 3ff1628935d87ebc1537af200bab7b9dc45b91cae95d51659bca0f2e4d26ffd3611de29f7fabf94ae0b8df279d922dd38f65bb3c91162883a24b891931d4ce75
+  data.tar.gz: 54244a7a196a7d540138dec17a1c12805af50f2026d634ee8eb2aac0296fa5909bd22d057357a56197b928497396532d72d065fe9a1e83b024f721ebf3de7a2e

data/.watchr

@@ -1,56 +1,52 @@
-def run(cmd)
-  puts "***** #{cmd}"
-  system "/usr/bin/time --format 'Elapsed time %E' #{cmd}"
+HH = '#' * 22  unless defined?(HH)
+H = '#' * 5    unless defined?(H)
+
+def usage
+  puts <<-EOS
+  Ctrl-\\ or ctrl-4   Running all tests
+  Ctrl-C             Exit
+  EOS
 end
 
-def run_without(list)
-  all = Dir.glob("spec/**/*_spec.rb")
-  res = []
-  list.each { |str|
-    files = Dir.glob("spec/**/#{str}/*_spec.rb")
-    res << files
-  }
-  run "rspec #{(all - res.flatten).sort.uniq.join(' ')}"
+def run(cmd)
+  puts "#{HH} #{Time.now} #{HH}"
+  puts "#{H} #{cmd}"
+  system "/usr/bin/time --format '#{HH} Elapsed time %E' #{cmd}"
 end
 
-def run_matching(name)
-  arr = name.gsub('_', '/').split('/')
-  bool = false
-  arr.each { |str|
-    files = Dir.glob("spec/**/#{str}_spec.rb")
-    files.each { |file|
-      bool = true
-      run "rspec #{file}"
-    }
-  }
-  puts "***** Changed #{name}; not yet done"  unless bool
+def run_it(type, file)
+  case type
+  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
+  when 'spec';  run %Q{rspec -X #{file}}
+  else;         puts "#{H} unknown type: #{type}, file: #{file}"
+  end
 end
 
+def run_all_tests
+  puts "\n#{HH} Running all tests #{HH}\n"
+  %w{test spec}.each { |dir| run "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+end
 
-watch('spec/.*/*_spec\.rb')     { |match| run "rspec #{match[0]}" }
-watch('spec/.*/.*/*_spec\.rb')  { |match| run "rspec #{match[0]}" }
+def run_matching_files(base)
+  base = base.split('_').first
+  %w{test spec}.each { |type|
+    files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
+    run_it type, files.join(' ')  unless files.empty?
+  }
+end
 
-watch('app/(.*)?\.rb') { |match|
-  puts "** touched #{match[1]}"
-  file = "spec/#{match[1]}_spec.rb"
-  if File.exists?(file)
-    run "rspec #{file}"
-  else
-    run_matching match[1]
-  end
+%w{test spec}.each { |type|
+  watch("#{type}/#{type}_helper\.rb") { run_all_tests }
+  watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
 }
-
-watch('app/views/(.*)?\.erb') { |match|
-  puts "** touched #{match[1]}"
-  run_without ['models']
+%w{rb erb haml slim}.each { |type|
+  watch("app/.*/.*\.#{type}") { |m|
+    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
+  }
 }
 
-
 # Ctrl-\ or ctrl-4
-Signal.trap('QUIT') do
-  puts "\n--- Running all tests ---\n"
-  run 'rake spec'
-end
-
+    Signal.trap('QUIT') { run_all_tests }
 # Ctrl-C
-Signal.trap('INT') { abort("Interrupted\n") }
+    Signal.trap('INT')  { abort("Interrupted\n") }
+usage

data/Gemfile

@@ -1,15 +1,18 @@
 source "http://rubygems.org"
 
 gem 'rails'
+#gem 'rails', '4.0.0.rc1'
 gem 'jquery-rails'
+gem 'slim'
 
 group :test do
-  gem "capybara"
+  gem 'capybara'
   gem 'rspec-rails'
 end
 
 group :development, :test do
-  gem "sqlite3"
+  gem 'sqlite3'
   gem 'watchr'
   gem 'spork'
+  gem 'simplecov', require: false
 end

data/Gemfile.lock

@@ -1,123 +1,116 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.7)
-      actionpack (= 3.2.7)
-      mail (~> 2.4.4)
-    actionpack (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.7)
-      activesupport (= 3.2.7)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
-    activesupport (3.2.7)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
     arel (3.0.2)
-    builder (3.0.0)
-    capybara (1.1.2)
+    builder (3.0.4)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.4)
-      ffi (~> 1.0, >= 1.0.6)
-    diff-lcs (1.1.3)
+      xpath (~> 2.0)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffi (1.1.1)
-    hike (1.2.1)
-    i18n (0.6.0)
+    hike (1.2.2)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.4)
-    libwebsocket (0.1.5)
-      addressable
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    jquery-rails (3.0.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
+    mime-types (1.23)
+    multi_json (1.7.4)
+    nokogiri (1.5.9)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.7)
-      actionmailer (= 3.2.7)
-      actionpack (= 3.2.7)
-      activerecord (= 3.2.7)
-      activeresource (= 3.2.7)
-      activesupport (= 3.2.7)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.7)
-    railties (3.2.7)
-      actionpack (= 3.2.7)
-      activesupport (= 3.2.7)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    rspec-rails (2.11.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.25.0)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      rubyzip
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slim (2.0.0)
+      temple (~> 0.6.5)
+      tilt (~> 1.3, >= 1.3.3)
     spork (0.9.2)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.15.4)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    sqlite3 (1.3.7)
+    temple (0.6.5)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.37)
     watchr (0.7)
-    xpath (0.1.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -128,6 +121,8 @@ DEPENDENCIES
   jquery-rails
   rails
   rspec-rails
+  simplecov
+  slim
   spork
   sqlite3
   watchr

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 Dittmar Krall - http://matique.de
+Copyright 2009-2013 Dittmar Krall - http://matique.de
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -19,7 +19,7 @@ methods (index, show, edit,...).
 The methods may be redefined in OrdersController overwritting the
 methods from RowsController.
 
-Protected low level methods like 'resources' may be redefined as well.
+Low level methods like 'resources' may be redefined as well.
 An example:
 
     def resources
@@ -34,10 +34,13 @@ Customization of views
 ----------------------
 
 Providing e.g. an "#{Rails.root}/app/views/order/index.html.erb"
-overwrites the default view as Rails will first look
+overwrites the default Rows view as Rails will first look
 into the directory "#{Rails.root}/app/views" before looking
 into the RowsController.
 
+Similarly, partials '_row_buttons' and '_list_footer' may be overwritten
+as well.
+
 
 model_class
 -----------
@@ -51,11 +54,24 @@ be changed by e.g.:
 The model class can be retrieved with model_class.
 
 
+Rails 4
+-------
+
+This gem is intended for Rails 4.
+For older Rails versions feel free to switch to "gem 'rows_controller', '0.4.4'".
+
+Rails 4 introduced strong parameters.
+To support them a private method 'resource_whitelist' is required
+in the controllers.
+Alternatively you may define a private method 'resource_params'
+in the controller to filter params.
+
+
 ## Enhancements
 
 ### copy
 
-The method "copy" was added to the RowsController.
+The method "copy" was added to the RowsExtController.
 "copy" is like "new", however its attributes are initialized
 from an existing resource.
 The "id" of the cloned resource is set to nil.
@@ -94,4 +110,4 @@ Look for:
 - decent_exposure
 
 
-Copyright (c) 2009-2012 [Dittmar Krall], released under the MIT license
+Copyright (c) 2009-2013 [Dittmar Krall], released under the MIT license

data/app/controllers/rows_controller.rb

@@ -1,86 +1,101 @@
+RAILS4 = Rails.version.to_i == 4
+
+
 class RowsController < ApplicationController
   require_dependency 'rows_controller/helpers'
 
-  respond_to :html, :xml, :json
-
+  # GET /:resources[.json]
   def index
-    respond_with(resources)
+    set_resources
   end
 
+  # GET /:resource/1[.json]
   def show
-    respond_with(resource)
+    set_resource
   end
 
+  # GET /:resource/new
   def new
-    respond_with(resource)
+    resource_new
   end
 
+  # GET /:resource/1/edit
   def edit
-    respond_with(resource)
+    set_resource
   end
 
+  # POST /:resources.json
   def create
-#    merge_bag
-    msg = t('ui.created', :model => model_name,
-	    :default => "%{model} created.")
-    save_and_respond(msg, 'rows/new')
+    respond_to do |format|
+      if resource_create
+	flash[:notice] = t('ui.created', model: model_name,
+		      default: "%{model} created.")
+	format.html {
+	  if params[:commit] == 'OK'
+	    redirect_to_index
+	  else
+	    redirect_to action: 'edit', id: resource.id
+	  end
+	}
+	format.json { render action: 'show', status: :created, location: resource }
+      else
+        format.html { render action: 'new' }
+	format.json { render json: resource.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
+  # PATCH/PUT /:resources/1[.json]
   def update
-#    merge_bag
-    msg = t('ui.updated', :model => model_name,
-	    :default => "%{model} updated.")
-    save_and_respond(msg, 'rows/edit')
+    set_resource
+    respond_to do |format|
+      if resource_update
+	flash[:notice] = t('ui.updated', model: model_name,
+		      default: "%{model} updated.")
+	format.html {
+	  if params[:commit] == 'OK'
+	    redirect_to_index
+	  else
+	    redirect_to action: 'edit'
+	  end
+	}
+        format.json { head :no_content }
+      else
+        format.html { render action: 'edit' }
+	format.json { render json: resource.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
+  # DELETE /:resources/1[.json]
   def destroy
-    resource.destroy
-    respond_with(resource) do |format|
-      format.html { redirect_to :action => :index }
-      format.js   { render :template => 'rows/destroy' }
+    set_resource
+    resource_destroy
+    flash[:notice] = t('ui.destroyed', model: model_name)  unless request.xhr?
+    respond_to do |format|
+      format.html { redirect_to_index }
+      format.js   { render template: 'rows/destroy', layout: false }
       format.json { head :no_content }
     end
-    flash[:notice] = t('ui.deleted', :model => model_name,
-		       :default => "%{model} deleted.")
-  end
-
-  def copy
-    @_resource = resource.dup
-    @_resource.id = nil
-    respond_with(resource) do |format|
-      format.html { render :action => :new }
-    end
   end
 
 
  private
-  def save_and_respond(notice, failure_template)
-    if resource.save
-      respond_with(resource) do |format|
-	format.html { redirect_to :action => :edit, :id => resource.id }
-	format.xml  { render :xml => resource.errors, :status => :unprocessable_entity }
-	format.json { head :no_content }
-      end
-      flash[:notice] = notice
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def resource_params
+    permits = resource_whitelist
+    if RAILS4
+      params.require(model_symbol).permit(permits)
     else
-      respond_with(resource) do |format|
-	format.html { render :template => failure_template, :id => resource.id }
-	format.xml  { render xml:  resource.errors, :status => :unprocessable_entity }
-	format.json { render json: resource.errors, :status => :unprocessable_entity }
-      end
+      pars = params[model_symbol] || {}
+      pars.keys.each { |x|
+	unless permits.include?(x)
+	  pars.delete(x)
+	  p "** WARNING: model <#{model_name}> dropping params <#{x}>"
+	end
+      }
+      pars
     end
   end
 
-# May be useful:
-#  def multi_deletion
-#    items = params[:multi_deletion] || []
-#    items -= ['']
-#    items.map {|id|  model_class.find(id).destroy }
-#    redirect_to :action => :index
-#  end
-
-#  def merge_bag
-#    self.params = model_class.merge({}, self.params) if model_class.respond_to?(:merge)
-#  end
-
 end