visualruby 3.0.23 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9875dc7a7e491c539661b24beb1f82ae9800ff
-  data.tar.gz: cb5116d5521afb53cb20b5c00baeb73b19d92eac
+  metadata.gz: ba9a01f856cbf0b63959f1594e7562ccb164bfb1
+  data.tar.gz: 9c0936f16c0daf499fe1957c1a011aad94805f79
 SHA512:
-  metadata.gz: 2185e832ea7999cf184a7967d5b58a0b7f799d67938cd2d7389eba8653969ce841cb9e674176f64ad58f3841364a8787fa50ed87bb7b013427d7e7266b1fdf2d
-  data.tar.gz: 46a0b8df4685f384fe99ea0724c0f111a8cf46b46dd5818ea7103115af5bb144accfc459d76d5c21f9b10341609f10901056a3765182e96215020ef79bfe6602
+  metadata.gz: db216647fe5143893255fbf0eee9768bd6ee8bdfc2a1ff1fa7f9368d0a47c74cf7949f174fe4033236d2817b5b5760159af4047c8007993dc40977324bf70570
+  data.tar.gz: 79f0a78b6ad273f7fb9aad781ebbfd7e59afdeeaa1823d4fdc66c339bae5d0891b59607471f6e9045172df3713d9f25a40752f03bc11638ac611511fbb8b72aa

data/.vr_settings.yaml

@@ -15,17 +15,27 @@ open_files:
 - "/home/eric/vrp/vr3/src/main/GemTree.rb"
 - "/home/eric/vrp/vr3/lib/treeview/FileTreeView.rb"
 - "/home/eric/vrp/vr3/lib/treeview/columns/TreeViewColumn.rb"
-- "/home/eric/vrp/vr3/lib/treeview/ListView.rb"
-- "/home/eric/vrp/vr3/lib/treeview/ViewCommon.rb"
 - "/home/eric/vrp/vr3/lib/treeview/columns/ComboCol.rb"
 - "/home/eric/vrp/vr3/lib/treeview/columns/ImageCol.rb"
+- "/home/eric/vrp/vr3/vr.gemspec"
+- "/home/eric/vrp/vr3/src/main/VR_Tools.rb"
+- "/home/eric/vrp/vr3/lib/treeview/TreeView.rb"
+- "/home/eric/vrp/vr3/examples/active_record2/main.rb"
+- "/home/eric/vrp/vr3/examples/filetreeview/bin/ProjectTreeGUI.rb"
+- "/home/eric/vrp/vr3/lib/treeview/ListView.rb"
+- "/home/eric/vrp/vr3/doc/file_list.html"
+- "/home/eric/vrp/vr3/doc/class_and_method_list.html"
+- "/home/eric/vrp/vr3/doc/just_file_list.html"
 open_folders:
 - "/home/eric/vrp/vr3"
-- "/home/eric/vrp/vr3/site"
+- "/home/eric/vrp/vr3/doc"
+- "/home/eric/vrp/vr3/lib"
+- "/home/eric/vrp/vr3/lib/treeview"
+- "/home/eric/vrp/vr3/lib/treeview/columns"
 - "/home/eric/vrp/vr3/src"
 - "/home/eric/vrp/vr3/src/main"
-current_file: "/home/eric/vrp/vr3/lib/treeview/columns/ImageCol.rb"
-current_line: 4
+current_file: "/home/eric/vrp/vr3/doc/just_file_list.html"
+current_line: 83
 rdoc_command_line: yardoc lib - site/*.*
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/examples/calculator/bin/Calculator.rb

@@ -29,6 +29,7 @@ class Calculator
               [  4,  5,  6, "+" ] +
               [ 7,  8,  9, "-" ] +
               [ 0, ".","/","=" ]
+    @clear_display = false
   end  
 
 #  This method is called when any key is clicked.  It follows
@@ -46,18 +47,26 @@ class Calculator
   def button__clicked(button)
     case button.label
       when "C" then 
-        @builder["display"].text = ""
+        clear_display
       when "=" then
         begin # this doesn't catch all errors
            @builder["display"].text = eval(@builder["display"].text).to_s
         rescue
           @builder["display"].text = "error"
         end
+        @clear_display = true
+      when /[0-9]/ then
+        clear_display if @clear_display
+        @builder["display"].text = @builder["display"].text + button.label
       else 
         @builder["display"].text = @builder["display"].text + button.label
     end   
   end  
 
+  def clear_display
+    @builder["display"].text = ""
+    @clear_display = false
+  end
 
 
 end

data/lib/treeview/ListView.rb

@@ -39,14 +39,24 @@ module VR
       load_columns(cls)
     end
 
+#    def add_active_record_rows(ar) # :nodoc:
+#      ar.each do |obj|
+#        row = add_row()
+#        matches = obj.attributes.keys & @column_keys #intersection
+#        matches.each { |field| row[field] = obj.attributes[field] }   
+#      end
+#    end
+
     def add_active_record_rows(ar) # :nodoc:
+      fields = ar.column_names.map { |x| x.to_sym }
+      matches = fields & @column_keys #intersection
       ar.each do |obj|
         row = add_row()
-        matches = obj.attributes.keys & @column_keys #intersection
-        matches.each { |field| row[field] = obj.attributes[field] }   
+        matches.each { |f| row[f] = obj[f] unless obj[f].nil? }          
       end
     end
 
+
     def []( row )  # :nodoc:
       model.get_iter(Gtk::TreePath.new("#{row}"))
     end

data/lib/treeview/ViewCommon.rb

@@ -111,7 +111,7 @@ module VR
 
   module ViewCommon
 
-attr_accessor :vr_renderer
+attr_accessor :vr_renderer, :column_keys
   
     def load_columns(cols) # :nodoc:
       @vr_renderer = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.1.0
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,36 +9,36 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: gtksourceview3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,7 @@ extra_rdoc_files: []
 files:
 - "./.vr_settings.yaml"
 - "./.yardoc/my_yard.yaml"
+- "./doc/img/logo.png"
 - "./examples/active_record/.vr_settings.yaml"
 - "./examples/active_record/active_record.rb"
 - "./examples/active_record/bin/ChoosePerson.rb"