dom-rb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bea94521028abe3b88220fd369b2ed399d49094
-  data.tar.gz: 2fd651272b2923fb793a1b38d2c46ce814ce6856
+  metadata.gz: 4094aecbbafbb4c2a1dd1ef9fdc792654ee33ae6
+  data.tar.gz: e559c378becd4619c814853b4450ecbcb79a8d1b
 SHA512:
-  metadata.gz: 2c72e3408c30567670e74eecd2461bc22b4d72606b19dcfb282664451c5feba2abbbf34b408633875c5cd0c09ee91dfce4a1779a2754484127ba7e9c6bf948af
-  data.tar.gz: ee2775001232bf81ea60da2d4b5c0b985b38857384369efeba9eccab04a501fb6d3f1ef6a232a3a9125fe581c73e94ea3171a2218680c637e4ecf98de27538e1
+  metadata.gz: cd0d3f612e5d765e75aae4739cfb80a9a95520b58222062f4d498b3a674da96e1ecff2d64afa8eb507f18f17cf1c671226dc53971db6f51e73ccbb1450c913f0
+  data.tar.gz: 56c46eff3826114066929e5ffa50e0176c3716735a182d253649c78f85e76866b99970073d547b6cf7067f64fd7c52d94ff0c5073e294ec945310aa8ab47db7a

data/csr/dom/browser_ext/node.rb

@@ -25,6 +25,10 @@ end
 class Browser
   class DOM
     class Node
