RubyGems - perquackey - Versions diffs - 0.7.3 → 0.8.0 - Mend

perquackey 0.7.3 → 0.8.0

Files changed (18) hide show

data/CHANGELOG.rdoc +7 -0
data/bin/perquackey +1 -15
data/data/perquackey/templates/index.erb +93 -29
data/ext/perquackey/anagrams.c +3 -21
data/lib/perquackey.rb +5 -13
data/lib/perquackey/application.rb +6 -15
data/lib/perquackey/console.rb +2 -18
data/lib/perquackey/dictionary.rb +10 -4
data/lib/perquackey/server.rb +10 -1
data/lib/perquackey/{word_table.rb → table.rb} +5 -1
data/lib/perquackey/version.rb +3 -0
data/test/dictionary_test.rb +2 -2
data/test/helper.rb +0 -7
data/test/table_test.rb +34 -0
metadata +84 -86
data/data/perquackey/templates/layout.erb +0 -24
data/lib/perquackey/game.rb +0 -17
data/test/word_table_test.rb +0 -23

data/CHANGELOG.rdoc CHANGED

@@ -1,3 +1,10 @@
+== Git
+== 0.8.0 -- 2011-12-23
+* JSON api: GET /rstlne.json
+* Use optparse-defaults for command line options.
 == 0.7.3 -- 2010-04-29
 * Document C extension.

data/bin/perquackey CHANGED

@@ -1,18 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  require 'perquackey'
-rescue LoadError
-  raise unless $!.message =~ /\bperquackey$/
-  lib = File.expand_path('../../lib', __FILE__)
-  if !$:.include?(lib)
-    warn "WARN: #{$!}.\n  Trying again with #{lib} on the $LOAD_PATH..."
-    $:.unshift(lib)
-    retry
-  end
-  raise
-end
+require 'perquackey'
 Perquackey::Application.run!(ARGV)

data/data/perquackey/templates/index.erb CHANGED

@@ -1,31 +1,95 @@
-<form action="/" method="post">
-  <input name="letters"
-        value="<%= letters %>"
- autocomplete="on"
-     autosave="perquackey"
-    autofocus="on"
-    maxlength="13"
-      pattern="[a-z]{10}([a-z]{3})?"
-  placeholder="Type your letters here."
-     required="on"
-      results="12"
-        title="Perquackey rolls are 10 or 13 letters."
-         type="search"
-  />
-</form>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Perquackey</title>
+    <style>
+      body {
+        margin: 0 auto 5em;
+        width: 45em;
+      }
+      section {
+        margin-bottom: 1em;
+      }
+      table {
+        border-collapse: collapse;
+      }
+      tbody tr:nth-child(5) td {
+        border-bottom: 1px dashed #ccc;
+      }
+      td, th {
+        padding-right: 1em;
+      }
+      footer {
+        background-color: #eee;
+        padding: 1em;
+      }
+    </style>
+  </head>
-<table>
-  <tr>
-    <% words.headers.each do |header| %>
-      <th><%= header %></th>
-    <% end %>
-  </tr>
+  <body>
+    <header>
+      <h1>Perquackey</h1>
+    </header>
-  <% words.each do |row| %>
-    <tr>
-      <% row.each do |word| %>
-        <td><%= word %></td>
-      <% end %>
-    </tr>
-  <% end %>
-</table>
+    <section>
+      <form action="/" method="post">
+        <input name="letters"
+       autocomplete="off"
+          autofocus="on"
+          maxlength="13"
+            pattern="[a-z]{10}([a-z]{3})?"
+        placeholder="Enter your letters here."
+           required="on"
+               size="30"
+              title="Perquackey rolls are 10 or 13 letters."
+              value="<%= letters %>"
+        />
+      </form>
+    </section>
+    <section>
+      <table>
+        <thead>
+          <tr>
+            <% words.headers.each do |header| %>
+              <th><%= header %></th>
+            <% end %>
+          </tr>
+        </thead>
+        <tbody>
+          <% words.each do |row| %>
+            <tr>
+              <% row.each do |word| %>
+                <td><%= word %></td>
+              <% end %>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </section>
+    <footer>
+      <p>
+        Enter the letters you rolled to see what you could have spelled.
+      </p>
+      <p>
+        Examples:
+        <a href="/eehhhijjoopqt">eehhhijjoopqt</a>,
+        <a href="/aaddeginoprsw">aaddeginoprsw</a>
+      </p>
+      <p>
+        These words are taken from
+        <a href="http://en.wikipedia.org/wiki/Tournament_Word_List">TWL06, the official word list</a>
+        for Scrabble tournaments in North America. (You can
+        <a href="http://www.isc.ro/en/commands/lists.html">download this list</a>
+        from the Internet Scrabble Club.)
+      </p>
+      <p>
+        <a href="https://github.com/matthewtodd/perquackey">This code is on GitHub</a>.
+        Patches welcome!
+      </p>
+    </footer>
+  </body>
+</html>

