knjrbfw 0.0.49 → 0.0.50

data/VERSION

@@ -1 +1 @@
-0.0.49
+0.0.50

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.49"
+  s.version = "0.0.50"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-18}
+  s.date = %q{2012-06-25}
   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

@@ -246,4 +246,84 @@ module Knj::ArrayExt
     
     return nil
   end
+  
+  #Returns a powerset of the given array. Copied from 'http://mikeburnscoder.wordpress.com/2009/05/30/powerset-in-ruby-using-the-list-monad/'.
+  #===Examples
+  # ps = Knj::ArrayExt.powerset(:arr => [1, 2 , 3, 4])
+  # ps.length #=> 16
+  def self.powerset(args)
+    arr = args[:arr]
+    raise "No array was given." if !arr
+    
+    if block_given?
+      if arr.length == 0
+        yield []
+      else
+        Knj::ArrayExt.powerset(:arr => arr[0..-2]) do |set|
+          yield set
+          yield set + [arr[-1]]
+        end
+      end
+      
+      arr
+    else
+      Enumerator.new do |sets|
+        Knj::ArrayExt.powerset(:arr => arr) do |set|
+          sets << set
+        end
+      end
+    end
+  end
+  
+  #Divides an array based on callback.
+  #===Examples
+  # arr = [1, 2, 3, 4, 6, 7, 8, 9, 15, 16, 17, 18]
+  # res = Knj::ArrayExt.divide(:arr => arr) do |a, b|
+  #   if (b - a) > 1
+  #     false
+  #   else
+  #     true
+  #   end
+  # end
+  # 
+  # res.length #=> 3
+  def self.divide(args)
+    prev_ele = args[:arr].shift
+    chunk = [prev_ele]
+    ret = [] if !args[:callback]
+    
+    args[:arr].each do |ele|
+      if !chunk
+        chunk = [ele]
+        prev_ele = ele
+        next
+      end
+      
+      if yield(prev_ele, ele)
+        chunk << ele
+      elsif callback = args[:callback]
+        callback.call(chunk)
+        chunk = nil
+      else
+        ret << chunk
+        chunk = nil
+      end
+      
+      prev_ele = ele
+    end
+    
+    if chunk and !chunk.empty?
+      if callback = args[:callback]
+        callback.call(chunk)
+      else
+        ret << chunk
+      end
+    end
+    
+    if args[:callback]
+      return nil
+    else
+      return ret
+    end
+  end
 end

data/lib/knj/gtk2_tv.rb

@@ -1,4 +1,8 @@
+#This module contains various helper-methods for handeling stuff regarding treeviews.
 module Knj::Gtk2::Tv
