knjrbfw 0.0.101 → 0.0.102

data/Gemfile

@@ -7,13 +7,14 @@ gem "tsafe"
 gem "datet"
 gem "http2"
 gem "php4r"
+gem "ruby_process"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.6.3"
+  gem "rspec"
+  gem "bundler"
+  gem "jeweler"
   gem "sqlite3" if RUBY_ENGINE != "jruby"
   gem "rmagick" if RUBY_ENGINE != "jruby"
   gem "rmagick4j" if RUBY_ENGINE == "jruby"

data/Gemfile.lock

@@ -1,28 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.20)
-    diff-lcs (1.1.3)
+    datet (0.0.21)
+    diff-lcs (1.2.1)
     git (1.2.5)
-    http2 (0.0.10)
-    jeweler (1.6.4)
+    http2 (0.0.13)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.7.7)
     php4r (0.0.3)
       datet
       http2
-    rake (0.9.2.2)
-    rmagick (2.13.1)
-    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.6)
+    rake (10.0.3)
+    rdoc (4.0.0)
+      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-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    ruby_process (0.0.8)
+      tsafe
+      wref
+    sqlite3 (1.3.7)
     tsafe (0.0.11)
     wref (0.0.5)
 
@@ -30,13 +37,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler
   datet
   http2
-  jeweler (~> 1.6.3)
+  jeweler
   php4r
   rmagick
-  rspec (~> 2.3.0)
+  rspec
+  ruby_process
   sqlite3
   tsafe
   wref

data/Rakefile

@@ -38,7 +38,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.101
+0.0.102

data/knjrbfw.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{knjrbfw}
-  s.version = "0.0.101"
+  s.name = "knjrbfw"
+  s.version = "0.0.102"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-10-12}
-  s.description = %q{Including stuff for HTTP, SSH and much more.}
-  s.email = %q{k@spernj.org}
+  s.date = "2013-03-03"
+  s.description = "Including stuff for HTTP, SSH and much more."
+  s.email = "k@spernj.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -61,7 +61,6 @@ Gem::Specification.new do |s|
     "lib/knj/csv.rb",
     "lib/knj/datarow.rb",
     "lib/knj/datarow_custom.rb",
-    "lib/knj/datestamp.rb",
     "lib/knj/db.rb",
     "lib/knj/degulesider.rb",
     "lib/knj/erb/apache_knjerb.conf",
@@ -263,11 +262,11 @@ Gem::Specification.new do |s|
     "spec/web_spec.rb",
     "testfiles/image.jpg"
   ]
