matthewtodd-perquackey 0.4.0 → 0.5.0

data/CHANGELOG

@@ -1,4 +1,7 @@
-== 0.3.3 -- 2009-04-18
+== 0.5.0 -- 2009-05-27
+* Removed dependency on RubyInline. (So I can deploy to Heroku.)
+
+== 0.4.0 -- 2009-04-18
 * Removed mongrel dependency.
 * Switched console to use readline instead of irb.
 * Remove stdout usage. Console is the default.

data/TODO

@@ -1,2 +1,3 @@
-* remove dependency on RubyInline?
+* Dictionary should take some kind of IO object.
+* Server script should just use Rack.
 * tabtab_definitions --> except tabtab's not working well with -- options.

data/bin/perquackey

@@ -15,8 +15,9 @@ end
 
 opts.parse! ARGV
 
-LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift LIB_DIR
+%w(ext lib).each do |dir|
+  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', dir))
+end
 
 case conf.mode
 when :console

data/ext/perquackey/dictionary.c

@@ -0,0 +1,58 @@
+// After finding YAWL, I pretty much lifted this algorithm straight from its
+// anagram.c. It's certainly much faster than the Ruby code I wrote, since
+// it's not making tons of throwaway strings. Fun stuff.
+#include "ruby.h"
+
+#define MAX_LENGTH 40
+#define XOUT '@'
+#define FALSE 0
+#define TRUE 1
+
+static VALUE mPerquackey;
+static VALUE cDictionary;
+
+int spell(char *word, char *letters) {
+  static char letter_set[MAX_LENGTH];
+  register char *letter;
+
+  strcpy(letter_set, letters);
+  strcat(letter_set, "\n");
+
+  while (*word) {
+    if ((letter = strchr(letter_set, *word++)) != NULL) {
+      *letter = XOUT;
+    } else {
+      return FALSE;
+    }
+  }
+
+  return TRUE;
+}
+
+VALUE Dictionary_initialize(VALUE self, VALUE filename) {
+  rb_iv_set(self, "@filename", filename);
+  return self;
+}
+
+VALUE Dictionary_words(VALUE self, VALUE letters) {
+  VALUE words = rb_ary_new();
+
+  char word[MAX_LENGTH];
+
+  FILE *file = fopen(RSTRING(rb_iv_get(self, "@filename"))->ptr, "rt");
+  while (fgets(word, MAX_LENGTH, file) != NULL) {
+    if (spell(word, RSTRING(letters)->ptr)) {
+      rb_ary_push(words, rb_str_new(word, strlen(word) - 1));
+    }
+  }
+  fclose(file);
+
+  return words;
+}
+
+void Init_dictionary() {
+  mPerquackey = rb_define_module("Perquackey");
+  cDictionary = rb_define_class_under(mPerquackey, "Dictionary", rb_cObject);
+  rb_define_method(cDictionary, "initialize", Dictionary_initialize, 1);
+  rb_define_method(cDictionary, "words",      Dictionary_words, 1);
+}

data/ext/perquackey/extconf.rb

@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'dictionary'

data/lib/perquackey.rb

@@ -1,9 +1,51 @@
-require 'rubygems'
-require 'inline'
+require 'perquackey/dictionary'
 
 module Perquackey
-end
+  class Game
+    YAWL = File.join(File.dirname(__FILE__), '..', 'resources', 'yawl-0.3.2-word.list')
 
-require 'perquackey/dictionary'
-require 'perquackey/game'
-require 'perquackey/word_table'
+    def initialize
+      @dictionary = Dictionary.new(YAWL)
+    end
+
+    def words(letters)
+      WordTable.new(@dictionary.words(letters).reject { |word| word.length < minimum_length(letters) })
+    end
+
+    private
+
+    def minimum_length(letters)
+      letters.length > 10 ? 4 : 3
+    end
+  end
+
+  class WordTable
+    include Enumerable
+
+    def initialize(list=[])
+      @table = Hash.new { |h, k| h[k] = [] }
+
+      list.each do |word|
+        @table[word.length] << word
+      end
+
+      if @table.empty?
+        @headers = []
+        @height  = 0
+      else
+        @headers = @table.keys.min .. @table.keys.max
+        @height  = @table.values.max { |a, b| a.length <=> b.length }.length
+      end
+    end
+
+    def headers
+      @headers
+    end
+
+    def each
+      @height.times do |row_number|
+        yield headers.collect { |length| @table[length][row_number] or ' ' * length}
+      end
+    end
+  end
+end

