flatulent 0.0.3 → 0.0.4

data/install.rb

@@ -0,0 +1,210 @@
+#!/usr/bin/env ruby
+require 'rbconfig'
+require 'find'
+require 'ftools'
+require 'tempfile'
+include Config
+
+LIBDIR      = "lib"
+LIBDIR_MODE = 0644
+
+BINDIR      = "bin"
+BINDIR_MODE = 0755
+
+
+$srcdir            = CONFIG["srcdir"]
+$version           = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
+$libdir            = File.join(CONFIG["libdir"], "ruby", $version)
+$archdir           = File.join($libdir, CONFIG["arch"])
+$site_libdir       = $:.find {|x| x =~ /site_ruby$/}
+$bindir            = CONFIG["bindir"] || CONFIG['BINDIR']
+$ruby_install_name = CONFIG['ruby_install_name'] || CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
+$ruby_ext          = CONFIG['EXEEXT'] || ''
+$ruby              = File.join($bindir, ($ruby_install_name + $ruby_ext))
+
+if !$site_libdir
+  $site_libdir = File.join($libdir, "site_ruby")
+elsif $site_libdir !~ %r/#{Regexp.quote($version)}/
+  $site_libdir = File.join($site_libdir, $version)
+end
+
+def install_rb(srcdir=nil, destdir=nil, mode=nil, bin=nil)
+#{{{
+  path   = []
+  dir    = []
+  Find.find(srcdir) do |f|
+    next unless FileTest.file?(f)
+    next if (f = f[srcdir.length+1..-1]) == nil
+    next if (/CVS$/ =~ File.dirname(f))
+    next if f =~ %r/\.lnk/
+    path.push f
+    dir |= [File.dirname(f)]
+  end
+  for f in dir
+    next if f == "."
+    next if f == "CVS"
+    File::makedirs(File.join(destdir, f))
+  end
+  for f in path
+    next if (/\~$/ =~ f)
+    next if (/^\./ =~ File.basename(f))
+    unless bin
+      File::install(File.join(srcdir, f), File.join(destdir, f), mode, true)
+    else
+      from = File.join(srcdir, f)
+      to = File.join(destdir, f)
+      shebangify(from) do |sf|
+        $deferr.print from, " -> ", File::catname(from, to), "\n"
+        $deferr.printf "chmod %04o %s\n", mode, to 
+        File::install(sf, to, mode, false)
+      end
+    end
+  end
+#}}}
+end
+def shebangify f
+#{{{
+  open(f) do |fd|
+    buf = fd.read 42 
+    if buf =~ %r/^\s*#\s*!.*ruby/o
+      ftmp = Tempfile::new("#{ $$ }_#{ File::basename(f) }")
+      begin
+        fd.rewind
+        ftmp.puts "#!#{ $ruby  }"
+        while((buf = fd.read(8192)))
+          ftmp.write buf
+        end
+        ftmp.close
+        yield ftmp.path
+      ensure
+        ftmp.close!
+      end
+    else
+      yield f
+    end
+  end
+#}}}
+end
+def ARGV.switch
+#{{{
+  return nil if self.empty?
+  arg = self.shift
+  return nil if arg == '--'
+  if arg =~ /^-(.)(.*)/
+    return arg if $1 == '-'
+    raise 'unknown switch "-"' if $2.index('-')
+    self.unshift "-#{$2}" if $2.size > 0
+    "-#{$1}"
+  else
+    self.unshift arg
+    nil
+  end
+#}}}
+end
+def ARGV.req_arg
+#{{{
+  self.shift || raise('missing argument')
+#}}}
+end
+def linkify d, linked = []
+#--{{{
+  if test ?d, d
+    versioned = Dir[ File::join(d, "*-[0-9].[0-9].[0-9].rb") ]
+    versioned.each do |v| 
+      src, dst = v, v.gsub(%r/\-[\d\.]+\.rb$/, '.rb')
+      lnk = nil
+      begin
+        if test ?l, dst
+          lnk = "#{ dst }.lnk"
+          puts "#{ dst } -> #{ lnk }"
+          File::rename dst, lnk
+        end
+        unless test ?e, dst
+          puts "#{ src } -> #{ dst }"
+          File::copy src, dst 
+          linked << dst
+        end
+      ensure
+        if lnk
+          at_exit do
+            puts "#{ lnk } -> #{ dst }"
+            File::rename lnk, dst
+          end
+        end
+      end
+    end
+  end
+  linked
+#--}}}
+end
+
+
+#
+# main program
+#
+
+libdir = $site_libdir
+bindir = $bindir
+no_linkify = false
+linked = nil
+help = false
+
+usage = <<-usage
+  #{ File::basename $0 }
+    -d, --destdir    <destdir>
+    -l, --libdir     <libdir>
+    -b, --bindir     <bindir>
+    -r, --ruby       <ruby>
+    -n, --no_linkify
+    -s, --sudo
+    -h, --help
+usage
+
+begin
+  while switch = ARGV.switch
+    case switch
+    when '-d', '--destdir'
+      libdir = ARGV.req_arg
+    when '-l', '--libdir'
+      libdir = ARGV.req_arg
+    when '-b', '--bindir'
+      bindir = ARGV.req_arg
+    when '-r', '--ruby'
+      $ruby = ARGV.req_arg
+    when '-n', '--no_linkify'
+      no_linkify = true
+    when '-s', '--sudo'
+      sudo = 'sudo' 
+    when '-h', '--help'
+      help = true
+    else
+      raise "unknown switch #{switch.dump}"
+    end
+  end
+rescue
+  STDERR.puts $!.to_s
+  STDERR.puts usage
+  exit 1
+end    
+
+if help
+  STDOUT.puts usage
+  exit
+end
+
+system "#{ sudo } #{ $ruby } pre-install.rb" if test(?s, 'pre-install.rb')
+
+unless no_linkify
+  linked = linkify('lib') + linkify('bin')
+end
+
+system "#{ $ruby } extconf.rb && make && #{ sudo } make install" if test(?s, 'extconf.rb')
+
+install_rb(LIBDIR, libdir, LIBDIR_MODE)
+install_rb(BINDIR, bindir, BINDIR_MODE, bin=true)
+
+if linked
+  linked.each{|path| File::rm_f path}
+end
+
+system "#{ sudo } #{ $ruby } post-install.rb" if test(?s, 'post-install.rb')

