royw-shoeshine 0.0.1 → 0.0.2

data/README.rdoc

@@ -5,13 +5,14 @@ This is a collection of UI elements for shoes (http://shoooes.net).
 The collection currently includes:
 
 * UnorderedList is an unordered lists with various bullets
+  * with/without bullets
+  * vertical or horizontal orientation
 * ListItems is a handy wrapper for placing things in the list
 * DropDownMenu is an inplace drop down menu that can serve as popup menus
 * An example application to show them off with
 
 TODOs include:
 * ordered lists
-* horizontal lists
 * toolbar (horizontal list of icons)
 * maybe a menubar
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 0

data/examples/example_app.rb

@@ -5,6 +5,7 @@ Shoes.setup do
 end
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'shoeshine')
+$:.push(File.join(File.dirname(__FILE__)))
 
 require 'nav'
 require 'action'

data/examples/unordered_list_widget.rb

@@ -2,6 +2,7 @@ require 'shoeshine/widget'
 
 class UnorderedListWidget
   include Widget
+  include Nav
 
   def initialize
   end
@@ -22,6 +23,12 @@ class UnorderedListWidget
         list_two({:bullet => List::STAR_BULLET})
         list_two({:bullet => List::PLUS_BULLET})
       end
+      app.stack(opt) do
+        list_horizontal({})
+        list_horizontal({:bullet => List::CIRCLE_BULLET})
+        list_horizontal({:bullet => List::STAR_BULLET})
+        list_horizontal({:bullet => List::PLUS_BULLET})
+      end
     end
   end
 
@@ -45,4 +52,17 @@ class UnorderedListWidget
     end
   end
 
+  def list_horizontal(options)
+    app.stack do
+      list = UnorderedList.new(app, options.merge(:orientation => :horizontal, :width => '100%'))
+      %w(alpha bravo charlie).each do |item|
+        list.add(ListItem.new(item))
+      end
+      %w(delta echo foxtrot).each do |item|
+        list.add(ListItem.new(item, :click => lambda{alert("#{item} clicked")}))
+      end
+      list.show
+    end
+  end
+
 end

data/lib/shoeshine/list_item.rb

@@ -10,46 +10,50 @@ class ListItem
   end
 
   def show(list_options={})
-    item_opts = self.options
-    right = (list_options[:margin_right].nil? ? 0 : list_options[:margin_right])
-    left = 10
-    bullet = @options[:bullet] || item_opts[:bullet] || list_options[:bullet]
-    icon = @options[:image] || item_opts[:image] || list_options[:image]
-    menu_items = @options[:menu_items] || item_opts[:menu_items] || list_options[:menu_items]
+    list_options ||= {}
+    show_options = list_options.merge(self.options)
+
+    bullet = show_options[:bullet]
+    icon = show_options[:image]
+    menu_items = show_options[:menu_items]
+
     indent = (bullet.nil? ? 0 : 15)
-    app.flow(:margin_left => indent) do
-      unless icon.nil?
-        icon_image = app.image icon
-        indent = icon_image.full_width + 5
-      else
-        unless bullet.nil?
-          indent = 15
-          List::BULLETS[bullet].call(app)
-        end
-      end
-      app.stack do
-        bg = item_opts[:background] || list_options[:background]
-        unless bg.nil?
-          app.background(bg, :margin_left => left)
-          left += 5
-        end
-        unless menu_items.nil?
-          menu_options = {
-            :margin_top => 4,
-            :margin_left => left,
-            :margin_right => right,
-            :margin_bottom => 0,
-            :background => app.gainsboro,
-            :border => app.gray
-          }.merge(@options[:menu_options] || item_opts[:menu_options] || list_options[:menu_options] || {})
-          trigger = @options[:menu_trigger] || DropDownMenuWidget::RIGHT_BUTTON
-          menu = DropDownMenuWidget.new(app, self, trigger, menu_items, menu_options)
-          menu.show
-        else
-          app.para(self.as_value(app), :margin_left => left, :margin_right => right, :margin_bottom => 0)
-        end
+    right = (show_options[:margin_right].nil? ? 0 : show_options[:margin_right])
+    left = (show_options[:margin_left].nil? ? 10 : show_options[:margin_left])
+
+    unless icon.nil?
+      icon_image = app.image icon
+      indent = icon_image.full_width + 5
+    else
+      unless bullet.nil?
+        indent = 15
+        List::BULLETS[bullet].call(app)
       end
     end
+
+    unless show_options[:background].nil?
+      app.background(show_options[:background], :margin_left => left)
+      left += 5
+    end
+    unless menu_items.nil?
+      trigger = show_options[:menu_trigger] || DropDownMenuWidget::RIGHT_BUTTON
+      menu = DropDownMenuWidget.new(app, self, trigger, menu_items, menu_options(show_options))
+      menu.show
+    else
+      para_opts = {:margin_left => left, :margin_right => right, :margin_bottom => 0}
+      app.para(self.as_value(app), para_opts)
+    end
+  end
+
+  def menu_options(show_options)
+    {
+      :margin_top => 4,
+      :margin_left => (show_options[:margin_left].nil? ? 10 : show_options[:margin_left]),
+      :margin_right => (show_options[:margin_right].nil? ? 0 : show_options[:margin_right]),
+      :margin_bottom => 0,
+      :background => app.gainsboro,
+      :border => app.gray
+    }.merge(show_options[:menu_options])
   end
 
   def as_value(app)

data/lib/shoeshine/unordered_list.rb

@@ -19,14 +19,34 @@ class UnorderedList < List
   #   :background => app.background argument
   # }
   def show(opts={})
-    list_options = {:margin_bottom => 10}.merge(@list_opts.merge(opts)) unless opts.nil?
+    show_options = {:margin_bottom => 10}.merge(@list_opts.merge(opts)) unless opts.nil?
 
-    app.stack(list_options) do
-      @list_items.each do |item|
-        item.app = app
-        item.show @list_opts
+    orientation = show_options[:orientation]
+    orientation = :vertical if orientation.nil?
+    case orientation.to_sym
+    when :vertical
+      app.stack(show_options) do
+        @list_items.each do |item|
+          item.app = app
+          app.flow do
+            item.show @list_opts
+          end
+        end
       end
+    when :horizontal
+      app.flow(show_options) do
+        @list_items.each do |item|
+          item.app = app
+          app.stack(:width => 80) do
+            item.show @list_opts
+          end
+        end
+      end
+    else
+      app.error "Invalid orientation value: '#{orientation.to_s}'"
     end
   end
 
+  def show_items
+  end
 end

data/lib/shoeshine.rb

@@ -5,8 +5,6 @@ $:.push(File.join(File.dirname(__FILE__)))
 # require 'singleton'
 # require 'ruby-debug'
 
-puts "shoeshine"
-
 require 'shoeshine/widget'
 require 'shoeshine/list'
 require 'shoeshine/list_item'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-shoeshine
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Roy Wright