data/ext/perquackey/anagrams.c CHANGED

@@ -1,5 +1,5 @@
 #include "ruby.h"
-#include "rubyio.h"
+#include "ruby/io.h"
 #define MAX_LENGTH 40
 #define XOUT '@'
@@ -34,23 +34,6 @@ static int anagram_p(char *letters, char *word) {
   return TRUE;
 }
-/*
- * Document-class: Anagrams
- * Document-method: anagrams
- *
- * call-seq:
- *   anagrams(letters) -> array
- *
- */
-static VALUE Anagrams_anagrams(VALUE self, VALUE letters) {
-  return rb_apply(
-           rb_apply(self,
-                    rb_intern("enum_for"),
-                    rb_ary_new3(2, rb_str_new2("each_anagram"), letters)),
-           rb_intern("to_a"),
-           rb_ary_new());
-}
 /*
  * Document-class: Anagrams
  * Document-method: each_anagram
@@ -62,11 +45,11 @@ static VALUE Anagrams_anagrams(VALUE self, VALUE letters) {
 static VALUE Anagrams_each_anagram(VALUE self, VALUE letters_value) {
   rb_io_t *stream;
   char     word[MAX_LENGTH];
-  char    *letters = RSTRING(letters_value)->ptr;
+  char    *letters = RSTRING_PTR(letters_value);
   GetOpenFile(self, stream);
-  while (fgets(word, sizeof(word), stream->f) != NULL) {
+  while (fgets(word, sizeof(word), rb_io_stdio_file(stream)) != NULL) {
     chop(word);
     if (anagram_p(letters, word)) {
@@ -92,6 +75,5 @@ static VALUE Anagrams_each_anagram(VALUE self, VALUE letters_value) {
 void Init_anagrams() {
   mPerquackey = rb_define_module("Perquackey");
   mAnagrams = rb_define_module_under(mPerquackey, "Anagrams");
-  rb_define_method(mAnagrams, "anagrams", Anagrams_anagrams, 1);
   rb_define_method(mAnagrams, "each_anagram", Anagrams_each_anagram, 1);
 }

data/lib/perquackey.rb CHANGED

@@ -1,26 +1,18 @@
+require 'perquackey/version'
 require 'pathname'
-require 'rbconfig'
-require 'rbconfig/datadir'
+require 'rubygems'
 module Perquackey
-  VERSION = '0.7.3'
   autoload :Anagrams,   'perquackey/anagrams'
   autoload :Application,'perquackey/application'
   autoload :Console,    'perquackey/console'
   autoload :Dictionary, 'perquackey/dictionary'
   autoload :Game,       'perquackey/game'
   autoload :Server,     'perquackey/server'
-  autoload :WordTable,  'perquackey/word_table'
+  autoload :Table,      'perquackey/table'
   def self.datadir
-    @@datadir ||= begin
-      datadir = RbConfig.datadir('perquackey')
-      if !File.exist?(datadir)
-        warn "WARN: #{datadir} does not exist.\n  Trying again with relative data directory..."
-        datadir = File.expand_path('../../data/perquackey', __FILE__)
-      end
-      Pathname.new(datadir)
-    end
+    Pathname.new Gem.datadir('perquackey')
   end
 end

data/lib/perquackey/application.rb CHANGED

@@ -1,4 +1,4 @@
-require 'optparse'
+require 'optparse/defaults'
 module Perquackey
   class Application
@@ -7,11 +7,10 @@ module Perquackey
     end
     def initialize
-      @defaults = %w(--console)
-      @options  = OptionParser.new do |opts|
-        opts.banner  = "Usage: #{File.basename($0)} [-c|-s]"
-        opts.version = Perquackey::VERSION
+      @options = OptionParser.with_defaults do |opts|
+        opts.banner   = "Usage: #{File.basename($0)} [-c|-s]"
+        opts.defaults = %w(--console)
+        opts.version  = Perquackey::VERSION
         opts.separator ''
         opts.on('-c', '--console', 'Run an interactive console.') do
@@ -22,19 +21,11 @@ module Perquackey
           @mode = :server
           @port = port || 3000
         end
-        opts.separator ''
-        opts.separator 'Defaults:'
-        opts.separator "#{opts.summary_indent}#{@defaults.join(' ')}"
       end
     end
     def run!(argv)
-      begin
-        @options.parse(@defaults.dup.concat(argv))
-      rescue OptionParser::ParseError
-        @options.abort($!)
-      end
+      @options.order(argv)
       case @mode
       when :console

data/lib/perquackey/console.rb CHANGED

@@ -6,37 +6,21 @@ module Perquackey
       new.run
     end
-    def initialize
-      @game = Game.new
-    end
     def run
       puts 'Type ctrl-d or quit to exit.'
       loop do
-        letters = prompt_for_letters
-        case letters
+        case letters = Readline::readline('> ')
         when nil, 'quit'
           puts 'Goodbye.'
           exit
         when /^[a-z]+$/
           Readline::HISTORY.push(letters)
-          puts words(letters)
+          puts Table.new(Dictionary.words(letters))
         else
           next
         end
       end
     end
-    private
-    def prompt_for_letters
-      Readline::readline('> ')
-    end
-    def words(letters)
-      @game.words(letters).map { |row| row.join(' ') }
-    end
   end
 end

data/lib/perquackey/dictionary.rb CHANGED

@@ -1,15 +1,21 @@
 module Perquackey
   class Dictionary
-    TOURNAMENT_WORD_LIST = Perquackey.datadir.join('dict', 'TWL06.txt')
+    def self.words(letters)
+      new.words(letters)
+    end
     def initialize
-      @word_list = TOURNAMENT_WORD_LIST
+      @word_list = Perquackey.datadir.join('dict', 'TWL06.txt')
     end
     def words(letters)
-      @word_list.open do |stream|
-        stream.extend(Anagrams).anagrams(letters)
+      anagrams = @word_list.open do |stream|
+        stream.extend(Anagrams)
+        stream.enum_for(:each_anagram, letters).to_a
       end
+      minimum = (letters.length <= 10) ? 3 : 4
+      anagrams.reject { |anagram| anagram.length < minimum }
     end
   end
 end

data/lib/perquackey/server.rb CHANGED

@@ -1,3 +1,4 @@
+require 'json'
 require 'sinatra/base'
 module Perquackey
@@ -5,7 +6,15 @@ module Perquackey
     set :views, Perquackey.datadir.join('templates')
     get %r{^/([a-z]{0,13})$} do |letters|
-      erb :index, :locals => { :letters => letters, :words => Game.new.words(letters) }
+      erb :index, :locals => {
+        :letters => letters,
+        :words   => Table.new(Dictionary.words(letters))
+      }
+    end
+    get %r{^/([a-z]{0,13})\.json$} do |letters|
+      content_type :json
+      Dictionary.words(letters).to_json
     end
     post '/' do

data/lib/perquackey/{word_table.rb → table.rb} RENAMED

@@ -1,5 +1,5 @@
 module Perquackey
-  class WordTable
+  class Table
     include Enumerable
     def initialize(list=[])
@@ -27,5 +27,9 @@ module Perquackey
         yield headers.collect { |length| @table[length][row_number] or ' ' * length}
       end
     end
+    def to_s
+      map { |row| row.join(' ') }.join("\n")
+    end
   end
 end

data/lib/perquackey/version.rb ADDED

@@ -0,0 +1,3 @@
+module Perquackey
+  VERSION = '0.8.0'
+end

data/test/dictionary_test.rb CHANGED

@@ -1,7 +1,7 @@
-require 'test/helper'
+require 'helper'
 class DictionaryTest < Test::Unit::TestCase
   def test_simple_search
-    assert_equal ['ab', 'ba', 'cab'], Perquackey::Dictionary.new.words('abc')
+    assert_equal ['cab'], Perquackey::Dictionary.new.words('abc')
   end
 end

data/test/helper.rb CHANGED

@@ -1,9 +1,2 @@
 require 'test/unit'
 require 'perquackey'
-begin
-  require 'redgreen' if $stdout.tty?
-rescue LoadError
-  # It's nice not to have hard dependencies on any gems for testing, so that
-  # it's super-easy for your users to run `gem check --test perquackey.`
-end

data/test/table_test.rb ADDED

@@ -0,0 +1,34 @@
+require 'helper'
+class TableTest < Test::Unit::TestCase
+  def test_handles_empty_list
+    empty_table = Perquackey::Table.new %w()
+    assert_equal [], empty_table.headers.to_a
+    assert_equal [], empty_table.to_a
+  end
+  def test_handles_some_list
+    table = Perquackey::Table.new %w(ape bear cat dog eagle fox goose hippo ibis)
+    assert_equal [3, 4, 5], table.headers.to_a
+    assert_equal [
+      ['ape', 'bear', 'eagle'],
+      ['cat', 'ibis', 'goose'],
+      ['dog', '    ', 'hippo'],
+      ['fox', '    ', '     ']
+    ], table.to_a
+  end
+  def test_to_s
+    table = Perquackey::Table.new %w(ape bear cat dog eagle fox goose hippo ibis)
+    assert_equal <<-END.gsub(/^ */, '').strip, table.to_s.strip
+      ape bear eagle
+      cat ibis goose
+      dog      hippo
+      fox
+    END
+  end
+end

