knjrbfw 0.0.92 → 0.0.93

data/VERSION

@@ -1 +1 @@
-0.0.92
+0.0.93

data/knjrbfw.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{knjrbfw}
-  s.version = "0.0.92"
+  s.name = "knjrbfw"
+  s.version = "0.0.93"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-09-03}
-  s.description = %q{Including stuff for HTTP, SSH and much more.}
-  s.email = %q{k@spernj.org}
+  s.date = "2012-09-04"
+  s.description = "Including stuff for HTTP, SSH and much more."
+  s.email = "k@spernj.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -263,11 +263,11 @@ Gem::Specification.new do |s|
     "spec/web_spec.rb",
     "testfiles/image.jpg"
   ]
-  s.homepage = %q{http://github.com/kaspernj/knjrbfw}
+  s.homepage = "http://github.com/kaspernj/knjrbfw"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A framework with lots of stuff for Ruby.}
+  s.rubygems_version = "1.8.24"
+  s.summary = "A framework with lots of stuff for Ruby."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/knj/arrayext.rb

@@ -1,5 +1,3 @@
-require "php4r"
-
 module Knj::ArrayExt
   def self.join(args = {}, key = nil, sep = nil)
     if args.is_a?(Array) and sep
@@ -15,6 +13,7 @@ module Knj::ArrayExt
     str = ""
     first = true
     
+    require "php4r"
     Php4r.foreach(args[:arr]) do |key, value|
       if first
         first = false
@@ -213,6 +212,7 @@ module Knj::ArrayExt
   def self.clone_encode(hash, encoding, args = {})
     return hash if !hash
     
+    require "php4r"
     hash = hash.clone
     Php4r.foreach(hash) do |key, val|
       if val.is_a?(String)

data/lib/knj/gtk2_cb.rb

@@ -1,43 +1,41 @@
 module Knj::Gtk2::Cb
+  #This method can be used to invoke autoloading of this file.
   def self.init(paras)
     return paras["cb"].init(paras["items"])
   end
   
+  #This method can be used to invoke autoloading of this file.
   def self.sel(cb)
     return cb.sel
   end
 end
 
 class Gtk::ComboBox
+  #Shortcut to initialize a combobox with items (or models).
   def init(items)
     @knj = {
       :items => []
     }
     
-    ls = Gtk::ListStore.new(String, String)
+    @ls = Gtk::ListStore.new(String, String)
     cr = Gtk::CellRendererText.new
     self.pack_start(cr, false)
     self.add_attribute(cr, "text", 0)
     
     if items.is_a?(Array)
       items.each do |appendob|
-        iter = ls.append
-        
         if appendob.is_a?(String)
+          iter = @ls.append
           iter[0] = appendob
         elsif appendob.respond_to?(:is_knj?)
-          iter[0] = appendob.title
-          @knj[:items] << {
-            :iter => iter,
-            :object => appendob
-          }
+          self.append_model(:model => appendob)
         end
       end
     elsif items.is_a?(Hash)
       @knj[:type] = :hash
       
       items.each do |key, val|
-        iter = ls.append
+        iter = @ls.append
         iter[0] = val
         
         @knj[:items] << {
@@ -49,10 +47,32 @@ class Gtk::ComboBox
       raise "Unsupported type: '#{items.class.name}'."
     end
     
-    self.model = ls
+    self.model = @ls
     self.active = 0
   end
   
+  #Appens a model to the list-store.
+  def append_model(args)
+    iter = @ls.append
+    appendob = args[:model]
+    
+    if appendob.respond_to?(:name)
+      iter[0] = appendob.name
+    elsif appendob.respond_to?(:title)
+      iter[0] = appendob.title
+    else
+      raise "Could not figure out of the name of the object."
+    end
+    
+    @knj[:items] << {
+      :iter => iter,
+      :object => appendob
+    }
+    
+    return {}
+  end
+  
+  #Returns the active item (or model) for the combobox.
   def sel
     iter = self.active_iter
     
@@ -72,6 +92,7 @@ class Gtk::ComboBox
     end
   end
   
+  #Sets the active element (or model) in the combobox.
   def sel=(actob)
     if actob.respond_to?(:is_knj?)
       @knj[:items].each do |item|
@@ -100,4 +121,24 @@ class Gtk::ComboBox
     
     raise "Could not find such a row: '#{actob}'."
   end
+  
+  #Resorts all items in the list-store. If an item doesnt have an ID, then that item will be put first (for 'Choose', 'All' and such options).
+  def resort
+    @ls.set_sort_column_id(0)
+    @ls.set_sort_func(0, &lambda{|iter1, iter2|
+      item_id_1 = iter1[1].to_i
+      item_id_2 = iter2[1].to_i
+      
+      item_name_1 = iter1[0].to_s.downcase
+      item_name_2 = iter2[0].to_s.downcase
+      
+      if item_id_1 == 0
+        return -1
+      elsif item_id_2 == 0
+        return 1
+      else
+        return item_name_1 <=> item_name_2
+      end
+    })
+  end
 end

data/lib/knj/objects.rb

@@ -149,11 +149,21 @@ class Knj::Objects
   
   #Unconnects a connect by 'object' and 'conn_id'.
   def unconnect(args)
-    raise "No object given." if !args["object"]
-    raise "No conn-ID given." if !args["conn_id"]
-    raise "Object doesnt exist: '#{args["object"]}'." if !@callbacks.key?(args["object"].to_sym)
-    raise "Conn ID doest exist: '#{args["conn_id"]}'." if !@callbacks[args["object"].to_sym].key?(args["conn_id"])
-    @callbacks[args["object"].to_sym].delete(args["conn_id"])
+    raise ArgumentError, "No object given." if !args["object"]
+    raise ArgumentError, "Object doesnt exist: '#{args["object"]}'." if !@callbacks.key?(args["object"].to_sym)
+    
+    if args["conn_id"]
+      conn_ids = [args["conn_id"]]
+    elsif args["conn_ids"]
+      conn_ids = args["conn_ids"]
+    else
+      raise ArgumentError, "Could not figure out connection IDs."
+    end
+    
+    conn_ids.each do |conn_id|
+      raise Errno::ENOENT, "Conn ID doest exist: '#{conn_id}' (#{args})." if !@callbacks[args["object"].to_sym].key?(conn_id)
+      @callbacks[args["object"].to_sym].delete(conn_id)
+    end
   end
   
   #This method is used to call the connected callbacks for an event.

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.92
+  version: 0.0.93
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-03 00:00:00 +02:00
-default_executable: 
+date: 2012-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wref
@@ -378,7 +377,6 @@ files:
 - spec/strings_spec.rb
 - spec/web_spec.rb
 - testfiles/image.jpg
-has_rdoc: true
 homepage: http://github.com/kaspernj/knjrbfw
 licenses: 
 - MIT
@@ -392,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -538892594692910848
+      hash: -3932683874553081
       segments: 
       - 0
       version: "0"
@@ -405,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A framework with lots of stuff for Ruby.