-  s.homepage = %q{http://github.com/kaspernj/knjrbfw}
+  s.homepage = "http://github.com/kaspernj/knjrbfw"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A framework with lots of stuff for Ruby.}
+  s.rubygems_version = "1.8.25"
+  s.summary = "A framework with lots of stuff for Ruby."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -278,9 +277,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<http2>, [">= 0"])
       s.add_runtime_dependency(%q<php4r>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
+      s.add_runtime_dependency(%q<ruby_process>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rmagick>, [">= 0"])
     else
@@ -289,9 +289,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<http2>, [">= 0"])
       s.add_dependency(%q<php4r>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
+      s.add_dependency(%q<ruby_process>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rmagick>, [">= 0"])
     end
@@ -301,9 +302,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<http2>, [">= 0"])
     s.add_dependency(%q<php4r>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
+    s.add_dependency(%q<ruby_process>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rmagick>, [">= 0"])
   end

data/lib/knj/autoload/wref.rb

@@ -1,6 +1 @@
-begin
-  require "wref" if !Kernel.const_defined?(:Wref)
-rescue LoadError
-  require "rubygems"
-  require "wref" if !Kernel.const_defined?(:Wref)
-end
+Knj.gem_require(:Wref, :wref)

data/lib/knj/cmd_parser.rb

@@ -1,3 +1,5 @@
+Knj.gem_require(:Datet, :datet)
+
 #This class can help you parse results from command-line commands.
 class Knj::Cmd_parser
   #Parses the results of "ls -l".

data/lib/knj/datarow.rb

@@ -160,32 +160,7 @@ class Knj::Datarow
         where_args = nil
       end
       
-      define_method(methodname) do |*args, &block|
-        if args and args[0]
-          list_args = args[0] 
-        else
-          list_args = {}
-        end
-        
-        list_args.merge!(where_args) if where_args
-        list_args[colname.to_s] = self.id
-        
-        return self.class.ob.list(classname, list_args, &block)
-      end
-      
-      define_method("#{methodname}_count".to_sym) do |*args|
-        list_args = args[0] if args and args[0]
-        list_args = {} if !list_args
-        list_args[colname.to_s] = self.id
-        list_args["count"] = true
-        
-        return self.class.ob.list(classname, list_args)
-      end
-      
-      define_method("#{methodname}_last".to_sym) do |args|
-        args = {} if !args
-        return self.class.ob.list(classname, {"orderby" => [["id", "desc"]], "limit" => 1}.merge(args))
-      end
+      self.define_many_methods(classname, methodname, colname, where_args)
       
       self.joined_tables(
         classname => {
@@ -251,26 +226,7 @@ class Knj::Datarow
       
       methodname = classname.to_s.downcase if !methodname
       colname = "#{classname.to_s.downcase}_id".to_sym if !colname
-      
-      define_method(methodname) do
-        return self.class.ob.get_try(self, colname, classname)
-      end
-      
-      methodname_html = "#{methodname}_html".to_sym
-      define_method(methodname_html) do |*args|
-        obj = self.__send__(methodname)
-        return self.class.ob.events.call(:no_html, classname) if !obj
-        
-        raise "Class '#{classname}' does not have a 'html'-method." if !obj.respond_to?(:html)
-        return obj.html(*args)
-      end
-      
-      methodname_name = "#{methodname}_name".to_sym
-      define_method(methodname_name) do |*args|
-        obj = self.__send__(methodname)
-        return self.class.ob.events.call(:no_name, classname) if !obj
-        return obj.name(*args)
-      end
+      self.define_one_methods(classname, methodname, colname)
       
       self.joined_tables(
         classname => {
@@ -368,12 +324,13 @@ class Knj::Datarow
       sqlhelper_args[:table] = @table
       
       @db.tables[table].columns do |col_obj|
-        col_name = col_obj.name
+        col_name = col_obj.name.to_s
+        col_name_sym = col_name.to_sym
         col_type = col_obj.type
         col_type = :int if col_type == :bigint or col_type == :tinyint or col_type == :mediumint or col_type == :smallint
         sqlhelper_args[:cols][col_name] = true
         
-        self.define_bool_methods(:inst_methods => inst_methods, :col_name => col_name)
+        self.define_bool_methods(inst_methods, col_name)
         
         if col_type == :enum and col_obj.maxlength == "'0','1'"
           sqlhelper_args[:cols_bools] << col_name
@@ -385,19 +342,19 @@ class Knj::Datarow
           sqlhelper_args[:cols_str] << col_name
         elsif col_type == :date or col_type == :datetime
           sqlhelper_args[:cols_date] << col_name
-          self.define_date_methods(:inst_methods => inst_methods, :col_name => col_name)
+          self.define_date_methods(inst_methods, col_name_sym)
         end
         
         if col_type == :int or col_type == :decimal
-          self.define_numeric_methods(:inst_methods => inst_methods, :col_name => col_name)
+          self.define_numeric_methods(inst_methods, col_name_sym)
         end
         
         if col_type == :int or col_type == :varchar
-          self.define_text_methods(:inst_methods => inst_methods, :col_name => col_name)
+          self.define_text_methods(inst_methods, col_name_sym)
         end
         
         if col_type == :time
-          self.define_time_methods(:inst_methods => inst_methods, :col_name => col_name)
+          self.define_time_methods(inst_methods, col_name_sym)
         end
       end
       
@@ -801,46 +758,41 @@ class Knj::Datarow
   end
   
   #Defines the boolean-methods based on enum-columns.
-  def self.define_bool_methods(args)
+  def self.define_bool_methods(inst_methods, col_name)
     #Spawns a method on the class which returns true if the data is 1.
-    method_name = "#{args[:col_name]}?".to_sym
-    
-    if args[:inst_methods].index(method_name) == nil
-      define_method(method_name) do
-        return true if self[args[:col_name].to_sym].to_s == "1"
+    if !inst_methods.include?("#{col_name}?".to_sym)
+      define_method("#{col_name}?") do
+        return true if self[col_name.to_sym].to_s == "1"
         return false
       end
     end
   end
   
   #Defines date- and time-columns based on datetime- and date-columns.
-  def self.define_date_methods(args)
-    method_name = "#{args[:col_name]}_str".to_sym
-    if args[:inst_methods].index(method_name) == nil
-      define_method(method_name) do |*method_args|
-        if Datet.is_nullstamp?(self[args[:col_name].to_sym])
+  def self.define_date_methods(inst_methods, col_name)
+    if !inst_methods.include?("#{col_name}_str".to_sym)
+      define_method("#{col_name}_str") do |*method_args|
+        if Datet.is_nullstamp?(self[col_name])
           return self.class.ob.events.call(:no_date, self.class.name)
         end
         
-        return Datet.in(self[args[:col_name].to_sym]).out(*method_args)
+        return Datet.in(self[col_name]).out(*method_args)
       end
     end
     
-    method_name = "#{args[:col_name]}".to_sym
-    if args[:inst_methods].index(method_name) == nil
-      define_method(method_name) do |*method_args|
-        return false if Datet.is_nullstamp?(self[args[:col_name].to_sym])
-        return Datet.in(self[args[:col_name].to_sym])
+    if !inst_methods.include?(col_name)
+      define_method(col_name) do |*method_args|
+        return false if Datet.is_nullstamp?(self[col_name])
+        return Datet.in(self[col_name])
       end
     end
   end
   
   #Define various methods based on integer-columns.
-  def self.define_numeric_methods(args)
-    method_name = "#{args[:col_name]}_format"
-    if args[:inst_methods].index(method_name) == nil
-      define_method(method_name) do |*method_args|
-        return Knj::Locales.number_out(self[args[:col_name].to_sym], *method_args)
+  def self.define_numeric_methods(inst_methods, col_name)
+    if !inst_methods.include?("#{col_name}_format".to_sym)
+      define_method("#{col_name}_format") do |*method_args|
+        return Knj::Locales.number_out(self[col_name], *method_args)
       end
     end
   end
@@ -849,22 +801,73 @@ class Knj::Datarow
   #===Examples
   #  user = Models::User.by_username('John Doe')
   #  print user.id
-  def self.define_text_methods(args)
-    method_name = "by_#{args[:col_name]}".to_sym
-    if args[:inst_methods].index(method_name) == nil and RUBY_VERSION.to_s.slice(0, 3) != "1.8"
-      define_singleton_method(method_name) do |arg|
-        return self.class.ob.get_by(self.class.table, {args[:col_name].to_s => arg})
+  def self.define_text_methods(inst_methods, col_name)
+    if !inst_methods.include?("by_#{col_name}".to_sym) and RUBY_VERSION.to_s.slice(0, 3) != "1.8"
+      define_singleton_method("by_#{col_name}") do |arg|
+        return self.class.ob.get_by(self.class.table, {col_name.to_s => arg})
       end
     end
   end
   
   #Defines dbtime-methods based on time-columns.
-  def self.define_time_methods(args)
-    method_name = "#{args[:col_name]}_dbt"
-    if args[:inst_methods].index(method_name) == nil
-      define_method(method_name) do
-        return Knj::Db::Dbtime.new(self[args[:col_name].to_sym])
+  def self.define_time_methods(inst_methods, col_name)
+    if !inst_methods.include?("#{col_name}_dbt".to_sym)
+      define_method("#{col_name}_dbt") do
+        return Knj::Db::Dbtime.new(self[col_name.to_sym])
+      end
+    end
+  end
+  
+  #Memory friendly helper method that defines methods for 'has_many'.
+  def self.define_many_methods(classname, methodname, colname, where_args)
+    define_method(methodname) do |*args, &block|
+      if args and args[0]
+        list_args = args[0] 
+      else
+        list_args = {}
       end
+      
+      list_args.merge!(where_args) if where_args
+      list_args[colname.to_s] = self.id
+      
+      return self.class.ob.list(classname, list_args, &block)
+    end
+    
+    define_method("#{methodname}_count".to_sym) do |*args|
+      list_args = args[0] if args and args[0]
+      list_args = {} if !list_args
+      list_args[colname.to_s] = self.id
+      list_args["count"] = true
+      
+      return self.class.ob.list(classname, list_args)
+    end
+    
+    define_method("#{methodname}_last".to_sym) do |args|
+      args = {} if !args
+      return self.class.ob.list(classname, {"orderby" => [["id", "desc"]], "limit" => 1}.merge(args))
+    end
+  end
+  
+  #Memory friendly helper method that defines methods for 'has_one'.
+  def self.define_one_methods(classname, methodname, colname)
+    define_method(methodname) do
+      return self.class.ob.get_try(self, colname, classname)
+    end
+    
+    methodname_html = "#{methodname}_html".to_sym
+    define_method(methodname_html) do |*args|
+      obj = self.__send__(methodname)
+      return self.class.ob.events.call(:no_html, classname) if !obj
+      
+      raise "Class '#{classname}' does not have a 'html'-method." if !obj.respond_to?(:html)
+      return obj.html(*args)
+    end
+    
+    methodname_name = "#{methodname}_name".to_sym
+    define_method(methodname_name) do |*args|
+      obj = self.__send__(methodname)
+      return self.class.ob.events.call(:no_name, classname) if !obj
+      return obj.name(*args)
     end
   end
 end

data/lib/knj/eruby.rb

@@ -94,6 +94,8 @@ class Knj::Eruby
       @error = true
       self.handle_error(e)
     end
+    
+    return nil
   end
   
   #Destroyes this object unsetting all variables and clearing all cache.
@@ -109,6 +111,8 @@ class Knj::Eruby
     @connects = nil
     @headers = nil
     @cookies = nil
+    
+    return nil
   end
   
   #Returns various headers as one complete string ready to be used in a HTTP-request.
@@ -140,28 +144,33 @@ class Knj::Eruby
   #Resets all connections.
   def reset_connects
     @connects = {}
+    return nil
   end
   
   #Resets all headers.
   def reset_headers
     @headers = []
     @cookies = []
+    return nil
   end
   
   #Adds a new header to the list.
   def header(key, value)
     @headers << [key, value]
+    return nil
   end
   
   #Adds a new cookie to the list.
   def cookie(cookie_data)
     @cookies << cookie_data
+    return nil
   end
   
   #Connects a block to a certain event.
   def connect(signal, &block)
     @connects[signal] = [] if !@connects.key?(signal)
     @connects[signal] << block
+    return nil
   end
   
   def printcont(tmp_out, args = {})
@@ -183,6 +192,8 @@ class Knj::Eruby
         print tmp_out.read
       end
     end
+    
+    return nil
   end
   
   def load_return(filename, args = {})
@@ -221,6 +232,8 @@ class Knj::Eruby
       self.handle_error(e)
       self.printcont(tmp_out, args)
     end
+    
+    return nil
   end
   
   #This method will handle an error without crashing simply adding the error to the print-queue.
@@ -253,6 +266,8 @@ class Knj::Eruby
     end
     
     print "</pre>"
+    
+    return nil
   end
 end
 

data/lib/knj/google_sitemap.rb

@@ -10,30 +10,34 @@ class Knj::Google_sitemap
     require "time"
     
     #REXML is known to leak memory - use subprocess.
-    @subproc = Knj::Process_meta.new("id" => "google_sitemap", "debug_err" => true)
+    Knj.gem_require(:Ruby_process)
     
     begin
-      @subproc.static("Object", "require", "rexml/rexml")
-      @subproc.static("Object", "require", "rexml/document")
-      
-      @doc = @subproc.new("REXML::Document")
-      
-      xmldecl = @subproc.new("REXML::XMLDecl", "1.0", "UTF-8")
-      @doc._pm_send_noret("<<", xmldecl)
-      
-      urlset = @subproc.proxy_from_call(@doc, "add_element", "urlset")
-      urlset._pm_send_noret("add_attributes", {"xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9"})
-      
-      @root = @subproc.proxy_from_call(@doc, "root")
-      yield(self)
+      Ruby_process::Cproxy.run do |data|
+        @subproc = data[:subproc]
+        @subproc.static(:Object, :require, "rexml/rexml")
+        @subproc.static(:Object, :require, "rexml/document")
+        @subproc.static(:Object, :require, "rexml/element")
+        
+        @doc = @subproc.new("REXML::Document")
+        
+        xmldecl = @subproc.new("REXML::XMLDecl", "1.0", "UTF-8")
+        @doc << xmldecl
+        
+        urlset = @doc.add_element("urlset")
+        urlset.add_attributes("xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9")
+        
+        @root = @doc.root
+        yield(self)
+      end
     ensure
       @doc = nil
       @root = nil
-      @subproc.destroy
       @subproc = nil
     end
   end
   
+  #Adds a URL to the XML.
   def add_url(url_value, lastmod_value, cf_value = nil, priority_value = nil)
     if !lastmod_value or lastmod_value.to_i == 0
       raise sprintf("Invalid date: %1$s, url: %2$s", lastmod_value.to_s, url_value)
@@ -41,27 +45,27 @@ class Knj::Google_sitemap
     
     el = @subproc.new("REXML::Element", "url")
     
-    loc = @subproc.proxy_from_call(el, "add_element", "loc")
-    loc._pm_send_noret("text=", url_value)
+    loc = el.add_element("loc")
+    loc.text = url_value
     
-    lm = @subproc.proxy_from_call(el, "add_element", "lastmod")
+    lm = el.add_element("lastmod")
     if @args.key?(:date_min) and @args[:date_min] > lastmod_value
       lastmod_value = @args[:date_min]
     end
     
-    lm._pm_send_noret("text=", lastmod_value.iso8601)
+    lm.text = lastmod_value.iso8601
     
     if cf_value
-      cf = @subproc.proxy_from_call(el, "add_element", "changefreq")
-      cf._pm_send_noret("text=", cf_value)
+      cf = el.add_element("changefreq")
+      cf.text = cf_value
     end
     
     if priority_value
-      priority = @subproc.proxy_from_call("el", "add_element", "priority")
-      priority._pm_send_noret("text=", priority_value)
+      priority = el.add_element("priority")
+      priority.text = priority_value
     end
     
-    @root._pm_send_noret("<<", el)
+    @root << el
   end
   
   #This will return a non-human-readable XML-string.
@@ -75,24 +79,21 @@ class Knj::Google_sitemap
   end
   
   #This will print the result.
-  def write
+  def write(io = $stdout)
     #Require and spawn StringIO in the subprocess.
-    @subproc.static("Object", "require", "stringio")
-    string_io = @subproc.spawn_object("StringIO")
+    @subproc.static(:Object, :require, "stringio")
+    string_io = @subproc.new("StringIO")
     
     #We want a human-readable print.
-    writer = @subproc.spawn_object("REXML::Formatters::Pretty", 5)
-    writer._pm_send_noret("write", @doc, string_io)
+    writer = @subproc.new("REXML::Formatters::Pretty", 5)
+    writer.write(@doc, string_io)
     
     #Prepare printing by rewinding StringIO to read from beginning.
-    string_io._pm_send_noret("rewind")
-    
-    #Buffer results from subprocess in order to speed up printing.
-    string_io._process_meta_block_buffer_use = true
+    string_io.rewind
     
     #Print out the result in bits to avoid raping the memory (subprocess is already raped - no question there...).
-    string_io._pm_send_noret("each", 4096) do |str|
-      print str
+    string_io.each(4096) do |str|
+      io.print(str)
     end
   end
 end

data/lib/knj/gtk2_window.rb

@@ -1,6 +1,7 @@
+Knj.gem_require(:wref)
+
 #Containing various helper methods for Gtk2-windows.
 class Knj::Gtk2::Window
-  require "wref" if !Kernel.const_defined?(:Wref)
   @@uniques = Wref_map.new
   
   #Used to make a window-instance unique. If it already exists when unique! is called, then it will pass focus to the existing window instead of yielding the block, which should contain code to create the window.