knjappserver 0.0.21 → 0.0.22

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/bin/check_running.rb

@@ -51,9 +51,8 @@ end
 
 require "#{options[:knjrbfw_path]}knjrbfw"
 require "knj/autoload"
-require "tmpdir"
 
-tmpdir = "#{Dir.tmpdir}/knjappserver"
+tmpdir = "#{Knj::Os.tmpdir}/knjappserver"
 tmppath = "#{tmpdir}/run_#{options[:title]}"
 count = 0
 

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-04-26}
+  s.date = %q{2012-05-03}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]

data/lib/include/class_httpsession.rb

@@ -1,6 +1,6 @@
 class Knjappserver::Httpsession
   attr_accessor :data, :alert_sent
-  attr_reader :get, :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
+  attr_reader :cookie, :get, :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
   
   dir = File.dirname(__FILE__)
   

data/lib/include/class_knjappserver_web.rb

@@ -92,6 +92,7 @@ class Knjappserver
     return Knj::Locales.number_out(*args)
   end
   
+  #Hashes with numeric keys will be turned into arrays instead. This is not done automatically because it can wrongly corrupt data if not used correctly.
   def get_parse_arrays(arg = nil, ob = nil)
     arg = _get.clone if !arg
     

data/lib/include/class_log.rb

@@ -18,6 +18,7 @@ class Knjappserver::Log < Knj::Datarow
 			"
 		end
 		
+		return_sql = false
 		sql << " WHERE 1=1"
 		
 		ret = list_helper(d)
@@ -25,6 +26,8 @@ class Knjappserver::Log < Knj::Datarow
 			case key
 				when "object_lookup"
           sql << " AND Log_link.id IS NOT NULL"
+        when "return_sql"
+          return_sql = true
         when "tag"
           data_val = d.ob.get_by(:Log_data_value, {"value" => val})
           if !data_val
@@ -41,6 +44,8 @@ class Knjappserver::Log < Knj::Datarow
 		sql << ret[:sql_order]
 		sql << ret[:sql_limit]
 		
+		return sql if return_sql
+		
 		return d.ob.list_bysql(:Log, sql, &block)
 	end
 	

data/spec/knjappserver_spec.rb

@@ -5,10 +5,9 @@ describe "Knjappserver" do
     require "rubygems"
     require "knjappserver"
     require "knjrbfw"
-    require "tmpdir"
     require "knj/autoload"
     
-    db_path = "#{Dir.tmpdir}/knjappserver_rspec.sqlite3"
+    db_path = "#{Knj::Os.tmpdir}/knjappserver_rspec.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
     
     require "knj/knjdb/libknjdb.rb"

data/spec/leakproxy_spec.rb

@@ -5,10 +5,9 @@ describe "Knjappserver" do
     require "rubygems"
     require "knjappserver"
     require "knjrbfw"
-    require "tmpdir"
     require "knj/autoload"
     
-    db_path = "#{Dir.tmpdir}/knjappserver_rspec.sqlite3"
+    db_path = "#{Knj::Os.tmpdir}/knjappserver_rspec.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
     
     require "knj/knjdb/libknjdb.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 +02:00
+date: 2012-05-03 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &10828140 !ruby/object:Gem::Requirement
+  requirement: &16549300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10828140
+  version_requirements: *16549300
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &10827060 !ruby/object:Gem::Requirement
+  requirement: &16547440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10827060
+  version_requirements: *16547440
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &10826360 !ruby/object:Gem::Requirement
+  requirement: &16546360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10826360
+  version_requirements: *16546360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10825400 !ruby/object:Gem::Requirement
+  requirement: &16542740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *10825400
+  version_requirements: *16542740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10824260 !ruby/object:Gem::Requirement
+  requirement: &16525460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10824260
+  version_requirements: *16525460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10822320 !ruby/object:Gem::Requirement
+  requirement: &16523980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *10822320
+  version_requirements: *16523980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &10821260 !ruby/object:Gem::Requirement
+  requirement: &16522600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10821260
+  version_requirements: *16522600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10820300 !ruby/object:Gem::Requirement
+  requirement: &16521620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10820300
+  version_requirements: *16521620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10819440 !ruby/object:Gem::Requirement
+  requirement: &16520740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10819440
+  version_requirements: *16520740
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1162266061337157012
+      hash: 2394284405486771539
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: