deep-hash-struct 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2347cc60e1b5f08f0c78d608366f75fd6cc91c81
-  data.tar.gz: dd638be2da0bcc0d329954abaefd1c6334daa022
+  metadata.gz: c143922bc1bce734facd703fc9b19e2021dbdd5b
+  data.tar.gz: 39a7013a18b621d0a7ea7ce8dd594d3066f5a8bd
 SHA512:
-  metadata.gz: 6bf02841a252a96abcdd64e4d199a29acb324b57eb0a2f4f232a689765fee957f5f21390983819da5290735d3f542ff9d6ddf850877b66c031d657e0d8232f34
-  data.tar.gz: fdc4a2576e615ee1eaf3add0fa30c94b8f08069e79df963aeab77d4db626b2fde30dc0a66e6ff114b772fa9573b52deeed9e58d2051d7ccd8783bfe72c0aeea4
+  metadata.gz: ede814152eca2d38acaf4e38c80354c020e15fb35d2ebe1f1dec17607bb54eb365fc4da88b6d5407ee12ffa1f10bd29e44c82ba40c65c82aeaa987be4f41ad79
+  data.tar.gz: e13209641d9517afef831137c5762a1f30d042acf8a0d292ebbb4157b63b4e8c2a7041ba64e07f7c1b02ec1c294d950d338f9ec287a1704da6f475b362c1cdc3

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

data/.travis.yml

@@ -3,4 +3,3 @@ language: ruby
 rvm:
   - 2.4.1
   - 2.3.1
-before_install: gem install bundler -v 1.14.6

data/README.md

@@ -492,7 +492,7 @@ table = "<table>\n"
 dashboard.tables[0].each do |rows|
   table << "  <tr>\n"
   rows.each do |row|
-    if row.header? || row.side?
+    if row.side_or_header?
       table << "    <th>#{row.name}</th>\n"
     else
       table << "    <td>#{row.value}</td>\n"
@@ -633,7 +633,7 @@ table = "<table>\n"
 dashboard.tables[0].each do |rows|
   table << "  <tr>\n"
   rows.each do |row|
-    if row.header? || row.side?
+    if row.side_or_header?
       table << "    <th>#{row.name}</th>\n"
     else
       table << "    <td>#{row.value}</td>\n"
@@ -770,7 +770,7 @@ table = "<table>\n"
 dashboard.tables[0].each do |rows|
   table << "  <tr>\n"
   rows.each do |row|
-    if row.header? || row.side?
+    if row.side_or_header?
       table << "    <th>#{row.name}</th>\n"
     else
       table << "    <td>#{row.value}</td>\n"
@@ -876,6 +876,157 @@ puts table
 # => </table>
 ```
 
+### Create like html matrix table
+```
+dashboard = Deep::Hash::Struct::Dashboard.new
+dashboard.add_table(matrix: true) do |t|
+  t.tr do |tr|
+    tr.th "header1"
+    tr.th "header2"
+    tr.th "header3"
+  end
+
+  t.tr side: true do |tr|
+    tr.th "side1"
+    tr.td 1
+    tr.td 2
+    tr.td 3
+  end
+
+  t.tr side: true do |tr|
+    tr.th "side2"
+    tr.td 4
+    tr.td 5
+    tr.td 6
+  end
+
+  t.tr side: true do |tr|
+    tr.th "side3"
+    tr.td 7
+    tr.td 8
+    tr.td 9
+  end
+end
+
+result = "<table>\n"
+dashboard.each do |t|
+  t.each do |tr|
+    result << "  <tr>\n"
+    tr.each do |cell|
+      if cell.side_or_header?
+        result << "    <th>#{cell.name}</th>"
+      else
+        result << "    <td>#{cell.value}</td>"
+      end
+      result << "\n"
+    end
+    result << "  </tr>\n"
+  end
+end
+result << "</table>\n"
+
+puts table
+
+# => <table>
+# =>   <tr>
+# =>     <th></th>
+# =>     <th>header1</th>
+# =>     <th>header2</th>
+# =>     <th>header3</th>
+# =>   </tr>
+# =>   <tr>
+# =>     <th>side1</th>
+# =>     <td>1</td>
+# =>     <td>2</td>
+# =>     <td>3</td>
+# =>   </tr>
+# =>   <tr>
+# =>     <th>side2</th>
+# =>     <td>4</td>
+# =>     <td>5</td>
+# =>     <td>6</td>
+# =>   </tr>
+# =>   <tr>
+# =>     <th>side3</th>
+# =>     <td>7</td>
+# =>     <td>8</td>
+# =>     <td>9</td>
+# =>   </tr>
+# => </table>
+```
+
+### Create like html segment table
+```
+dashboard = Deep::Hash::Struct::Dashboard.new
+dashboard.add_table do |t|
+  t.tr do |tr|
+    tr.th "header1"
+    tr.th "header2"
+    tr.th "header3"
+  end
+
+  t.tr do |tr|
+    tr.td 1
+    tr.td 2
+    tr.td 3
+  end
+
+  t.tr do |tr|
+    tr.td 4
+    tr.td 5
+    tr.td 6
+  end
+
+  t.tr do |tr|
+    tr.td 7
+    tr.td 8
+    tr.td 9
+  end
+end
+
+result = "<table>\n"
+dashboard.each do |t|
+  t.each do |tr|
+    result << "  <tr>\n"
+    tr.each do |cell|
+      if cell.side_or_header?
+        result << "    <th>#{cell.name}</th>"
+      else
+        result << "    <td>#{cell.value}</td>"
+      end
+      result << "\n"
+    end
+    result << "  </tr>\n"
+  end
+end
+result << "</table>\n"
+
+puts table
+
+# => <table>
+# =>   <tr>
+# =>     <th>header1</th>
+# =>     <th>header2</th>
+# =>     <th>header3</th>
+# =>   </tr>
+# =>   <tr>
+# =>     <td>1</td>
+# =>     <td>2</td>
+# =>     <td>3</td>
+# =>   </tr>
+# =>   <tr>
+# =>     <td>4</td>
+# =>     <td>5</td>
+# =>     <td>6</td>
+# =>   </tr>
+# =>   <tr>
+# =>     <td>7</td>
+# =>     <td>8</td>
+# =>     <td>9</td>
+# =>   </tr>
+# => </table>
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/etiopiamokamame/deep-hash-struct. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/deep/hash/struct/dashboard/table/row.rb

