knjrbfw 0.0.7 → 0.0.8

data/lib/knj/webscripts/image.rhtml

@@ -1,5 +1,5 @@
 <%
-	idstr = Knj::Php.md5("#{_get["path"]}_#{_get["smartsize"].to_i}_#{_get["width"].to_i}_#{_get["height"].to_i}_#{_get["maxwidth"].to_i}_#{_get["maxheight"].to_i}")
+	idstr = Knj::Php.md5("#{_get["path"]}_#{_get["smartsize"].to_i}_#{_get["width"].to_i}_#{_get["height"].to_i}_#{_get["maxwidth"].to_i}_#{_get["maxheight"].to_i}_#{_get["rounded_corners"].to_i}_#{_get["border"].to_i}_#{_get["border_color"]}")
 	
 	tmp_use = false
 	tmp_write = false
@@ -19,8 +19,15 @@
 		end
 	end
 	
+	if !_get["path"] or !File.exists?(_get["path"])
+    print "File does not exist: '#{_get["path"]}'.\n"
+    exit
+  end
+	
 	if !tmp_use or tmp_write or _get["force"].to_i > 0
-		pic = Magick::ImageList.new(_get["path"])
+    pic = Magick::Image.read(_get["path"]).first
+    pic.format = "png"
+    
 		width = pic.columns
 		height = pic.rows
 		
@@ -64,7 +71,17 @@
 			pic = pic.resize_to_fit(width.to_i, height.to_i)
 		end
 		
-		pic.format = "png"
+		if _get["rounded_corners"]
+      args = {:img => pic, :radius => _get["rounded_corners"].to_i}
+      
+      if _get["border"] and _get["border_color"]
+        args[:border] = _get["border"].to_i
+        args[:border_color] = _get["border_color"]
+      end
+      
+      Knj::Image.rounded_corners(args)
+    end
+		
 		blob_cont = pic.to_blob
 	end
 	
@@ -73,9 +90,11 @@
 	end
 	
 	if tmp_use
+    Knj::Php.header("Last-Modified: #{time_orig.httpdate} GMT") if time_orig
 		Knj::Php.header("Content-Type: image/png")
 		print File.read(tmp_path)
 	else
+    Knj::Php.header("Last-Modified: #{time_orig.httpdate} GMT") if time_orig
 		Knj::Php.header("Content-Type: image/png")
 		print blob_cont
 	end

data/lib/knj/x11vnc.rb

@@ -4,10 +4,10 @@ class Knj::X11VNC
 		@open = true
 		
 		cmd = "x11vnc -q"
-		cmd += " -shared" if @args[:shared] or !@args.has_key?(:shared)
-		cmd += " -forever" if @args[:forever] or !@args.has_key?(:forever)
+		cmd += " -shared" if @args[:shared] or !@args.key?(:shared)
+		cmd += " -forever" if @args[:forever] or !@args.key?(:forever)
 		cmd += " -rfbport #{@args[:port]}" if @args[:port]
-		cmd += " -nolookup" if @args[:nolookup] or !@args.has_key?(:nolookup)
+		cmd += " -nolookup" if @args[:nolookup] or !@args.key?(:nolookup)
 		
 		print cmd + "\n"
 		

data/spec/amixer_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Amixer" do
+  it "should load by using autoload" do
+    require "knjrbfw"
+    require "knj/autoload"
+    
+    $amixer = Knj::Amixer.new
+  end
+  
+  it "should register various devices" do
+    $devices = $amixer.devices
+  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
+        end
+      end
+    end
+  end
+end

data/spec/knjrbfw_spec.rb

@@ -81,9 +81,34 @@ describe "Knjrbfw" do
     raise "Registered nullstamp on valid date." if Knj::Datet.is_nullstamp?("1985-06-17 10:30:00")
     
     date = Knj::Datet.in("2011-07-09 13:05:04 +0200")
-    if date.time.localtime.to_s != "2011-07-09 15:05:04 +0200"
-      raise "Datet didnt return expected result: '#{date.time.localtime}'."
+    ltime = date.localtime_str
+    
+    #if RUBY_VERSION.slice(0, 3) == "1.9"
+    #  if ltime != date.time.localtime
+    #    raise "Calculated localtime (#{ltime}) was not the same as the real Time-localtime (#{date.time.localtime})."
+    #  end
+    #end
+    
+    if ltime != "2011-07-09 13:05:04 +0200"
+      raise "Datet didnt return expected result: '#{ltime}'."
+    end
+  end
+  
+  it "should be able to compare dates" do
+    date1 = Knj::Datet.in("17/06 1985")
+    date2 = Knj::Datet.in("18/06 1985")
+    date3 = Knj::Datet.in("17/06 1985")
+    
+    raise "Date1 was wrongly higher than date2." if date1 > date2
+    
+    if date2 > date1
+      #do nothing.
+    else
+      raise "Date2 was wrongly not higher than date1."
     end
+    
+    raise "Date1 was wrongly not the same as date3." if date1 != date3
+    raise "Date1 was the same as date2?" if date1 == date2
   end
   
   it "should be able to automatic generate methods on datarow-classes (has_many, has_one)." do
@@ -203,16 +228,6 @@ describe "Knjrbfw" do
     raise "Unexpected result from ArrayExt." if res != "'1','2','3'"
   end
   
