html_skeleton 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43dd93d55ec87d5e024b088ae78c7878618a46fc
-  data.tar.gz: 5de99008a76f63eaee5cf2e1b5f70b71257defae
+SHA256:
+  metadata.gz: e29dd94798168a8ab8267eed2aaf79df55206eebdc08529fa4d3105959761a7c
+  data.tar.gz: e42c7b766fd842f825e8c53b2e32652c8535728e9a67360de5b0deffafb9d364
 SHA512:
-  metadata.gz: 667f0653eaffc91e4f4d34de378f93f0d05ade478ef44982cc79f15518bfa52897a38fcb509485e09175838c36f28b07ff8a5c92d46281a74693abc8262d20e9
-  data.tar.gz: f334d20f9e254b9740b0d36c2dbf004e7a1f63bccd8fb7257cd7770f270d8c629455b18d31e5ffa8f287e0785021ea922a6d3323643029246f4de80d7f512625
+  metadata.gz: f1866ed93d9c6e5c2a8bb055c9a8a1529bb7117429ee8ffa57adf371902e7e373306c2ef30968f9f57a7e5e18056c0c5f5b79f36f822e69e2544f94e75769d1b
+  data.tar.gz: 8bb4b6fd8ca2d34f18af0fe5850a5ab9cab30b03a0792aa94a11c637fe45265f2df9216dd2686d11a98f368fc6d9b16ef4bf1c3d8c21185f0e1bf42fddf5f622

data/MIT-LICENSE

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

data/README.md

@@ -1,5 +1,6 @@
 HtmlSkeleton
 ============
