ruby_mvc 0.0.1 → 0.0.2

data/test/unit/models/test_keyed_array_table_model.rb

@@ -23,10 +23,11 @@
 ######################################################################
 #++
 
+$:.unshift File.join(File.dirname(__FILE__), "../../../lib")
 require 'testy'
-require 'shoes_mvc/models'
+require 'ruby_mvc/models'
 
-include ShoesMVC::Models
+include RubyMVC::Models
 
 Testy.testing "Core KeyedArrayTableModel tests" do
   test "Basic functionality" do |result|

data/test/unit/models/test_model.rb

@@ -0,0 +1,88 @@
+#--
+######################################################################
+#
+# 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:     test_model.rb
+# Created:  Sat 31 Dec 2011 16:07:07 CET
+#
+######################################################################
+#++
+
+$:.unshift File.join(File.dirname(__FILE__), "../../../lib")
+
+require 'testy'
+require 'ruby_mvc'
+
+include RubyMVC::Models
+
+Testy.testing "Core Model tests" do
+  test "Basic functionality" do |result|
+    model = Model.new
+    model[:key1] = "val1"
+    model[:key2] = "val2"
+
+    result.check "keys are correct",
+        :expect => [ :key1, :key2 ],
+        :actual => model.keys.sort
+   
+    result.check "labels are correct",
+        :expect => [ { :key => :key1, :label => "Key1" }, { :key => :key2, :label => "Key2" } ],
+        :actual => model.labels
+
+    result.check ":key1 is editable",
+        :expect => true,
+        :actual => model.is_editable?(:key1)
+    
+    result.check ":key2 is editable",
+        :expect => true,
+        :actual => model.is_editable?(:key2)
+
+    result.check "#[] accessor",
+        :expect => "val1",
+        :actual => model[:key1]
+
+    result.check "#size accessor",
+        :expect => 2,
+        :actual => model.size
+
+    result.check "#label_for :key1",
+        :expect => "Key1",
+        :actual => model.label_for(:key1)
+
+    result.check "#label_for :key2",
+        :expect => "Key2",
+        :actual => model.label_for(:key2)
+  end
+  
+  test "Signal tests" do |result|
+    model = Model.new
+
+    event = {}
+    model.signal_connect("property-changed") do |m, k, o, v|
+      event[:model] = m
+      event[:key] = k
+      event[:old] = o
+      event[:value] = v
+    end 
+    model[:key1] = "val1"
+    
+    result.check "signal emit",
+        :expect => { :model => model, :key => :key1, :old => nil, :value => "val1" },
+        :actual => event
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_mvc
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Andrew S. Townley
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 +00:00
-default_executable: 
+date: 2012-01-09 00:00:00 Z
 dependencies: []
 
 description: A simple, cross-platform MVC framework for Ruby
@@ -29,47 +23,78 @@ extra_rdoc_files: []
 
 files: 
 - lib/ruby_mvc/application.rb
+- lib/ruby_mvc/controllers/action.rb
+- lib/ruby_mvc/controllers/action_group.rb
 - lib/ruby_mvc/controllers/app_controller.rb
 - lib/ruby_mvc/controllers/rails_controller.rb
+- lib/ruby_mvc/controllers.rb
+- lib/ruby_mvc/models/ar_table_model.rb
 - lib/ruby_mvc/models/array_table_model.rb
 - lib/ruby_mvc/models/keyed_array_table_model.rb
+- lib/ruby_mvc/models/model.rb
 - lib/ruby_mvc/models/table_model.rb
+- lib/ruby_mvc/models/view_model_template.rb
 - lib/ruby_mvc/models.rb
 - lib/ruby_mvc/module.rb
 - lib/ruby_mvc/renderers/html4_table_model_renderer.rb
+- lib/ruby_mvc/renderers/hyperlink_cell_renderer.rb
 - lib/ruby_mvc/renderers.rb
 - lib/ruby_mvc/toolkit/app.rb
+- lib/ruby_mvc/toolkit/browser_history.rb
 - lib/ruby_mvc/toolkit/dialog.rb
 - lib/ruby_mvc/toolkit/frame.rb
