knjrbfw 0.0.50 → 0.0.51

data/VERSION

@@ -1 +1 @@
-0.0.50
+0.0.51

data/knjrbfw.gemspec

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

data/lib/knj/arrayext.rb

@@ -287,9 +287,17 @@ module Knj::ArrayExt
   # end
   # 
   # res.length #=> 3
-  def self.divide(args)
+  def self.divide(args, &block)
     prev_ele = args[:arr].shift
     chunk = [prev_ele]
+    
+    if !args[:evaluate]
+      callback_eval = block
+    elsif !args[:callback] and args[:evaluate]
+      callback_res = block
+      callback_eval = args[:evaluate]
+    end
+    
     ret = [] if !args[:callback]
     
     args[:arr].each do |ele|
@@ -299,10 +307,10 @@ module Knj::ArrayExt
         next
       end
       
-      if yield(prev_ele, ele)
+      if callback_eval.call(prev_ele, ele)
         chunk << ele
-      elsif callback = args[:callback]
-        callback.call(chunk)
+      elsif callback_res
+        callback_res.call(chunk)
         chunk = nil
       else
         ret << chunk
@@ -313,8 +321,8 @@ module Knj::ArrayExt
     end
     
     if chunk and !chunk.empty?
-      if callback = args[:callback]
-        callback.call(chunk)
+      if callback_res
+        callback_res.call(chunk)
       else
         ret << chunk
       end

data/lib/knj/datarow.rb

