webink 1.1.5 → 1.2.5

data/bin/rfcgi

@@ -1,5 +1,5 @@
 require "fcgi"
-require "mmap"
+require "simple_mmap"
 require "webink/beauty"
 
 def getBinding(cgi,env,params)
@@ -17,10 +17,10 @@ pram = nil
 is_production = nil
 use_errors = nil
 FCGI.each_cgi do |cgi|
-  puts cgi.header
-  cgi.env_table.each do |k,v|
-    puts "#{k}=#{v}<br>"
-  end
+  #puts cgi.header
+  #cgi.env_table.each do |k,v|
+  #  puts "#{k}=#{v}<br>"
+  #end
   is_production = ((cgi.env_table["INK_PRODUCTION"] and eval cgi.env_table["INK_PRODUCTION"]) or (ENV["INK_PRODUCTION"] and eval ENV["INK_PRODUCTION"])) ? true : false
   use_errors = ((cgi.env_table["INK_ERRORS"] and eval cgi.env_table["INK_ERRORS"]) or (ENV["INK_ERRORS"] and eval ENV["INK_ERRORS"])) ? true : false
   time = Time.now
@@ -29,10 +29,10 @@ FCGI.each_cgi do |cgi|
     pram = CGI::parse(cgi.env_table['QUERY_STRING'].gsub(/\?/, "&"))
     control = pram['controller'][0]
     routes = Ink::Beauty.load_routes script
-    fhandle = Mmap.new(routes, "r")
+    fhandle = SimpleMmap::MappedFile.new(routes)
     Dir.chdir( File.dirname(routes) )
-    control = eval fhandle, getBinding(cgi,cgi.env_table,control) if fhandle
-    fhandle.munmap
+    control = eval fhandle.read_window_data(0,fhandle.size), getBinding(cgi,cgi.env_table,control) if fhandle
+    fhandle.close
     raise StandardError.new("Routes not matched.") if control.keys.length <= 1
     
     control[:get] = pram
@@ -47,7 +47,7 @@ FCGI.each_cgi do |cgi|
           v.each do |a|
             control[:post][k].push((control[:config]["escape_post_data"]) ? CGI::escapeHTML(a) : a)
           end
-          control[:post][k] = control[:post][k].to_s
+          control[:post][k] = control[:post][k][0] if control[:post][k].length <= 1
         else
           control[:post][k] = (control[:config]["escape_post_data"]) ? CGI::escapeHTML(v) : v
         end
@@ -60,11 +60,10 @@ FCGI.each_cgi do |cgi|
     end
     
     script = Ink::Beauty.load_init script
-    fhandle = Mmap.new(script, "r")
+    fhandle = SimpleMmap::MappedFile.new(script)
     Dir.chdir( File.dirname(script) )
-    eval fhandle, getBinding(cgi,cgi.env_table,control) if fhandle
-    fhandle.munmap
-    
+    eval fhandle.read_window_data(0,fhandle.size), getBinding(cgi,cgi.env_table,control) if fhandle
+    fhandle.close
     
   rescue LoadError => bang
     if not is_production

data/bin/webink_database

@@ -1,4 +1,4 @@
-require 'mmap'
+require 'simple_mmap'
 require 'webink/beauty'
 
 config = nil

data/lib/webink/beauty.rb

@@ -33,9 +33,9 @@ module Ink
       config = "#{File.dirname(script)}/config"
       config = "#{config}.rb" if not File.exist? config
       raise LoadError.new("Config not found.") if not File.exist? config
-      fhandle = Mmap.new(config, "r")
-      config = eval fhandle
-      fhandle.munmap
+      fhandle = SimpleMmap::MappedFile.new(config)
+      config = eval fhandle.read_window_data(0,fhandle.size)
+      fhandle.close
       raise RuntimeError.new("Config error.") if not config.instance_of? Hash
       config
     end

data/lib/webink/controller.rb

@@ -160,11 +160,13 @@ module Ink
       if args[:template]
         template = File.open "./views/#{args[:template]}.html.erb", "r"
         erb = ERB.new template.readlines * "\n"
+        template.close
         puts @params[:cgi].header
         erb.run self.getBinding(args[:locals])
       elsif args[:partial]
         template = File.open "./views/#{(File.dirname(args[:partial]) != ".") ? "#{File.dirname(args[:partial])}/" : ""}_#{File.basename(args[:partial])}.html.erb", "r"
         erb = ERB.new template.readlines * "\n"
+        template.close
         if not args[:standalone]
           erb.result self.getBinding(args[:locals])
         else
@@ -256,7 +258,7 @@ module Ink
     # Retrieve the current binding of the instance.
     # [param locals:] an Array of data for the template
     # [returns:] current binding
-    def getBinding(*locals)
+    def getBinding(locals)
       binding
     end
     

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: webink
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
+  prerelease: 
+  version: 1.2.5
 platform: ruby
 authors: 
 - Matthias Geier
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +02:00
-default_executable: 
+date: 2012-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fcgi
@@ -26,28 +20,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 8
-        - 8
         version: 0.8.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mmap
+  name: simple-mmap
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 2
-        - 6
-        version: 0.2.6
+        version: 1.1.4
   type: :runtime
   version_requirements: *id002
 description: 
@@ -63,11 +47,10 @@ files:
 - lib/webink.rb
 - lib/webink/model.rb
 - lib/webink/database.rb
-- lib/webink/controller.rb
 - lib/webink/beauty.rb
-- bin/rfcgi
+- lib/webink/controller.rb
 - bin/webink_database
-has_rdoc: true
+- bin/rfcgi
 homepage: http://powerpuff.net/
 licenses: []
 
@@ -81,25 +64,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
-      version: 1.8.1
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A minimal web framework.