knjrbfw 0.0.35 → 0.0.36

data/VERSION

@@ -1 +1 @@
-0.0.35
+0.0.36

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.35"
+  s.version = "0.0.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-19}
+  s.date = %q{2012-05-21}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -166,16 +166,19 @@ Gem::Specification.new do |s|
     "lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb",
     "lib/knj/knjdb/drivers/mysql/knjdb_mysql_columns.rb",
     "lib/knj/knjdb/drivers/mysql/knjdb_mysql_indexes.rb",
+    "lib/knj/knjdb/drivers/mysql/knjdb_mysql_sqlspecs.rb",
     "lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb",
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb",
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb",
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_indexes.rb",
+    "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_sqlspecs.rb",
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb",
     "lib/knj/knjdb/libknjdb.rb",
     "lib/knj/knjdb/libknjdb_java_sqlite3.rb",
     "lib/knj/knjdb/libknjdb_row.rb",
     "lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb",
     "lib/knj/knjdb/revision.rb",
+    "lib/knj/knjdb/sqlspecs.rb",
     "lib/knj/kvm.rb",
     "lib/knj/libqt.rb",
     "lib/knj/libqt_window.rb",

data/lib/knj/datarow.rb

@@ -201,15 +201,22 @@ class Knj::Datarow
         return @ob.get_try(self, colname, classname)
       end
       
-      methodname_html = "#{methodname.to_s}_html".to_sym
+      methodname_html = "#{methodname}_html".to_sym
       define_method(methodname_html) do |*args|
-        obj = self.send(methodname)
+        obj = self.__send__(methodname)
         return @ob.events.call(:no_html, classname) if !obj
         
         raise "Class '#{classname}' does not have a 'html'-method." if !obj.respond_to?(:html)
         return obj.html(*args)
       end
       
