royw-shoeshine 0.0.2 → 0.0.3

data/README.rdoc

@@ -4,15 +4,15 @@ 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
+* List displays lists with various optional bullets or indexes
+  * bullets (circle, star, plus, or custom)
+  * indexes (anything that responds to a .next())
   * 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
 * toolbar (horizontal list of icons)
 * maybe a menubar
 

data/VERSION.yml

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

data/examples/command_widget.rb

@@ -5,16 +5,13 @@ class CommandWidget
   def show(opt={})
     app.stack(opt) do
       app.background app.gradient(app.rgb(0, 255, 255), app.rgb(255, 0, 255), :angle => -35)
-      command_list = UnorderedList.new(app, :left_margin => 0)
+      command_list = List.new(app, :left_margin => 0)
       command_list.add ListItem.new("Index",
                                     :click => lambda{app.visit(INDEX_PAGE)},
                                     :bullet => List::STAR_BULLET)
       command_list.add HorizontalRule.new(:width => opt[:width])
-      command_list.add ListItem.new("Unordered Lists",
-                                    :click => lambda {app.visit(UNORDERED_LIST_PAGE)},
-                                    :bullet => List::CIRCLE_BULLET)
-      command_list.add ListItem.new("Ordered Lists",
-                                    :click => lambda {app.visit(ORDERED_LIST_PAGE)},
+      command_list.add ListItem.new("Lists",
+                                    :click => lambda {app.visit(LIST_PAGE)},
                                     :bullet => List::CIRCLE_BULLET)
       command_list.add ListItem.new("DropDownMenus",
                                     :click => lambda {app.visit(DROP_DOWN_MENU_PAGE)},

data/examples/dd_menu_widget.rb

@@ -12,7 +12,8 @@ class DDMenuWidget
       app.para "Both columns close the menu when the mouse leaves it."
       app.flow do
         app.stack(:width => 100) do
-          list = UnorderedList.new(app)
+          app.para "right click"
+          list = List.new(app)
           numbers = %w(one two three four five).collect do |item|
             ListItem.new(item,
                         :click => lambda{alert("#{item} was clicked")})
@@ -27,9 +28,11 @@ class DDMenuWidget
                                   ))
           end
           list.show
+          app.rect(90, 0, 1, 180)
         end
         app.stack(:width => 100) do
-          list = UnorderedList.new(app)
+          app.para 'hover'
+          list = List.new(app)
           numbers = %w(six seven eight nine).collect do |item|
             ListItem.new(item,
                         :click => lambda{alert("#{item} was clicked")})

data/examples/example_app.rb

@@ -11,8 +11,7 @@ require 'nav'
 require 'action'
 require 'dd_menu_action'
 require 'index_action'
-require 'ordered_list_action'
-require 'unordered_list_action'
+require 'list_action'
 
 class ListExample < Shoes
   include Nav
@@ -42,8 +41,7 @@ class ListExample < Shoes
 
   # define our pages
   page_def INDEX_PAGE,          :index,           IndexAction
-  page_def UNORDERED_LIST_PAGE, :ul,              UnorderedListAction
-  page_def ORDERED_LIST_PAGE,   :ol,              OrderedListAction
+  page_def LIST_PAGE,           :list,            ListAction
   page_def DROP_DOWN_MENU_PAGE, :drop_down_menu,  DropDownMenuAction
 
   private

data/examples/{unordered_list_action.rb → list_action.rb}

@@ -1,13 +1,13 @@
 require 'action'
 require 'nav'
-require 'unordered_list_widget'
+require 'list_widget'
 
-class UnorderedListAction < Action
+class ListAction < Action
   include Nav
 
   def initialize
     super
-    @widget = UnorderedListWidget.new
+    @widget = ListWidget.new
   end
 
   def execute()

data/examples/list_widget.rb

