ruby_mvc 0.0.1 → 0.0.2

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

@@ -38,29 +38,32 @@ module RubyMVC
             evt_html_link_clicked self, :on_link_clicked
             #evt_html_cell_hover self, :on_hover
           end
+          @history = BrowserHistory.new
         end
 
-        attr_reader :location
+        def location
+          @history.current
+        end
 
         def can_go_back?
-          history_can_back
+          @history.has_prev?
         end
 
         def can_go_forward?
-          history_can_forward
+          @history.has_next?
         end
 
         def go_back
-          history_back
+          load_entry @history.prev
         end
 
         def go_forward
-          history_forward
+          load_entry @history.next
         end
 
         def open(uri)
-          @location = uri
-          load_page(uri)
+          @history << { :uri => uri }
+          load_entry(@history.current)
         end
 
         def stop_loading
@@ -68,13 +71,30 @@ module RubyMVC
         end
 
         def reload
-          open(location)
+          load_entry(@history.current)
         end
 
         def load_html(html, base_uri = nil)
           # FIXME: this isn't quite right...
-          set_page(html)
-          @location = base_uri
+          if base_uri
+            if base_uri != @history.current[:uri]
+              @history << { :uri => base_uri, :content => html }
+            else
+              @history.current[:content] = html
+            end
+          else
+            @history << { :uri => base_uri, :content => html }
+          end
+          load_entry(@history.current)
+        end
+
+        def append_html(html = "", &block)
+          # FIXME: not sure if I want to keep this API as it
+          # seems kinda clunky...
+          h = html || ""
+          h << block.call if block
+          @history.current[:content] << h
+          append_to_page(h)
         end
 
         #--
@@ -89,6 +109,16 @@ module RubyMVC
           signal_emit("navigation-requested", self, link.href, link.target)
         end
 
+      protected
+        def load_entry(entry)
+          if html = entry[:content]
+            set_page(html)
+          else
+            load_page(entry[:uri])
+          end
+          signal_emit("load-finished", self, entry[:uri])
+        end
+
       end
     end
   end

data/lib/ruby_mvc/toolkit/property_change_notifier.rb

@@ -0,0 +1,46 @@
+#--
+######################################################################
+#
+# 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:     property_change_notifier.rb
+# Created:  Mon  2 Jan 2012 12:52:02 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Toolkit
+
+  module PropertyChangeNotifier
+    include Toolkit::SignalHandler
+    extend Toolkit::SignalHandler::ClassMethods
+
+    # this signal is emitted when any property is changed on
+    # the model.  The arguments are the sender, the old and
+    # the new values
+
+    signal "property-changed"
+
+  protected
+    def property_changed(key, old, val)
+      signal_emit("property-changed", self, key, old, val)
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/toolkit/signal_handler.rb

