knjrbfw 0.0.103 → 0.0.104

data/Gemfile

@@ -18,4 +18,5 @@ group :development do
   gem "sqlite3" if RUBY_ENGINE != "jruby"
   gem "rmagick" if RUBY_ENGINE != "jruby"
   gem "rmagick4j" if RUBY_ENGINE == "jruby"
+  gem "array_enumerator"
 end

data/Gemfile.lock

@@ -1,8 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.21)
-    diff-lcs (1.2.1)
+    array_enumerator (0.0.3)
+    datet (0.0.25)
+    diff-lcs (1.2.2)
     git (1.2.5)
     http2 (0.0.13)
     jeweler (1.8.4)
@@ -11,32 +12,35 @@ GEM
       rake
       rdoc
     json (1.7.7)
-    php4r (0.0.3)
+    php4r (0.0.4)
       datet
       http2
-    rake (10.0.3)
-    rdoc (4.0.0)
+      string-strtr
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
     rmagick (2.13.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
+    rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     ruby_process (0.0.8)
       tsafe
       wref
     sqlite3 (1.3.7)
+    string-strtr (0.0.3)
     tsafe (0.0.11)
-    wref (0.0.5)
+    wref (0.0.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  array_enumerator
   bundler
   datet
   http2

data/VERSION

@@ -1 +1 @@
-0.0.103
+0.0.104

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "knjrbfw"
-  s.version = "0.0.103"
+  s.version = "0.0.104"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-03-04"
+  s.date = "2013-04-11"
   s.description = "Including stuff for HTTP, SSH and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -284,6 +284,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rmagick>, [">= 0"])
+      s.add_development_dependency(%q<array_enumerator>, [">= 0"])
     else
       s.add_dependency(%q<wref>, [">= 0"])
       s.add_dependency(%q<tsafe>, [">= 0"])
@@ -296,6 +297,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rmagick>, [">= 0"])
+      s.add_dependency(%q<array_enumerator>, [">= 0"])
     end
   else
     s.add_dependency(%q<wref>, [">= 0"])
@@ -309,6 +311,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rmagick>, [">= 0"])
+    s.add_dependency(%q<array_enumerator>, [">= 0"])
   end
 end
 

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

@@ -332,7 +332,7 @@ class KnjDB_mysql
             sql << ","
           end
           
-          sql << "'#{self.escape(val)}'"
+          sql << @knjdb.sqlval(val)
         end
       else
         hash.each do |key, val|
@@ -342,7 +342,7 @@ class KnjDB_mysql
             sql << ","
           end
           
-          sql << "'#{self.escape(val)}'"
+          sql << @knjdb.sqlval(val)
         end
       end
     end

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

@@ -113,6 +113,15 @@ class KnjDB_sqlite3::Tables::Table
     return @data[:maxlength]
   end
   
+  def reload
+    @data = @db.select("sqlite_master", {"type" => "table", "name" => self.name}, {"orderby" => "name"}).fetch
+  end
+  
+  def rows_count
+    data = @db.q("SELECT COUNT(*) AS count FROM `#{self.name}`").fetch
+    return data[:count].to_i
+  end
+  
   #Drops the table from the database.
   def drop
     raise "Cant drop native table: '#{self.name}'." if self.native?

data/lib/knj/knjdb/libknjdb.rb

@@ -264,7 +264,7 @@ class Knj::Db
         sql << "#{@sep_col}#{key}#{@sep_col}"
       end
       
-      sql << ")  VALUES ("
+      sql << ") VALUES ("
       
       first = true
       arr_insert.each do |key, value|
@@ -274,7 +274,7 @@ class Knj::Db
           sql << ", "
         end
         
-        sql << "#{@sep_val}#{@esc_driver.escape(value)}#{@sep_val}"
+        sql << self.sqlval(value)
       end
       
       sql << ")"
@@ -289,6 +289,23 @@ class Knj::Db
     end
   end
   
+  #Returns the correct SQL-value for the given value. If it is a number, then just the raw number as a string will be returned. nil's will be NULL and strings will have quotes and will be escaped.
+  def sqlval(val)
+    return @conn.sqlval(val) if @conn.respond_to?(:sqlval)
+    
+    if val.is_a?(Fixnum) or val.is_a?(Integer)
+      return val.to_s
+    elsif val == nil
+      return "NULL"
+    elsif val.is_a?(Date)
+      return "#{@sep_val}#{Datet.in(val).dbstr(:time => false)}#{@sep_val}"
+    elsif val.is_a?(Time) or val.is_a?(DateTime)
+      return "#{@sep_val}#{Datet.in(val).dbstr}#{@sep_val}"
+    else
+      return "#{@sep_val}#{self.escape(val)}#{@sep_val}"
+    end
+  end
+  
   #Simply and optimal insert multiple rows into a table in a single query. Uses the drivers functionality if supported or inserts each row manually.
   #
   #===Examples
@@ -362,6 +379,17 @@ class Knj::Db
     end
   end
   
+  #Checks if a given selector exists. If it does, updates it to match data. If not inserts the row.
+  def upsert(table, selector, data)
+    row = self.select(table, selector, "limit" => 1).fetch
+    
+    if row
+      self.update(table, data, row)
+    else
+      self.insert(table, selector.merge(data))
+    end
+  end
+  
   #Makes a select from the given arguments: table-name, where-terms and other arguments as limits and orders. Also takes a block to avoid raping of memory.
   def select(tablename, arr_terms = nil, args = nil, &block)
     #Set up vars.

data/lib/knj/os.rb

@@ -54,17 +54,18 @@ module Knj::Os
   # print "I like it better now." if Knj::Os.os == "linux"
   def self.os
     if ENV["OS"]