+      methodname_name = "#{methodname}_name".to_sym
+      define_method(methodname_name) do |*args|
+        obj = self.__send__(methodname)
+        return @ob.events.call(:no_name, classname) if !obj
+        return obj.name(*args)
+      end
+      
       self.joined_tables(
         classname => {
           :where => {

data/lib/knj/gtk2.rb

@@ -27,7 +27,7 @@ module Knj::Gtk2
     elsif paras.is_a?(String) or paras.is_a?(Integer)
       msg = paras
     else
-      raise "Cant handle the parameters: " + paras.class.to_s
+      raise "Cant handle the parameters: '#{paras.class.name}'."
     end
     
     type = "info" if !type
@@ -81,13 +81,13 @@ module Knj::Gtk2
           if element.respond_to?("id") and element.respond_to?("title")
             tv.append([count.to_s, element.title])
           else
-            raise "Could not handle object in array: " + element.class.to_s
+            raise "Could not handle object in array: '#{element.class.name}'."
           end
           
           count += 1
         end
       else
-        raise "Unhandeled class: " + items.class.to_s
+        raise "Unhandeled class: '#{items.class.name}'."
       end
       
       sw = Gtk::ScrolledWindow.new
@@ -95,7 +95,7 @@ module Knj::Gtk2
       
       box.pack_start(sw)
     else
-      raise "No such mode: " + type
+      raise "No such mode: '#{type}'."
     end
     
     if button1 and button2
@@ -104,12 +104,12 @@ module Knj::Gtk2
       dialog = Gtk::Dialog.new(title, nil, Gtk::Dialog::MODAL, button1)
     end
     
-    if image
-      box.pack_start(image)
-    end
+    box.pack_start(image) if image
     
     if msg
-      box.pack_start(Gtk::Label.new(msg))
+      label = Gtk::Label.new(msg)
+      label.selectable = true
+      box.pack_start(label)
     end
     
     box.spacing = 15
@@ -123,7 +123,23 @@ module Knj::Gtk2
       tv.grab_focus
     end
     
-    response = dialog.run
+    if paras.is_a?(Hash) and paras["transient_for"]
+      dialog.transient_for = paras["transient_for"]
+    end
+    
+    do_run = true
+    do_run = false if paras.is_a?(Hash) and paras.key?("run") and !paras["run"]
+    
+    if do_run
+      response = dialog.run
+    else
+      #Connect the one button to close the window.
+      dialog.children[0].children[1].children[0].signal_connect("clicked") do
+        dialog.destroy
+      end
+      
+      return false
+    end
     
     if type == "list"
       sel = tv.sel
@@ -153,7 +169,7 @@ module Knj::Gtk2
     elsif response == Gtk::Dialog::RESPONSE_CLOSE or response == Gtk::Dialog::RESPONSE_DELETE_EVENT
       return close_sig
     else
-      raise "Unknown response: " + response.to_s
+      raise "Unknown response: '#{response}'."
     end
   end
   
@@ -191,7 +207,7 @@ module Knj::Gtk2
         elsif item["name"][0..2] == "che"
           item["type"] = "check"
         else
-          raise "Could not figure out type for: " + item["name"]
+          raise "Could not figure out type for: '#{item["name"]}'."
         end
       end
       
@@ -238,7 +254,7 @@ module Knj::Gtk2
           "object" => cb
         }
       else
-        raise "Unknown type: " + item["type"]
+        raise "Unknown type: '#{item["type"]}'."
       end
       
       
@@ -286,7 +302,7 @@ module Knj::Gtk2
       sel = object.sel
       return sel["text"]
     else
-      raise "Unknown object: #{object.class.name}"
+      raise "Unknown object: '#{object.class.name}'."
     end
   end
 end

data/lib/knj/gtk2_tv.rb

@@ -12,6 +12,7 @@ module Knj::Gtk2::Tv
     columns.each do |col_title|
       renderer = Gtk::CellRendererText.new
       col = Gtk::TreeViewColumn.new(col_title, renderer, :text => count)
+      col.resizable = true
       tv.append_column(col)
       count += 1
     end

data/lib/knj/http2.rb

@@ -1,6 +1,3 @@
-require "#{$knjpath}web"
-require "socket"
-
 #This class tries to emulate a browser in Ruby without any visual stuff. Remember cookies, keep sessions alive, reset connections according to keep-alive rules and more.
 #===Examples
 # Knj::Http2.new(:host => "www.somedomain.com", :port => 80, :ssl => false, :debug => false) do |http|
@@ -16,6 +13,8 @@ class Knj::Http2
   attr_reader :cookies, :args
   
   def initialize(args = {})
+    require "#{$knjpath}web"
+    
     args = {:host => args} if args.is_a?(String)
     raise "Arguments wasnt a hash." if !args.is_a?(Hash)
     
@@ -99,6 +98,7 @@ class Knj::Http2
   
   #Reconnects to the host.
   def reconnect
+    require "socket"
     print "Http2: Reconnect.\n" if @debug
     
     #Reset variables.
@@ -272,13 +272,13 @@ class Knj::Http2
         
         if val.class.name == "Tempfile" and val.respond_to?("original_filename")
           praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
-          praw << "Content-Length: #{val.bytesize}#{@nl}"
+          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
         elsif val.is_a?(Hash) and val[:filename]
           praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val[:filename]}\";#{@nl}"
-          praw << "Content-Length: #{val[:content].bytesize}#{@nl}"
+          praw << "Content-Length: #{val[:content].to_s.bytesize}#{@nl}"
         else
           praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
-          praw << "Content-Length: #{val.bytesize}#{@nl}"
+          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
         end
         
         praw << "Content-Type: text/plain#{@nl}"

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_sqlspecs.rb

@@ -0,0 +1,5 @@
+class KnjDB_mysql::Sqlspecs < Knj::Db::Sqlspecs
+  def strftime(val, colstr)
+    return "DATE_FORMAT(#{colstr}, '#{val}')"
+  end
+end

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_sqlspecs.rb

@@ -0,0 +1,5 @@
+class KnjDB_sqlite3::Sqlspecs < Knj::Db::Sqlspecs
+  def strftime(val, col_str)
+    return "STRFTIME('#{val}', SUBSTR(#{col_str}, 0, 20))"
+  end
+end

data/lib/knj/knjdb/libknjdb.rb

@@ -299,6 +299,9 @@ class Knj::Db
           sql << ", "
         end
         
+        #Convert dates to valid dbstr.
+        value = self.date_out(value) if value.is_a?(Knj::Datet) or value.is_a?(Time)
+        
         sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col} = "
         sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
       end
@@ -596,11 +599,29 @@ class Knj::Db
     return @enc_col
   end
   
+  #Returns a string which can be used in SQL with the current driver.
+  #===Examples
+  # str = db.date_out(Time.now) #=> "2012-05-20 22:06:09"
   def date_out(date_obj = Knj::Datet.new, args = {})
+    conn_exec do |driver|
+      if driver.respond_to?(:date_out)
+        return driver.date_out(date_obj, args)
+      end
+    end
+    
     return Knj::Datet.in(date_obj).dbstr(args)
   end
   