data/lib/perquackey/server.rb

@@ -1,4 +1,4 @@
-%w(rubygems camping perquackey).each { |lib| require lib }
+require 'perquackey'
 
 Camping.goes :Perquackey
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-perquackey
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Matthew Todd
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-18 00:00:00 -07:00
+date: 2009-05-27 00:00:00 -07:00
 default_executable: perquackey
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: RubyInline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: camping
   type: :runtime
@@ -36,8 +26,8 @@ description:
 email: matthew.todd@gmail.com
 executables: 
 - perquackey
-extensions: []
-
+extensions: 
+- ext/perquackey/extconf.rb
 extra_rdoc_files: 
 - README
 - CHANGELOG
@@ -47,21 +37,20 @@ files:
 - CHANGELOG
 - TODO
 - bin/perquackey
+- ext/perquackey/dictionary.c
+- ext/perquackey/extconf.rb
 - lib/perquackey/console.rb
-- lib/perquackey/dictionary.rb
-- lib/perquackey/game.rb
 - lib/perquackey/server.rb
-- lib/perquackey/word_table.rb
 - lib/perquackey.rb
 - resources/yawl-0.3.2-word.list
-has_rdoc: true
+has_rdoc: false
 homepage: 
 post_install_message: 
 rdoc_options: 
 - --main
 - README
 - --title
-- perquackey-0.4.0
+- perquackey-0.5.0
 - --inline-source
 - --line-numbers
 require_paths: 

data/lib/perquackey/dictionary.rb

@@ -1,57 +0,0 @@
-class Perquackey::Dictionary
-  YAWL = File.join(File.dirname(__FILE__), '..', '..', 'resources', 'yawl-0.3.2-word.list')
-
-  def words(letters)
-    c_words(letters, YAWL)
-  end
-
-  # After finding YAWL, I pretty much lifted this algorithm straight from its
-  # anagram.c. It's certainly much faster than the Ruby code I wrote, since
-  # it's not making tons of throwaway strings. Fun stuff.
-  inline do |builder|
-    builder.prefix <<-END
-      #define MAX_LENGTH 40
-      #define XOUT '@'
-      #define FALSE 0
-      #define TRUE 1
-    END
-
-    builder.c_raw <<-END
-      int c_spell(char *word, char *letters) {
-        static char letter_set[MAX_LENGTH];
-        register char *letter;
-
-        strcpy(letter_set, letters);
-        strcat(letter_set, "\\n");
-
-        while (*word) {
-          if ((letter = strchr(letter_set, *word++)) != NULL) {
-            *letter = XOUT;
-          } else {
-            return FALSE;
-          }
-        }
-
-        return TRUE;
-      }
-    END
-
-    builder.c <<-END
-      VALUE c_words(VALUE letters, VALUE filename) {
-        VALUE words = rb_ary_new();
-
-        char word[MAX_LENGTH];
-
-        FILE *file = fopen(RSTRING(filename)->ptr, "rt");
-        while (fgets(word, MAX_LENGTH, file) != NULL) {
-          if (c_spell(word, RSTRING(letters)->ptr)) {
-            rb_ary_push(words, rb_str_new(word, strlen(word) - 1));
-          }
-        }
-        fclose(file);
-
-        return words;
-      }
-    END
-  end
-end

data/lib/perquackey/game.rb

@@ -1,15 +0,0 @@
-class Perquackey::Game
-  def initialize
-    @dictionary = Perquackey::Dictionary.new
-  end
-
-  def words(letters)
-    Perquackey::WordTable.new(@dictionary.words(letters).reject { |word| word.length < minimum_length(letters) })
-  end
-
-  private
-
-  def minimum_length(letters)
-    letters.length > 10 ? 4 : 3
-  end
-end

data/lib/perquackey/word_table.rb

@@ -1,29 +0,0 @@
-class Perquackey::WordTable
-  include Enumerable
-
-  def initialize(list=[])
-    @table = Hash.new { |h, k| h[k] = [] }
-
-    list.each do |word|
-      @table[word.length] << word
-    end
-
-    if @table.empty?
-      @headers = []
-      @height  = 0
-    else
-      @headers = @table.keys.min .. @table.keys.max
-      @height  = @table.values.max { |a, b| a.length <=> b.length }.length
-    end
-  end
-
-  def headers
-    @headers
-  end
-
-  def each
-    @height.times do |row_number|
-      yield headers.collect { |length| @table[length][row_number] or ' ' * length}
-    end
-  end
-end