@@ -251,7 +251,7 @@ class Knj::Datarow
         table_name => {
           :where => {
             "object_class" => self.name,
-            "object_id" => {:type => :col, :name => "id"},
+            "object_id" => {:type => :col, :name => :id},
             "key" => val.to_s,
             "locale" => proc{|d| _session[:locale]}
           },

data/lib/knj/event_handler.rb

@@ -73,9 +73,9 @@ class Knj::Event_handler
   # events.call(:test_event) #=> Doesnt print 'test event!'.
   def disconnect(name, callback_id)
     raise "No such event: '#{name}'." if !@events.key?(name)
-    raise "No such connection: '#{name}' --> '#{callback_id}'" if !@events[name].key?(callback_id)
-    @events[name][callback_id].clear
-    @events[name].delete(callback_id)
+    raise "No such connection: '#{name}' --> '#{callback_id}' (#{@events[name]})" if !@events[name][:callbacks].key?(callback_id)
+    @events[name][:callbacks][callback_id].clear
+    @events[name][:callbacks].delete(callback_id)
   end
   
   #Returns how many blocks have been connected to an event.

data/lib/knj/gtk2_tv.rb

@@ -35,8 +35,14 @@ module Knj::Gtk2::Tv
       end
       
       if args[:type] == :string
+        if args[:markup]
+          col_args = {:markup => count}
+        else
+          col_args = {:text => count}
+        end
+        
         renderer = Gtk::CellRendererText.new
-        col = Gtk::TreeViewColumn.new(args[:title], renderer, :text => count)
+        col = Gtk::TreeViewColumn.new(args[:title], renderer, col_args)
         col.resizable = true
         tv.append_column(col)
       elsif args[:type] == :toggle
@@ -47,9 +53,13 @@ module Knj::Gtk2::Tv
         renderer = Gtk::CellRendererCombo.new
         renderer.text_column = 0
         
-        col = Gtk::TreeViewColumn.new(args[:title])
-        col.pack_start(renderer, false)
-        col.add_attribute(renderer, :text, count)
+        if args[:markup]
+          col_args = {:markup => count}
+        else
+          col_args = {:text => count}
+        end
+        
+        col = Gtk::TreeViewColumn.new(args[:title], renderer, col_args)
         
         renderer.model = args[:model] if args.key?(:model)
         renderer.has_entry = args[:has_entry] if args.key?(:has_entry)
@@ -166,10 +176,12 @@ module Knj::Gtk2::Tv
           id = args[:tv].model.get_value(iter, args[:id_col])
           model_obj = args[:ob].get(args[:model_class], id)
           cancel = false
+          callback_hash = {:args => args, :value => value, :model => model_obj, :col_no => col_no, :col_data => col_data}
           
           if col_data[:value_callback]
             begin
-              value = col_data[:value_callback].call(:args => args, :value => value, :model => model_obj, :col_no => col_no, :col_data => col_data)
+              value = col_data[:value_callback].call(callback_hash)
+              callback_hash[:value] = value
             rescue => e
               Knj::Gtk2.msgbox(e.message, "warning")
               cancel = true
@@ -177,29 +189,38 @@ module Knj::Gtk2::Tv
           end
           
           if !cancel
-            args[:change_before].call if args[:change_before]
-            
             begin
-              model_obj[col_data[:col]] = value
-              value = col_data[:value_set_callback].call(:args => args, :value => value, :model => model_obj, :col_no => col_no, :col_data => col_data) if col_data.key?(:value_set_callback)
-              iter[col_no] = value
+              args[:change_before].call(callback_hash) if args[:change_before]
             rescue => e
+              cancel = true
               Knj::Gtk2.msgbox(e.message, "warning")
-            ensure
-              args[:change_after].call(:args => args) if args[:change_after]
+            end
+            
+            if !cancel
+              begin
+                model_obj[col_data[:col]] = value
+                value = col_data[:value_set_callback].call(callback_hash) if col_data.key?(:value_set_callback)
+                iter[col_no] = value
+              rescue => e
+                Knj::Gtk2.msgbox(e.message, "warning")
+              ensure
+                args[:change_after].call(callback_hash) if args[:change_after]
+              end
             end
           end
         end
       elsif renderer.is_a?(Gtk::CellRendererToggle)
         renderer.activatable = true
-        renderer.signal_connect("toggled") do |renderer, path, val|
+        renderer.signal_connect("toggled") do |renderer, path, value|
           iter = args[:tv].model.get_iter(path)
           id = args[:tv].model.get_value(iter, 0)
           model_obj = args[:ob].get(args[:model_class], id)
+          callback_hash = {:args => args, :value => value, :model => model_obj, :col_no => col_no, :col_data => col_data}
           
           if col_data[:value_callback]
             begin
-              value = col_data[:value_callback].call(:args => args, :value => value, :model => model_obj, :col_no => col_no, :col_data => col_data)
+              value = col_data[:value_callback].call(callback_hash)
+              callback_hash[:value] = value
             rescue => e
               Knj::Gtk2.msgbox(e.message, "warning")
               cancel = true
@@ -207,7 +228,7 @@ module Knj::Gtk2::Tv
           end
           
           if !cancel
-            args[:change_before].call if args[:change_before]
+            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

data/lib/knj/gtk2_window.rb

@@ -23,4 +23,16 @@ class Knj::Gtk2::Window
       @@uniques[id] = obj
     end
   end
+  
+  #Returns the object if it hasnt been destroyed.
+  #===Examples
+  # Knj::Gtk2::Window.get("my_window") #=> nil
+  # Knj::Gtk2::Window.get("my_window") #=> Gtk::Builder-object
+  def self.get(id)
+    if instance and !instance.gui["window"].destroyed?
+      return instance.gui["window"]
+    end
+    
+    return nil
+  end
 end

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

@@ -74,7 +74,9 @@ class KnjDB_mysql::Tables
   def create(name, data, args = nil)
     raise "No columns was given for '#{name}'." if !data["columns"] or data["columns"].empty?
     
-    sql = "CREATE TABLE `#{name}` ("
+    sql = "CREATE"
+    sql << " TEMPORARY" if data["temp"]
+    sql << " TABLE `#{name}` ("
     
     first = true
     data["columns"].each do |col_data|

data/lib/knj/knjdb/query_buffer.rb

@@ -4,40 +4,78 @@ class Knj::Db::Query_buffer
   def initialize(args)
     @args = args
     @queries = []
+    @inserts = {}
+    @queries_count = 0
     @debug = @args[:debug]
+    @lock = Mutex.new
     
     begin
       yield(self)
     ensure
-      self.flush if !@queries.empty?
+      self.flush if @queries_count > 0 or !@queries.empty? or !@inserts.empty?
     end
   end
   
   #Adds a query to the buffer.
   def query(str)
-    STDOUT.print "Adding to buffer: #{str}\n" if @debug
-    @queries << str
-    self.flush if @queries.length > 1000
+    @lock.synchronize do
+      STDOUT.print "Adding to buffer: #{str}\n" if @debug
+      @queries << str
+      @queries_count += 1
+    end
+    
+    self.flush if @queries_count > 1000
     return nil
   end
   
   #Delete as on a normal Knj::Db.
+  #===Examples
+  # db.q_buffer do |buffer|
+  #   buffer.delete(:users, {:id => 5})
+  # end
   def delete(table, where)
     self.query(@args[:db].delete(table, where, :return_sql => true))
     return nil
   end
   
-  #Flushes all queries out in a transaction.
-  def flush
-    return nil if @queries.empty?
-    
-    @args[:db].transaction do
-      @queries.shift(1000).each do |str|
-        STDOUT.print "Executing via buffer: #{str}\n" if @debug
-        @args[:db].q(str)
-      end
+  #Plans to inset a hash into a table. It will only be inserted when flush is called.
+  #===Examples
+  # db.q_buffer do |buffer|
+  #   buffer.insert(:users, {:name => "John Doe"})
+  # end
+  def insert(table, data)
+    @lock.synchronize do
+      @inserts[table] = [] if !@inserts.key?(table)
+      @inserts[table] << data
+      @queries_count += 1
     end
     
+    self.flush if @queries_count > 1000
     return nil
   end
+  
+  #Flushes all queries out in a transaction. This will automatically be called for every 1000 queries.
+  def flush
+    @lock.synchronize do
+      return nil if @queries_count <= 0 and @queries.empty? and @inserts.empty?
+      
+      @args[:db].transaction do
+        @queries.shift(1000).each do |str|
+          STDOUT.print "Executing via buffer: #{str}\n" if @debug
+          @args[:db].q(str)
+        end
+        
+        @inserts.each do |table, datas_arr|
+          while !datas_arr.empty?
+            datas_chunk_arr = datas_arr.shift(1000)
+            @args[:db].insert_multi(table, datas_chunk_arr)
+          end
+        end
+      end
+      
+      @inserts.clear
+      @queries_count = 0
+      return nil
+    end
+  end
 end

data/lib/knj/knjdb/revision.rb

@@ -4,15 +4,20 @@
 # db = Knj::Db.new(:type => "sqlite3", :path => "test_db.sqlite3")
 # schema = {
 #   "tables" => {
-#     "columns" => [
-#       {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
-#       {"name" => "name", "type" => "varchar"},
-#       {"name" => "lastname", "type" => "varchar"}
-#     ],
-#     "indexes" => [
-#       "name",
-#       {"name" => "lastname", "columns" => ["lastname"]}
-#     ]
+#     "User" => {
+#       "columns" => [
+#         {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+#         {"name" => "name", "type" => "varchar"},
+#         {"name" => "lastname", "type" => "varchar"}
+#       ],
+#       "indexes" => [
+#         "name",
+#         {"name" => "lastname", "columns" => ["lastname"]}
+#       ],
+#       "on_create_after" => proc{|d|
+#         d["db"].insert("User", {"name" => "John", "lastname" => "Doe"})
+#       }
+#     }
 #   }
 # }
 # 

data/lib/knj/objects/objects_sqlhelper.rb

@@ -220,9 +220,8 @@ class Knj::Objects
             )
             sql_where << " AND #{table}`#{db.esc_col(key)}` IN (#{escape_sql})"
           end
