gopher2000 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: febb4c0d9036ca121d7ee16c85346ee7afa10ad7f09158d3b6c6c823d1256256
-  data.tar.gz: abfa74d3dd3742bc383a176770e0c68d24ec9ec458a0b0806a288fee7f096480
+  metadata.gz: 599d0bfe771be1795d77d08bd7fa8ef1df0b5c8ef89a6270d344aa9ad206e5ab
+  data.tar.gz: 64ee23ab4b4f63351c9572e19a995c5ca3da96919a79703e47a2830b9ddf6fba
 SHA512:
-  metadata.gz: 971a695d248ddad837c5e7ff17d36d70696729ea383842d09fa289e1d20516e75b7b5c2f40727bd45b28224b3c540af4e3c0e7bf90fb389522f616c792e7db84
-  data.tar.gz: b0290447843496e4cf77e435f523804824be33728ba45cc236465737f574f2e443a2cd8796dc2e01170b311ea91687e6a882a8e5b19dfda8edfc043ecc6ee80d
+  metadata.gz: 7c16b9f80341276ad4f93aacbbf505d01b3aea5264da1e3119d43a10ea0037984b4d423ca51ff9f174a9af805daf8e079a71686296b9baee12607c0767706c59
+  data.tar.gz: 20adee6253ced84ab8d4a8c4c7413874b6f034a0b3ae12a86418336fa04acf16ca81ffc19fef41c6c4bdb28c348c7960a1214a4d9563274a80075a81d72fffae

data/README.markdown

@@ -59,7 +59,7 @@ menu :index do
   br(2)
 
   # link somewhere
-  link 'current time', '/time'
+  text_link 'current time', '/time'
   br
 end
 

data/examples/simple.rb

@@ -57,11 +57,11 @@ menu :index do
   br(2)
 
   # link somewhere
-  link 'current time', '/time'
+  text_link 'current time', '/time'
   br
 
   # another link
-  link 'about', '/about'
+  text_link 'about', '/about'
   br
 
   # ask for some input

data/lib/gopher2000/base.rb

@@ -169,12 +169,11 @@ 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
             url = match.shift
-
+            
             params = to_params_hash(keys, match)
 
             #
@@ -208,6 +207,9 @@ module Gopher
       if ! @request.valid?
         response.body = handle_invalid_request
         response.code = :error
+      elsif @request.url?
+        response.body = handle_url(@request)
+        response.code = :success
       else
         begin
           debug_log("do lookup for #{@request.selector}")
@@ -354,6 +356,15 @@ module Gopher
       menus.include?(:error) ? :error : :'internal/error'
     end
 
+
+    #
+    # get the id of the template that will be used when rendering an html page
+    # @return name of error template
+    #
+    def url_template
+      menus.include?(:html) ? :html : :'internal/url'
+    end
+    
     #
     # get the id of the template that will be used when rendering an
     # invalid request
@@ -438,20 +449,18 @@ module Gopher
 
     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
-
-	  #
+	    #
+	    # 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!
+	    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
@@ -464,7 +473,7 @@ module Gopher
         method
       end
     end
-
+    
     #
     # output a debugging message
     #
@@ -481,15 +490,37 @@ module Gopher
     #
     def register_defaults
       menu :'internal/not_found' do
-        text "Sorry, #{@request.selector} was not found"
+        error "Sorry, #{@request.selector} was not found"
       end
 
       menu :'internal/error' do |details|
-        text "Sorry, there was an error #{details}"
+        error "Sorry, there was an error #{details}"
       end
 
       menu :'internal/invalid_request' do
-        text "invalid request"
+        error "invalid request"
+      end
+
+      menu :'internal/url' do
+        output = <<-EOHTML
+<html>
+  <head>
+    <meta http-equiv="refresh" content="5;URL=#{@request.url}">
+  </head>
+  <body>
+    <p>
+      You are following a link from gopher to a website. If your browser supports it, you will be
+      automatically taken to the web site shortly.  If you do not get
+      sent there, please click <a href="#{@request.url}">here</a>.
+   </p>
+   <p>
+     The URL linked is: <a href="#{@request.url}">#{@request.url}</a>.
+   </p>
+   <p>Have a nice day!</p>
+  </body>
+</html>
+EOHTML
+        output
       end
     end
 
@@ -497,6 +528,10 @@ module Gopher
       render not_found_template
     end
 
+    def handle_url(request)
+      render url_template, request
+    end
+
     def handle_error(e)
       render error_template, e
     end

data/lib/gopher2000/request.rb

@@ -7,12 +7,21 @@ module Gopher
     attr_accessor :selector, :input, :ip_address
 
     def initialize(raw, ip_addr=nil)
-      @selector, @input = raw.chomp.split("\t")
+      @raw = raw
+      @selector, @input = @raw.chomp.split("\t")
       
 	    @selector = Gopher::Application.sanitize_selector(@selector)
 	    @ip_address = ip_addr
     end
 
+    def url?
+      @raw =~ /^URL\:/
+    end
+
+    def url
+      @raw.chomp.split("\t").first.gsub(/^URL\:/, '')
+    end
+    
     # confirm that this is actually a valid gopher request
     # @return [Boolean] true if the request is valid, false otherwise
     def valid?

data/lib/gopher2000/version.rb

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

data/spec/dispatching_spec.rb

@@ -51,6 +51,7 @@ describe Gopher::Application do
 
       @response = @server.dispatch(@request)
       expect(@response.code).to eq(:missing)
+      expect(@response.body).to contain_any_error
     end
 
     it "should respond with error if invalid request" do
@@ -59,6 +60,7 @@ describe Gopher::Application do
 
       @response = @server.dispatch(@request)
       expect(@response.code).to eq(:error)
+      expect(@response.body).to contain_any_error
     end
 
     it "should respond with error if there's an exception" do
@@ -67,6 +69,7 @@ describe Gopher::Application do
 
       @response = @server.dispatch(@request)
       expect(@response.code).to eq(:error)
+      expect(@response.body).to contain_any_error
     end
   end
 
@@ -127,7 +130,17 @@ describe Gopher::Application do
     end
   end
 
+  describe 'dispatch for URL requests' do
+    let(:target) { 'URL:http://github.com/muffinista/gopher2000' }
+    let(:request) { Gopher::Request.new(target) }
+    let(:response) { @server.dispatch(request) }
 
+    it "should return web page" do
+      expect(response.body).to include('<meta http-equiv="refresh" content="5;URL=http://github.com/muffinista/gopher2000">')
+    end
+  end
+
+  
   describe "globs" do
     before(:each) do
       @server.route '/about/*' do
@@ -142,3 +155,11 @@ describe Gopher::Application do
     end
   end
 end
+
+RSpec::Matchers.define :contain_any_error do
+  match do |actual|
+    actual.split(/\r?\n/).any? do |line| 
+      line.match(/^3.*?\tnull\t\(FALSE\)\t0$/)
+    end
+  end
+end

data/spec/request_spec.rb

@@ -32,4 +32,10 @@ describe Gopher::Request do
     request = Gopher::Request.new("x" * 255, "bar")
     expect(request.valid?).to eq(false)
   end
+
+  it 'detects urls' do
+    request = Gopher::Request.new("URL:http://github.com/muffinista/gopher2000")
+    expect(request).to be_url
+    expect(request.url).to eql('http://github.com/muffinista/gopher2000')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gopher2000
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Colin Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec