knjrbfw 0.0.78 → 0.0.79

data/VERSION

@@ -1 +1 @@
-0.0.78
+0.0.79

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.78"
+  s.version = "0.0.79"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-03}
+  s.date = %q{2012-08-07}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/knj/eruby.rb

@@ -51,7 +51,7 @@ class Knj::Eruby
     cachetime = File.mtime(cachename) if File.exists?(cachename)
     
     if !File.exists?(cachename) or filetime > cachetime
-      Knj::Eruby::Handler.load_file(filename, {:cachename => cachename})
+      Knj::Eruby::Handler.load_file(filename, :cachename => cachename)
       File.chmod(0777, cachename)
       cachetime = File.mtime(cachename)
       reload_cache = true

data/lib/knj/gtk2_tv.rb

@@ -45,11 +45,9 @@ module Knj::Gtk2::Tv
         renderer = Gtk::CellRendererText.new
         col = Gtk::TreeViewColumn.new(args[:title], renderer, col_args)
         col.resizable = true
-        tv.append_column(col)
       elsif args[:type] == :toggle
         renderer = Gtk::CellRendererToggle.new
         col = Gtk::TreeViewColumn.new(args[:title], renderer, :active => count)
-        tv.append_column(col)
       elsif args[:type] == :combo
         renderer = Gtk::CellRendererCombo.new
         renderer.text_column = 0
@@ -61,16 +59,29 @@ module Knj::Gtk2::Tv
         end
         
         col = Gtk::TreeViewColumn.new(args[:title], renderer, col_args)
+        col.resizable = true
         
         renderer.model = args[:model] if args.key?(:model)
         renderer.has_entry = args[:has_entry] if args.key?(:has_entry)
-        tv.append_column(col)
       else
         raise "Invalid type: '#{args[:type]}'."
       end
       
+      col.spacing = 0
       col.reorderable = true
       col.sort_column_id = count
+      
+      if args.key?(:fixed_width)
+        col.sizing = Gtk::TreeViewColumn::FIXED
+      else
+        col.sizing = Gtk::TreeViewColumn::AUTOSIZE
+      end
+      
+      [:min_width, :max_width, :fixed_width, :expand, :spacing, :reorderable].each do |arg|
+        col.__send__("#{arg}=", args[arg]) if args.key?(arg)
+      end
+      
+      tv.append_column(col)
       ret[:renderers] << renderer
       count += 1
     end
@@ -148,6 +159,15 @@ module Knj::Gtk2::Tv
     :human_number => {
       :value => proc{ |data| Knj::Locales.number_in(data[:value]) },
       :value_set => proc{ |data| Knj::Locales.number_out(data[:value], data[:col_data][:decimals]) }
+    },
+    :toggle_rev => {
+      :value_set => lambda{|data|
+        if data[:value]
+          return false
+        else
+          return true
+        end
+      }
     }
   }
   
@@ -184,6 +204,16 @@ module Knj::Gtk2::Tv
         end
       end
       
+      if col_data[:on_edit]
+        renderer.signal_connect("editing-started") do |renderer, row_no, path|
+          iter = args[:tv].model.get_iter(path)
+          id = args[:tv].model.get_value(iter, args[:id_col])
+          model_obj = args[:ob].get(args[:model_class], id)
+          
+          col_data[:on_edit].call(:renderer => renderer, :row_no => row_no, :path => path, :iter => iter, :args => args, :model => model_obj, :col_no => col_no, :col_data => col_data)
+        end
+      end
+      
       if renderer.is_a?(Gtk::CellRendererText)
         renderer.editable = true
         renderer.signal_connect("edited") do |renderer, row_no, value|
@@ -230,10 +260,19 @@ module Knj::Gtk2::Tv
         end
       elsif renderer.is_a?(Gtk::CellRendererToggle)
         renderer.activatable = true
-        renderer.signal_connect("toggled") do |renderer, path, value|
+        renderer.signal_connect("toggled") do |renderer, path|
           iter = args[:tv].model.get_iter(path)
           id = args[:tv].model.get_value(iter, 0)
           model_obj = args[:ob].get(args[:model_class], id)
+          
+          if model_obj[col_data[:col]].to_i == 1
+            value = false
+            value_i = 0
+          else
+            value = true
+            value_i = 1
+          end
+          
           callback_hash = {:args => args, :value => value, :model => model_obj, :col_no => col_no, :col_data => col_data}
           
           if col_data[:value_callback]
@@ -246,16 +285,30 @@ module Knj::Gtk2::Tv
             end
           end
           
+          if value
+            value_i = 1
+          else
+            value_i = 0
+          end
+          
+          callback_hash[:value] = value
+          
           if !cancel
             args[:change_before].call(callback_hash) if args[:change_before]
             begin