+      def as_native
+        @native
+      end
+
       # requires jquery and bootstrap.js - will fail otherwise
       def check_jquery
         %x(

data/csr/dom/builder/base.rb

@@ -72,7 +72,7 @@ module CSR
       end
 
       def resolve_value(element, value, bindings, id, attr, tag_name)
-        # debug 1, ->{[ __FILE__, __LINE__, __method__, "tag=#{tag_name} value=#{value} bindings=#{bindings} id=#{id} attr=#{attr}" ]}
+        debug 1, ->{[ __FILE__, __LINE__, __method__, "tag=#{tag_name} value=#{value} bindings=#{bindings} id=#{id} attr=#{attr}" ]}
         result = case value
           when BoundProc
             # debug 1, ->{[ __FILE__, __LINE__, __method__, "BoundProc===value" ]}
@@ -95,7 +95,7 @@ module CSR
             # debug 1, ->{[ __FILE__, __LINE__, __method__, "value=#{value}" ]}
             value
         end
-        # debug 1, ->{[ __FILE__, __LINE__, __method__, "result=#{result}" ]}
+        debug 1, ->{[ __FILE__, __LINE__, __method__, "result=#{result}" ]}
         result
       end
 

data/csr/dom/builder/helpers.rb

@@ -5,39 +5,28 @@ require 'dom/builder/base'
 module CSR
   module DOM
     module Builder
-
       module_function
 
-      def icon(name, callback: nil, css: nil, float: nil, margins: nil, style: nil)
-        _style = {
+      def icon(name, callback: nil, attributes: nil)
+        style = {
           text_align: 'center',
-          vertical_align: 'middle',
           color: 'inherit',
           background_color: 'inherit',
           cursor: 'pointer',
         }
-        if margins
-          _style =_style.merge(margins)
-        elsif float
-          _style = _style.merge(
-            case float.to_sym
-            when :left
-              { margin_right: '0.5em' } # { margin_top: '0.2em', margin_right: '0.5em' }
-            when :right
-              { margin_left: '0.5em' } # { margin_top: '0.2em', margin_right: '0.5em' }
-            else
-               {  } # { margin_top: '0.2em', margin_right: '0.5em' }
-            end
-          )
+        klass = iconify(name)
+        if attributes
+          if attributes[:style]
+            # arg style overrides any defaults
+            style = style.merge(attributes[:style])
+          end
+          if attributes[:class]
+            klass = klass + ' ' + attributes[:class]
+          end
         end
-        # arg style overrides any defaults
-        _style = _style.merge(style) if style
-        _class = iconify(name)
-        _class = "#{_class} #{css}" if css
-        _class = "#{_class} pull-#{float}" if float
         attributes = {
-          class: _class,
-          style: _style
+          class: klass,
+          style: style
         }.merge(
           callback ? { onclick: callback } : {}
         )
@@ -47,24 +36,33 @@ module CSR
         )
       end
 
-      def icon_with_anchor(icon_name, href, float: nil, margins: nil, icon_css: nil, anchor_css: nil, icon_style: nil, anchor_style: nil)
-        _icon = icon(icon_name, css: icon_css, float: float, margins: margins, style: icon_style)
+      def icon_with_anchor(icon_name, href, icon_attributes: nil, anchor_attributes: nil)
+        attributes = { href: href }
+        if anchor_attributes
+          attributes = anchor_attributes.merge(attributes)
+        end
         tag(
           :a,
-          attributes: {
-            href: href,
-            style: anchor_style,
-            class: anchor_css || '',
-          },
-          content: _icon
+          attributes: attributes,
+          content: icon(icon_name, attributes: icon_attributes)
         )
       end
 
-      def plus_sign_icon(href = nil)
+      def plus_sign_icon_anchor(href, icon_attributes: nil, anchor_attributes: nil)
+        _icon_attributes = {
+          style: {
+            color: 'lightgreen',
+          }
+        }
+        if icon_attributes
+          # argument takes precedence
+          _icon_attributes = _icon_attributes.merge(icon_attributes)
+        end
         icon_with_anchor(
           :plus_sign,
           href,
-          icon_style: { color: 'lightgreen'}
+          icon_attributes: _icon_attributes,
+          anchor_attributes: anchor_attributes
         )
       end
 
@@ -72,7 +70,7 @@ module CSR
         icon(
           :remove_sign,
           callback: callback,
-          style: {color: 'red'}
+          attributes: { style: {color: 'red'} }
         )
       end
 
@@ -80,7 +78,7 @@ module CSR
         icon(
           :refresh,
           callback: callback,
-          style: {color: 'inherit'}
+          attributes: { style: {color: 'inherit'} }
         )
       end
 
@@ -88,7 +86,7 @@ module CSR
         icon(
           :save,
           callback: callback,
-          style: {color: 'inherit'}
+          attributes: { style: {color: 'inherit'} }
         )
       end
 
@@ -96,7 +94,7 @@ module CSR
         icon(
           :menu_hamburger,
           callback: callback,
-          style: {color: 'inherit'}
+          attributes: { style: {color: 'inherit'} }
         )
       end
 
@@ -105,91 +103,79 @@ module CSR
       # 1. icon: is the name of the (bootstrap) icon
       # 2. items: should be hashes containing menu items
       #    e.g. { callback: ->{}, href: '#', content: 'list item'}
-      # 3. content: of the div (apart from the icon)
-      # 4. pull: which side of div to pull the span, 'right' or 'left'
-      # 5. style: any additional styling fro the span/icon
-      def drop_down_icon(icon: 'menu-hamburger', items: [], pull: 'right', style: {})
-        pull = pull.to_s
-        right = pull == 'right'
+      # 3. menu_right: set true if right of menu should go under icon
+      # 4. icon_attributes: any attributes for icon
+      def drop_down_icon(icon: 'menu-hamburger', items: [], menu_right: false, icon_attributes: nil, menu_attributes: nil)
+        _menu_attributes = {
+            class: "dropdown-menu#{menu_right ? ' dropdown-menu-right' : nil}"
+        }
+        if menu_attributes
+          _menu_attributes  = _menu_attributes.merge(menu_attributes)
+        end
         tag(
-          :span,
+          :div,
           attributes: {
-            class: "pull-#{pull}"
+            class: 'dropdown',
           },
-          content: tag(
-            :div,
-            attributes: {
-              class: 'dropdown',
-            },
-            content: [
-              tag(
-                :div,
-                attributes: {
-                  class: 'dropdown-toggle',
-                  # type: 'button',
-                  data_toggle: 'dropdown',
-                  style: {
-                    font_size: 'smaller',
-                    # margin_top: '0.2em',
-                    # margin_bottom: '0.1em',
-                    margin_left: right ? '0.5em' : '0.3em',
-                    margin_right: right ? '0.3em' : '0.5em',
-                    vertical_align: 'middle',
-                    color: 'inherit',
-                    background_color: 'inherit',
-                  }.merge(
-                    style
-                  )
-                },
-                content: icon(
-                  icon,
-                  style: {
-                    font_size: 'smaller',
-                    # margin_top: '0.2em',
-                    margin_bottom: '0.2em',
-                    margin_left: right ? '0.5em' : '0.3em',
-                    margin_right: right ? '0.3em' : '0.5em',
-                    vertical_align: 'middle',
-                    color: 'inherit',
-                    background_color: 'inherit',
-                  }.merge(
-                    style
+          content: [
+            tag(
+              :div,
+              attributes: {
+                class: 'dropdown-toggle',
+                data_toggle: 'dropdown'
+              },
+              content: icon(
+                icon,
+                attributes: icon_attributes
+              )
+            ),
+            tag(
+              :ul,
+              attributes: _menu_attributes,
+              content: items.map { |item|
+                content = item[:content]
+                if content == 'divider' || content == 'separator'
+                  tag(
+                    :li,
+                    attributes: {
+                      role: 'separator',
+                      class: 'divider',
+                    }
                   )
-                )
-              ),
-              tag(
-                :ul,
-                attributes: {
-                  class: "dropdown-menu#{right ? ' dropdown-menu-right' : nil}"
-                },
-                content: items.map { |item|
-                  content = item[:content]
-                  `console.log(#{"#{__FILE__}[#{__LINE__}]: adding item #{content} to menu icon #{icon}"})`
-                  if content == 'divider' || content == 'separator'
-                    tag(
-                      :li,
-                      attributes: {
-                        role: 'separator',
-                        class: 'divider',
-                      }
-                    )
-                  else
-                    attrs = {}
-                    attrs[:href] = item[:href] if item[:href]
-                    attrs[:onclick] = item[:callback] if item[:callback]
-                    tag(
-                      :li,
-                      content: tag(
-                        :div,
-                        content: content,
-                        attributes: attrs
-                      )
+                else
+                  attrs = {}
+                  attrs[:href] = item[:href] if item[:href]
+                  attrs[:onclick] = item[:callback] if item[:callback]
+                  tag(
+                    :li,
+                    content: tag(
+                      :div,
+                      content: content,
+                      attributes: attrs
                     )
-                  end
-                }
-              )
-            ]
-          )
+                  )
+                end
+              }
+            )
+          ]
+        )
+      end
+
+      def plus_sign_drop_down(items: [], menu_right: false, icon_attributes: nil, menu_attributes: nil)
+        _icon_attributes = {
+          style: {
+            color: 'lightgreen'
+          }
+        }
+        if icon_attributes
+          # argument attributes take precedence
+          _icon_attributes = _icon_attributes.merge(icon_attributes)
+        end
+        drop_down_icon(icon: 'plus-sign',
+           items: items,
+           menu_right: menu_right,
+           icon_attributes: _icon_attributes,
+           menu_attributes: menu_attributes
         )
       end
 
@@ -321,11 +307,22 @@ module CSR
       #    e.g. { callback: ->{}, href: '#', content: 'list item'}
       # 3. content: of the div (apart from the icon)
       # 4. pull: which side of div to pull the icon, 'right' or 'left'
-      def div_with_dropdown_icon(icon: 'menu-hamburger', items: [], content: nil, pull: 'right')
+      def div_with_dropdown_icon(icon: 'menu-hamburger', items: [], attributes: nil, content: nil, pull: 'right', menu_attributes: nil)
         tag(
           :div,
+          attributes: attributes,
           content: arrify(
-            drop_down_icon(icon: icon, items: items, pull: pull),
+            tag(
+              :span,
+              attributes: {
+                class: "pull-#{pull}",
+                style: {
+                  margin_left: '0.5em',
+                  margin_right: '0.5em'
+                }
+              },
+              content: drop_down_icon(icon: icon, items: items, menu_right: pull.to_s == 'right', menu_attributes: menu_attributes)
+            ),
             content
           )
         )

data/csr/dom/table/base.rb

@@ -133,6 +133,18 @@ module CSR
         @sections ? @sections.detect {|e| e.id == id} : nil
       end
 
+      def head
+        section(:head)
+      end
+
+      def body
+        section(:body)
+      end
+
+      def foot
+        section(:foot)
+      end
+
       def visible_columns
         @visible_columns ||= visible_column_indexes.map {|i| columns[i]}
       end

data/csr/dom/table/column.rb

@@ -11,18 +11,18 @@ module CSR
         # where table is a Table; section is :head, :body or :foot; row is an element in
         # head_rows, body_rows or foot_rows.
 
-        attr_reader :head_content   # Content or String or nil.
-        attr_reader :body_content   # Content or String or nil.
-        attr_reader :foot_content   # Content or String or nil.
+        attr_reader :head   # Content or String or nil.
+        attr_reader :body   # Content or String or nil.
+        attr_reader :foot   # Content or String or nil.
 
         # OPTIONS:
-        # :id             # unique in table
-        # :sort           # column may be sorted : boolean or nil
-        # :hide           # column may be hidden : boolean or nil
-        # :master         # column used for grouping in accordion table
-        # :head_content   # Content or String or nil for column head
-        # :body_content   # Content or String or nil for column body
-        # :foot_content   # Content or String or nil for column foot
+        # :id     # unique in table
+        # :sort   # column may be sorted : boolean or nil
+        # :hide   # column may be hidden : boolean or nil
+        # :master # column used for grouping in accordion table
+        # :head   # Content or String or nil for column head
+        # :body   # Content or String or nil for column body
+        # :foot   # Content or String or nil for column foot
 
         # TODO:
         # width:
@@ -32,9 +32,9 @@ module CSR
           @sort_callback = options[:sort]
           @hide = !!options[:hide]
           @master = !!options[:master]
-          @head_content = options[:head_content]
-          @body_content = options[:body_content]
-          @foot_content = options[:foot_content]
+          @head = options[:head]
+          @body = options[:body]
+          @foot = options[:foot]
         end
 
         def hash
@@ -67,7 +67,7 @@ module CSR
 
         # section is :head, :body or :foot
         def section_content(section)
-          send(:"#{section}_content")
+          send(section.to_sym)
         end
 
         # Returns a (probably) unique column id.

data/csr/dom/table/row.rb

@@ -65,8 +65,10 @@ module CSR
         # Returns array of cell elements in table's visible column order
         def cells
           unless @cells
+            column_index = -1
             @cells = @table.visible_columns.map do |column|
-              cell(column)
+              column_index += 1
+              cell(column, column_index)
             end
           end
           @cells
@@ -80,8 +82,8 @@ module CSR
           @section.row_source(@index)
         end
 
-        def cell(column)
-          attributes, content = cell_attributes_content(column)
+        def cell(column, column_index)
+          attributes, content = cell_attributes_and_content(column, column_index)
           tag(
             head? ? :th : :td,
             attributes: attributes,
@@ -89,7 +91,7 @@ module CSR
           )
         end
 
-        def cell_attributes_content(column)
+        def cell_attributes_and_content(column, column_index)
           content = column.section_content(@section.id)
           attributes = nil
           debug 1, ->{[ __FILE__, __LINE__,  __method__, "section.id=#{@section.id} row_index=#{@index} column.id=#{column.id} content=#{content}" ]}

data/csr/dom/table/section.rb

@@ -74,13 +74,11 @@ module CSR
         end
 
         def root
-          debug 1, ->{[ __FILE__, __LINE__,  __method__, "@id=#{@id}" ]}
           @root ||= tag(
             "t#{@id}",
             attributes: attributes,
             content: content
           )
-          debug 1, ->{[ __FILE__, __LINE__,  __method__, "@id=#{@id} @root=#{@root}" ]}
           @root
         end
 

data/lib/dom/version.rb

@@ -1,5 +1,5 @@
 module CSR
   module DOM
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dom-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Colin Gunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal-browser