html_skeleton 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55532393dae14c551ad8a938425e057aa82e94e84fc2cc101bf48af785b18a92
-  data.tar.gz: b3a1aa963b89dc333e7a5574a9c8cdfb9613d824f9e96c3a88e622b0a74d7dfb
+  metadata.gz: 56db184d22751726492ac71403572cd8a2834d0181aadc3ba867c88308cd249d
+  data.tar.gz: da19bf08daca4345f61044155ea1e2829824614d02489bfdcb187f30cf6538f1
 SHA512:
-  metadata.gz: 6182e2b9914696e363d0aefbde4c07e3920cb94605b2d8c2770f3b5acd5e0894b9c6ec58c3410f1664284abbef10aec80dc0c41cdb171ecfc56e46630a31029c
-  data.tar.gz: 4b7c5fe799657a40782a68f3a938c084e72c3f248853b6855a45a42a55fab3caef258d8019126fd3a0aaac91da20608b3f8faacc82f52d744a78c2ecc5c72136
+  metadata.gz: dbc2c9998eb15367256072d4c1963526f5225a72c5177a63d852ac587bf4f7a8aff7278c6558d2093a0eed9c9f1b2ced057cdfe65612112b99d9ed392d05c36a
+  data.tar.gz: 138ab21b89eb023bdaddeff721831a96cceb5b7e5b85ec457dee7d043ffb04f6ec888f0acc2aae57e19af2b05b77668b6c8f1522abfcb2752dcc451584905b44

data/MIT-LICENSE

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

@@ -47,7 +47,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 +80,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|
@@ -92,10 +92,10 @@ Default Options
     legend: nil,
     col_legend:   lambda(&:to_s),
     row_legend:   lambda(&:id),
-    th_attribute: lambda { |col| nil },
-    tr_attribute: lambda { |row| nil },
+    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?

data/lib/html_skeleton.rb

@@ -7,35 +7,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,8 +42,8 @@ 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>}
+      str = abbr == day ? day : %(<abbr title="#{day}">#{abbr}</abbr>)
+      %(<th scope="col">#{str}</th>)
     }.join('')
   end
 
@@ -54,12 +52,11 @@ class HtmlSkeleton
       legend: nil,
       col_legend: lambda(&:to_s),
       row_legend: lambda(&:id),
-      th_attribute: lambda { |col| nil },
-      tr_attribute: lambda { |row| nil },
+      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>" }
     }.merge options
   end
-
 end

data/lib/html_skeleton_calendar.rb

@@ -8,42 +8,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>"}
+    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 << '<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
     }
@@ -58,7 +58,7 @@ class HtmlSkeleton
     "<td class=\"#{attrs}\">#{block.call(date)}</td>"
 #    "<td class=\"#{attrs}\">##</td>"
   end
-  
+
   def weekend?(date)
     [0, 6].include?(date.wday)
   end
@@ -66,5 +66,4 @@ class HtmlSkeleton
   def days_between(first, second)
     first > second ? second + (7 - first) : second - first
   end
-
 end

data/lib/html_skeleton_table.rb

@@ -2,7 +2,7 @@ require 'date'
 
 # table methods ######################################################
 class HtmlSkeleton
- protected
+  protected
   def table_header(cols)
     legend       = @options[:legend]
     th_attribute = @options[:th_attribute]
@@ -12,7 +12,7 @@ class HtmlSkeleton
     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,10 +20,10 @@ 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
 
@@ -31,5 +31,4 @@ class HtmlSkeleton
     cell_proc = @options[:cell_proc]
     cols.collect { |col|  cell_proc.call(row, col) }.join('')
   end
-
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: html_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  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: '13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13'
 description: |2
       A simple helper for creating HTML calendars and tables.
 
@@ -60,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A simple helper for creating HTML calendars and tables