+  #Takes a valid date-db-string and converts it into a Knj::Datet.
+  #===Examples
+  # db.date_in('2012-05-20 22:06:09') #=> 2012-05-20 22:06:09 +0200
   def date_in(date_obj)
+    conn_exec do |driver|
+      if driver.respond_to?(:date_in)
+        return driver.date_in(date_obj)
+      end
+    end
+    
     return Knj::Datet.in(date_obj)
   end
   
@@ -642,6 +663,17 @@ class Knj::Db
     return @indexes
   end
   
+  def sqlspecs
+    if !@sqlspecs
+      require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_sqlspecs" if (!@opts.key?(:require) or @opts[:require])
+      @sqlspecs = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Sqlspecs).new(
+        :db => self
+      )
+    end
+    
+    return @sqlspecs
+  end
+  
   #Proxies the method to the driver.
   #
   #===Examples

data/lib/knj/knjdb/sqlspecs.rb

@@ -0,0 +1,5 @@
+class Knj::Db::Sqlspecs
+  def initialize(args)
+    @args = args
+  end
+end

data/lib/knj/objects.rb

@@ -23,6 +23,7 @@ class Knj::Objects
     #Set up various events.
     @events = Knj::Event_handler.new
     @events.add_event(:name => :no_html, :connections_max => 1)
+    @events.add_event(:name => :no_name, :connections_max => 1)
     @events.add_event(:name => :no_date, :connections_max => 1)
     @events.add_event(:name => :missing_class, :connections_max => 1)
     @events.add_event(:name => :require_class, :connections_max => 1)

data/lib/knj/objects/objects_sqlhelper.rb

@@ -333,7 +333,7 @@ class Knj::Objects
             sql_where << " AND DATE_FORMAT(#{table}`#{db.esc_col(match[1])}`, '%d %m %Y') = DATE_FORMAT('#{db.esc(val.dbstr)}', '%d %m %Y')"
           end
         elsif match[2] == "month"
-          sql_where << " AND DATE_FORMAT(#{table}`#{db.esc_col(match[1])}`, '%m %Y') = DATE_FORMAT('#{db.esc(val.dbstr)}', '%m %Y')"
+          sql_where << " AND #{db.sqlspecs.strftime("%m %Y", "#{table}`#{db.esc_col(match[1])}`")} = #{db.sqlspecs.strftime("%m %Y", "'#{db.esc(val.dbstr)}'")}"
         elsif match[2] == "year"
           sql_where << " AND DATE_FORMAT(#{table}`#{db.esc_col(match[1])}`, '%Y') = DATE_FORMAT('#{db.esc(val.dbstr)}', '%Y')"
         elsif match[2] == "from" or match[2] == "above"

data/lib/knj/strings.rb

@@ -260,4 +260,29 @@ module Knj::Strings
       return parts[0].to_s
     end
   end
+  
+  #Returns a human readable time-string from a given number of seconds.
+  def self.secs_to_human_time_str(secs)
+    secs = secs.to_i
+    hours = (secs.to_f / 3600.0).floor.to_i
+    secs = secs - (hours * 3600)
+    
+    mins = (secs.to_f / 60).floor.to_i
+    secs = secs - (mins * 60)
+    
+    return "#{"%02d" % hours}:#{"%02d" % mins}:#{"%02d" % secs}"
+  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*/)
+    raise "Could not match string: '#{str}'." if !match
+    
+    hours = match[1].to_i
+    minutes = match[2].to_i
+    secs = match[3].to_i
+    
+    total = (hours * 3600) + (minutes * 60) + secs
+    return total
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-19 00:00:00 +02:00
+date: 2012-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -260,16 +260,19 @@ files:
 - lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb
 - lib/knj/knjdb/drivers/mysql/knjdb_mysql_columns.rb
 - lib/knj/knjdb/drivers/mysql/knjdb_mysql_indexes.rb
+- lib/knj/knjdb/drivers/mysql/knjdb_mysql_sqlspecs.rb
 - lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb
 - lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb
 - lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb
 - lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_indexes.rb
+- lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_sqlspecs.rb
 - lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb
 - lib/knj/knjdb/libknjdb.rb
 - lib/knj/knjdb/libknjdb_java_sqlite3.rb
 - lib/knj/knjdb/libknjdb_row.rb
 - lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb
 - lib/knj/knjdb/revision.rb
+- lib/knj/knjdb/sqlspecs.rb
 - lib/knj/kvm.rb
 - lib/knj/libqt.rb
 - lib/knj/libqt_window.rb
@@ -371,7 +374,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2601154118778035133
+      hash: -15958701086613038
       segments: 
       - 0
       version: "0"