@@ -0,0 +1,93 @@
+require 'shoeshine/widget'
+
+class ListWidget
+  include Widget
+  include Nav
+
+  def initialize
+  end
+
+  def show(opt={})
+    opt = opt.merge(VIEW_AREA_OPTS)
+    app.stack(opt) do
+      app.background(app.floralwhite) if $DEBUG
+      app.caption "Vertical Lists"
+
+      app.para "Various Bullets"
+      app.flow do
+        app.background(app.gainsboro) if $DEBUG
+        @x = 0
+        list_one(80, {})
+        list_one(80, {:bullet => List::CIRCLE_BULLET})
+        list_one(100, {:bullet => List::STAR_BULLET, :indent => 40, :background => app.yellow})
+        list_one(80, {:bullet => List::PLUS_BULLET, :background => app.cyan})
+        list_one(80, {:bullet => List::INDEX_BULLET, :index_seed => '1', :index_separator => '.'})
+        list_one(80, {:bullet => List::INDEX_BULLET, :index_seed => 'a', :index_separator => ')'})
+        list_one(80, {:bullet => List::INDEX_BULLET, :index_seed => 'G', :index_separator => ''})
+      end
+
+      app.para "With Links"
+      app.flow do
+        app.background(app.lavender) if $DEBUG
+        @x = 0
+        list_two(80, {})
+        list_two(80, {:bullet => List::CIRCLE_BULLET})
+        list_two(80, {:bullet => List::STAR_BULLET})
+        list_two(80, {:bullet => List::PLUS_BULLET})
+      end
+
+      app.caption "Horizontal Lists"
+      app.stack do
+        app.background(app.khaki) if $DEBUG
+        @y = 0
+        list_horizontal(30, {:column_width => 90})
+        list_horizontal(30, {:column_width => 100, :bullet => List::CIRCLE_BULLET})
+        list_horizontal(30, {:column_width => 110, :bullet => List::STAR_BULLET})
+        list_horizontal(30, {:column_width => 120, :bullet => List::PLUS_BULLET})
+      end
+
+      app.para ''
+    end
+  end
+
+  def list_one(width, options)
+    app.stack({:width => width}) do
+      list = List.new(app, options)
+      %w(alpha bravo charlie delta echo foxtrot).each do |item|
+        list.add(ListItem.new(item))
+      end
+      list.show
+    end
+    @x += width
+    app.rect(@x,0,1,140)
+  end
+
+  def list_two(width, options)
+    app.stack({:width => width}) do
+      list = List.new(app, options)
+      %w(alpha bravo charlie delta echo foxtrot).each do |item|
+        list.add(ListItem.new(item, :click => lambda{alert("#{item} clicked")}))
+      end
+      list.show
+    end
+    @x += width
+    app.rect(@x,0,1,140)
+  end
+
+  def list_horizontal(height, options)
+    app.stack(:height => height, :width => '100%') do
+      app.background(app.deeppink) if $DEBUG
+      list = List.new(app, options.merge(:orientation => :horizontal, :width => '100%'))
+      %w(alpha bravo charlie).each do |item|
+        list.add(ListItem.new(item))
+      end
+      %w(delta echo).each do |item|
+        list.add(ListItem.new(item, :click => lambda{alert("#{item} clicked")}))
+      end
+      list.show
+    end
+    @y += height
+    app.rect(0, @y, 5 * options[:column_width], 1)
+  end
+
+end

data/examples/nav.rb

@@ -1,9 +1,8 @@
 module Nav
   INDEX_PAGE = '/'
-  UNORDERED_LIST_PAGE = '/ul'
-  ORDERED_LIST_PAGE = '/ol'
+  LIST_PAGE = '/list'
   DROP_DOWN_MENU_PAGE = '/drop_down_menu'
 
-  COMMAND_AREA_WIDTH = 150
+  COMMAND_AREA_WIDTH = 160
   VIEW_AREA_OPTS = {:width => -COMMAND_AREA_WIDTH, :margin_left => 10, :margin_right => @gutter}
 end

data/lib/shoeshine.rb

@@ -8,6 +8,5 @@ $:.push(File.join(File.dirname(__FILE__)))
 require 'shoeshine/widget'
 require 'shoeshine/list'
 require 'shoeshine/list_item'
-require 'shoeshine/unordered_list'
 require 'shoeshine/drop_down_menu'
 require 'shoeshine/horizontal_rule'

data/lib/shoeshine/horizontal_rule.rb

@@ -1,6 +1,8 @@
 class HorizontalRule
   include Widget
 
+  attr_accessor :counter
+
   def initialize(opts={})
     @options = opts
     @options ||= {}

data/lib/shoeshine/list.rb

@@ -1,19 +1,114 @@
+require 'shoeshine/widget'
+
 class List
