ruby_mvc 0.0.1 → 0.0.2

data/README.md

@@ -63,7 +63,21 @@ wxruby-ruby19 gem using the following platform magic:
 
 	$ gem install --platform x86-darwin-9 --no-ri --no-rdoc wxruby-ruby19
 
+
 ### Windows
 
 Amazingly enough, it seems to *just work* on Windows (Vista is the
 only tested configuration at the moment).  YMMV.
+
+
+Building and Publishing the Gem
+-------------------------------
+
+In order to build the gem, simply execute the following command:
+
+    $ gem build ruby_mvc.gemspec
+
+Once you're sure things are working, then push the gem to
+rubygems.org:
+
+    $ gem push ruby_mvc-VERSION.gem

data/lib/ruby_mvc.rb

@@ -24,10 +24,12 @@
 #++
 
 require 'yaml'
+require 'uri'
+require 'cgi'
 require 'ruby_mvc/module'
 require 'ruby_mvc/toolkit'
 require 'ruby_mvc/renderers'
-require 'ruby_mvc/controllers/app_controller'
+require 'ruby_mvc/controllers'
 require 'ruby_mvc/models'
 require 'ruby_mvc/views'
 require 'ruby_mvc/application'

data/lib/ruby_mvc/application.rb

@@ -27,26 +27,76 @@ module RubyMVC
 
   # This provides the entry point for a basic application.
   class Application
+    # FIXME 2011-12-29 ast:  The relationship between
+    # Toolkit::App and the AppController classes don't really
+    # make sense.  This needs to be revisited in a future
+    # iteration.
+
     attr_accessor :frame
     attr_accessor :controller
+    attr_accessor :windows
 
     def initialize(options, &block)
-      self.frame = Toolkit::Frame.new(options)
+      @windows = []
+      if ico = options[:icon]
+        ico = options[:icon] = File.expand_path(ico)
+        puts "icon requested: #{ico}"
+      end
+      @windows << (self.frame = Toolkit::Frame.new(options))
       if cc = options[:controller]
         self.controller = cc
         self.controller.app = self
         self.controller.init
       end
+      @frame_width = options[:width]
+      @frame_height = options[:height]
       self.instance_eval(&block) if block
       self.frame.show
     end
+
+    def window(options, &block)
+      set_parent(options)
+
+      # FIXME: this is a bit of a hack for wxRuby peers
+      options[:height] = @frame_height if !options[:height]
+      options[:width] = @frame_width if !options[:width]
+      win = Toolkit::Frame.new(options)
+      block.call(win) if block
+      win.show
+
+      # FIXME: need to be able to intercept the close event so
+      # we can remove the window from the list
+      @windows << win
+      win
+    end
+
+    def dialog(options, &block)
+      set_parent(options)
+      dlg = Toolkit::Dialog.new(options)
+      block.call(dlg) if block
+      dlg.show
+      dlg
+    end
+
+    def error(msg, options)
+      options[:class] = :error
+      dlg = Toolkit::MessageBox.new(msg, options)
+      dlg.show
+    end
+
+  protected
+    def set_parent(options)
+      if !options[:parent]
+        options[:parent] = self.frame
+      end
+    end
   end
 
   # This method creates a default application and runs it
   # using the active toolkit.
   
   def self.app(*args, &block)
-    Toolkit::App.new do
+    Toolkit::App.new(*args) do
       Application.new(*args, &block)
     end
   end

data/lib/ruby_mvc/controllers.rb

@@ -0,0 +1,28 @@
+#--
+######################################################################
+#
+# Copyright 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:     controllers.rb
+# Created:  Mon  2 Jan 2012 16:44:27 CET
+#
+#####################################################################
+#++ 
+
+require 'ruby_mvc/controllers/action'
+require 'ruby_mvc/controllers/action_group'
+require 'ruby_mvc/controllers/app_controller'

data/lib/ruby_mvc/controllers/action.rb

@@ -0,0 +1,93 @@
+#--
+######################################################################
+#
+# 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:     action.rb
+# Created:  Sun  1 Jan 2012 16:44:29 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+
+  # This class provides the ability to define discrete
+  # operations a la the Command pattern.  Actions have keys,
+  # labels and a block that is called when they are activated.
+  # Additionally, they may be initialized with options that
+  # define when they are available.
+
+  class Action
+    include Toolkit::PropertyChangeNotifier
+    attr_reader :key
+
+    def initialize(key, options = {}, &block)
+      @key = key.to_sym
+      @options = options
+      @block = block
+      @sensitive = true
+      @sensitive = false if !@options[:enable].nil?
+      if !(x = options[:sensitive]).nil?
+        @sensitive = x
+      end
+    end
+
+    # This method is used to access the options for this
+    # action.
+
+    def [](key)
+      @options[key]
+    end
+
+    def label
+      @options[:label] || @key.to_s.capitalize
+    end
+
+    def call(*args)
+      @block.call(*args) if @block
+    end
+
+    def sensitive=(val)
+      if val != @sensitive
+        @sensitive = val
+        property_changed(:sensitive, !val, val)
+      end
+    end
+
+    # This method may be overridden by action instances to
+    # have more control over when the action should be enabled
+    # or not.
+
+    def sensitive
+      @sensitive
+    end
+
+    # This method is used to allow the action instances to
+    # determine internal state changes based on selection
+    # state changes in their view.
+
+    def selection(sender, model, sel)
+      case @options[:enable]
+      when :select_multi
+        self.sensitive = sel.size >= 1
+      when :select_single
+        self.sensitive = sel.size == 1
+      end
+    end
+  end
+
+end

