stones 0.2.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3c9ac7bdc63fd9cfb92d8f617b4eb13d0d5ebd
-  data.tar.gz: 7386db63c6d2872366615d1c22f64ec4df797eaa
+  metadata.gz: 604109717f1a47ecc8307f48891a444ed1ed9bcd
+  data.tar.gz: fc05e2ecbf6f04cd4512ad51e8be96f5db1f4963
 SHA512:
-  metadata.gz: 88d9fbcab334235a65044314955fabade8209bf23fdd689d08dc42d6e5e6974ee40c7bc7b805f6c03a41ff9e74d2b313c667fa2e5aedbf8b247d93fd3b2e588c
-  data.tar.gz: c3cb44eadfe61687d79df4df9f3f59f630c71486ed42fa5c53af22c046d1ca34034ed72aa15047b0d6dc44dc05fa8b90257f15d285a714780e234787b7818760
+  metadata.gz: bbd267725493622dae6fb4edd695220d7207c221c87d0341e15b7eeec2d62a49fafeb64bfe3609971913912ea4b79e612bb02e74b529b193c4a2fa2ca1a92902
+  data.tar.gz: 0921412e96b93a978354125282b62e31cb8a3bbcbdb0f5023f2ab93681828719429be4871592cdf0d9bf8effc3e65dc504a18d4841f8e8dacbd832a77b5fe24a

data/.ruby-gemset

@@ -1 +1 @@
-rails-4.1
+rails-5.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.4
+ruby-2.3.1

data/Gemfile

@@ -1,16 +1,3 @@
 source "http://rubygems.org"
 
-gem 'rails'
-#gem 'jquery-rails'
-#gem 'rows_controller'
-
-group :test do
-  gem "capybara"
-  gem 'rspec-rails'
-end
-
-group :development, :test do
-  gem "sqlite3"
-  gem 'watchr'
-  gem 'spork'
-end
+gem 'rails', '= 5.0.0.beta4', '< 5.1'

data/Gemfile.lock