-        elsif val.is_a?(Hash) and val[:type] == :col
+        elsif val.is_a?(Hash) and val[:type].to_sym == :col
           raise "No table was given for join: '#{val}', key: '#{key}' on table #{table}." if !val.key?(:table)
-          
           do_joins[val[:table].to_sym] = true
           sql_where << " AND #{table}`#{db.esc_col(key)}` = `#{db.esc_table(val[:table])}`.`#{db.esc_col(val[:name])}`"
         elsif val.is_a?(Hash) and val[:type] == :sqlval and val[:val] == :null

data/lib/knj/php.rb

@@ -168,8 +168,9 @@ module Knj::Php
       end
       
       retstr << "}\n"
-    elsif cstr == "Time"
-      retstr << "Time::#{argument.year}-#{argument.month}-#{argument.day} #{argument.hour}:#{argument.min}:#{argument.sec}\n"
+    elsif cstr == "Time" or cstr == "Knj::Datet"
+      argument = argument.time if cstr == "Knj::Datet"
+      retstr << "#{cstr}::#{"%04d" % argument.year}-#{"%02d" % argument.month}-#{"%02d" % argument.day} #{"%02d" % argument.hour}:#{"%02d" % argument.min}:#{"%02d" % argument.sec}\n"
     else
       #print argument.to_s, "\n"
       retstr << "Unknown class: '#{cstr}' with superclass '#{supercl}'.\n"

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-25 00:00:00 +02:00
+date: 2012-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -379,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 499014487481488360
+      hash: -3860857740067589006
       segments: 
       - 0
       version: "0"