knjrbfw 0.0.31 → 0.0.32

data/VERSION

@@ -1 +1 @@
-0.0.31
+0.0.32

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.31"
+  s.version = "0.0.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -260,6 +260,7 @@ Gem::Specification.new do |s|
     "spec/strings_spec.rb",
     "spec/threadsafe_spec.rb",
     "spec/web_spec.rb",
+    "spec/wref_spec.rb",
     "testfiles/image.jpg"
   ]
   s.homepage = %q{http://github.com/kaspernj/knjrbfw}

data/lib/knj/knj.rb

@@ -4,8 +4,10 @@ module Knj
   CONFIG = {}
   
   def self.const_missing(name)
-    if name == "db"
-      filepath = "#{$knjpath}/knjdb/libknjdb"
+    if name == :Db
+      filepath = "#{$knjpath}knjdb/libknjdb"
+    elsif name == :Wref_map
+      filepath = "#{$knjpath}wref"
     else
       filepath = "#{$knjpath}#{name.to_s.downcase}"
     end

data/lib/knj/process.rb

@@ -36,6 +36,9 @@ class Knj::Process
           else
             $stderr.print "Process error: #{str}"
           end
+          
+          #Try to break out of loop - the process has been destroyed.
+          break if (!@out_mutex and str.to_s.strip.length <= 0) or (@args and @args[:err] and @args[:err].closed?)
         end
       end
     end
@@ -67,10 +70,15 @@ class Knj::Process
   def listen
     loop do
       self.listen_loop
+      
+      #Break out if something is wrong.
+      break if !@out_mutex or (@in and @in.closed?) or (@out and @out.closed?)
     end
   end
   
   def listen_loop
+    $stderr.print "listen-loop called.\n" if @debug
+    
     str = @in.gets("\n")
     if str == nil
       raise "Socket closed." if @in.closed?
@@ -425,6 +433,7 @@ class Knj::Process
     self.kill_listen
     @err_thread.kill if @err_thread
     @out_answers = nil
+    @out_mutex = nil
   end
 end
 

data/lib/knj/process_meta.rb

@@ -383,6 +383,7 @@ class Knj::Process_meta
         raise e if e.message.index("No such process") == nil
       end
       
+      $stderr.print "Try to kill again...\n"
       retry
     end
     

data/lib/knj/table_writer.rb

@@ -14,6 +14,37 @@ class Knj::Table_writer
       @wb = Spreadsheet::Workbook.new
       @ws = @wb.create_worksheet
       @row = 0
+    elsif @args["format"] == "excel2007"
+      require "php_process"
+      
+      @php = Php_process.new
+      @php.func("require_once", "PHPExcel.php")
+      
+      if @args["date_format"]
+        @date_format_excel = args["date_format"].gsub("d", "dd").gsub("m", "mm").gsub("y", "yy").gsub("Y", "yyyy").gsub("-", '\\-')
+      end
+      
+      #Array used for identifiyng Excel-columns.
+      @colarr = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+      
+      #This greatly speeds up the process, since it minimizes the call to PHP by ~25%.
+      @date_cache = {}
+      
+      #Set cache-mode to cache-in-memory-gzip.
+      cache_gzip_const = @php.constant_val("PHPExcel_CachedObjectStorageFactory::cache_to_discISAM")
+      cosf = @php.static("PHPExcel_CachedObjectStorageFactory", "initialize", cache_gzip_const)
+      @php.static("PHPExcel_Settings", "setCacheStorageMethod", cosf)
+      
+      #Create PHPExcel-objects.
+      @pe = @php.new("PHPExcel")
+      @pe.getProperties.setCreator(args["creator"]) if args["creator"]
+      @pe.getProperties.setLastModifiedBy(args["last_modified_by"]) if args["last_modified_by"]
+      @pe.getProperties.setTitle(args["title"]) if args["title"]
+      @pe.getProperties.setSubject(args["subject"]) if args["subject"]
+      @pe.getProperties.setDescription(args["descr"]) if args["descr"]
+      @pe.setActiveSheetIndex(0)
+      @sheet = @pe.getActiveSheet
+      @linec = 1
     else
       raise "Unsupported format: '#{@args["format"]}'."
     end
@@ -33,8 +64,6 @@ class Knj::Table_writer
       
       line_str = Knj::Csv.arr_to_csv(arr, @args["expl"], @args["surr"])
       
-      #line_str = line_str.encode("iso8859-1") if @args["encoding"] == "iso8859-1"
-      
       @fp.write(line_str)
     elsif @args["format"] == "excel5"
       col_count = 0
@@ -51,6 +80,29 @@ class Knj::Table_writer
       end
       
       @row += 1
+    elsif @args["format"] == "excel2007"
+      col_count = 0
+      arr.each do |val|
+        colval = "#{@colarr[col_count]}#{@linec}"
+        
+        if val.is_a?(Hash) and val["type"] == "decimal"
+          @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.days + 1
+          
+          date_val = @php.static("PHPExcel_Shared_Date", "PHPToExcel", datet.to_i)
+          @sheet.setCellValue(colval, date_val)
+          @sheet.getStyle(colval).getNumberFormat.setFormatCode(@date_format_excel)
+        else
+          @sheet.setCellValue(colval, val)
+        end
+        
+        col_count += 1
+      end
+      
+      @linec += 1
     else
       raise "Unsupported format: '#{@args["format"]}'."
     end
@@ -58,6 +110,12 @@ class Knj::Table_writer
     return nil
   end
   
+  def destroy
+    @sheet = nil
+    @php.destroy if @php
+    @php = nil
+  end
+  
   def close
     if @args["format"] == "csv"
       @fp.close
@@ -72,6 +130,10 @@ class Knj::Table_writer
       @ws = nil
       
       FileUtils.mv(temp_path, @args["filepath"])
+    elsif @args["format"] == "excel2007"
+      writer = @php.new("PHPExcel_Writer_Excel2007", @pe)
+      writer.save(@args["filepath"])
+      self.destroy
     else
       raise "Unsupported format: '#{@args["format"]}'."
     end
@@ -84,6 +146,8 @@ class Knj::Table_writer
       return "csv"
     elsif @args["format"] == "excel5"
       return "xls"
+    elsif @args["format"] == "excel2007"
+      return "xlsx"
     else
       raise "Unsupported format: '#{@args["format"]}'."
     end
@@ -92,7 +156,7 @@ class Knj::Table_writer
   def ftype
     if @args["format"] == "csv"
       return "text/csv"
-    elsif @args["format"] == "excel5"
+    elsif @args["format"] == "excel5" or @args["format"] == "excel2007"
       return "application/ms-excel"
     else
       raise "Unsupported format: '#{@args["format"]}'."

data/spec/wref_spec.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Wref" do
+  it "should load by using autoload" do
+    require "knjrbfw"
+    
+    #Autoload wref-map.
+    Knj::Wref_map
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -332,6 +332,7 @@ files:
 - spec/strings_spec.rb
 - spec/threadsafe_spec.rb
 - spec/web_spec.rb
+- spec/wref_spec.rb
 - testfiles/image.jpg
 has_rdoc: true
 homepage: http://github.com/kaspernj/knjrbfw
@@ -347,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1220639088849160956
+      hash: -468641823555202698
       segments: 
       - 0
       version: "0"