ruby_mvc 0.0.1 → 0.0.2

data/lib/ruby_mvc/renderers.rb

@@ -24,3 +24,4 @@
 #++ 
 
 require 'ruby_mvc/renderers/html4_table_model_renderer'
+require 'ruby_mvc/renderers/hyperlink_cell_renderer'

data/lib/ruby_mvc/renderers/html4_table_model_renderer.rb

@@ -47,16 +47,17 @@ module RubyMVC
             :valign => "top"
       }.freeze
 
-      def self.render(model, cols, options = {})
-        self.new.render(model, cols, options)
+      def self.render(model, options = {})
+        self.new.render(model, options)
       end
 
-      def render(model, cols, options = {})
+      def render(model, options = {})
         options = OPTIONS.merge(options)
         tagz {
           table_(options) {
-            build_header(model, cols, options)
-            model.each { |row| build_row(cols, row) }
+            labels = model.labels
+            build_header(model, labels, options)
+            model.each { |row| build_row(labels, row) }
           }
         }
       end
@@ -81,7 +82,7 @@ module RubyMVC
               tagz.concat r.render(self, row, col)
             else
               data = row[col[:key]]
-              style = TD_OPTIONS.merge(col[:style])
+              style = TD_OPTIONS.merge(col[:style] || {})
               weight = style.delete(:weight)
               td_(style) {
                 if weight == "bold"

data/lib/ruby_mvc/renderers/hyperlink_cell_renderer.rb

@@ -0,0 +1,47 @@
+#--
+######################################################################
+#
+# Copyright 2011-2012 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     hyperlink_cell_renderer.rb
+# Created:  Mon  9 Jan 2012 17:47:19 GMT
+#
+#####################################################################
+#++ 
+
+require 'tagz'
+
+module RubyMVC
+  module Renderers
+
+    class HyperlinkCellRenderer
+      include Tagz
+
+      def render(widget, row, col)
+        lk = col[:hl_label_key] || col[:key]
+        text = row[lk]
+        val = row[col[:key]]
+        tagz {
+          td_ {
+            a_ text, :href => "#{col[:href]}#{val}"
+          }
+        }
+      end
+    end
+
+  end
+end

data/lib/ruby_mvc/toolkit.rb

@@ -23,9 +23,13 @@
 #####################################################################
 #++ 
 
-require 'ruby_mvc/toolkit/notification'
+require 'ruby_mvc/toolkit/signal_handler'
+require 'ruby_mvc/toolkit/property_change_notifier'
 require 'ruby_mvc/toolkit/widget'
 require 'ruby_mvc/toolkit/app'
 require 'ruby_mvc/toolkit/dialog'
+require 'ruby_mvc/toolkit/messagebox'
 require 'ruby_mvc/toolkit/frame'
+require 'ruby_mvc/toolkit/browser_history'
 require 'ruby_mvc/toolkit/web_view'
+require 'ruby_mvc/toolkit/grid_view'

data/lib/ruby_mvc/toolkit/browser_history.rb

@@ -0,0 +1,115 @@
+#--
+######################################################################
+#
+# Copyright 2008-2012 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     browser_history.rb
+# Created:  Sun Oct 19 17:08:26 IST 2008
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Toolkit
+
+  # This class provides a mechanism for tracking browser
+  # history operations where the underlying peer controls
+  # don't do this well enough for our purposes (yes, I'm
+  # looking at you Wx::HtmlWindow...)
+
+  class BrowserHistory
+    def initialize(maxsize = 100)
+      @mutex = Mutex.new
+      @history = []
+      @maxsize = maxsize
+      @index = 0
+    end
+
+    def <<(entry)
+      @mutex.synchronize {
+        return if @history[-1] == entry
+        if @history.size >= @maxsize
+          @history.delete(0)
+        else
+          @history = @history[0..@index]
+        end
+        @history << entry if @history[-1] != entry
+        @index = @history.size - 1
+#        dump_history
+      }
+    end
+
+    def current
+      @mutex.synchronize { @history[@index] }
+    end
+
+    def has_prev?
+      @index > 0
+    end
+
+    def has_next?
+      @index < @history.size - 1
+    end
+
+    def prev
+      @mutex.synchronize {
+        if has_prev?
+          @index -= 1
+        end
+#        dump_history
+      }
+      current
+    end
+
+    def next
+      @mutex.synchronize {
+        if has_next?
+          @index += 1
+        end
+#        dump_history
+      }
+      current
+    end
+
+    def each(&block)
+      @mutex.synchronize {
+        @history.each(&block)
+      }
+    end
+
+    def reverse_each(&block)
+      @mutex.synchronize {
+        @history.reverse_each(&block)
+      }
+    end
+
+  private
+    def dump_history
+      puts "HISTORY ---"
+      @history.each_index do |index|
+        if @index == index
+          puts ">> #{@history[index]}"
+        else
+          puts "   #{@history[index]}  "
+        end
+      end
+      puts "---"
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/toolkit/dialog.rb

@@ -26,6 +26,17 @@
 module RubyMVC
   module Toolkit
   
-    class Dialog < Widget; end
+    class Dialog < Widget
+      def add(w)
+        # FIXME: this is a cheezy way to do this...
+        if w.is_a? RubyMVC::Views::FormView
+          peer.add_form(w)
+        elsif w.is_a? RubyMVC::Views::View
+          peer.add_view(w)
+        else
+          peer.add(w)
+        end
+      end
+    end
   end
 end

data/lib/ruby_mvc/toolkit/frame.rb

@@ -27,7 +27,9 @@ module RubyMVC
   module Toolkit
   
     class Frame < Widget
-      api_methods :add
+      api_methods :add, :merge_actions
+
+      signal "window-closed"
     end
 
   end

data/lib/ruby_mvc/toolkit/grid_view.rb

@@ -0,0 +1,46 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     grid_view.rb
+# Created:  Sat 31 Dec 2011 18:59:06 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+  
+    class GridView < Widget
+      api_methods :model=, :editable=, :selected_rows
+
+      # This method is used to inform the listener that the
+      # specified row in the view was "activated" (normally, a
+      # double-click on the row).  Arguments are the sender,
+      # the model, the row and the column activated.
+
+      signal "row-activated"
+
+      # This method is used to monitor changes in the selected
+      # rows of the grid.  Arguments are the sender, the model
+      # and the row indexes selected.
+
+      signal "row-selection-changed"
+    end
+  end
+end

data/lib/ruby_mvc/toolkit/messagebox.rb

@@ -0,0 +1,32 @@
+#--
+######################################################################
+#
+# Copyright 2011-2012 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     messagebox.rb
+# Created:  Mon  9 Jan 2012 11:39:56 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+  
+    class MessageBox < Widget
+    end
+  end
+end

data/lib/ruby_mvc/toolkit/peers/wxruby.rb

@@ -26,6 +26,11 @@
 require 'wx'
 
 require 'ruby_mvc/toolkit/peers/wxruby/common'
+require 'ruby_mvc/toolkit/peers/wxruby/form_builder'
 require 'ruby_mvc/toolkit/peers/wxruby/app'
+require 'ruby_mvc/toolkit/peers/wxruby/dialog'
+require 'ruby_mvc/toolkit/peers/wxruby/messagebox'
 require 'ruby_mvc/toolkit/peers/wxruby/frame'
 require 'ruby_mvc/toolkit/peers/wxruby/web_view'
+require 'ruby_mvc/toolkit/peers/wxruby/grid_model'
+require 'ruby_mvc/toolkit/peers/wxruby/grid_view'

data/lib/ruby_mvc/toolkit/peers/wxruby/app.rb

@@ -29,13 +29,34 @@ module RubyMVC
       class App < Wx::App
         Toolkit::App.peer_class = self
 
-        def initialize(&block)
-          super
+        def initialize(options, &block)
+          super()
           @block = block
+          @options = options
           main_loop
         end
     
         def on_init
+          if icon = @options[:icon]
+
+# FIXME: the following does what yu expect, but the issue is
+# that we need to destroy it when the last application window
+# is closed (meaning we also need to track windows for this
+# too).  tbicon.remove_icon should cause everything to shut
+# down the way we expect.  What a PITA!!!
+#
+#            if Wx::PLATFORM == "WXMAC"
+#              # ensure we have a dock icon set
+#              tbicon = Wx::TaskBarIcon.new
+#              tbicon.set_icon(WxRuby.load_icon(icon), @options[:title])
+#              class << tbicon
+#                def create_popup_menu
+#                  puts "popup menu"
+#                  Wx::Menu.new
+#                end
+#              end
+#            end
+          end
           @block.call
         end
       end

data/lib/ruby_mvc/toolkit/peers/wxruby/common.rb

@@ -54,7 +54,17 @@ module RubyMVC
           default_parent
         end
       end
-          
+      
+      def self.load_icon(path, size = nil)
+        img = Wx::Image.new(path)
+        if size
+          img = img.scale(size, size)
+        end
+        icon = Wx::Icon.new
+        icon.copy_from_bitmap(Wx::Bitmap.new(img))
+        icon
+      end
+
       # This module has some common things that map between
       # controls in the WxRuby universe
 

data/lib/ruby_mvc/toolkit/peers/wxruby/dialog.rb

@@ -0,0 +1,82 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     dialog.rb
+# Created:  Sun 11 Dec 2011 14:37:40 CST
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Toolkit
+    module WxRuby
+      class Dialog < Wx::Dialog
+        include Common
+        Toolkit::Dialog.peer_class = self
+
+        def initialize(options)
+          opts = {}
+          title = options[:title] || "Dialog"
+          winid = options[:id] || -1
+          opts[:size] = [ options[:width], options[:height] ]
+          if parent = options[:parent]
+            parent = parent.peer
+          end
+          if options[:modal].nil? || options[:modal]
+            @modal = true
+          else
+            @modal = false
+          end
+          super(parent, winid, title)
+          @buttons = create_separated_button_sizer(Wx::OK|Wx::CANCEL)
+        end
+
+        # This method is used to add a child to the existing
+        # frame.
+
+        def add(child, options = {})
+          child.peer.reparent(self)
+        end
+
+        # This method is used to add a FormView to the main
+        # content part of the dialog
+
+        def add_form(form)
+          @wxform = FormBuilder.build(self, form)
+          @wxform.widget.add(@buttons, 0, Wx::ALIGN_RIGHT|Wx::ALL, 5)
+          self.sizer = @wxform.widget
+          self.sizer.fit(self)
+        end
+
+        def show
+          self.centre
+          if @modal
+            if Wx::ID_OK == self.show_modal()
+              @wxform.submit if @wxform
+            end
+          else
+            sel.show()
+          end
+        end
+      end
+
+    private
+    end
+  end
+end