shoesgem 0.1480.0 → 0.1514.0

data/shoes/ruby/lib/ftsearch/suffix_array_writer.rb

@@ -1,99 +1,99 @@
-# Copyright (C) 2006  Mauricio Fernandez <mfp@acm.org>
-#
-
-require 'enumerator'
-require 'ftsearch/util'
-
-module FTSearch
-
-class SuffixArrayWriter
-  include InMemoryWriter
-
-  DEFAULT_OPTIONS = {
-    :path => "suffixes-#{Process.pid}-#{rand(100000)}",
-    :block_size => 32,
-    :inline_suffix_size => 8,
-    :default_analyzer => nil,
-  }
-  def initialize(options = {})
-    options             = DEFAULT_OPTIONS.merge(options)
-    @path               = options[:path]
-    @suffixes           = []
-    @block_size         = options[:block_size]
-    @inline_suffix_size = options[:inline_suffix_size]
-    @finished           = false
-    initialize_in_memory_buffer
-  end
-
-  def merge(suffix_array_reader)
-    unless @suffixes.empty?
-      raise "Cannot merge if the destination SuffixArrayWriter isn't empty!"
-    end
-    suffix_array_reader.dump_data do |partial_sarray|
-      @suffixes.concat partial_sarray
-    end
-  end
-
-  def add_suffixes(analyzer, data, offset)
-    #analyzer.new.find_suffixes(data).each{|x| @suffixes << offset + x}
-    analyzer.append_suffixes(@suffixes, data, offset)
-  end
-
-  def finish!(fulltext)
-    return if @finished
-    if $DEBUG
-      puts "Suffixes: #{@suffixes.size}"
-      t0 = Time.new
-    end
-    sort!(fulltext)
-    if $DEBUG
-      puts "Sorted in #{Time.new - t0}"
-    end
-    if $DEBUG
-      puts "Dumping suffixes"
-      t0 = Time.new
-    end
-    dump_suffixes(fulltext)
-    if $DEBUG
-      puts "Dumped in #{Time.new - t0}"
-    end
-    @finished = true
-  end
-
-  private
-  def dump_suffixes(fulltext)
-    io = @path ? File.open(@path, "wb") : @memory_io
-    io.write([@suffixes.size, @block_size || 0, @inline_suffix_size].pack("VVV"))
-    if @block_size
-      dump_inline_suffixes(io, fulltext)
-    end
-    add_padding(io)
-    dump_suffix_array(io)
-  ensure
-    io.close if @path
-  end
-
-  def dump_inline_suffixes(io, fulltext)
-    0.step(@suffixes.size, @block_size) do |suffix_idx|
-      io.write([fulltext[@suffixes[suffix_idx], @inline_suffix_size]].pack("a#{@inline_suffix_size}"))
-    end
-  end
-
-  def dump_suffix_array(io)
-    @suffixes.each_slice(1024){|suffixes| io.write(suffixes.pack("V*")) }
-  end
-
-  def add_padding(io)
-    # padding to 16-byte
-    if (mod = io.pos & 0xf) != 0
-      io.write("\0" * (16 - mod))
-    end
-  end
-
-  def sort!(fulltext)
-    tsize = fulltext.size
-    @suffixes = @suffixes.sort_by{|offset| fulltext[offset, tsize - offset]}
-  end
-end
-
-end  # FTSearch
+# Copyright (C) 2006  Mauricio Fernandez <mfp@acm.org>
+#
+
+require 'enumerator'
+require 'ftsearch/util'
+
+module FTSearch
+
+class SuffixArrayWriter
+  include InMemoryWriter
+
+  DEFAULT_OPTIONS = {
+    :path => "suffixes-#{Process.pid}-#{rand(100000)}",
+    :block_size => 32,
+    :inline_suffix_size => 8,
+    :default_analyzer => nil,
+  }
+  def initialize(options = {})
+    options             = DEFAULT_OPTIONS.merge(options)
+    @path               = options[:path]
+    @suffixes           = []
+    @block_size         = options[:block_size]
+    @inline_suffix_size = options[:inline_suffix_size]
+    @finished           = false
+    initialize_in_memory_buffer
+  end
+
+  def merge(suffix_array_reader)
+    unless @suffixes.empty?
+      raise "Cannot merge if the destination SuffixArrayWriter isn't empty!"
+    end
+    suffix_array_reader.dump_data do |partial_sarray|
+      @suffixes.concat partial_sarray
+    end
+  end
+
+  def add_suffixes(analyzer, data, offset)
+    #analyzer.new.find_suffixes(data).each{|x| @suffixes << offset + x}
+    analyzer.append_suffixes(@suffixes, data, offset)
+  end
+
+  def finish!(fulltext)
+    return if @finished
+    if $DEBUG
+      puts "Suffixes: #{@suffixes.size}"
+      t0 = Time.new
+    end
+    sort!(fulltext)
+    if $DEBUG
+      puts "Sorted in #{Time.new - t0}"
+    end
+    if $DEBUG
+      puts "Dumping suffixes"
+      t0 = Time.new
+    end
+    dump_suffixes(fulltext)
+    if $DEBUG
+      puts "Dumped in #{Time.new - t0}"
+    end
+    @finished = true
+  end
+
+  private
+  def dump_suffixes(fulltext)
+    io = @path ? File.open(@path, "wb") : @memory_io
+    io.write([@suffixes.size, @block_size || 0, @inline_suffix_size].pack("VVV"))
+    if @block_size
+      dump_inline_suffixes(io, fulltext)
+    end
+    add_padding(io)
+    dump_suffix_array(io)
+  ensure
+    io.close if @path
+  end
+
+  def dump_inline_suffixes(io, fulltext)
+    0.step(@suffixes.size, @block_size) do |suffix_idx|
+      io.write([fulltext[@suffixes[suffix_idx], @inline_suffix_size]].pack("a#{@inline_suffix_size}"))
+    end
+  end
+
+  def dump_suffix_array(io)
+    @suffixes.each_slice(1024){|suffixes| io.write(suffixes.pack("V*")) }
+  end
+
+  def add_padding(io)
+    # padding to 16-byte
+    if (mod = io.pos & 0xf) != 0
+      io.write("\0" * (16 - mod))
+    end
+  end
+
+  def sort!(fulltext)
+    tsize = fulltext.size
+    @suffixes = @suffixes.sort_by{|offset| fulltext[offset, tsize - offset]}
+  end
+end
+
+end  # FTSearch

