object-view 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdbf95fc20bfc771a92a231f4e4d078da74e972
-  data.tar.gz: 1cab6105620ccfdbf64eb8120499b38b2983a552
+  metadata.gz: e5ef04d593b48cf9662d57e22b02fb146231a0a0
+  data.tar.gz: 532a9bd9f58fa1ce23e77ea214a36b4ddf981677
 SHA512:
-  metadata.gz: 4f2ad765044ab6ee361b22f0a9691e25b69dbc2e0a2f6ca22e10379144cdb5c733c67123811ba95fb69e83e92bdcf41316c903498914ee9e50cc2bd9a701c35a
-  data.tar.gz: 7011650f82ac301ce98fd23914a4c2ede0354c668567c0f0aa853a862b5f9e4fd595f14fdc8f6c0fde96637f58a2a2fa55ee6e7debc8c77997bcbb82d7d5ba9c
+  metadata.gz: 4c0eb12bc3d84dcc42331a854451e41c8e477e3357b54fa1938eec7de83ab0ff664a227beb65317b57f1a1554e400efaa19301d0a103b3f80eb11437a11690f2
+  data.tar.gz: 3c692b9e8e3330ccb7281941e48f23c275f666c737f59c05ccaaafa2e78f7da6417a887534035c4d7c671019c489f525d3ac706e0f3a1183db6eb6d498762a94

data/lib/object-view.rb

@@ -12,6 +12,8 @@ require_relative 'object_view/table'
 require_relative "object_view/link"
 require_relative "object_view/ul"
 require_relative "object_view/chart_data"
+require_relative "object_view/paragraph"
+require_relative "object_view/nav"
 
 
 module ObjectView

data/lib/object_view/element.rb

@@ -2,19 +2,26 @@ require_relative './errors/illegal_child_element_error'
 
 module ObjectView 
 
-  class Element 
-    attr_accessor :tag, :attributes, :single_line
+  class Element < Hash
+    attr_accessor :tag, :single_line
     attr_reader   :children, :acceptable_children
   
     def initialize
       @tab = "  "
       @single_line = false
       @tag = nil
-      @attributes = Hash.new
       @children = []
       @acceptable_children = [String, Element]
     end
   
+    def attributes
+      return self
+    end
+    
+    def style
+      self[:style] = {} if (!self[:style])
+      return self[:style]
+    end
   
     def find_element_with_tag(tag)
       found = []
@@ -33,7 +40,7 @@ module ObjectView
     end
   
     def attr(name, value)
-      @attributes[name] = value
+      self[name] = value
     end
   
     def acceptable_children=(value)
@@ -66,14 +73,16 @@ module ObjectView
     end
   
     def add(element_or_string)
-      if (self.is_acceptable_child?(element_or_string))
-        @children << element_or_string
-      elsif (element_or_string.is_a?(Array))
-        element_or_string.each do |child|
-          add child
+      if (element_or_string)
+        if (self.is_acceptable_child?(element_or_string))
+          @children << element_or_string
+        elsif (element_or_string.is_a?(Array))
+          element_or_string.each do |child|
+            add child
+          end
+        else
+          raise IllegalChildElementError.new "Parent: #{self.tag} - Attempt to add an element that is not a valid child, and not an ObjectView::Element.  Class of element: #{element_or_string.class.name}:  #{element_or_string}\nTag of parent: #{self.tag}.\nAcceptable children: #{@acceptable_children.join(',')}"
         end
-      else
-        raise IllegalChildElementError.new "Parent: #{self.tag} - Attempt to add an element that is not a valid child, and not an ObjectView::Element.  Class of element: #{element_or_string.class.name}:  #{element_or_string}\nTag of parent: #{self.tag}.\nAcceptable children: #{@acceptable_children.join(',')}"
       end
       return element_or_string
     end
@@ -114,8 +123,8 @@ module ObjectView
   
     def render_attributes
       html = StringIO.new
-      if (@attributes.length > 0)
-        @attributes.each do |name, value|
+      if (self.keys.length > 0)
+        self.each do |name, value|
           if (value.class == Hash)
             attr_value = ''
             value.keys.each do |key|
