ruby_mvc 0.0.2 → 0.0.3

data/lib/ruby_mvc/models/ar_table_model.rb

@@ -35,11 +35,12 @@ module Models
   class ActiveRecordTableModel < TableModel
     attr_reader :keys
 
-    def initialize(entity_type, rows = nil)
+    def initialize(entity_type, options = {})
       super()
       @row_idx = []
       @entity_type = entity_type
-      @rows = rows 
+      @rows = options[:rows]
+      @filter = options[:filter]
       @keys = @entity_type.attribute_names.sort
 
       # FIXME: this is a hack because I'm not sure how best to
@@ -49,7 +50,7 @@ module Models
 
     def create_rows(count = 1)
       rows = []
-      count.times { rows << @entity_type.new }
+      count.times { rows << @entity_type.new(@filter) }
       rows
     end
 
@@ -123,7 +124,11 @@ module Models
 
   protected
     def _rows
-      x = @rows || @entity_type.find(:all)
+      if @filter
+        x = @entity_type.where(@filter)
+      else
+        x = @rows || @entity_type.find(:all)
+      end
       puts "working with #{x.count} rows"
       x
     end

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

@@ -49,7 +49,7 @@ module RubyMVC
           end
 
           evt_grid_range_select do |e|
-            puts "Event alt: #{e.alt_down}; ctrl: #{e.control_down}; brc: #{e.get_bottom_right_coords}; bottom: #{e.get_bottom_row}; left: #{e.get_left_col}; right: #{e.get_right_col}; tlc: #{e.get_top_left_coords}; top: #{e.get_top_row}; meta: #{e.meta_down}; selecting: #{e.selecting}; shift: #{e.shift_down}" if !e.selecting
+#            puts "Event alt: #{e.alt_down}; ctrl: #{e.control_down}; brc: #{e.get_bottom_right_coords}; bottom: #{e.get_bottom_row}; left: #{e.get_left_col}; right: #{e.get_right_col}; tlc: #{e.get_top_left_coords}; top: #{e.get_top_row}; meta: #{e.meta_down}; selecting: #{e.selecting}; shift: #{e.shift_down}" if !e.selecting
             next if !e.selecting
 
             # FIXME: this should be a bit more clever in the
@@ -87,6 +87,7 @@ module RubyMVC
           @model.signal_connect("rows-removed") do |s, i, r|
             puts "refresh rows-removed"
             @gm = GridModel.new(model)
+            selected_rows.delete(i)
             set_table(@gm, Wx::Grid::GridSelectRows, false)
           end
           @model.signal_connect("row-changed") do |s, i, r|

data/lib/ruby_mvc/views/ar_type_editor.rb

@@ -30,7 +30,7 @@ module Views
     def initialize(app, parent, entity_type, options = {}, &block)
       options[:editable] = false
       options[:show_row_labels] = false
-      @model = Models::ActiveRecordTableModel.new(entity_type)
+      @model = Models::ActiveRecordTableModel.new(entity_type, options)
       @template = options[:template]
       super((@template ? @template.apply(@model) : @model), options)
       signal_connect("row-edit") do |s, m, i, r|
@@ -40,6 +40,8 @@ module Views
             begin
               r.save!
               m.update_row(i, r)
+            rescue ActiveRecord::StatementInvalid => e
+              app.error(e, :title => "Database Error", :parent => dlg)
             rescue ActiveRecord::RecordInvalid => e
               app.error(e, :title => "Validation Error", :parent => dlg)
             end

data/lib/ruby_mvc/views/ar_web_type_list.rb

@@ -28,7 +28,7 @@ module Views
 
   class ActiveRecordWebTypeList < WebContentTableView
     def initialize(entity_type, options = {}, &block)
-      @model = Models::ActiveRecordTableModel.new(entity_type)
+      @model = Models::ActiveRecordTableModel.new(entity_type, options)
       if options.is_a? Hash
         @template = options[:template]
       else

data/ruby_mvc.gemspec

@@ -27,7 +27,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name        = "ruby_mvc"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.summary     = "Ruby MVC"
   s.description = "A simple, cross-platform MVC framework for Ruby"
   s.authors     = [ "Andrew S. Townley" ]

metadata

@@ -2,7 +2,7 @@
 name: ruby_mvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andrew S. Townley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: []
 
 description: A simple, cross-platform MVC framework for Ruby