data/lib/ruby_mvc/controllers/action_group.rb

@@ -0,0 +1,70 @@
+#--
+######################################################################
+#
+# 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:     action_group.rb
+# Created:  Sun  1 Jan 2012 17:32:19 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+
+  # This class provides a collection for actions so that they
+  # can be more easily managed.  ActionGroups form the basis
+  # for creating menus, toolbars and similar control groups.
+
+  class ActionGroup
+    def initialize
+      @actions = []
+      @index = {}
+    end
+
+    # This method is used to retrieve an action by action key.
+
+    def [](key)
+      @index[key]
+    end
+
+    def <<(action)
+      if !@actions.include? action
+        @actions << action
+        @index[action.key] = action
+      end
+    end
+
+    def delete(action)
+      if action.is_a? Symbol
+        key = action
+      else
+        key = action.key
+      end
+      val = @index.delete(key)
+      @actions.delete(val)
+    end
+
+    def each(&block)
+      @actions.each(&block)
+    end
+
+    def each_with_index(&block)
+      @actions.each_with_index(&block)
+    end
+  end
+
+end

data/lib/ruby_mvc/controllers/app_controller.rb

@@ -41,9 +41,11 @@ module RubyMVC
 
     def link_activated(sender, link)
       puts "#link_activated(#{sender}, #{link})"
-      m = RubyMVC.method_name(link).to_sym
+      uri = URI.parse(link)
+      params = CGI.parse(uri.query) if uri.query
+      m = RubyMVC.method_name(uri.path).to_sym
       if self.respond_to? m
-        self.send(m, sender, link)
+        self.send(m, sender, link, params)
       end
     end
   end

data/lib/ruby_mvc/controllers/rails_controller.rb

@@ -24,6 +24,8 @@
 #++ 
 
 require 'active_record'
+require 'ruby_mvc/models/ar_table_model'
+require 'ruby_mvc/views/ar_support'
 
 module RubyMVC
 

data/lib/ruby_mvc/models.rb

@@ -23,6 +23,8 @@
 #####################################################################
 #++ 
 
+require 'ruby_mvc/models/model'
+require 'ruby_mvc/models/view_model_template'
 require 'ruby_mvc/models/table_model'
 require 'ruby_mvc/models/array_table_model'
 require 'ruby_mvc/models/keyed_array_table_model'

data/lib/ruby_mvc/models/ar_table_model.rb

@@ -0,0 +1,133 @@
+#--
+######################################################################
+#
+# 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_table_model.rb
+# Created:  Sun 11 Dec 2011 10:38:34 CST
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Models
+
+  # This class provides an adapter between the ActiveRecord
+  # model classes and the RubyMVC TableModel interface.  This
+  # class is designed to be able to provide access to either
+  # all instances of a particular AR table or only a subset of
+  # the rows matching a particular query.
+
+  class ActiveRecordTableModel < TableModel
+    attr_reader :keys
+
+    def initialize(entity_type, rows = nil)
+      super()
+      @row_idx = []
+      @entity_type = entity_type
+      @rows = rows 
+      @keys = @entity_type.attribute_names.sort
+
+      # FIXME: this is a hack because I'm not sure how best to
+      # ensure we have the rows we need
+      self.each { |r| }
+    end
+
+    def create_rows(count = 1)
+      rows = []
+      count.times { rows << @entity_type.new }
+      rows
+    end
+
+    def insert_row(index, row)
+      @row_idx.insert(index, row)
+      super(index, row)
+    end
+
+    def insert_rows(index, rows)
+      if index == -1
+        @row_idx.concat(rows)
+      else
+        rows.each_with_index do |row, i|
+          @row_idx.insert(index + i, row)
+        end
+      end
+      super(index, rows)
+    end
+
+    def remove_row(index)
+      if row = @row_idx.delete_at(index)
+        @entity_type.delete(row[@entity_type.primary_key])
+        signal_emit("rows-removed", self, index, [ row ])
+      end
+      row
+    end
+
+    def remove_rows(index, count)
+      rows = []
+      count.times do
+        rows << @row_idx.delete_at(index)
+        @entity_type.delete(rows.last[@entity_type.primary_key])
+      end
+      signal_emit("rows-removed", self, index, rows)
+      rows
+    end
+
+    def update_row(index, row)
+      @row_idx[index] = row
+      super
+    end
+
+    def [](index)
+      @row_idx[index]
+    end
+
+    def each(&block)
+      @row_idx.clear
+      _rows.each do |row|
+        @row_idx << row
+        block.call(row)
+      end
+    end
+
+    def each_with_index(&block)
+      @row_idx.clear
+      _rows.each_with_index do |row, i|
+        @row_idx << row
+        block.call(row, i)
+      end
+    end
+
+    def value_for(row, key)
+      @row_idx[row][key]
+    end
+
+    def size
+      puts "idx.size: #{@row_idx.size}"
+      [_rows.count, @row_idx.size].max
+    end
+
+  protected
+    def _rows
+      x = @rows || @entity_type.find(:all)
+      puts "working with #{x.count} rows"
+      x
+    end
+  end
+
+end
+end