-      teststring = ENV["OS"].to_s
+      teststring = ENV["OS"].to_s.downcase
     elsif RUBY_PLATFORM
-      teststring = RUBY_PLATFORM.to_s
+      teststring = RUBY_PLATFORM.to_s.downcase
     end
     
-    if teststring.downcase.index("windows") != nil
+    if teststring.include?("windows")
       return "windows"
-    elsif teststring.downcase.index("linux") != nil
+    elsif teststring.include?("linux")
       return "linux"
+    elsif teststring.include?("darwin")
     else
-      raise "Could not figure out OS."
+      raise "Could not figure out OS: '#{teststring}'."
     end
   end
   
@@ -221,6 +222,11 @@ module Knj::Os
   def self.executed_executable
     return ENV["rvm_ruby_string"] if !ENV["rvm_ruby_string"].to_s.empty?
     
+    if ENV["MY_RUBY_HOME"]
+      ruby_bin_path = "#{ENV["MY_RUBY_HOME"]}/bin/ruby"
+      return ruby_bin_path if File.exists?(ruby_bin_path)
+    end
+    
     #Try to look the executeable up by command.
     if self.os == "linux"
       unix_proc = Knj::Unix_proc.find_self
@@ -235,6 +241,8 @@ module Knj::Os
       end
     end
     
+    puts ENV.to_hash
+    
     raise "Could not figure out the executed executable."
   end
 end

data/spec/amixer_spec.rb

@@ -2,24 +2,29 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Amixer" do
   it "should load by using autoload" do
-    require "knjrbfw"
-    
-    $amixer = Knj::Amixer.new
+    if Knj::Os.os == "linux"
+      require "knjrbfw"
+      $amixer = Knj::Amixer.new
+    end
   end
   
   it "should register various devices" do
-    $devices = $amixer.devices
+    if Knj::Os.os == "linux"
+      $devices = $amixer.devices
+    end
   end
   
   it "should register various mixers and do various operations on them" do
-    $devices.each do |name, device|
-      mixers = device.mixers
-      
-      if device.active?(:stream => "PLAYBACK")
-        mixers.each do |name, mixer|
-          next if !mixer.volume?
-          mixer.vol_add -5
-          mixer.vol_add 3
+    if Knj::Os.os == "linux"
+      $devices.each do |name, device|
+        mixers = device.mixers
+        
+        if device.active?(:stream => "PLAYBACK")
+          mixers.each do |name, mixer|
+            next if !mixer.volume?
+            mixer.vol_add -5
+            mixer.vol_add 3
+          end
         end
       end
     end

data/spec/db_spec.rb

@@ -42,7 +42,9 @@ describe "Db" do
         "test_table" => {
           "columns" => [
             {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
-            {"name" => "name", "type" => "varchar"}
+            {"name" => "name", "type" => "varchar"},
+            {"name" => "age", "type" => "int"},
+            {"name" => "nickname", "type" => "varchar"}
           ],
           "indexes" => [
             "name"
@@ -98,6 +100,25 @@ describe "Db" do
     raise "Block with should have ran too little: #{block_ran}." if block_ran < rows_count
     
     
+    #Test upserting.
+    data = {:name => "Kasper Johansen"}
+    sel = {:nickname => "kaspernj"}
+    
+    table = db.tables[:test_table]
+    table.reload
+    rows_count = table.rows_count
+    
+    db.upsert(:test_table, sel, data)
+    
+    table.reload
+    table.rows_count.should eql(rows_count + 1)
+    
+    db.upsert(:test_table, sel, data)
+    
+    table.reload
+    table.rows_count.should eql(rows_count + 1)
+    
+    
     #Test dumping.
     dump = Knj::Db::Dump.new(:db => db, :debug => false)
     str_io = StringIO.new
@@ -159,4 +180,27 @@ describe "Db" do
     #Delete test-database if everything went well.
     File.unlink(db_path) if File.exists?(db_path)
   end
+  
+  it "should generate proper sql" do
+    require "knj/db"
+    require "knj/os"
+    require "rubygems"
+    require "sqlite3" if !Kernel.const_defined?("SQLite3") and RUBY_ENGINE != "jruby"
+    
+    db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
+    File.unlink(db_path) if File.exists?(db_path)
+    
+    db = Knj::Db.new(
+      :type => "sqlite3",
+      :path => db_path,
+      :return_keys => "symbols",
+      :index_append_table_name => true
+    )
+    
+    time = Time.new(1985, 6, 17, 10, 30)
+    db.insert(:test, {:date => time}, :return_sql => true).should eql("INSERT INTO `test` (`date`) VALUES ('1985-06-17 10:30:00')")
+    
+    date = Date.new(1985, 6, 17)
+    db.insert(:test, {:date => date}, :return_sql => true).should eql("INSERT INTO `test` (`date`) VALUES ('1985-06-17')")
+  end
 end

data/spec/objects_spec.rb

@@ -2,7 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Objects" do
   it "should be able to cache rows" do
-    require "#{File.dirname(__FILE__)}/../../array_enumerator/lib/array_enumerator"
+    begin
+      require "#{File.dirname(__FILE__)}/../../array_enumerator/lib/array_enumerator"
+    rescue LoadError
+      require "array_enumerator"
+    end
+    
     require "sqlite3" if RUBY_ENGINE != "jruby"
     
     $db_path = "#{Knj::Os.tmpdir}/knjrbfw_objects_cache_test.sqlite3"

data/spec/process_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+require "socket"
+
 describe "Process" do
   it "should be able to start a server and a client" do
     require "timeout"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.103
+  version: 0.0.104
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wref
@@ -187,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: array_enumerator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -455,7 +471,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3060785805087232524
+      hash: -708484530570275600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: