html_table_dsl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d042b81a908f47f4a06115492bb0b3d59af150e00eaed401210f9735b6beb7
-  data.tar.gz: 9f1ec8604e62a81ec9870044b367436036a163e50c87ab70fe0bcfed1548b834
+  metadata.gz: c3d8bba615e6b3109d0bc42b772ee8fb9af58fbba61429255b2f843caefe1011
+  data.tar.gz: 632c3177d6f57eb9fda67418d322e83758ff5a3db2bb134371a029d778877c6d
 SHA512:
-  metadata.gz: b278ae4bfe43fbb99e422a15007e06b0801d39e52a59232b7c177a7a4e0a7e36a80055d27bbe73f868e0275e74df67fce07a1f1fd6d95107272a73e00a9a5dd9
-  data.tar.gz: 4689a55bcf08b252c4c3916e035ca2662abd0e01aad25589e638c4eca87b84c0f2c688b0b7284c5082df7eec3f5b87a36ee641d2ba342f7fd8dcc352807be5ac
+  metadata.gz: 9b5b93a8185a38b80bbbd87b1e1d497fd60cf4d9e1c87d063314010fda0a9bbc0083f5b9047a8d7297fd32603fd4990e92842ecde056ab00037a64a6cd9a4012
+  data.tar.gz: b95e69b2bfa0d947a4b3b34d93c1b6c79b1420187061798af63c12d4d50bba8e5938a051d3f776960f2c0c5d3599b02ad98707f5835fa6bd32f46da17f82363d

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 git_source(:github) { 'https://github.com/GorohovAlex/html_table_dsl' }
 
-gemspec
+gemspec

data/README.md

@@ -1,6 +1,14 @@
 # HTML-table DSL
 DLS for working with HTML tables. Easy creation and population of tables in Ruby.
 
+## Install gem
+```
+gem install html_table_dsl
+```
+## Use gem
+```
+require 'html/table'
+```
 ## Create table
 ```ruby
 html_table = Html.table(1, 2, name: 'table_name', class: 'table_class')
@@ -14,8 +22,8 @@ html_table.attributes = { class: 'table_class_new', name: nil, style: 'border: 1
 ## Set headers
 ```ruby
 head_cols = [Html::HeadCol.new('Text')]
-head_row = Html::Row.new(head_cols, name: 'row_name', class: 'row_class')
-html_table.write_header(head_row)
+head_rows = [Html::Row.new(head_cols, name: 'row_name', class: 'row_class')]
+html_table.write_header(head_rows)
 # <table><thead><tr name='row_name' class='row_class'><th>Text</th></tr></thead><tbody> ... </tbody></table>
 ```
 ## Set rows

data/html_table_dsl.gemspec

@@ -0,0 +1,27 @@
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = 'html_table_dsl'
+  spec.version       = '0.0.2'
+  spec.authors       = ['GorohovAlex']
+  spec.email         = ['gorochov.as@gmail.com']
+
+  spec.summary       = 'HTML-table DSL'
+  spec.description   = 'DLS for working with HTML tables. Easy creation and population of tables in Ruby.'
+  spec.homepage      = 'https://github.com/GorohovAlex/html_table_dsl'
+
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'fasterer', '~> 0.10.1'
+  spec.add_development_dependency 'pry', '~> 0.14.2'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.23.2'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
+end

data/lib/error.rb

@@ -0,0 +1,6 @@
+class ChildFormatError < StandardError
+  def initialize(allowed_classes)
+    message = "The child must be an Html class on of: #{allowed_classes.join(', ')}"
+    super(message)
+  end
+end

data/lib/html/col.rb

@@ -3,20 +3,10 @@ require_relative 'tag'
 
 module Html
   class Col < Tag
-    def initialize(value = '', **attrs)
-      super(**attrs)
-
-      @value = value
-    end
-
     private
 
     def tag_name
       :td
     end
-
-    def value
-      CGI.escapeHTML(@value.to_s)
-    end
   end
 end

data/lib/html/row.rb

@@ -1,24 +1,15 @@
 require_relative 'col'
+require_relative 'head_col'
 require_relative 'tag'
 
 module Html
   class Row < Tag
-    attr_reader :cols
-
-    def initialize(cols = Array.new(0, Col.new), **attrs)
-      super(**attrs)
-
-      @cols = cols
-    end
+    ALLOWED_CHILDREN = [Html::Col, Html::HeadCol].freeze
 
     private
 
     def tag_name
       :tr
     end
-
-    def value
-      @cols&.map(&:to_s)&.join
-    end
   end
 end

data/lib/html/table.rb

@@ -10,10 +10,10 @@ module Html
 
   class Table < Tag
     def initialize(rows = 0, cols = 0, **attrs)
-      super(**attrs)
+      @head_rows = []
+      @body_rows = Array.new(rows, Row.new(Array.new(cols, Col.new(' '))))
 
-      @head_rows = Row.new(Array.new(0))
-      @body_rows = Array.new(rows, Row.new(Array.new(cols, Col.new)))
+      super(**attrs)
     end
 
     def write_row(index, row)
@@ -24,18 +24,18 @@ module Html
       @head_rows = head_rows
     end
 
-    private
-
-    def tag_name
-      :table
-    end
-
     def value
       output_value = ''
       output_value += head.to_s unless head.empty?
       output_value + body.to_s unless body.empty?
     end
 
+    private
+
+    def tag_name
+      :table
+    end
+
     def head
       @head ||= Thead.new(@head_rows)
     end

data/lib/html/tag.rb

@@ -1,27 +1,38 @@
-require 'cgi'
+require './lib/error'
 
 module Html
   class Tag
-    def initialize(**attrs)
+    ALLOWED_CHILDREN = [].freeze
+    attr_reader :value
+
+    def initialize(value = nil, **attrs)
       @attributes = attrs
+      @value = value
+      valid_children?
     end
 
     def to_s
-      "<#{tag_name}#{read_attributes}>#{value}</#{tag_name}>"
+      "<#{tag_name}#{read_attributes}>#{read_value}</#{tag_name}>"
     end
 
     def attributes=(new_attributes)
       @attributes.merge!(new_attributes).compact!
     end
 
-    private
-
     def tag_name
-      raise NotImplementedError
+      nil
     end
 
-    def value
-      raise NotImplementedError
+    def empty?
+      return value.all?(&:empty?) if value.is_a?(Array)
+
+      value.nil? ? true : value&.empty?
+    end
+
+    private
+
+    def read_value
+      value.is_a?(Array) ? value.map(&:to_s).join : value
     end
 
     def read_attributes
@@ -31,5 +42,12 @@ module Html
     def attributes
       @attributes.map { |key, value| "#{CGI.escapeHTML(key.to_s)}='#{CGI.escapeHTML(value)}'" }.join(' ')
     end
+
+    def valid_children?
+      return true if @value.is_a?(String) || @value.nil?
+
+      all_allowed = @value&.all? { |value| self.class::ALLOWED_CHILDREN.include?(value.class) }
+      raise ChildFormatError, self.class::ALLOWED_CHILDREN unless all_allowed
+    end
   end
 end

data/lib/html/tbody.rb

@@ -1,24 +1,13 @@
 require_relative 'tag'
+require_relative 'row'
 module Html
   class Tbody < Tag
-    def initialize(rows = Row.new(Array.new(0)), **attrs)
-      super(**attrs)
-
-      @rows = rows
-    end
-
-    def empty?
-      @rows.nil? || @rows.empty?
-    end
+    ALLOWED_CHILDREN = [Html::Row].freeze
 
     private
 
     def tag_name
       :tbody
     end
-
-    def value
-      @rows&.map(&:to_s)&.join
-    end
   end
 end

data/lib/html/thead.rb

@@ -1,25 +1,14 @@
 require_relative 'tag'
+require_relative 'row'
 
 module Html
   class Thead < Tag
-    def initialize(row = Row.new(Array.new(0)), **attrs)
-      super(**attrs)
-
-      @row = row
-    end
-
-    def empty?
-      @row.nil? || @row.cols.empty?
-    end
+    ALLOWED_CHILDREN = [Html::Row].freeze
 
     private
 
     def tag_name
       :thead
     end
-
-    def value
-      @row
-    end
   end
 end

data/main.rb

@@ -3,20 +3,24 @@ require_relative './lib/html/head_col'
 require_relative './lib/html/row'
 require_relative './lib/html/table'
 
-html_table = Html.table(1, 2) #, name: 'table_name', class: 'table_class')
-# html_table.attributes = { class: 'table_class_new', name: nil, style: 'border: 1px' }
+html_table = Html.table(1, 2) # , name: 'table_name', class: 'table_class')
+html_table.attributes = { class: 'table_class_new', name: nil, style: 'border: 1px' }
 
-# head_cols = [Html::HeadCol.new('Text')]
-# head_row = Html::Row.new(head_cols, name: 'row_name', class: 'row_class')
-# html_table.write_header(head_row)
+head_cols = [Html::HeadCol.new('<i>Text</i>')]
+head_row = [Html::Row.new(head_cols, name: 'row_name', class: 'row_class')]
+html_table.write_header(head_row)
 # cols = Array.new(3) { |index| Html::Col.new("COL #{index} VALUE", style: 'border: 1px solid black') }
-# first_row = Html::Row.new(cols, name: 'row_name', class: 'row_class', style: 'background-color: red;')
+# Html::Row.new(cols, name: 'row_name', class: 'row_class111', style: 'background-color: red;')
+# first_row = Html::Row.new([1], name: 'row_name', class: 'row_class111', style: 'background-color: red;')
 # second_row = Html::Row.new(cols, name: 'row_name', class: 'row_class', style: 'background-color: green;')
 
 # html_table.write_row(0, first_row)
+# puts html_table
+# first_row.attributes = { class: 'row_class222' }
+
 # html_table.write_row(1, second_row)
 
-cols = [Html::Col.new('Text', name: 'col_name', style: 'col_style')]
-html_table.write_row(0, Html::Row.new(cols, name: 'row_name', class: 'row_class'))
+# cols = [Html::Col.new('Text', name: 'col_name', style: 'col_style')]
+# html_table.write_row(0, Html::Row.new(cols, name: 'row_name', class: 'row_class'))
 
 puts html_table

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html_table_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - GorohovAlex
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,8 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- html_table_dsl.gemspec
+- lib/error.rb
 - lib/html/col.rb
 - lib/html/head_col.rb
 - lib/html/row.rb