gopher2000 0.2.2 → 0.3.0

data/Gemfile

@@ -4,7 +4,6 @@ source "http://rubygems.org"
 gemspec
 
 gem "rake"
-gem "logging"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/gopher2000.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "eventmachine"
 
   s.add_runtime_dependency "eventmachine"
-  s.add_runtime_dependency "logger"
+  s.add_runtime_dependency "logging"
 end

data/lib/gopher2000/base.rb

@@ -133,7 +133,7 @@ module Gopher
     #   end
     #
     def route(path, &block)
-      selector = sanitize_selector(path)
+      selector = Gopher::Application.sanitize_selector(path)
       sig = compile!(selector, &block)
 
       debug_log("Add route for #{selector}")
@@ -162,7 +162,7 @@ module Gopher
     #
     def lookup(selector)
       unless routes.nil?
-        routes.each do |pattern, keys, block|
+		routes.each do |pattern, keys, block|
 
           if match = pattern.match(selector)
             match = match.to_a
@@ -428,19 +428,23 @@ module Gopher
       [/^#{pattern}$/, keys]
     end
 
-    #
-    # Sanitizes a gopher selector
-    #
-    def sanitize_selector(raw)
-      raw.to_s.dup.
-        strip. # Strip whitespace
-        sub(/\/$/, ''). # Strip last rslash
-        sub(/^\/*/, '/'). # Strip extra lslashes
-        gsub(/\.+/, '.') # Don't want consecutive dots!
-    end
 
     class << self
-      #
+
+	  #
+	  # Sanitizes a gopher selector
+	  #
+	  def sanitize_selector(raw)
+		"/#{raw}".dup.
+		  strip. # Strip whitespace
+		  sub(/\/$/, ''). # Strip last rslash
+		  sub(/^\/*/, '/'). # Strip extra lslashes
+		  gsub(/\.+/, '.') # Don't want consecutive dots!
+
+		#raw = "/#{raw}" if ! raw.match(/^\//)
+	  end
+
+	  #
       # generate a method which we will use to run routes. this is
       # based on #generate_method as used by sinatra.
       # @see https://github.com/sinatra/sinatra/blob/master/lib/sinatra/base.rb

data/lib/gopher2000/rendering/base.rb

@@ -119,6 +119,12 @@ module Gopher
         underline(@width, under)
       end
 
+	  def small_header(str, under = '=')
+		str = " " + str + " "
+		text(str)
+		underline(str.length, under)
+	  end
+
       #
       # output a centered string in a box
       # @param [String] str the string to output

data/lib/gopher2000/request.rb

@@ -8,7 +8,9 @@ module Gopher
 
     def initialize(raw, ip_addr=nil)
       @selector, @input = raw.chomp.split("\t")
-      @ip_address = ip_addr
+
+	  @selector = Gopher::Application.sanitize_selector(@selector)
+	  @ip_address = ip_addr
     end
 
     # confirm that this is actually a valid gopher request

data/lib/gopher2000/version.rb

@@ -1,4 +1,4 @@
 module Gopher
   # current version of the app
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/gopher2000.rb

@@ -1,6 +1,6 @@
 require 'eventmachine'
 require 'stringio'
-
+require 'logging'
 
 #
 # Define everything needed to run a gopher server

data/spec/request_spec.rb

@@ -3,13 +3,18 @@ require File.join(File.dirname(__FILE__), '/spec_helper')
 describe Gopher::Request do
   it 'should split raw request' do
     request = Gopher::Request.new("foo\tbar")
-    request.selector.should == "foo"
+    request.selector.should == "/foo"
     request.input.should == "bar"
   end
 
-  it "should be ok with just selector" do
+  it "normalizes by adding a slash to the front" do
     request = Gopher::Request.new("foo")
-    request.selector.should == "foo"
+    request.selector.should == "/foo"
+  end
+
+  it "should be ok with just selector" do
+    request = Gopher::Request.new("/foo")
+    request.selector.should == "/foo"
     request.input.should == nil
   end
 
@@ -19,12 +24,12 @@ describe Gopher::Request do
   end
 
   it "valid? == true for valid selectors" do
-    request = Gopher::Request.new("x" * 255, "bar")
+    request = Gopher::Request.new("x" * 254, "bar")
     request.valid?.should == true
   end
 
   it "valid? == false for invalid selectors" do
-    request = Gopher::Request.new("x" * 256, "bar")
+    request = Gopher::Request.new("x" * 255, "bar")
     request.valid?.should == false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gopher2000
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12080320 !ruby/object:Gem::Requirement
+  requirement: &18116460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12080320
+  version_requirements: *18116460
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &12079440 !ruby/object:Gem::Requirement
+  requirement: &18115520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12079440
+  version_requirements: *18115520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12078120 !ruby/object:Gem::Requirement
+  requirement: &18114820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12078120
+  version_requirements: *18114820
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &12076940 !ruby/object:Gem::Requirement
+  requirement: &18113580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12076940
+  version_requirements: *18113580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12075000 !ruby/object:Gem::Requirement
+  requirement: &18093380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12075000
+  version_requirements: *18093380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &12072800 !ruby/object:Gem::Requirement
+  requirement: &18092340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12072800
+  version_requirements: *18092340
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &12046120 !ruby/object:Gem::Requirement
+  requirement: &18086720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12046120
+  version_requirements: *18086720
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &12044580 !ruby/object:Gem::Requirement
+  requirement: &18032500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12044580
+  version_requirements: *18032500
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &12043120 !ruby/object:Gem::Requirement
+  requirement: &18031440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12043120
+  version_requirements: *18031440
 - !ruby/object:Gem::Dependency
-  name: logger
-  requirement: &12041700 !ruby/object:Gem::Requirement
+  name: logging
+  requirement: &18029980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12041700
+  version_requirements: *18029980
 description: Gopher2000 is a ruby-based Gopher server. It is built for speedy, enjoyable
   development of all sorts of gopher sites.
 email:
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1373198557486184416
+      hash: -579980991170337830
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1373198557486184416
+      hash: -579980991170337830
 requirements: []
 rubyforge_project: gopher2000
 rubygems_version: 1.8.17