@@ -28,6 +28,10 @@ module Deep
               header? && side?
             end
 
+            def side_or_header?
+              header? || side?
+            end
+
             private
 
             def default_options

data/lib/deep/hash/struct/dashboard/table/tr.rb

@@ -0,0 +1,76 @@
+module Deep
+  module Hash
+    module Struct
+      class Dashboard
+        class Table
+          class Tr
+            include PP::Dashboard::Table::Tr
+
+            attr_accessor :header, :body, :side, :options
+
+            def initialize(header, body, side, options = {})
+              @header  = header
+              @body    = body
+              @side    = side
+              @options = options
+            end
+
+            def th(value = nil)
+              hash = {}
+              if !value.is_a?(Array) && value.respond_to?(:each)
+                if value.has_key?(:key) && value.has_key?(:value)
+                  hash[value[:key]] = value[:value]
+                else
+                  value.each do |k, v|
+                    hash[k] = v
+                  end
+                end
+              else
+                i = if options[:side]
+                      side.count + 1
+                    elsif options[:matrix]
+                      header.count
+                    else
+                      header.count + 1
+                    end
+                hash["key_#{i}"] = value
+              end
+
+              if options[:side]
+                side.merge! hash
+              else
+                header.merge! hash
+              end
+
+              value
+            end
+
+            def td(value = nil)
+              hash = {}
+              if !value.is_a?(Array) && value.respond_to?(:each)
+                if value.has_key?(:key) && value.has_key?(:value)
+                  hash[value[:key]] = value[:value]
+                else
+                  value.each do |k, v|
+                    hash[k] = v
+                  end
+                end
+              else
+                i = body.count + 1
+                hash["key_#{i}"] = value
+              end
+
+              if options[:side]
+                hash.each do |k, v|
+                  body[k][side.keys[options[:b_index]]] = v
+                end
+              else
+                body.merge! hash
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deep/hash/struct/dashboard/table.rb

@@ -1,4 +1,5 @@
 require "deep/hash/struct/dashboard/table/row"
+require "deep/hash/struct/dashboard/table/tr"
 
 module Deep
   module Hash
@@ -55,9 +56,10 @@ module Deep
             end
 
             self.bodies = if matrix?
-                            merge_body = body.shift
+                            bs = Wrapper.new
+
                             body.size.times do
-                              bs.merge! body.shift
+                              bs.deep_merge! body.shift
                             end
 
                             sides.map do |s|
@@ -65,7 +67,7 @@ module Deep
                               rs << s
                               rs += headers.map do |h|
                                 next if h.side_header?
-                                v = merge_body.to_h.dig(h.value, s.value)
+                                v = bs.to_h.dig(h.value, s.value)
                                 v = v.nil? ? opt[:default] : v
                                 Row.new(value: v)
                               end.compact
@@ -106,6 +108,17 @@ module Deep
           end
           alias collect map
 
