knjrbfw 0.0.80 → 0.0.81

data/VERSION

@@ -1 +1 @@
-0.0.80
+0.0.81

data/knjrbfw.gemspec

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

data/lib/knj/objects/objects_sqlhelper.rb

@@ -206,7 +206,20 @@ class Knj::Objects
         key = realkey
       end
       
-      if args[:cols].key?(key)
+      if args.key?(:cols_bools) and args[:cols_bools].index(key) != nil
+        val_s = val.to_s
+        
+        if val_s == "1" or val_s == "true"
+          realval = "1"
+        elsif val_s == "0" or val_s == "false"
+          realval = "0"
+        else
+          raise "Could not make real value out of class: #{val.class.name} => #{val}."
+        end
+        
+        sql_where << " AND #{table}`#{db.esc_col(key)}` = '#{db.esc(realval)}'"
+        found = true
+      elsif args[:cols].key?(key)
         if val.is_a?(Array)
           if val.empty? and db.opts[:type].to_s == "mysql"
             sql_where << " AND false"
@@ -234,17 +247,6 @@ class Knj::Objects
           sql_where << " AND #{table}`#{db.esc_col(key)}` = '#{db.esc(val)}'"
         end
         
-        found = true
-      elsif args.key?(:cols_bools) and args[:cols_bools].index(key) != nil
-        if val.is_a?(TrueClass) or (val.is_a?(Integer) and val.to_i == 1) or (val.is_a?(String) and (val == "true" or val == "1"))
-          realval = "1"
-        elsif val.is_a?(FalseClass) or (val.is_a?(Integer) and val.to_i == 0) or (val.is_a?(String) and (val == "false" or val == "0"))
-          realval = "0"
-        else
-          raise "Could not make real value out of class: #{val.class.name} => #{val}."
-        end
-        
-        sql_where << " AND #{table}`#{db.esc_col(key)}` = '#{db.esc(realval)}'"
         found = true
       elsif key.to_s == "limit_from"
         limit_from = val.to_i

data/lib/knj/table_writer.rb

@@ -20,7 +20,7 @@ class Knj::Table_writer
     elsif @args["format"] == "excel2007"
       require "php_process"
       
-      @php = Php_process.new
+      @php = Php_process.new if !Kernel.const_defined?(:Php_process)
       @php.func("require_once", "PHPExcel.php")
       
       if @args["date_format"]

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-08 00:00:00 +02:00
+date: 2012-08-10 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: -3889913433613768246
+      hash: -494812604107398775
       segments: 
       - 0
       version: "0"