-  STAR_BULLET   = :star
-  CIRCLE_BULLET = :circle
-  PLUS_BULLET   = :plus
-  SPACE_BULLET  = :space
-
-  BULLETS = {
-    :star   => lambda{|app| app.star(-3,13,5,6,3)},
-    :circle => lambda{|app| app.oval(-7,10,7)},
-    :plus   => lambda do |app|
-                 # rect(x,y,w,h) NOTE, docs are wrong
-                 length = 9
-                 beam = 1
-                 app.rect(-5,8,beam,length,1)   # vertical bar
-                 app.rect(-9,12,length,beam,1)  # horizontal bar
-               end,
-    :space  => lambda {|app| }
-    }
+  include Widget
+
+  STAR_BULLET   = lambda{ |app, *ignore| List.star_image(app) }
+  CIRCLE_BULLET = lambda{ |app, *ignore| List.circle_image(app) }
+  PLUS_BULLET   = lambda{ |app, *ignore| List.plus_image(app) }
+  SPACE_BULLET  = lambda{ |app, *ignore| ' '}
+  INDEX_BULLET  = lambda{ |app, counter, separator| List.index_string(app, counter, separator) }
+  IMAGE_BULLET  = lambda{ |app, image_url, *ignore| app.image(image_url) unless image_url.nil? }
+
+  IMAGE_SIZE = 20
+
+  def initialize(app, list_opts={})
+    self.app = app
+    @list_opts = list_opts
+    @list_opts ||= {}
+    @list_items = []
+  end
+
+  def add(list_item)
+    @list_items << list_item
+  end
+
+  # list_opts => {
+  #   :bullet => one_of(BULLETS.keys),
+  #   :background => app.background argument
+  # }
+  def show(opts={})
+    show_options = {:margin_bottom => 10}.merge(@list_opts.merge(opts)) unless opts.nil?
+    column_options = {}
+    column_options[:width] = show_options[:column_width] unless show_options[:column_width].nil?
+    counter = show_options[:index_seed]
+    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.counter = counter
+            item.show @list_opts
+            counter = counter.next unless counter.nil?
+          end
+        end
+      end
+    when :horizontal
+      app.flow(show_options.merge(:width => '100%')) do
+        app.background(app.cyan) if $DEBUG
+        @list_items.each do |item|
+          item.app = app
+          app.stack(column_options) do
+            app.background(app.red) if $DEBUG
+            app.flow do
+              app.background(app.yellow) if $DEBUG
+              item.counter = counter
+              item.show @list_opts
+              counter = counter.next unless counter.nil?
+            end
+          end
+        end
+      end
+    else
+      app.error "Invalid orientation value: '#{orientation.to_s}'"
+    end
+  end
+
+  protected
+
+  def self.star_image(app)
+    app.image IMAGE_SIZE, IMAGE_SIZE do
+      top = IMAGE_SIZE / 2 + 2
+      left = IMAGE_SIZE / 2
+      points = 5
+      outer = IMAGE_SIZE / 3
+      inner = IMAGE_SIZE / 6
+      app.star(left, top, points, outer, inner)
+    end
+  end
+
+  def self.circle_image(app)
+    app.image IMAGE_SIZE, IMAGE_SIZE do
+      top = (IMAGE_SIZE / 2)
+      left = (IMAGE_SIZE / 2)
+      radius = IMAGE_SIZE / 3
+      app.oval(left, top, radius)
+    end
+  end
+
+  def self.plus_image(app)
+    app.image IMAGE_SIZE, IMAGE_SIZE do
+      # rect(x,y,w,h) NOTE, docs are wrong
+      length = (IMAGE_SIZE * 2) / 3
+      beam = 3
+      top = ((IMAGE_SIZE - length) / 2) + 2
+      left = ((IMAGE_SIZE - length) / 2) + 2
+      vertical_center = IMAGE_SIZE / 2
+      horizontal_center = IMAGE_SIZE / 2
+      app.rect(horizontal_center, top, beam, length, 1)   # vertical bar
+      app.rect(left, vertical_center, length, beam, 1)  # horizontal bar
+    end
+  end
+
+  def self.index_string(app, counter, separator)
+    str = ''
+    separator ||= ''
+    unless counter.nil?
+      str = "#{counter}#{separator}"
+    end
+    app.para(str, :margin_bottom => 0)
+  end
 end

data/lib/shoeshine/list_item.rb

@@ -2,45 +2,46 @@ class ListItem
   include Widget
 
   attr_reader :options
+  attr_accessor :counter
 
   def initialize(text, opts={})
     @text = text
     @options = opts
     @options ||= {}
+    @counter = nil
   end
 
   def show(list_options={})
     list_options ||= {}
     show_options = list_options.merge(self.options)
+    bullet_options = {}
+    bullet_options[:width] = show_options[:indent].nil? ? 20 : show_options[:indent]
 
     bullet = show_options[:bullet]
-    icon = show_options[:image]
     menu_items = show_options[:menu_items]
 