data/shoes/ruby/lib/ftsearch/util.rb

@@ -1,21 +1,21 @@
-# Copyright (C) 2006  Mauricio Fernandez <mfp@acm.org>
-#
-
-require 'stringio'
-module FTSearch
-
-module InMemoryWriter
-  def initialize_in_memory_buffer
-    @memory_io = StringIO.new("")
-  end
-
-  def data
-    if @path
-      File.open(@path, "rb"){|f| f.read} rescue nil
-    else
-      @memory_io.string.clone
-    end
-  end
-end
-
-end  # FTSearch
+# Copyright (C) 2006  Mauricio Fernandez <mfp@acm.org>
+#
+
+require 'stringio'
+module FTSearch
+
+module InMemoryWriter
+  def initialize_in_memory_buffer
+    @memory_io = StringIO.new("")
+  end
+
+  def data
+    if @path
+      File.open(@path, "rb"){|f| f.read} rescue nil
+    else
+      @memory_io.string.clone
+    end
+  end
+end
+
+end  # FTSearch

data/shoes/ruby/lib/i386-mingw32/rbconfig.rb

@@ -12,7 +12,7 @@ module RbConfig
   CONFIG["DESTDIR"] = DESTDIR
   CONFIG["INSTALL"] = '/bin/install -c'
   CONFIG["EXEEXT"] = ".exe"
-  CONFIG["prefix"] = (TOPDIR || DESTDIR + "C:/shoes_dev/sandbox/mingw")
+  CONFIG["prefix"] = (TOPDIR || DESTDIR + "D:/shoes_dev/sandbox/mingw")
   CONFIG["ruby_install_name"] = "ruby"
   CONFIG["RUBY_INSTALL_NAME"] = "ruby"
   CONFIG["RUBY_SO_NAME"] = "msvcrt-ruby191"