-  it "should be able to generate valid SQL based on arrays." do
-    ret = $ob.sqlhelper({
-      "test_col" => [1, 2, 3]
-    },{
-      :cols_str => ["test_col"]
-    })
-    
-    raise "Unexpected SQL for generating based on array: '#{ret[:sql_where]}'" if ret[:sql_where] != " AND `test_col` IN ('1','2','3')"
-  end
-  
   it "should be able to execute various forms of Web.input methods." do
     html = Knj::Web.inputs([{
       :title => "Test 1",
@@ -267,6 +282,48 @@ describe "Knjrbfw" do
     end
   end
   
+  it "should be able to properly parse 'Set-Cookie' headers." do
+    data = Knj::Web.parse_set_cookies("TestCookie=TestValue+; Expires=Fri, 05 Aug 2011 10:58:17 GMT; Path=\n")
+    
+    raise "No data returned?" if !data or !data.respond_to?(:length)
+    raise "Wrong number of cookies returned: '#{data.length}'." if data.length != 1
+    
+    raise "Unexpected name: '#{data[0]["name"]}'." if data[0]["name"] != "TestCookie"
+    raise "Unexpected value: '#{data[0]["value"]}'." if data[0]["value"] != "TestValue "
+    raise "Unexpected path: '#{data[0]["path"]}'." if data[0]["path"] != ""
+    raise "Unexpected expire:' #{data[0]["expire"]}'." if data[0]["expires"] != "Fri, 05 Aug 2011 10:58:17 GMT"
+  end
+  
+  it "should be able to draw rounded transparent corners on images." do
+    pic = Magick::Image.read("#{File.dirname(__FILE__)}/../testfiles/image.jpg").first
+    pic.format = "png"
+    
+    Knj::Image.rounded_corners(
+      :img => pic,
+      :radius => 10
+    )
+    
+    blob_cont = pic.to_blob
+  end
+  
+  it "should be possible to use Strings.html_links-method." do
+    teststr = "This is a test. http://www.google.com This is a test."
+    
+    
+    #Test normal usage.
+    test1 = Knj::Strings.html_links(teststr)
+    raise "Unexpected string: '#{teststr}'" if test1 != "This is a test. <a href=\"http://www.google.com\">http://www.google.com</a> This is a test."
+    
+    
+    #Test with a block.
+    test2 = Knj::Strings.html_links(teststr) do |data|
+      data[:str].gsub(data[:match][0], "TEST")
+    end
+    
+    raise "Unexpected string: '#{test2}'." if test2 != "This is a test. TEST This is a test."
+  end
+  
+=begin
   it "should be able to use Knj::Mutexcl with advanced arguments." do
     mutex = Knj::Mutexcl.new(
       :modes => {
@@ -334,4 +391,5 @@ describe "Knjrbfw" do
     sleep 0.35
     raise "Count should be 4 but it wasnt: '#{$count}'." if $count != 4
   end
+=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000 +02:00
+date: 2011-11-15 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13561560 !ruby/object:Gem::Requirement
+  requirement: &20019120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *13561560
+  version_requirements: *20019120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13537480 !ruby/object:Gem::Requirement
+  requirement: &20018500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13537480
+  version_requirements: *20018500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13534260 !ruby/object:Gem::Requirement
+  requirement: &20017840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *13534260
+  version_requirements: *20017840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &13526740 !ruby/object:Gem::Requirement
+  requirement: &20017240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13526740
+  version_requirements: *20017240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &13524020 !ruby/object:Gem::Requirement
+  requirement: &20016640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13524020
+  version_requirements: *20016640
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &20016040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *20016040
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -78,13 +89,13 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - knjrbfw.gemspec
 - lib/knj/.gitignore
+- lib/knj/amixer.rb
 - lib/knj/arrayext.rb
 - lib/knj/autoload.rb
 - lib/knj/autoload/activesupport.rb
@@ -110,6 +121,7 @@ files:
 - lib/knj/autoload/twitter.rb
 - lib/knj/autoload/xmlsimple.rb
 - lib/knj/autoload/zip.rb
+- lib/knj/cmd_gen.rb
 - lib/knj/compiler.rb
 - lib/knj/cpufreq.rb
 - lib/knj/datarow.rb
@@ -132,6 +144,7 @@ files:
 - lib/knj/event_handler.rb
 - lib/knj/exchangerates.rb
 - lib/knj/ext/webrick.rb
+- lib/knj/facebook_connect.rb
 - lib/knj/filesystem.rb
 - lib/knj/fs/drivers/filesystem.rb
 - lib/knj/fs/drivers/ftp.rb
@@ -147,6 +160,8 @@ files:
 - lib/knj/gtk2_tv.rb
 - lib/knj/hash_methods.rb
 - lib/knj/http.rb
+- lib/knj/http2.rb
+- lib/knj/image.rb
 - lib/knj/includes/appserver_cli.rb
 - lib/knj/ip2location.rb
 - lib/knj/ironruby-gtk2/button.rb
@@ -266,6 +281,7 @@ files:
 - lib/knj/tests/compiler/compiler_test.rb
 - lib/knj/tests/compiler/compiler_test_file.rb
 - lib/knj/tests/test_degulesider.rb
+- lib/knj/tests/test_http2.rb
 - lib/knj/tests/test_mount.rb
 - lib/knj/tests/test_retry.rb
 - lib/knj/thread.rb
@@ -282,8 +298,10 @@ files:
 - lib/knj/x11vnc.rb
 - lib/knj/youtube.rb
 - lib/knjrbfw.rb
+- spec/amixer_spec.rb
 - spec/knjrbfw_spec.rb
 - spec/spec_helper.rb
+- testfiles/image.jpg
 has_rdoc: true
 homepage: http://github.com/kaspernj/knjrbfw
 licenses:
@@ -300,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3172684593992288463
+      hash: -3343804310231409804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,32 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.6.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.9.2)
-    rcov (0.9.9)
-    rcov (0.9.9-java)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    sqlite3 (1.3.3)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.3)
-  rcov
-  rspec (~> 2.3.0)
-  sqlite3