-    indent = (bullet.nil? ? 0 : 15)
-    right = (show_options[:margin_right].nil? ? 0 : show_options[:margin_right])
-    left = (show_options[:margin_left].nil? ? 10 : show_options[:margin_left])
+#     right = (show_options[:margin_right].nil? ? 0 : show_options[:margin_right])
+#     left = (show_options[:margin_left].nil? ? 10 : show_options[:margin_left])
+#     left = (show_options[:indent].nil? ? 10 : show_options[:indent])
 
-    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
+    unless show_options[:background].nil?
+      app.background(show_options[:background], :margin_left => bullet_options[:width])
+#       app.background(show_options[:background])
+#       left += 5
     end
 
-    unless show_options[:background].nil?
-      app.background(show_options[:background], :margin_left => left)
-      left += 5
+    unless bullet.nil?
+      app.flow(bullet_options) do
+        bullet_image = bullet.call(app, @counter, show_options[:index_separator])
+      end
     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}
+      para_opts = {:margin_bottom => 0}
       app.para(self.as_value(app), para_opts)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-shoeshine
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Roy Wright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,19 +34,18 @@ files:
 - examples/example_app.rb
 - examples/index_action.rb
 - examples/index_widget.rb
+- examples/list_action.rb
+- examples/list_widget.rb
 - examples/nav.rb
 - examples/ordered_list_action.rb
 - examples/ordered_list_widget.rb
 - examples/page_widget.rb
 - examples/title_widget.rb
-- examples/unordered_list_action.rb
-- examples/unordered_list_widget.rb
 - lib/shoeshine.rb
 - lib/shoeshine/drop_down_menu.rb
 - lib/shoeshine/horizontal_rule.rb
 - lib/shoeshine/list.rb
 - lib/shoeshine/list_item.rb
-- lib/shoeshine/unordered_list.rb
 - lib/shoeshine/widget.rb
 - spec/drop_down_menu_spec.rb
 - spec/spec_helper.rb
@@ -81,15 +80,15 @@ test_files:
 - spec/drop_down_menu_spec.rb
 - examples/example_app.rb
 - examples/dd_menu_action.rb
+- examples/list_action.rb
 - examples/nav.rb
 - examples/title_widget.rb
 - examples/dd_menu_widget.rb
-- examples/unordered_list_action.rb
 - examples/ordered_list_widget.rb
 - examples/ordered_list_action.rb
 - examples/index_action.rb
+- examples/list_widget.rb
 - examples/index_widget.rb
 - examples/page_widget.rb
 - examples/action.rb
-- examples/unordered_list_widget.rb
 - examples/command_widget.rb

data/examples/unordered_list_widget.rb

@@ -1,68 +0,0 @@
-require 'shoeshine/widget'
-
-class UnorderedListWidget
-  include Widget
-  include Nav
-
-  def initialize
-  end
-
-  def show(opt={})
-    app.stack(opt) do
-      app.flow do
-        app.para "Various bullets"
-        list_one({})
-        list_one({:bullet => List::CIRCLE_BULLET})
-        list_one({:bullet => List::STAR_BULLET})
-        list_one({:bullet => List::PLUS_BULLET})
-      end
-      app.flow(opt) do
-        app.para "With links"
-        list_two({})
-        list_two({:bullet => List::CIRCLE_BULLET})
-        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
-
-  def list_one(options)
-    app.stack({:width => 80}) do
-      list = UnorderedList.new(app, options)
-      %w(alpha bravo charlie delta echo foxtrot).each do |item|
-        list.add(ListItem.new(item))
-      end
-      list.show
-    end
-  end
-
-  def list_two(options)
-    app.stack({:width => 80}) do
-      list = UnorderedList.new(app, options)
-      %w(alpha bravo charlie delta echo foxtrot).each do |item|
-        list.add(ListItem.new(item, :click => lambda{alert("#{item} clicked")}))
-      end
-      list.show
-    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/unordered_list.rb

@@ -1,52 +0,0 @@
-class UnorderedList < List
-  include Widget
-
-  public
-
-  def initialize(app, list_opts={})
-    self.app = app
-    @list_opts = list_opts
-    @list_opts ||= {}
-    @list_items = []
-  end
-
-  def add(list_item)
-    @list_items << list_item
-  end
-
-  # list_opts => {
-  #   :bullet => one_of(BULLETS.keys),
-  #   :background => app.background argument
-  # }
-  def show(opts={})
-    show_options = {:margin_bottom => 10}.merge(@list_opts.merge(opts)) unless opts.nil?
-
-    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