-- lib/ruby_mvc/toolkit/notification.rb
+- lib/ruby_mvc/toolkit/grid_view.rb
+- lib/ruby_mvc/toolkit/messagebox.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/app.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/box_layout.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/common.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/dialog.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/form_builder.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/frame.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/grid_model.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/grid_view.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/messagebox.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/web_view.rb
 - lib/ruby_mvc/toolkit/peers/wxruby.rb
+- lib/ruby_mvc/toolkit/property_change_notifier.rb
+- lib/ruby_mvc/toolkit/signal_handler.rb
 - lib/ruby_mvc/toolkit/web_view.rb
 - lib/ruby_mvc/toolkit/widget.rb
 - lib/ruby_mvc/toolkit.rb
-- lib/ruby_mvc/views/ar_model_editor.rb
+- lib/ruby_mvc/views/ar_form_view.rb
+- lib/ruby_mvc/views/ar_support.rb
 - lib/ruby_mvc/views/ar_type_editor.rb
-- lib/ruby_mvc/views/ar_type_list.rb
+- lib/ruby_mvc/views/ar_web_model_view.rb
+- lib/ruby_mvc/views/ar_web_type_list.rb
+- lib/ruby_mvc/views/browser_view.rb
+- lib/ruby_mvc/views/form_view.rb
+- lib/ruby_mvc/views/grid_table_view.rb
 - lib/ruby_mvc/views/table_view.rb
-- lib/ruby_mvc/views/web_view.rb
+- lib/ruby_mvc/views/view.rb
+- lib/ruby_mvc/views/web_content_table_view.rb
+- lib/ruby_mvc/views/web_content_view.rb
+- lib/ruby_mvc/views/web_model_view.rb
 - lib/ruby_mvc/views.rb
 - lib/ruby_mvc/wx.rb
 - lib/ruby_mvc.rb
+- sample/browser_view.rb
+- sample/form.rb
+- sample/form2.rb
 - sample/frame.rb
+- sample/grid_table_view.rb
+- sample/grid_view.rb
+- sample/grid_view2.rb
 - sample/mvc.rb
 - sample/test.html
+- sample/test2.html
 - sample/web_view.rb
 - test/unit/models/test_array_table_model.rb
 - test/unit/models/test_keyed_array_table_model.rb
+- test/unit/models/test_model.rb
 - test/unit/test_array_table_model.rb
 - LICENSE
 - README.md
 - ruby_mvc.gemspec
-has_rdoc: true
 homepage: https://github.com/atownley/ruby_mvc
 licenses: []
 
@@ -83,23 +108,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby MVC

data/lib/ruby_mvc/toolkit/notification.rb