data/lib/flatulent.rb

@@ -1,6 +1,5 @@
 class Flatulent
-  Flatulent::VERSION = '0.0.3' unless defined? Flatulent::VERSION
-  def self.flatulent() Flatulent::VERSION end
+  def self.version() '0.0.4' end
   def self.libdir() File.expand_path(__FILE__).gsub(%r/\.rb$/, '') end
 
   require 'cgi'
@@ -42,12 +41,13 @@ class Flatulent
       'font-weight' => 'bold',
       'font-size'   => 'medium',
       #'background'  => '#ffc',
-      'background'  => '#ccffcc',
+      'background'  => '#ffff99',
       #'color'       => '#000',
-      'color'       => '#330066',
+      'color'       => '#000000',
       'margin'      => '2px',
       'padding'     => '2px',
       'display'     => 'table',
+      'width'       => '33%',
     ] }
 
     attribute('key'){ default_key }
@@ -265,7 +265,8 @@ class Flatulent
     end
 
     @font = String opt[ 'font', 'big' ]
-    @noise = Float opt[ 'noise', 0.22 ]
+    @noise = Float opt[ 'noise', 0.05 ]
+    @transform = Float opt[ 'transform', 0.03 ]
     @id = String opt[ 'id', 'flatulent' ]
     @action = String opt[ 'action' ]
     @ttl = Integer opt[ 'ttl', 300 ]
@@ -421,53 +422,69 @@ class Flatulent
   end  #--}}}
 
   def captcha!  #--{{{
-    @captcha = " " * @figlet.size
+    figlet = @figlet.dup
+    chars = figlet.split %r""
+    hammer chars
+    figlet = chars.join
     space = " "[0]
     newline = "\n"[0]
-    noisy = %w`| / - _ ( ) \\ ! [ ]` 
 
-    @figlet.size.times do |i|
-      fbyte = @figlet[i]
+    @captcha = " " * figlet.size
+    # merge vapour with figlet
+    figlet.size.times do |i|
+      fbyte = figlet[i]
       vbyte = @vapour[i]
 
       if fbyte == newline
         @captcha[i] = newline
       elsif fbyte == space
-        #if vbyte == space
-          #@captcha[i] = noisy[ rand(noisy.size) ]
-        #else
-          @captcha[i] = vbyte 
-        #end
+        @captcha[i] = vbyte 
       else
         @captcha[i] = fbyte 
       end
     end
+    @captcha
+  end  #--}}}
 
-
-=begin
-    alpha = ('A'..'Z').to_a + ('a'..'z').to_a
+  def hammer chars #--{{{
+    # transform character chars
+    newline = "\n"[0]
+    space = " "[0]
+    alphas = ('A'..'Z').to_a + ('a'..'z').to_a
     transform = {
-      '|' => rchar(%w'. * \` + , ; : '),
-      '/' => rchar(%w'\\ ] [ { } ( ) @' + alpha),
-      '\\' => rchar(%w'/ ] [ { } ( ) @' + alpha),
+      '|'  => rchar(%w'. * + , ; : ' + alphas),
+      '/'  => rchar(%w'] [ { } ( ) @' + alphas),
+      '\\' => rchar(%w'/ ] [ { } ( ) @' + alphas),
       '-'  => rchar(%w'_ * ^ # @ ~'),
       '_'  => rchar(%w'- * ^ # @ ~'),
-      '(' => rchar(%w'\\ / ] [ { } ) @' + alpha),
-      ')' => rchar(%w'\\ / ] [ { } ( @' + alpha),
+      '('  => rchar(%w'/ ] [ { } ) @' + alphas),
+      ')'  => rchar(%w'/ ] [ { } ( @' + alphas),
     }
