knjrbfw 0.0.59 → 0.0.62

data/lib/knj/table_writer.rb

@@ -1,13 +1,16 @@
 class Knj::Table_writer
   def initialize(args = {})
     @args = args
-    
-    if !@args["filepath"]
-      raise "No filepath was given."
-    end
+    raise "No filepath was given." if @args["filepath"].to_s.empty?
     
     if @args["format"] == "csv"
-      @fp = File.open(@args["filepath"], "w")
+      if @args["encoding"]
+        encoding = @args["encoding"]
+      else
+        encoding = "utf-8"
+      end
+      
+      @fp = File.open(@args["filepath"], "w", :encoding => encoding)
     elsif @args["format"] == "excel5"
       require "spreadsheet"
       
@@ -89,7 +92,7 @@ class Knj::Table_writer
           @sheet.setCellValue(colval, val["value"])
           @sheet.getStyle(colval).getNumberFormat.setFormatCode("#,##0.00")
         elsif val.is_a?(Hash) and val["type"] == "date"
-          datet = Knj::Datet.in(val["value"])
+          datet = Datet.in(val["value"])
           datet.days + 1
           
           date_val = @php.static("PHPExcel_Shared_Date", "PHPToExcel", datet.to_i)

data/lib/knj/tests/test_http2.rb

@@ -5,14 +5,14 @@ require "../../knjrbfw.rb"
 
 require "../autoload"
 
-http = Knj::Http2.new(:host => "www.partyworm.dk", :port => 80, :ssl => false)
-resp = http.get("/?show=frontpage")
-resp = http.get("/?show=login")
+http = Http2.new(:host => "www.partyworm.dk", :port => 80, :ssl => false)
+resp = http.get(:url => "/?show=frontpage")
+resp = http.get(:url => "/?show=login")
 
 #print "Wee!\n"
 #exit
 
-http = Knj::Http2.new(:host => "mexico.balance4u.com", :port => 443, :ssl => true)
-resp = http.get("/")
+http = Http2.new(:host => "mexico.balance4u.com", :port => 443, :ssl => true)
+resp = http.get(:url => "/")
 
 Knj::Php.print_r(http.cookies)

data/lib/knj/tests/test_http2_proxy.rb

@@ -5,7 +5,7 @@ require "knj/autoload"
 
 proxy_settings = Marshal.load(File.read("#{File.dirname(__FILE__)}/test_http2_proxy_settings.marshal"))
 
-http = Knj::Http2.new(
+http = Http2.new(
   :host => "www.partyworm.dk",
   :proxy => proxy_settings
 )
@@ -21,6 +21,6 @@ urls = ["robots.txt"]
 0.upto(105) do |count|
   url = urls[rand(urls.size)]
   print "Doing request #{count} of 200 (#{url}).\n"
-  res = http.get(url)
+  res = http.get(:url => url)
   raise "Body was empty." if res.body.to_s.length <= 0
 end

data/lib/knj/tests/test_retry.rb

@@ -7,7 +7,7 @@ count = 0
 result = Knj::Retry.try(
   :exit => false,
   :interrupt => true,
-  :errors => [Knj::Errors::NotFound, RuntimeError],
+  :errors => [Errno::ENOENT, RuntimeError],
   :timeout => 1,
   :tries => 3,
   :return_error => true

data/lib/knj/threadhandler.rb

@@ -3,7 +3,7 @@ class Knj::Threadhandler
   
   def initialize(args = {})
     require "#{$knjpath}errors"
-    require "tsafe"
+    require "tsafe" if !Kernel.const_defined?(:Tsafe)
     
     @args = args
     @objects = []

data/lib/knj/unix_proc.rb

@@ -1,5 +1,5 @@
 #Requires the 'wref'-gem.
-require "wref"
+require "wref" if !Kernel.const_defined?(:Wref)
 
 #This class handels various stuff regarding Unix-processes.
 class Knj::Unix_proc

data/lib/knj/web.rb

@@ -401,6 +401,13 @@ class Knj::Web
         html << "<select#{self.attr_html(attr)}>"
         html << Knj::Web.opts(args[:opts], value, args[:opts_args])
         html << "</select>"
+        
+        if args[:moveable]
+          html << "<div style=\"padding-top: 3px;\">"
+          html << "<input type=\"button\" value=\"#{_("Up")}\" onclick=\"select_moveup($('##{args[:id]}'));\" />"
+          html << "<input type=\"button\" value=\"#{_("Down")}\" onclick=\"select_movedown($('##{args[:id]}'));\" />"
+          html << "</div>"
+        end
       elsif args[:type] == :imageupload
         html << "<table class=\"designtable\"><tr#{classes_tr_html}><td style=\"width: 100%;\">"
         html << "<input type=\"file\" name=\"#{args[:name].html}\" class=\"input_file\" />"

data/spec/strings_spec.rb

@@ -14,7 +14,7 @@ describe "Strings" do
     begin
       regex = Knj::Strings.regex("/\d+/U")
       raise "Ruby doesnt support the U-modifier - an exception should be thrown!"
-    rescue Knj::Errors::InvalidData
+    rescue ArgumentError
       #this should happen - Ruby doesnt support U-modifier...
     end
     

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.59
+  version: 0.0.62
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 +02:00
+date: 2012-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,8 +36,30 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: datet
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: http2
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +67,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +89,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,10 +100,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +111,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rmagick
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,7 +122,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -156,7 +178,6 @@ files:
 - lib/knj/datarow.rb
 - lib/knj/datarow_custom.rb
 - lib/knj/datestamp.rb
-- lib/knj/datet.rb
 - lib/knj/db.rb
 - lib/knj/degulesider.rb
 - lib/knj/erb/apache_knjerb.conf
@@ -190,8 +211,6 @@ files:
 - lib/knj/gtk2_tv.rb
 - lib/knj/gtk2_window.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/includes/require_info.rb
@@ -353,10 +372,8 @@ files:
 - spec/amixer_spec.rb
 - spec/arrayext_spec.rb
 - spec/cmd_parser_spec.rb
-- spec/datet_spec.rb
 - spec/db_spec.rb
 - spec/db_spec_encoding_test_file.txt
-- spec/http2_spec.rb
 - spec/knjrbfw_spec.rb
 - spec/objects_spec.rb
 - spec/php_spec.rb
@@ -381,7 +398,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3172499843963479378
+      hash: -733667267458829383
       segments: 
       - 0
       version: "0"