@@ -1,202 +0,0 @@
-#--
-######################################################################
-#
-# 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:     notification.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 class allows obsevers to register a single block
-  # rather than implementing public observer methods (which
-  # can get messy and unnecessarily pollute the public API
-  # of the class)
-  #
-  # Each registered block will be called with the following
-  # arguments:
-  #
-  # 1) The notification name (or the method name to be called)
-  # 2) The sender of the notification
-  # 3) The notification parameters.
-
-  class ObserverReference
-    attr_reader :observer
-
-    def initialize(observer, &block)
-      @observer = observer
-      @block = block
-    end
-
-    def method_missing(method, *args, &block)
-      if @observer.respond_to? method
-        @observer.send(method, *args, &block)
-      elsif !@block.nil?
-        @block.call(method, *args)
-      else
-        super
-      end
-    end
-  end
-
-  class ObserverList
-    def initialize
-      @observers = {}
-    end
-
-    def <<(val)
-      if !val.is_a? ObserverReference
-        raise ArgumentError, "can only have observer references in the list!"
-      end
-
-      @observers[val.observer] = val if !@observers.include? val.observer
-    end
-
-    def delete(val)
-      @observers.delete(val)
-    end
-
-    def each(&block)
-      @observers.each_value(&block)
-    end
-  end
-
-  # This class is used to relay notifications from one sender
-  # to another sender's registered listeners.
-
-  class NotificationRelay
-    def initialize(sender, listeners)
-      @listeners = listeners
-      @sender = sender
-    end
-
-    def method_missing(method, *args, &block)
-      args[0] = @sender
-      @listeners.each { |l| l.send(method, *args, &block) }
-    end
-  end
-
-  module ViewChangeNotifier
-    def register_view_change_observer(observer, &block)
-      observers = (@view_change_observers ||= ObserverList.new)
-      observers << ObserverReference.new(observer, &block)
-    end
-
-    def unregister_view_change_observer(observer)
-      observers = (@view_change_observers ||= ObserverList.new)
-      observers.delete(observer)
-    end
-
-  protected
-    def fire_view_changed
-      observers = (@view_change_observers ||= [])
-      observers.each { |o| o.view_changed(self) }
-    end
-  end
-
-  module ChangeNotifier
-    def register_change_observer(observer, &block)
-      observers = (@change_observers ||= ObserverList.new)
-      observers << ObserverReference.new(observer, &block)
-    end
-
-    def unregister_change_observer(observer)
-      observers = (@change_observers ||= [])
-      observers.delete(observer)
-    end
-
-    def squelch=(val)
-      @notification_squelch = val
-    end
-
-  protected
-    def fire_changed
-      return if @notification_squelch
-      observers = (@change_observers ||= [])
-      observers.each { |o| o.changed(self) }
-    end
-  end
-
-  module PropertyChangeNotifier
-    def register_property_change_observer(observer, &block)
-      observers = (@property_change_observers ||= [])
-      observers << ObserverReference.new(observer, &block)
-    end
-
-    def unregister_property_change_observer(observer)
-      observers = (@property_change_observers ||= [])
-      observers.delete(observer)
-    end
-
-    def squelch=(val)
-      @notification_squelch = val
-    end
-
-  protected
-    def fire_property_changed(property, old_val, new_val)
-      return if @notification_squelch
-      observers = (@property_change_observers ||= [])
-      observers.each { |o| o.property_changed(self, property, old_val, new_val) }
-    end
-  end
-
-  module SignalHandler
-    module ClassMethods
-      def signals
-        @signals ||= {}
-      end
-
-      def signal(signal, options = { :vetoable => false })
-        signals[signal] = options
-      end
-
-      def valid_signal?(signal)
-        if !signals.has_key? 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 ||= {})
-      signals[signal] = block
-    end
-
-    def signal_disconnect(signal)
-      self.class.valid_signal? signal if self.class.respond_to? :signals
-      signals = (@signals ||= {})
-      signals.delete(signal)
-    end
-
-    def signal_emit(signal, *args)
-      self.class.valid_signal? signal if self.class.respond_to? :signals
-      signals = (@signals ||= {})
-      if signals.key? signal
-        proc = signals[signal]
-        proc.call(*args) if !proc.nil?
-      end
-    end
-  end   
-end
-end

data/lib/ruby_mvc/views/ar_model_editor.rb

@@ -1,84 +0,0 @@
-#--
-######################################################################
-#
-# 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:     ar_model_editor.rb
-# Created:  Sat 19 Nov 2011 11:26:37 GMT
-#
-#####################################################################
-#++ 
-
-module RubyMVC
-module Views
-
-  # This class is responsible for building a form for the
-  # given ActiveRecord model
-
-  class ActiveRecordModelEditor < View
-    DEFAULTS    = { :label_width => 0.3 }.freeze
-    
-    def initialize(model, options = {}, &block)
-      super(options, &block)
-      load(model, options, &block)
-    end
-
-    # This method is used to load the view with the
-    # information in the AR model.
-
-    def load(model, options = {}, &block)
-      lwidth = options[:label_width] || DEFAULTS[:label_width]
-
-      stack :width => "100%" do
-        flow :width => "100%" do
-          model.attributes.keys.sort.each do |key|
-            # FIXME: I can't believe that you have to do this
-            # this way with AR.  I'm surely missing
-            # something...
-            m = "#{key}=".to_sym
-            value = model.attributes[key]
-            flow :width => lwidth, :margin_top => 2 do
-              para key, :weight => 'bold', :align => "right"
-            end
-            flow :width => 1 - lwidth do
-              edit_line model.attributes[key] do |e|
-                model.send(m, e.text)
-              end
-            end
-          end
-        end
-      end
-
-      @model = model
-      @options = options
-    end
-
-    def save
-      @model.save!
-    end
-
-    def create
-      if @model
-        load(@model.class.new, options)
-      else
-        alert("No template model.\nUse the #load method instead.")
-      end
-    end
-  end
-
-end
-end