@@ -0,0 +1,149 @@
+#--
+######################################################################
+#
+# Copyright 2008, 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:     signal_handler.rb
+# Author:   Andrew S. Townley
+# Created:  Sat Nov  1 14:27:10 GMT 2008
+# Borrowed: Wed 23 Nov 2011 22:29:22 GMT
+#
+######################################################################
+#++
+
+module RubyMVC
+module Toolkit
+
+  # This module provides an implementation of signal handlers
+  # originally modelled on the GTK+ 2.x mechanisms.  While it
+  # is similar to GTK+, it may not behave in exactly the same
+  # way.
+  #
+  # This module also defines some useful class methods to
+  # expand the meta-programming of Ruby objects to support
+  # signal handling.  To use these methods, you follow the
+  # following idiom in the derived class:
+  #
+  #   class SignalSource
+  #     incude RubyMVC::Toolkit::SignalHandler
+  #     extend RubyMVC::Toolkit::SignalHandler::ClassMethods
+  #     ...
+  #   end
+  #
+  # Once the class has been defined as per above, valid
+  # signals for the signal source may be defined using the
+  # class method #signal as follows:
+  #
+  #   class SignalSource
+  #     ...
+  #
+  #     signal "sig1", :description => "A test signal", 
+  #     signal "sig2", :description => "A vetoable signal", :vetoable => true
+  #     ...
+  #   end
+  #
+  # To register for signal notification, use the
+  # #signal_connect method of the signal source instance as
+  # follows:
+  #
+  #   src = SignalSource.new
+  #   src.signal_connect "sig1" do |sender|
+  #     ...
+  #   end
+  #
+  # Internally to the signal source instance, the signal can
+  # be triggered using the #signal_emit method as follows
+  #
+  #   class SignalSource
+  #     def send_sig1
+  #       ...
+  #       signal_emit("sig1", self)
+  #       ...
+  #     end
+  #   end
+  #
+  # Planned Areas of Improvement
+  # ============================
+  #
+  # Currently, there's not a really good way to document the
+  # signals so that they're clear.  I'm not sure how these are
+  # represented in rdoc, but there should be a method/way to
+  # specify the arguments in order and what they should be so
+  # that they live with the signal definition within the class
+  # itself so things are self-documenting.
+  
+  module SignalHandler
+    module ClassMethods
+      def signals
+        @signals ||= {}
+      end
+
+      def signal(signal, options = { :vetoable => false })
+        signals[signal] = options
+      end
+
+      def valid_signal?(signal)
+#        puts "#{self}#signals.keys: #{signals.keys.inspect}"
+#        puts "#{self}#signals.has_key? #{signal}: #{signals.has_key?(signal)}"
+#        if self.superclass.respond_to?(:valid_signal?)
+#          puts "#{self.superclass}#signals.keys: #{self.superclass.signals.keys.inspect}"
+#          puts "#{self.superclass}#valid_signal? #{signal}: #{self.superclass.valid_signal?(signal)}"
+#        end
+
+        return true if signals.has_key? signal
+
+        if self.superclass.respond_to? :valid_signal?
+          self.superclass.valid_signal? signal
+        else
+          false
+        end
+      end
+
+      def valid_signal!(signal)
+        if !valid_signal? (signal)
+          raise ArgumentError, "class #{self} does not support signal '#{signal}'"
+        end
+      end
+    end
+
+    def signal_connect(signal, &block)
+      self.class.valid_signal! signal if self.class.respond_to? :signals
+      signals = (@signals ||= {})
+      sigs = (signals[signal] ||= [])
+      if !sigs.include? block
+        sigs << block
+      end
+    end
+
+    def signal_disconnect(signal, &block)
+      self.class.valid_signal! signal if self.class.respond_to? :signals
+      signals = (@signals ||= {})
+      sigs = (signals[signal] ||= [])
+      sigs.delete(block)
+    end
+
+    def signal_emit(signal, *args)
+      self.class.valid_signal! signal if self.class.respond_to? :signals
+      signals = (@signals ||= {})
+      (signals[signal] ||= []).each do |proc|
+        proc.call(*args) if !proc.nil?
+      end
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/toolkit/web_view.rb

@@ -30,7 +30,7 @@ module RubyMVC
     # modelled on WebKit
 
     class WebView < Widget
-      api_method :load_html
+      api_methods :load_html, :append_html
       api_methods :can_go_back?, :go_back
       api_methods :can_go_forward?, :go_forward
       api_methods :open, :reload, :go_home, :location

data/lib/ruby_mvc/toolkit/widget.rb

@@ -25,15 +25,22 @@
 
 module RubyMVC
   module Toolkit
-  
-    # This class defines the base toolkit widget class.  Each
-    # widget has one - and only one - UI peer that is
-    # registered automatically when the UI peer is loaded.
 
-    class Widget
+    # This class provides an un-peered abstract widget, mostly
+    # related to signal handling capabilities so that
+    # abstract, non-peer views can be created with built-in
+    # signal handling.
+
+    class AbstractWidget
       include SignalHandler
       extend SignalHandler::ClassMethods