@@ -22,7 +22,7 @@ module RbConfig
   CONFIG["vendorhdrdir"] = "$(rubyhdrdir)/vendor_ruby"
   CONFIG["sitehdrdir"] = "$(rubyhdrdir)/site_ruby"
   CONFIG["rubyhdrdir"] = "$(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)"
-  CONFIG["configure_args"] = " '--disable-install-doc' 'optflags=-O0' 'debugflags=-g3 -ggdb' '--enable-shared' '--prefix=C:/shoes_dev/sandbox/mingw'"
+  CONFIG["configure_args"] = " '--disable-install-doc' '--enable-shared' '--prefix=D:/shoes_dev/sandbox/mingw'"
   CONFIG["vendordir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby"
   CONFIG["sitedir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/site_ruby"
   CONFIG["ruby_version"] = "1.9.1"
@@ -50,8 +50,8 @@ module RbConfig
   CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import -Wl,--out-implib=$(LIBRUBY) $(RUBYDEF)"
   CONFIG["LIBRUBY_LDSHARED"] = "gcc -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)"
   CONFIG["warnflags"] = "-Wall -Wno-parentheses"
-  CONFIG["debugflags"] = "-g3 -ggdb"
-  CONFIG["optflags"] = "-O0"
+  CONFIG["debugflags"] = "-g"
+  CONFIG["optflags"] = "-O2"
   CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)"
   CONFIG["cppflags"] = ""
   CONFIG["RDOCTARGET"] = ""

data/shoes/samples/class-book.rb

@@ -1,43 +1,43 @@
-require 'yaml'
-
-class Book < Shoes
-  url '/', :index
-  url '/incidents/(\d+)', :incident
-
-  def index
-    incident(0)
-  end
-
-  INCIDENTS = YAML.load_file('class-book.yaml')
-
-  def table_of_contents
-    toc = []
-    INCIDENTS.each_with_index do |(title, story), i|
-      toc.push "(#{i + 1}) ",
-        link(title, :click => "/incidents/#{i}"),
-        " / "
-    end
-    toc.pop
-    span *toc
-  end
-
-  def incident(num)
-    num = num.to_i
-    background white
-    stack :margin => 10, :margin_left => 190, :margin_top => 20 do
-      banner "Incident", :margin => 4
-      para strong("No. #{num + 1}: #{INCIDENTS[num][0]}"), :margin => 4
-    end
-    flow :width => 180, :margin_left => 10, :margin_top => 0 do
-      para table_of_contents, :size => 8
-    end
-    stack :width => -190, :margin => 10, :margin_top => 0 do
-      INCIDENTS[num][1].split(/\n\n+/).each do |p|
-        para p
-      end
-    end
-  end
-end
-
-Shoes.app :width => 640, :height => 700,
-  :title => "Incidents, a Book"
+require 'yaml'
+
+class Book < Shoes
+  url '/', :index
+  url '/incidents/(\d+)', :incident
+
+  def index
+    incident(0)
+  end
+
+  INCIDENTS = YAML.load_file('class-book.yaml')
+
+  def table_of_contents
+    toc = []
+    INCIDENTS.each_with_index do |(title, story), i|
+      toc.push "(#{i + 1}) ",
+        link(title, :click => "/incidents/#{i}"),
+        " / "
+    end
+    toc.pop
+    span *toc
+  end
+
+  def incident(num)
+    num = num.to_i
+    background white
+    stack :margin => 10, :margin_left => 190, :margin_top => 20 do
+      banner "Incident", :margin => 4
+      para strong("No. #{num + 1}: #{INCIDENTS[num][0]}"), :margin => 4
+    end
+    flow :width => 180, :margin_left => 10, :margin_top => 0 do
+      para table_of_contents, :size => 8
+    end
+    stack :width => -190, :margin => 10, :margin_top => 0 do
+      INCIDENTS[num][1].split(/\n\n+/).each do |p|
+        para p
+      end
+    end
+  end
+end
+
+Shoes.app :width => 640, :height => 700,
+  :title => "Incidents, a Book"