metadata CHANGED

@@ -1,139 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: perquackey
-version: !ruby/object:Gem::Version
-  prerelease: false
-  segments:
-  - 0
-  - 7
-  - 3
-  version: 0.7.3
+version: !ruby/object:Gem::Version
+  version: 0.8.0
+  prerelease:
 platform: ruby
-authors:
+authors:
 - Matthew Todd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-29 00:00:00 +03:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2011-12-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &8436690 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *8436690
+- !ruby/object:Gem::Dependency
   name: sinatra
+  requirement: &8436330 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+  version_requirements: *8436330
+- !ruby/object:Gem::Dependency
+  name: optparse-defaults
+  requirement: &8435520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: redgreen
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
+  version_requirements: *8435520
+- !ruby/object:Gem::Dependency
   name: ronn
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+  requirement: &8434880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
-  name: shoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+  version_requirements: *8434880
+- !ruby/object:Gem::Dependency
+  name: shoe
+  requirement: &8434180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :development
-  version_requirements: *id004
-description: Provides console session and simple webapp for looking up Perquackey word matches
+  prerelease: false
+  version_requirements: *8434180
+description: Provides console session and simple webapp for looking up Perquackey
+  word matches
 email: matthew.todd@gmail.com
-executables:
+executables:
 - perquackey