+[![Gem Version](https://badge.fury.io/rb/html_skeleton.png)](http://badge.fury.io/rb/html_skeleton)
 
 HtmlSkeleton provides the frame for a calendar or a table,
 i.e. no loops are required to build up the HTML structure.
@@ -47,7 +48,7 @@ Default Options
     day_names:   Date::DAYNAMES.dup,
     month_names: Date::MONTHNAMES,
     abbrev:      (0..1),
-    cell_proc:   block || lambda {|d| d.day.to_s},
+    cell_proc:   block || ->(d) { d.day.to_s},
     first_day_of_week: 1
 
 
@@ -80,7 +81,7 @@ Examples
     }
 
     stripes = %w{odd even}
-    proc = lambda{ |row| k = stripes.shift; stripes << k; %Q{class="#{k}"} }
+    proc = ->(row) { k = stripes.shift; stripes << k; %Q{class="#{k}"} }
     HtmlSkeleton.new.table(@users, %w{email address},
 		tr_attribute: proc,
 		legend: 'Users') { |row, col|
@@ -90,12 +91,12 @@ Examples
 Default Options
 ---------------
     legend: nil,
-    col_legend:   lambda(&:to_s),
-    row_legend:   lambda(&:id),
-    th_attribute: lambda { |col| nil },
-    tr_attribute: lambda { |row| nil },
+    col_legend:   ->(x) { x.to_s },
+    row_legend:   ->(x) { x.id },
+    th_attribute: ->(col) { nil },
+    tr_attribute: ->(row) { nil },
     table_class:  'skeleton',
-    cell_proc:    block || lambda {|row, col| "<td>#{row} #{col}</td>"}
+    cell_proc:    block || ->(row, col) { "<td>#{row} #{col}</td>"}
 
 
 Curious?
@@ -109,4 +110,4 @@ Curious?
     github.com/watu/table_builder
     ruby-toolbox.com/projects/tableasy
 
-Copyright (c) 2012-2015 [Dittmar Krall], released under the MIT license.
+Copyright (c) 2012-2019 [Dittmar Krall], released under the MIT license.

data/lib/html_skeleton.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'html_skeleton_calendar'
 require 'html_skeleton_table'
@@ -7,35 +9,33 @@ class HtmlSkeleton
 
   def calendar(options = {}, &block)
     set_calendar_options(options, &block)
-    frame = @options[:month] ? 'div' : 'table'
-    body  = @options[:month] ?
-		a_month(@options[:year], @options[:month]) :
-		a_year(@options[:year])
-    %Q{<#{frame} class="#{@options[:calendar_class]}"> #{body} </#{frame}>}
+    month = @options[:month]
+    frame = month ? 'div' : 'table'
+    body  = month ? a_month(@options[:year], month) : a_year(@options[:year])
+    %(<#{frame} class="#{@options[:calendar_class]}"> #{body} </#{frame}>)
   end
 
   def table(rows, cols, options = {}, &block)
     set_table_options(options, &block)
-    <<-EOS
-<table class="#{@options[:table_class]}">
-  #{table_header(cols)}
-  #{table_body(rows, cols)}
-</table>
-    EOS
+    <<~TABLE
+      <table class="#{@options[:table_class]}">
+        #{table_header(cols)}
+        #{table_body(rows, cols)}
+      </table>
+    TABLE
   end
 
-
  protected
   def set_calendar_options(options, &block)
     year = DateTime.now.year
     @options = {
-      year:        year,
-      title:       year,
-      rows:        3,
+      year: year,
+      title: year,
+      rows: 3,
       calendar_class: 'skeleton',
       month_names: Date::MONTHNAMES,
-      abbrev:      (0..1),
-      cell_proc:   block || lambda {|d| d.day.to_s},
+      abbrev: (0..1),
+      cell_proc: block || ->(d) { d.day.to_s },
       first_day_of_week: 1
     }.merge options
 
@@ -44,22 +44,21 @@ class HtmlSkeleton
 
     @day_header = names.collect { |day|
       abbr = day[@options[:abbrev]]
-      str = abbr == day ? day : %Q{<abbr title='#{day}'>#{abbr}</abbr>}
-      %Q{<th scope='col'>#{str}</th>}
-    }.join('')
+      str = abbr == day ? day : %(<abbr title="#{day}">#{abbr}</abbr>)
+      %(<th scope="col">#{str}</th>)
+    }.join
   end
 
   def set_table_options(options, &block)
     @options = {
       legend: nil,
-      col_legend: lambda(&:to_s),
-      row_legend: lambda(&:id),
-      th_attribute: lambda { |col| nil },
-      tr_attribute: lambda { |row| nil },
+      col_legend: ->(x) { x.to_s },
+      row_legend: ->(x) { x.id },
+      th_attribute: ->(_col) {},
+      tr_attribute: ->(_row) {},
 
       table_class: 'skeleton',
-      cell_proc:   block || lambda {|row, col| "<td>#{row} #{col}</td>"},
+      cell_proc: block || ->(row, col) { "<td>#{row} #{col}</td>" }
     }.merge options
   end
-
 end

data/lib/html_skeleton_calendar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 # calendar methods ###################################################
@@ -8,42 +10,42 @@ class HtmlSkeleton
   def a_year(year)
     rows = @options[:rows]
     cols = 12 / rows
-    raise "html_skeleton_calendar: invalid option <rows>" unless rows * cols == 12
+    raise 'html_skeleton_calendar: invalid option <rows>' unless rows * cols == 12
 
-    body = (0..rows - 1).collect {|y|
-      str = (1..cols).collect {|x| "<td>#{a_month(year, y * cols + x)}</td>"}
-      "<tr>#{str.join('')}</tr>"
+    body = (0..rows - 1).collect { |y|
+      str = (1..cols).collect { |x| "<td>#{a_month(year, y * cols + x)}</td>" }
+      "<tr>#{str.join}</tr>"
     }
-    <<-EOS
-<thead><th colspan="2">#{@options[:title]}</th></thead>
-#{body.join('')}
-    EOS
+    <<~THEAD
+      <thead><th colspan="2">#{@options[:title]}</th></thead>
+      #{body.join}
+    THEAD
   end
 
   def a_month(year, month)
     title = @options[:month_names][month]
-    <<-EOS
-<table class="month">
-  <tr class="monthName"><th colspan="7">#{title}</th></tr>
-  <tr class="dayName">#{@day_header}</tr>
-  #{days_of_month(year, month)}
-</table>
-    EOS
+    <<~TABLE
+      <table class="month">
+        <tr class="monthName"><th colspan="7">#{title}</th></tr>
+        <tr class="dayName">#{@day_header}</tr>
+        #{days_of_month(year, month)}
+      </table>
+    TABLE
   end
 
   def days_of_month(year, month)
     first_weekday = @options[:first_day_of_week]
-    last_weekday  = first_weekday > 0 ? first_weekday - 1 : 6
+    last_weekday  = first_weekday.positive? ? first_weekday - 1 : 6
     cell_proc = @options[:cell_proc]
-    today = (Time.respond_to?(:zone) &&
-	    !(zone = Time.zone).nil? ? zone.now.to_date : Date.today)
+    bool = Time.respond_to?(:zone) && !(zone = Time.zone).nil?
+    today = bool ? zone.now.to_date : Date.today
 
     first = Date.civil(year, month, 1)
     last  = Date.civil(year, month, -1)
 
-    cal = '<tr>'
+    cal = +'<tr>'
     cal << '<td></td>' * days_between(first_weekday, first.wday)
-    first.upto(last) {|cur|
+    first.upto(last) { |cur|
       cal << a_day(cur, today, cell_proc)
       cal << '</tr> <tr>' if cur.wday == last_weekday
     }
@@ -56,9 +58,8 @@ class HtmlSkeleton
     attrs += ' weekendDay'  if weekend?(date)
     attrs += ' today'       if date == today
     "<td class=\"#{attrs}\">#{block.call(date)}</td>"
-#    "<td class=\"#{attrs}\">##</td>"
   end
-  
+
   def weekend?(date)
     [0, 6].include?(date.wday)
   end
@@ -66,5 +67,4 @@ class HtmlSkeleton
   def days_between(first, second)
     first > second ? second + (7 - first) : second - first
   end
-
 end

data/lib/html_skeleton_table.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'date'
 
 # table methods ######################################################
 class HtmlSkeleton
- protected
+  protected
   def table_header(cols)
     legend       = @options[:legend]
     th_attribute = @options[:th_attribute]
-    return ''  unless legend
+    return '' unless legend
 
     proc = @options[:col_legend]
     col_header = cols.collect { |col|
       "<th #{th_attribute.call(col)}>#{proc.call(col)}</th>"
     }.join
-    %Q{<thead><th class="legend">#{legend}</th>#{col_header}</thead>}
+    %(<thead><th class="legend">#{legend}</th>#{col_header}</thead>)
   end
 
   def table_body(rows, cols)
@@ -20,16 +22,15 @@ class HtmlSkeleton
     row_legend   = @options[:row_legend]
     tr_attribute = @options[:tr_attribute]
     rows.collect { |row|
-      rlegend = legend ? %Q{<td class="legend">#{row_legend.call(row)}</td>}
-		       : ''
+      rlegend = ''
+      rlegend = %(<td class="legend">#{row_legend.call(row)}</td>) if legend
       cells = table_row(row, cols)
-      %Q{<tr #{tr_attribute.call(row)}>#{rlegend}#{cells}</tr>}
+      %(<tr #{tr_attribute.call(row)}>#{rlegend}#{cells}</tr>)
     }.join("\n")
   end
 
   def table_row(row, cols)
     cell_proc = @options[:cell_proc]
-    cols.collect { |col|  cell_proc.call(row, col) }.join('')
+    cols.collect { |col|  cell_proc.call(row, col) }.join
   end
-
 end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: html_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2021-06-22 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: |2
@@ -44,7 +58,8 @@ files:
 homepage: http://matique.de
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/matique/html_skeleton
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -60,8 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: A simple helper for creating HTML calendars and tables