+    to_transform = 
+      (0 ... chars.size).to_a.select{|i| chars[i] !~ %r"\s"}.sort_by{ rand }
+    to_transform = to_transform.first((to_transform.size * @transform).ceil)
+    to_transform.each do |i|
+      char = chars[i]
+      chars[i] = (transform[char] || lambda{char}).call
+    end
 
-    (@noise * @captcha.size).ceil.times do |i|
-      cbyte = @captcha[i]
-        if cell =~ %r"nbsp;"
+    # background noise
+    to_noise = 
+      (0 ... chars.size).to_a.select{|i| chars[i] =~ %r" "}.sort_by{ rand }
+    to_noise = to_noise.first((to_noise.size * @noise).ceil)
+    noisy = %w`| / ( ) \\ ! [ ] < > ^ v V` 
+    noise = lambda{|*a| noisy[ rand(noisy.size) ]}
+    to_noise.each do |i|
+      char = chars[i]
+      chars[i] = noise[char]
     end
-=end
-    @captcha
   end  #--}}}
 
   def element!  #--{{{
     rows = []
     rows << (row = [])
     chars = @captcha.split %r//
+    #chars = @figlet.split %r//
     size = chars.size
     last = size - 1
 
@@ -475,53 +492,45 @@ class Flatulent
       content = 
         case char 
         when %r/\n/o
-          "<br>"
+          #"<br>"
+          "\n"
         when %r/\s/o
-          "&nbsp;"
+          #"&nbsp;"
+          " "
         when %r/([^\s])/o
           CGI.escapeHTML $1 
         end
-        Array.new(rand(10)){ content = "<span>#{ content }</span>"}
+        #Array.new(rand(10)){ content = "<span>#{ content }</span>"}
         row << content 
         rows << (row = []) unless idx == last 
     end
 
+    content = rows.join
+      #<table width='50%' border=1 bgcolor='#{ style["background"] }'><tr><td>
+     #</td></tr></table>
+    @element = <<-html
+        <div id='#{ @id }_element' style='#{ css }'>#{ content }</div>
+    html
+  end  #--}}}
 
-=begin
-    noisy = %w`| / - _ ( ) \\` 
-    alpha = ('A'..'Z').to_a + ('a'..'z').to_a
-    transform = {
-      '|' => rchar(%w'. * \` + , ; : '),
-      '/' => rchar(%w'\\ ] [ { } ( ) @' + alpha),
-      '\\' => rchar(%w'/ ] [ { } ( ) @' + alpha),
-      '-'  => rchar(%w'_ * ^ # @ ~'),
-      '_'  => rchar(%w'- * ^ # @ ~'),
-      '(' => rchar(%w'\\ / ] [ { } ) @' + alpha),
-      ')' => rchar(%w'\\ / ] [ { } ( @' + alpha),
-    }
 
-    (@noise * chars.size).ceil.times do
-      y = rand(rows.size - 1)
-      x = rand(rows.first.size - 1)
-      cell = rows[y][x]
-      next if cell =~ %r"br"
-      char = 
-        if cell =~ %r"nbsp;"
-          noisy[ rand(noisy.size) ]
-        else
-          #(transform[cell] || lambda{'.'}).call
-          nil
-        end
-      rows[y][x] = char if char
-    end
-=end
 
-    content = rows.join
-    @element = "<pre id='#{ @id }_element' style='#{ css }'>#{ content }</pre>"
-  end  #--}}}
+  def image options = {}
+    require 'RMagick'
+
+    grid = captcha.split(%r"\n").map{|row| row.split %r""}
+
+    width = grid.first.size
+    height = grid.size 
+
+    img = Magick::Image.new width, height
+
+    img
+  end
+
 
   def rchar *list  #--{{{
-    list = list.flatten
+    list = list.flatten.sort_by{ rand }
     n = list.size - 1
     lambda{list[ rand(n) ]}
   end  #--}}}
@@ -595,10 +604,16 @@ if $0 == __FILE__
   #p e
   #p Flatulent.decrypt(e)
 
+=begin
   f = Flatulent.new #('foobar')
   puts f.figlet
   puts('-' * 79)
   puts f.vapour
   puts('-' * 79)
   puts f.captcha
+=end
+
+  f = Flatulent.new
+  puts f.captcha
+  
 end

data/rails/app/controllers/flatulent_controller.rb

@@ -1,7 +1,10 @@
 class FlatulentController < ApplicationController
-  $:.unshift '../../lib'
-  load 'flatulent.rb'
-  #require 'flatulent.rb'
+  if ENV['RAILS_ENV'] == 'production'
+    require 'flatulent.rb'
+  else
+    $:.unshift '../lib'
+    load '../lib/flatulent.rb'
+  end
 
   def figlet
     render :text => Flatulent.figlet(params), :content_type => 'text/plain'
@@ -62,7 +65,6 @@ class FlatulentController < ApplicationController
           
           <form action='./' method='post'>
             <%= Flatulent.ajax %>
-
             <hr>
             <input type='submit' name='submit' value='submit' />
           </form>