thamble 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a2fd83722900bb09ea99100682d44f292daa222
-  data.tar.gz: b553cf68c0e2e739e214679686de413fe94a341e
+SHA256:
+  metadata.gz: be087dbd34683e86222c190ef4249057adfe43faad8e372cea1e498d8a62a5cf
+  data.tar.gz: 3bf1c710554f51d5573063d8814791b99257f554215eb53303df1f0a7096d82f
 SHA512:
-  metadata.gz: 65df2f5381247e83eacdc4232fca2bca9c49f2b8f1008370099e93e7016403a7a10b24879ab08bc0cd385fd1f566090d44360db8e30b2ef95cb5dd259570b87c
-  data.tar.gz: e74e10005826799250ffafdb3039abaa7fc350267727a1ccececc6b439d20d9d349a5615d009b47be2862c8c7a0663515836f8fb89636b1a7d3ab80f051b191a
+  metadata.gz: 0ea505f39ff8901cd49c1d65627ae0be026cb564dbca373b68e41028ec629dd629794bb4b7d9e52212fbd1efd72e6eaa4facd58a3697cea7b10b80534f450bd1
+  data.tar.gz: f38d8910459727b2b8c90f6bbd7aa6c6a7e656e7606c4c7a5cf196534c3af7620651336aa4c58b6f91465b3ccba5459b22cab0bd074b3da1aa0defa30ed0b2c8

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.1.0 (2019-11-20)
+
+* Support :column_th option for using th instead of td for first cell in each row (jeremyevans)
+
+* Use cgi/escape if available for faster escaping (jeremyevans)
+
 === 1.0.2 (2016-01-28)
 
 * Add support for running with --enable-frozen-string-literal on ruby 2.3 (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Jeremy Evans
+Copyright (c) 2013-2019 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -5,7 +5,7 @@ tables from enumerable objects.
 
 = Installation
 
-  sudo gem install thamble
+  gem install thamble
 
 = Source Code
 
@@ -71,6 +71,7 @@ You can use the :headers option to set custom headers:
 Other options supported are:
 
 :caption :: A caption for the table
+:column_th :: Use th instead of td for first cell in each row
 :table :: HTML attribute hash for the table itself
 :td :: HTML attribute hash for the table data cells, can be a proc called
        with the data value, row position, and row that returns a hash

data/Rakefile

@@ -12,7 +12,7 @@ end
 
 desc "Run specs"
 task :spec do
-  sh "#{FileUtils::RUBY} -rubygems -I lib spec/thamble_spec.rb"
+  sh "#{FileUtils::RUBY} -I lib spec/thamble_spec.rb"
 end
 
 task :default => :spec

data/lib/thamble.rb

@@ -1,7 +1,5 @@
 # frozen-string-literal: true
 
-require 'rack/utils'
-
 # Thamble exposes a single method named table to make it easy to generate
 # an HTML table from an enumerable.
 module Thamble
@@ -15,9 +13,11 @@ module Thamble
   #
   # Options:
   #
+  # :caption :: A caption for the table
+  # :column_th :: Use th instead of td for the first cell in each row in the
+  #               body.
   # :headers :: The headers to use for the table, as an array of strings or a
   #             single string using commas as the separtor.
-  # :caption :: A caption for the table
   # :table :: HTML attribute hash for the table itself
   # :td :: HTML attribute hash for the table data cells, can be a proc called
   #        with the data value, row position, and row that returns a hash
@@ -61,6 +61,7 @@ module Thamble
       tr_attr = @opts[:tr]
       th_attr = @opts[:th]
       td_attr = @opts[:td]
+      col_th = @opts[:column_th]
 
       t = tag('table', empty, @opts[:table])
       s = t.open.dup
@@ -97,7 +98,7 @@ module Thamble
         s << trh.open
         s << nl
         row.each_with_index do |col, i|
-          s << tag(td, col, handle_proc(td_attr, col, i, row)).to_s
+          s << tag((col_th && i == 0 ? th : td), col, handle_proc(td_attr, col, i, row)).to_s
         end
         s << trh.close
       end
@@ -194,6 +195,22 @@ module Thamble
       @attr.map{|k,v| "#{k}=\"#{h v}\""}.sort.join(' ')
     end
     
+    begin
+      require 'cgi/escape'
+      unless CGI.respond_to?(:escapeHTML) # work around for JRuby 9.1
+        CGI = Object.new
+        CGI.extend(defined?(::CGI::Escape) ? ::CGI::Escape : ::CGI::Util)
+      end
+      def escape_html(value)
+        CGI.escapeHTML(value.to_s)
+      end
+    rescue LoadError
+      require 'rack/utils'
+      def escape_html(value)
+        Rack::Utils.escape_html(value.to_s)
+      end
+    end
+
     # A HTML-escaped version of the given argument.
     def h(s)
       case s
@@ -202,7 +219,7 @@ module Thamble
       when Tag
         s.to_s
       else
-        Rack::Utils.escape_html(s.to_s)
+        escape_html(s)
       end
     end
   end

data/spec/thamble_spec.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require File.join(File.dirname(File.expand_path(__FILE__)), '../lib/thamble')
-require 'minitest/autorun'
+ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
+require 'minitest/global_expectations/autorun'
 
 describe "Thamble.table" do
   def table(*a, &block)
@@ -11,6 +12,10 @@ describe "Thamble.table" do
     table([[1, 2]]).must_equal '<table><tbody><tr><td>1</td><td>2</td></tr></tbody></table>'
   end
 
+  it 'should :support :column_th option for first column being th' do
+    table([[1, 2]], :column_th=>true).must_equal '<table><tbody><tr><th>1</th><td>2</td></tr></tbody></table>'
+  end
+
   it 'should support :headers option for the headers' do
     table([[1, 2]], :headers=>%w'a b').must_equal '<table><thead><tr><th>a</th><th>b</th></tr></thead><tbody><tr><td>1</td><td>2</td></tr></tbody></table>'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thamble
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  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: |
   Thamble exposes a single method, table, for easily creating HTML
   tables from enumerable objects.
@@ -82,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Create HTML Tables from Enumerables