@@ -1,115 +1,115 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actioncable (5.0.0.beta4)
+      actionpack (= 5.0.0.beta4)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.beta4)
+      actionpack (= 5.0.0.beta4)
+      actionview (= 5.0.0.beta4)
+      activejob (= 5.0.0.beta4)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (5.0.0.beta4)
+      actionview (= 5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
+      rack (~> 2.x)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
+    activerecord (5.0.0.beta4)
+      activemodel (= 5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
+      arel (~> 7.0)
+    activesupport (5.0.0.beta4)
+      concurrent-ruby (~> 1.0)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (7.0.0)
     builder (3.2.2)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    diff-lcs (1.2.5)
+    concurrent-ruby (1.0.2)
     erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    json (1.8.1)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
+    mini_portile2 (2.0.0)
+    minitest (5.9.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    rack (2.0.0.rc1)
+      json
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails (5.0.0.beta4)
+      actioncable (= 5.0.0.beta4)
+      actionmailer (= 5.0.0.beta4)
+      actionpack (= 5.0.0.beta4)
+      actionview (= 5.0.0.beta4)
+      activejob (= 5.0.0.beta4)
+      activemodel (= 5.0.0.beta4)
+      activerecord (= 5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+      railties (= 5.0.0.beta4)
+      sprockets-rails (>= 2.0.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0.beta4)
+      actionpack (= 5.0.0.beta4)
+      activesupport (= 5.0.0.beta4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    spork (0.9.2)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
+    rake (11.1.2)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    watchr (0.7)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    websocket-driver (0.6.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
-  rails
-  rspec-rails
-  spork
-  sqlite3
-  watchr
+  rails (= 5.0.0.beta4, < 5.1)
+
+BUNDLED WITH
+   1.12.2

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2014 Dittmar Krall - http://matique.de
+Copyright 2012-2016 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

@@ -4,7 +4,8 @@ Stones
 Each time I created a new Rails project these files are required.
 I got tired of it and collected them in a gem.
 
-Some files (e.g. reset.css) are overwritten by the corresponding ones fom the project.
+Some files (e.g. reset.css) can be overwritten by a
+corresponding ones from your project.
 Some files (e.g. .watchr) may be copied to your project.
 
 
@@ -21,14 +22,30 @@ Files:
     app/views/layouts/_body.slim
     app/views/layouts/_flash.slim
     app/views/layouts/_footer.slim
+    app/views/layouts/_header.slim
     app/views/layouts/_html_head.slim
+    app/views/layouts/_nav.slim
     app/views/shared/_error_explanation.html.erb
     config/initializers/concerns.rb
+    .watchr
 
+Installation
+------------
+To install add the following to your Gemfile:
+
+    gem 'stones'
+
+and run bundle.
 
 Recommended
-===========
+-----------
 
 - rvm
-- ruby 2.1.1
-- rails 4.1
+- ruby 2.3.1
+- rails 5.0
+
+Dropped/cleaned files (still available in version 0.2.5):
+
+- Rakefile
+- .watchr
+- lib/tasks/backup.rake

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 begin
   require 'bundler'
   require 'bundler/setup'
@@ -7,24 +5,9 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
 Bundler::GemHelper.install_tasks
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
 
 desc "Clean automatically generated files"
 task :clean do
   FileUtils.rm_rf "pkg"
 end
-
-desc "Check syntax"
-task :syntax do
-  Dir["**/*.rb"].each do |file|
-    print "#{file}: "
-    system("ruby -c #{file}")
-  end
-end

data/app/assets/stylesheets/reset.css

@@ -9,47 +9,38 @@ dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td, hr,
 textarea {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-weight: inherit;
-	font-style: inherit;
-	font-size: 100%;
-	font-family: inherit;
-	vertical-align: baseline;
-}
-
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  vertical-align: baseline;
 }
 
 body {
-	line-height: 1;
-	color: black;
-	background: white;
+  line-height: 1;
+  color: black;
+  background: white;
 }
+a img {border:none;}
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
 
-ol, ul {
-	list-style: none;
-}
+:focus { outline: 0; }
+ol, ul { list-style: none; }
 
 /* tables still need 'cellspacing="0"' in the markup */
 table {
-	border-collapse: separate;
-	border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
-
 caption, th, td {
-	text-align: left;
-	font-weight: normal;
-}
-
-blockquote:before, blockquote:after, q:before, q:after {
-	content: "";
+  text-align: left;
+  font-weight: normal;
 }
 
-blockquote, q {
-	quotes: "" "";
+blockquote, q { quotes: none; }
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: "";
 }

data/app/views/layouts/_body.slim

@@ -1,8 +1,5 @@
-div#wrapper
+body
   = render 'layouts/header'
-  = render 'layouts/flash', flash: flash
-  div#content
+  main
     = yield :layout
-  div#push
-footer
   = render 'layouts/footer'

data/app/views/layouts/_flash.slim

@@ -1,5 +1,5 @@
 - (flash || {}).each do |key, value|
-  p(class="flash_#{key}") #{sanitize(value)}
-  - if key.to_s == 'notice'
-    script(type="text/javascript")
-      | $('.flash_notice').fadeOut(5000, function() { $(this).remove(); });
+ p(class="flash_#{key}") #{sanitize(value)}
+ - if key.to_s == 'notice'
+   script(type="text/javascript")
+     | $('.flash_notice').fadeOut(5000, function() { $(this).remove(); });

data/app/views/layouts/_footer.slim

@@ -9,7 +9,5 @@ ruby:
   end
   str = "| #{app} | #{ruby} | #{rails} | #{STARTED_AT}"
 
-table
-  tr
-    td
-    td(style="text-align:center") #{copyright} #{str}
+footer
+  div #{copyright} #{str}

data/app/views/layouts/_header.slim

@@ -0,0 +1,3 @@
+header
+  h2 Dummy Header (delivered by gem stones)
+  p Please create your own 'app/views/layouts/_header.slim'

data/lib/stones/version.rb

@@ -1,3 +1,3 @@
 module Stones
-  VERSION = '0.2.5'
+  VERSION = '1.0.0'
 end

data/stones.gemspec

@@ -1,10 +1,9 @@
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'stones/version'
 
 Gem::Specification.new do |s|
-  s.name        = "stones"
+  s.name        = 'stones'
   s.version     = Stones::VERSION
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Stones contains some basic files."
@@ -12,16 +11,13 @@ Gem::Specification.new do |s|
   s.authors     = ['Dittmar Krall']
   s.email       = ['dittmar.krall@matique.de']
   s.homepage    = 'http://matique.de'
+  s.license     = 'MIT'
+
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+#  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+#  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
-
-#  s.add_development_dependency "sqlite3"  # for testing
-#  s.add_development_dependency "rspec-rails"
-#  s.add_development_dependency "capybara"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: stones
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
-dependencies: []
+date: 2016-06-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: A collection of, hopefully, useful files.
 email:
 - dittmar.krall@matique.de
@@ -19,7 +47,6 @@ extra_rdoc_files: []
 files:
 - ".ruby-gemset"
 - ".ruby-version"
-- ".watchr"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -35,6 +62,7 @@ files:
 - app/views/layouts/_body.slim
 - app/views/layouts/_flash.slim
 - app/views/layouts/_footer.slim
+- app/views/layouts/_header.slim
 - app/views/layouts/_html_head.slim
 - app/views/layouts/application.html.erb
 - app/views/shared/_error_explanation.html.erb
@@ -42,10 +70,10 @@ files:
 - lib/stones.rb
 - lib/stones/engine.rb
 - lib/stones/version.rb
-- lib/tasks/backup.rake
 - stones.gemspec
 homepage: http://matique.de
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -63,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Stones contains some basic files.

data/.watchr

@@ -1,52 +0,0 @@
-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(cmd)
-  puts "#{HH} #{Time.now} #{HH}"
-  puts "#{H} #{cmd}"
-  system "/usr/bin/time --format '#{HH} Elapsed time %E' #{cmd}"
-end
-
-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}"  if  File.exists?(dir) }
-end
-
-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
-
-%w{test spec}.each { |type|
-  watch("#{type}/#{type}_helper\.rb") { run_all_tests }
-  watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
-}
-%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') { run_all_tests }
-# Ctrl-C
-    Signal.trap('INT')  { abort("Interrupted\n") }
-usage

data/lib/tasks/backup.rake

@@ -1,92 +0,0 @@
-def dir
-  unless @dir
-    @dir = "#{Rails.root}/db/backup"
-    FileUtils.mkdir_p(@dir)
-  end
-  @dir
-end
-
-def interesting_tables
-  rval = ActiveRecord::Base.connection.tables.sort
-  rval.reject! do |tbl|
-    ['schema_migrations','schema_info', 'sessions', 'public_exceptions'].include?(tbl)
-  end
-  rval
-end
-
-namespace :db do
-  namespace :backup do
-
-    desc "Dump entire db."
-    task :write => :environment do
-      FileUtils.chdir(dir)
-      interesting_tables.each do |tbl|
-	klass = tbl.classify.constantize
-	puts "Writing #{tbl}..."
-	File.open("#{tbl}.yml", 'w+') { |f| YAML.dump klass.find(:all).collect(&:attributes), f }
-      end
-      FileUtils.chdir(Rails.root)
-    end
-
-    desc "Loads the entire db."
-    task :read => [:environment, 'db:schema:load'] do
-      FileUtils.chdir(dir)
-
-      interesting_tables.each do |tbl|
-	ActiveRecord::Base.transaction do
-	  begin
-	    klass = tbl.classify.constantize
-	    klass.destroy_all
-	    klass.reset_column_information
-
-	    puts "Loading #{tbl}..."
-	    YAML.load_file("#{tbl}.yml").each do |fixture|
-	      data = {}
-	      klass.columns.each do |c|
-		# filter out missing columns
-		data[c.name] = fixture[c.name] if fixture[c.name]
-	      end
-	      sql = "INSERT INTO #{tbl} "
-	      sql += "(#{data.keys.map{|kk| "#{kk}"}.join(",")}) "
-	      sql += "VALUES (#{data.values.collect { |value| ActiveRecord::Base.connection.quote(value) }.join(",")})"
-
-	      ActiveRecord::Base.connection.execute sql, 'Fixture Insert'
-	    end
-	  rescue Exception => exc
-	    puts "failed to load table #{tbl}; Exception: #{exc}"
-	  end
-	end
-      end
-    end
-
-    desc "Loads a table; e.g. rake db:backup:load[users]"
-    task :load, [:table]  => :environment  do |t, args|
-      FileUtils.chdir(dir)
-
-      tbl = args.table
-      ActiveRecord::Base.transaction do
-	begin
-	  klass = tbl.classify.constantize
-	  klass.reset_column_information
-	  puts "Loading #{tbl}..."
-	  YAML.load_file("#{tbl}.yml").each do |fixture|
-	    data = {}
-	    klass.columns.each do |c|
-	      # filter out missing columns
-	      data[c.name] = fixture[c.name] if fixture[c.name]
-	    end
-	    sql = "INSERT INTO #{tbl} "
-	    sql += "(#{data.keys.map{|kk| "#{kk}"}.join(",")}) "
-	    sql += "VALUES (#{data.values.collect { |value| ActiveRecord::Base.connection.quote(value) }.join(",")})"
-
-	    ActiveRecord::Base.connection.execute sql, 'Fixture Insert'
-
-	  end
-	rescue Exception => exc
-	  puts "failed to load table #{tbl}; Exception: #{exc}"
-	end
-      end
-    end
-
-  end
-end