+    end
+
+    # This class defines the base toolkit widget class.  Each
+    # widget has one - and only one - UI peer that is
+    # registered automatically when the UI peer is loaded.
 
+    class Widget < AbstractWidget
       class << self
         attr_accessor :peer_class
 
@@ -96,7 +103,7 @@ module RubyMVC
 
       def connect_peer_signals
         self.class.signals.each do |s, opts|
-          puts "connecting signal '#{s}' to #{peer}"
+          puts "connecting signal '#{peer}##{s}' to #{self}"
           peer.signal_connect(s) do |*args|
             args[0] = self
             signal_emit(s, *args)

data/lib/ruby_mvc/views.rb

@@ -23,63 +23,12 @@
 #####################################################################
 #++ 
 
-module RubyMVC
-  module Views
-    
-    class View
-      def self.widget_def(targ = nil)
-        if targ == nil
-          @widget_def
-        else
-          if (x = targ.widget_def).nil?
-            if targ != RubyMVC::Views::View
-              self.widget_def(targ.superclass)
-            end
-          else
-            x
-          end
-        end
-      end
-
-      def self.create_widget(klass)
-        w = self.widget_def(klass)
-        args = w[:args] 
-        block = w[:block]
-        args[0].new(*args[1..-1], &block)
-      end
-
-      class << self
-        # This method is used to define the primary widget
-        # class through which this view may be added to other
-        # widgets.
-
-        def widget(*args, &block)
-          puts "Set widget for #{self}: #{args.inspect}"
-          @widget_def = { :args => args, :block => block }
-        end
-      end
-
-      def peer
-        @widget.peer
-      end
-
-      attr_accessor :controller, :widget
-      def initialize(*args)
-        @widget = View.create_widget(self.class)
-        if(options = args.last).is_a? Hash
-          self.controller = options[:controller]
-        end
-      end
-
-      def method_missing(m, *a, &b)
-        @widget.send(m, *a, &b)
-      end
-    end
-  end
-end
-
+require 'ruby_mvc/views/view'
+require 'ruby_mvc/views/web_content_view'
+require 'ruby_mvc/views/web_model_view'
+require 'ruby_mvc/views/web_content_table_view'
+require 'ruby_mvc/views/form_view'
+require 'ruby_mvc/views/grid_table_view'
+require 'ruby_mvc/views/browser_view'
 #require 'ruby_mvc/views/table_view'
-#require 'ruby_mvc/views/ar_model_editor'
-#require 'ruby_mvc/views/ar_type_list'
-#require 'ruby_mvc/views/ar_type_editor'
-require 'ruby_mvc/views/web_view'
+#require 'ruby_mvc/views/web_table_view'

data/lib/ruby_mvc/views/{ar_type_list.rb → ar_form_view.rb}

@@ -1,7 +1,7 @@
 #--
 ######################################################################
 #
-# Copyright 2011 Andrew S. Townley
+# 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
@@ -17,8 +17,8 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# File:     ar_type_list.rb
-# Created:  Mon 21 Nov 2011 15:57:27 GMT
+# File:     ar_form_view.rb
+# Created:  Sat 19 Nov 2011 11:26:37 GMT
 #
 #####################################################################
 #++ 
@@ -26,18 +26,15 @@
 module RubyMVC
 module Views
 
-  class ActiveRecordTypeList < TableView
-    def load(model, options = {}, &block)
-      @entity_type = model
-      super(model.find(options[:query] || :all), options, &block)
-    end
+  # This class is responsible for building a form for the
+  # given ActiveRecord model
 
-    def columns(model, options)
-      cols = []
-      @entity_type.attribute_names.each do |key|
-        cols << { :key => key, :label => key.capitalize }
+  class ActiveRecordFormView < FormView
+    def initialize(model, &block)
+      super
+      signal_connect("form-submit") do |f, m|
+        m.save!
       end
-      cols
     end
   end