+          def tr(options = {})
+            b             = Wrapper.new
+            opt[:side]    = options[:side] || false
+            opt[:matrix]  = matrix?
+            opt[:b_index] =  body.size
+
+            yield Tr.new(header, b, side, opt)
+            body << b unless b.count.zero?
+            self
+          end
+
           private
 
           def default_options

data/lib/deep/hash/struct/pp/dashboard/table/tr.rb

@@ -0,0 +1,58 @@
+module Deep
+  module Hash
+    module Struct
+      module PP
+        module Dashboard
+          module Table
+            module Tr
+              def inspect
+                attributes  = []
+                attributes << "header=#{header}" if header.present?
+                attributes << "side=#{side}"     if side.present?
+                attributes << "body=#{body}"     if body.size > 0
+                attributes << "options=#{options}"
+                attributes  = "#{attributes.size.zero? ? '' : ' '}#{attributes.join(' ')}"
+                "#<#{self.class.name.split("::").last}#{attributes}>"
+              end
+
+              def pretty_print(q)
+                q.group(2, "#(#{self.class.name}:#{sprintf("0x%x", object_id)} {", "})") do
+                  q.breakable
+
+                  if header.present?
+                    q.text ":header => "
+                    q.pp header
+                    q.breakable
+                  end
+
+                  if side.present?
+                    q.text ":side => "
+                    q.pp side
+                    q.breakable
+                  end
+
+                  if body.size > 0
+                    q.text ":body => "
+                    q.pp body
+                    q.breakable
+                  end
+
+                  q.group(2, ":options => {", "}") do
+                    q.breakable
+                    q.seplist(options) do |k, v|
+                      q.text ":#{k} => "
+                      q.pp v
+                    end
+                    q.breakable
+                  end
+
+                  q.breakable
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deep/hash/struct/pp/wrapper.rb

@@ -9,15 +9,19 @@ module Deep
           end
 
           def pretty_print(q)
-            q.group(2, "#(#{self.class.name}:#{sprintf("0x%x", object_id)} {", "})") do
-              q.breakable
+            if present?
+              q.group(2, "#(#{self.class.name}:#{sprintf("0x%x", object_id)} {", "})") do
+                q.breakable
+
+                q.group(2, "{", "}") do
+                  q.breakable
+                  pretty_print_cycle(q)
+                end
 
-              q.group(2, "{", "}") do
                 q.breakable
-                pretty_print_cycle(q)
               end
-
-              q.breakable
+            else
+              q.text "#(#{self.class.name}:#{sprintf("0x%x", object_id)})"
             end
           end
 

data/lib/deep/hash/struct/pp.rb

@@ -3,3 +3,4 @@ require "deep/hash/struct/pp/wrapper"
 require "deep/hash/struct/pp/dashboard"
 require "deep/hash/struct/pp/dashboard/table"
 require "deep/hash/struct/pp/dashboard/table/row"
+require "deep/hash/struct/pp/dashboard/table/tr"

data/lib/deep/hash/struct/version.rb

@@ -1,7 +1,7 @@
 module Deep
   module Hash
     module Struct
-      VERSION = "0.1.4"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/deep/hash/struct/wrapper.rb

@@ -4,7 +4,8 @@ module Deep
       class Wrapper
         include PP::Wrapper
 
-        attr_accessor :parent_ins,
+        attr_accessor :keys,
+                      :parent_ins,
                       :parent_key,
                       :chain
 
@@ -13,6 +14,7 @@ module Deep
         alias chain? chain
 
         def initialize(h = {}, opt = {})
+          self.keys       = []
           self.chain      = opt[:chain].nil? ? false : opt[:chain]
           self.parent_ins = opt[:parent_ins]
           self.parent_key = opt[:parent_key]
@@ -20,12 +22,6 @@ module Deep
           wrap h, self
         end
 
-        def keys
-          instance_variables.reject { |k| k =~ /default|parent_ins|parent_key|chain/ }.map do |k|
-            k.to_s[1..-1].to_sym
-          end
-        end
-
         def values
           keys.map do |k|
             self[k]
@@ -274,15 +270,20 @@ module Deep
         end
 
         def delete(k)
+          keys.delete k.to_sym
           remove_instance_variable "@#{k}"
         end
 
         def delete_if
-          each do |k, v|
-            remove_instance_variable "@#{k}" if yield(k, v)
+          del_keys = map do |k, v|
+            k if yield(k, v)
+          end.compact
+          del_keys.each do |k|
+            delete k
           end
           self
         end
+        alias reject! delete_if
 
         def find
           klass = self.class.new
@@ -318,13 +319,6 @@ module Deep
           klass
         end
 