-              if model_obj[col_data[:col]].to_i == 1
-                model_obj[col_data[:col]] = 0
-                iter[col_no] = 0
-              else
-                model_obj[col_data[:col]] = 1
-                iter[col_no] = 1
+              model_obj[col_data[:col]] = value_i
+              
+              if col_data.key?(:value_set_callback)
+                value = col_data[:value_set_callback].call(callback_hash)
+                
+                if value
+                  value_i = 1
+                else
+                  value_i = 0
+                end
               end
+              
+              iter[col_no] = value_i
             ensure
               args[:change_after].call(:args => args) if args[:change_after]
             end

data/lib/knj/strings.rb

@@ -54,9 +54,7 @@ module Knj::Strings
       end
     end
     
-    regex = Regexp.new(pattern, arg_two)
-    
-    return regex
+    return Regexp.new(pattern, arg_two)
   end
   
   #Partens a string up in blocks for whatever words can be used to search for. Supports a block or returns an array.
@@ -272,8 +270,23 @@ module Knj::Strings
     end
   end
   
+  #Returns a short time-format for the given amount of seconds.
+  def self.secs_to_human_short_time(secs)
+    secs = secs.to_i
+    
+    return "#{secs}s" if secs < 60
+    
+    mins = (secs.to_f / 60.0).floor
+    if mins < 60
+      return "#{mins.to_i}m"
+    end
+    
+    hours = (mins.to_f / 60.0)
+    return "#{Knj::Locales.number_out(hours, 1)}t"
+  end
+  
   #Returns a human readable time-string from a given number of seconds.
-  def self.secs_to_human_time_str(secs)
+  def self.secs_to_human_time_str(secs, args = nil)
     secs = secs.to_i
     hours = (secs.to_f / 3600.0).floor.to_i
     secs = secs - (hours * 3600)
@@ -281,17 +294,23 @@ module Knj::Strings
     mins = (secs.to_f / 60).floor.to_i
     secs = secs - (mins * 60)
     
-    return "#{"%02d" % hours}:#{"%02d" % mins}:#{"%02d" % secs}"
+    str = "#{"%02d" % hours}:#{"%02d" % mins}"
+    
+    if !args or !args.key?(:secs) or args[:secs]
+      str << ":#{"%02d" % secs}"
+    end
+    
+    return str
   end
   
   #Turns a human readable time-string into a number of seconds.
   def self.human_time_str_to_secs(str)
-    match = str.match(/^\s*(\d+)\s*:\s*(\d+)\s*:\s*(\d+)\s*/)
+    match = str.match(/^\s*(\d+)\s*:\s*(\d+)(\s*:\s*(\d+)\s*|)/)
     raise "Could not match string: '#{str}'." if !match
     
     hours = match[1].to_i
     minutes = match[2].to_i
-    secs = match[3].to_i
+    secs = match[4].to_i
     
     total = (hours * 3600) + (minutes * 60) + secs
     return total

data/spec/strings_spec.rb

@@ -18,6 +18,11 @@ describe "Strings" do
       #this should happen - Ruby doesnt support U-modifier...
     end
     
+    regex = Knj::Strings.regex("/(\\d{6})$/")
+    res = "FNR. 7213820".match(regex)
+    raise "Not matched." if !res
+    raise "Expected result 1 to be '213820' but it wasnt: '#{res[1]}'." if res[1] != "213820"
+    
     res = Knj::Strings.is_regex?("Kasper")
     raise "Expected res to be false but it wasnt." if res
     
@@ -28,5 +33,22 @@ describe "Strings" do
   it "secs_to_human_time_str" do
     res = Knj::Strings.secs_to_human_time_str(3695)
     raise "Expected '01:01:35' but got: '#{res}'." if res != "01:01:35"
+    
+    secs = Knj::Strings.human_time_str_to_secs("01:30:30")
+    raise "Expected secs to be 5430 but it was #{secs}" if secs != 5430
+    
+    secs = Knj::Strings.human_time_str_to_secs("01:30")
+    raise "Expected secs to be 5400 but it was #{secs}" if secs != 5400
+  end
+  
+  it "secs_to_human_short_time" do
+    res = Knj::Strings.secs_to_human_short_time(3700)
+    raise "Expected '1.0t' but got '#{res}'." if res != "1.0t"
+    
+    res = Knj::Strings.secs_to_human_short_time(57)
+    raise "Expected '57s' but got '#{res}'." if res != "57s"
+    
+    res = Knj::Strings.secs_to_human_short_time(185)
+    raise "Expected '3m' but got '#{res}'." if res != "3m"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.78
+  version: 0.0.79
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-03 00:00:00 +02:00
+date: 2012-08-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -394,7 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1132063425696658380
+      hash: 1485433927830025325
       segments: 
       - 0
       version: "0"