+  #Initializes a treeview with a model and a number of columns. Returns a hash containing various data like the renderers.
+  #===Examples
+  # Knj::Gtk2::Tv.init(treeview, ["ID", "Name"])
   def self.init(tv, columns)
     ret = {
       :renderers => []
@@ -62,6 +66,9 @@ module Knj::Gtk2::Tv
     return ret
   end
   
+  #Appends data to the treeview.
+  #===Examples
+  # Knj::Gtk2::Tv.append(treeview, [1, "Kasper"])
   def self.append(tv, data)
     iter = tv.model.append
     
@@ -86,6 +93,9 @@ module Knj::Gtk2::Tv
     return {:iter => iter}
   end
   
+  #Gets the selected data from the treeview.
+  #===Examples
+  # Knj::Gtk2::Tv.sel(treeview) #=> [1, "Kasper"]
   def self.sel(tv)
     selected = tv.selection.selected_rows
     
@@ -218,15 +228,19 @@ module Knj::Gtk2::Tv
   end
 end
 
+#Shortcuts on the actual treeview-objects.
 class Gtk::TreeView
+  #Shortcut to do Knj::Gtk2::Tv.sel(treeview)
   def sel
     return Knj::Gtk2::Tv.sel(self)
   end
   
+  #Shortcut to do Knj::Gtk2.append(treeview, [data1, data2])
   def append(data)
     return Knj::Gtk2::Tv.append(self, data)
   end
   
+  #Shortcut to do Knj::Gtk2.init(treeview, columns_array)
   def init(cols)
     return Knj::Gtk2::Tv.init(self, cols)
   end

data/lib/knj/objects/objects_sqlhelper.rb

@@ -310,7 +310,8 @@ class Knj::Objects
         end
         
         found = true
-      elsif args.key?(:cols_date) and match = key.match(/^(.+)_(day|week|month|year|from|to|below|above)$/) and args[:cols_date].index(match[1]) != nil
+      elsif args.key?(:cols_date) and match = key.match(/^(.+)_(day|week|month|year|from|to|below|above)(|_(not))$/) and args[:cols_date].index(match[1]) != nil
+        not_v = match[4]
         val = Knj::Datet.in(val) if val.is_a?(Time)
         
         if match[2] == "day"
@@ -325,19 +326,19 @@ class Knj::Objects
                 sql_where << " OR "
               end
               
-              sql_where << "DATE_FORMAT(#{table}`#{db.esc_col(match[1])}`, '%d %m %Y') = DATE_FORMAT('#{db.esc(realval.dbstr)}', '%d %m %Y')"
+              sql_where << " AND #{db.sqlspecs.strftime("%d %m %Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{db.sqlspecs.strftime("%d %m %Y", "'#{db.esc(realval.dbstr)}'")}"
             end
             
             sql_where << ")"
           else
-            sql_where << " AND DATE_FORMAT(#{table}`#{db.esc_col(match[1])}`, '%d %m %Y') = DATE_FORMAT('#{db.esc(val.dbstr)}', '%d %m %Y')"
+            sql_where << " AND #{db.sqlspecs.strftime("%d %m %Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{db.sqlspecs.strftime("%d %m %Y", "'#{db.esc(val.dbstr)}'")}"
           end
         elsif match[2] == "week"
-          sql_where << " AND #{db.sqlspecs.strftime("%W %Y", "#{table}`#{db.esc_col(match[1])}`")} = #{db.sqlspecs.strftime("%W %Y", "'#{db.esc(val.dbstr)}'")}"
+          sql_where << " AND #{db.sqlspecs.strftime("%W %Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{db.sqlspecs.strftime("%W %Y", "'#{db.esc(val.dbstr)}'")}"
         elsif match[2] == "month"
-          sql_where << " AND #{db.sqlspecs.strftime("%m %Y", "#{table}`#{db.esc_col(match[1])}`")} = #{db.sqlspecs.strftime("%m %Y", "'#{db.esc(val.dbstr)}'")}"
+          sql_where << " AND #{db.sqlspecs.strftime("%m %Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{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')"
+          sql_where << " AND #{db.sqlspecs.strftime("%Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{db.sqlspecs.strftime("%Y", "'#{db.esc(val.dbstr)}'")}"
         elsif match[2] == "from" or match[2] == "above"
           sql_where << " AND #{table}`#{db.esc_col(match[1])}` >= '#{db.esc(val.dbstr)}'"
         elsif match[2] == "to" or match[2] == "below"
@@ -481,4 +482,12 @@ class Knj::Objects
     
     return datarow_argument
   end
+  
+  def not(not_v, val)
+    if not_v == "not" or not_v == "not_"
+      return val
+    end
+    
+    return ""
+  end
 end

data/spec/arrayext_spec.rb

@@ -1,6 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "ArrayExt" do
+  it "should be able to do powersets" do
+    ps = Knj::ArrayExt.powerset(:arr => [1, 2, 3, 4]).to_a
+    raise "Expected length of 16 but it wasnt: #{ps.length}" if ps.length != 16
+    
+    ite = 0
+    Knj::ArrayExt.powerset(:arr => [1, 2, 3, 4]) do |arr|
+      ite += 1
+    end
+    
+    raise "Expected block to be executed 16 times but it wasnt: #{ite}" if ite != 16
+  end
+  
+  it "should be able to divide arrays" do
+    arr = [1, 2, 3, 4, 6, 7, 8, 9, 15, 16, 17, 18]
+    res = Knj::ArrayExt.divide(:arr => arr) do |a, b|
+      if (b - a) > 1
+        false
+      else
+        true
+      end
+    end
+    
+    raise "Expected length of 3 but it wasnt: #{res.length}" if res.length != 3
+    raise "Expected length of 4 but it wasnt: #{res[0].length}" if res[0].length != 4
+    raise "Expected length of 3 but it wasnt: #{res[1].length}" if res[1].length != 3
+    raise "Expected length of 3 but it wasnt: #{res[2].length}" if res[2].length != 3
+  end
+  
   it "should be able to make ago-strings" do
     arr = [1, 2]
     Knj::ArrayExt.force_no_cols(:arr => arr, :no => 1)

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 +02:00
+date: 2012-06-25 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: 4237675880439105833
+      hash: 499014487481488360
       segments: 
       - 0
       version: "0"