-        def reject!
-          each do |k, v|
-            remove_instance_variable "@#{k}" if yield(k, v)
-          end
-          self
-        end
-
         def inject(init = 0)
           value = [Float, Fixnum].include?(init.class) ? init : init.dup
           each do |k, v|
@@ -337,10 +331,14 @@ module Deep
         alias reduce inject
 
         def clear
-          remove_instance_variable "@default" unless default.nil?
+          unless default.nil?
+            remove_instance_variable "@default"
+            keys.delete :default
+          end
           each_key do |k|
             remove_instance_variable "@#{k}"
           end
+          self.keys = []
           self
         end
 
@@ -384,7 +382,7 @@ module Deep
         end
 
         def shift
-          k = keys.first
+          k = keys.shift
           [k, remove_instance_variable("@#{k}")]
         end
 
@@ -397,7 +395,7 @@ module Deep
           klass = dup
 
           klass.each do |k, v|
-            klass.remove_instance_variable("@#{k}") if (v.class == self.class && v.blank?) || v.nil?
+            klass.delete(k) if (v.class == self.class && v.blank?) || v.nil?
           end
 
           klass
@@ -405,7 +403,7 @@ module Deep
 
         def compact!
           each do |k, v|
-            remove_instance_variable("@#{k}") if (v.class == self.class && v.blank?) || v.nil?
+            delete(k) if (v.class == self.class && v.blank?) || v.nil?
           end
 
           self
@@ -414,7 +412,7 @@ module Deep
         def deep_compact
           klass = deep_dup
 
-          klass.each do |k, v|
+          del_keys = klass.map do |k, v|
             flag  = if v.class == self.class
                       klass[k] = v.deep_compact
                       klass[k].present?
@@ -422,14 +420,18 @@ module Deep
                       !v.nil?
                     end
             next if flag
-            klass.remove_instance_variable("@#{k}")
+            k
+          end.compact
+
+          del_keys.each do |k|
+            klass.delete k
           end
 
           klass
         end
 
         def deep_compact!
-          each do |k, v|
+          del_keys = map do |k, v|
             flag  = if v.class == self.class
                       self[k] = v.deep_compact
                       self[k].present?
@@ -437,7 +439,11 @@ module Deep
                       !v.nil?
                     end
             next if flag
-            remove_instance_variable("@#{k}")
+            k
+          end.compact
+
+          del_keys.each do |k|
+            delete k
           end
 
           self
@@ -454,8 +460,12 @@ module Deep
         end
 
         def slice!(*syms)
-          each_key do |k|
-            remove_instance_variable("@#{k}") unless syms.map(&:to_sym).include?(k)
+          del_keys = keys.map do |k|
+            k unless syms.map(&:to_sym).include?(k)
+          end.compact
+
+          del_keys.each do |k|
+            delete k
           end
 
           self
@@ -503,6 +513,10 @@ module Deep
           end
         end
 
+        def dup
+          self.class.new(to_h)
+        end
+
         def deep_dup(klass = self)
           new_klass = self.class.new
 
@@ -520,8 +534,10 @@ module Deep
 
           if method_name.to_s.end_with? "="
             setting_chain_instance!(self, name, arg)
+            keys << name.to_sym unless keys.include?(name.to_sym)
           elsif block_given?
             __send__ "#{name}=", yield
+            keys << name.to_sym unless keys.include?(name.to_sym)
           else
             val = instance_variable_get "@#{name}"
             return val unless val.nil?
@@ -539,6 +555,7 @@ module Deep
 
         def setting_chain_instance!(klass, key, val)
           klass.instance_variable_set "@#{key}", hash?(val) && (!(self === val.class) || klass.chain?) ? wrap(val) : val
+          klass.keys << key.to_sym unless klass.keys.include?(key.to_sym)
           return val unless klass.chain?
           setting_chain_instance!(klass.parent_ins, klass.parent_key, klass)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep-hash-struct
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - adachi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,11 +74,13 @@ files:
 - lib/deep/hash/struct/dashboard.rb
 - lib/deep/hash/struct/dashboard/table.rb
 - lib/deep/hash/struct/dashboard/table/row.rb
+- lib/deep/hash/struct/dashboard/table/tr.rb
 - lib/deep/hash/struct/error.rb
 - lib/deep/hash/struct/pp.rb
 - lib/deep/hash/struct/pp/dashboard.rb
 - lib/deep/hash/struct/pp/dashboard/table.rb
 - lib/deep/hash/struct/pp/dashboard/table/row.rb
+- lib/deep/hash/struct/pp/dashboard/table/tr.rb
 - lib/deep/hash/struct/pp/wrapper.rb
 - lib/deep/hash/struct/version.rb
 - lib/deep/hash/struct/wrapper.rb