-extensions:
+extensions:
 - ext/perquackey/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.rdoc
 - TODO.rdoc
 - ext/perquackey/anagrams.c
-files:
+files:
 - CHANGELOG.rdoc
 - README.rdoc
 - TODO.rdoc
 - bin/perquackey
 - data/perquackey/dict/TWL06.txt
 - data/perquackey/templates/index.erb
-- data/perquackey/templates/layout.erb
 - ext/perquackey/extconf.rb
 - ext/perquackey/anagrams.c
 - lib/perquackey/application.rb
 - lib/perquackey/console.rb
 - lib/perquackey/dictionary.rb
-- lib/perquackey/game.rb
 - lib/perquackey/server.rb
-- lib/perquackey/word_table.rb
+- lib/perquackey/table.rb
+- lib/perquackey/version.rb
 - lib/perquackey.rb
 - man/perquackey.1
 - man/perquackey.1.ronn
 - test/dictionary_test.rb
 - test/helper.rb
-- test/word_table_test.rb
-has_rdoc: true
+- test/table_test.rb
 homepage: http://github.com/matthewtodd/perquackey
 licenses: []
 post_install_message:
-rdoc_options:
+rdoc_options:
 - --main
 - README.rdoc
 - --title
-- perquackey-0.7.3
+- perquackey-0.8.0
 - --inline-source
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -138864973
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key:
 specification_version: 3
-summary: Provides console session and simple webapp for looking up Perquackey word matches
-test_files:
+summary: Provides console session and simple webapp for looking up Perquackey word
+  matches
+test_files:
 - test/dictionary_test.rb
-- test/word_table_test.rb
+- test/table_test.rb

data/data/perquackey/templates/layout.erb DELETED

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>Perquackey</title>
-  </head>
-  <body>
-    <header>
-      <h1>Perquackey</h1>
-    </header>
-    <%= yield %>
-    <footer>
-      <p>
-        Now using the
-        <a href="http://en.wikipedia.org/wiki/Tournament_Word_List">TWL06 word list</a>
-        courtesy of the
-        <a href="http://www.isc.ro/en/commands/lists.html">Internet Scrabble Club</a>.
-      </p>
-    </footer>
-  </body>
-</html>

data/lib/perquackey/game.rb DELETED

@@ -1,17 +0,0 @@
-module Perquackey
-  class Game
-    def initialize
-      @dictionary = Dictionary.new
-    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
-end

data/test/word_table_test.rb DELETED

@@ -1,23 +0,0 @@
-require 'test/helper'
-class WordTableTest < Test::Unit::TestCase
-  def test_handles_empty_list
-    empty_table = Perquackey::WordTable.new %w()
-    assert_equal [], empty_table.headers.to_a
-    assert_equal [], empty_table.to_a
-  end
-  def test_handles_some_list
-    table = Perquackey::WordTable.new %w(ape bear cat dog eagle fox goose hippo ibis)
-    assert_equal [3, 4, 5], table.headers.to_a
-    assert_equal [
-      'ape bear eagle',
-      'cat ibis goose',
-      'dog      hippo',
-      'fox           '
-    ], table.collect { |row| row.join(' ') }
-  end
-end