@@ -139,26 +148,29 @@ module ObjectView
       if (indent != nil)
         html << (@tab * indent) 
       end
-      html << "<#{tag}#{render_attributes}>"
-      if (self.single_line)
-        html << "#{render_children(nil)}" 
-      else
-        if (indent == nil)
-          html <<  render_children(indent)
+      if (children.length > 0)
+        html << "<#{tag}#{render_attributes}>"
+        if (self.single_line) 
+          html << "#{render_children(nil)}" 
         else
-          html <<  render_children(indent + 1)
+          if (indent == nil)
+            html <<  render_children(indent)
+          else
+            html <<  render_children(indent + 1)
+          end
         end
-      end
-    
-    
-      if (!self.single_line)
-        html << "\n"
-        if (indent != nil)
-          html << @tab * indent 
+
+        if (!self.single_line)
+          html << "\n"
+          if (indent != nil)
+            html << @tab * indent 
+          end
         end
+        html << "</#{tag}>\n"
+      else
+        html << "<#{tag}#{render_attributes}/>"
       end
-      
-      html << "</#{tag}>\n"
+
       return html.string
     end
   

data/lib/object_view/head.rb

@@ -2,6 +2,7 @@ require_relative './element'
 require_relative './javascript'
 require_relative './javascript_file'
 require_relative './link'
+require_relative './stylesheet'
 
 module ObjectView 
 
@@ -10,7 +11,32 @@ module ObjectView
     def initialize
       super
       @tag = "head"
-      self.acceptable_children = [Javascript, JavascriptFile, Link]
+      self.acceptable_children = [Javascript, JavascriptFile, Stylesheet, Title, String]
+    end
+    
+    def add_stylesheet(path, id = Time.new.to_i.to_s)
+      link = self.add Stylesheet.new
+      link[:href] = path
+      link[:id] = id
+      link[:type] = 'text/css'
+      link[:media] = 'screen'
+      link[:rel] = 'stylesheet'
+      return link
+    end
+    
+    def add_title(title)
+      self.add Title.new(title)
+    end
+    
+  end
+  
+  class Title < Element
+    
+    def initialize(title)
+      super()
+      @tag = "title"
+      self.acceptable_children = [String]
+      self.add title if (title)
     end
   end
   

data/lib/object_view/javascript_file.rb

@@ -10,6 +10,7 @@ module ObjectView
       attr("type", "text/javascript")
       attr("src", file)
       @tag = "script"
+      self.add " "
     end
   
   

data/lib/object_view/nav.rb

@@ -0,0 +1,12 @@
+module ObjectView 
+
+  class Nav < Element 
+    def initialize(content = nil)
+      super()
+      @tag = "nav"
+      if (content != nil)
+        self.add content
+      end
+    end
+  end
+end

data/lib/object_view/paragraph.rb

@@ -0,0 +1,14 @@
+module ObjectView 
+
+  class Paragraph < Element 
+  
+    def initialize(content = nil)
+      super()
+      @tag = "p"
+      if (content != nil)
+        self.add content
+      end
+    end
+    
+  end
+end

data/lib/object_view/stylesheet.rb

@@ -0,0 +1,15 @@
+require_relative './element'
+
+module ObjectView 
+
+  class Stylesheet < Element
+    
+    def initialize
+      super
+      @tag = "link"
+      self.acceptable_children = []
+    end
+    
+  end
+  
+end

data/lib/object_view/table.rb

@@ -112,7 +112,7 @@ module ObjectView
       super()
       self.single_line = true
       @tag = "td"
-      self.acceptable_children = [Table, Div, Span, Javascript, Link, String]
+      self.acceptable_children = [Table, Div, Span, Javascript, Link, String, Header, Paragraph]
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object-view
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Mike Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -86,8 +86,11 @@ files:
 - lib/object_view/javascript.rb
 - lib/object_view/javascript_file.rb
 - lib/object_view/link.rb
+- lib/object_view/nav.rb
 - lib/object_view/page.rb
+- lib/object_view/paragraph.rb
 - lib/object_view/span.rb
+- lib/object_view/stylesheet.rb
 - lib/object_view/table.rb
 - lib/object_view/ul.rb
 homepage: https://github.com/mikejmoore/object-view