gopher2000 0.3.0 → 0.6.0

data/spec/rendering_spec.rb

@@ -18,11 +18,11 @@ describe Gopher::Application do
   describe "find_template" do
     it "should check in menus" do
       @s.menus['foo'] = "bar"
-      @s.find_template('foo').should == ["bar", Gopher::Rendering::Menu]
+      expect(@s.find_template('foo')).to eq(["bar", Gopher::Rendering::Menu])
     end
     it "should check in text_templates" do
       @s.text_templates['foo'] = "bar"
-      @s.find_template('foo').should == ["bar", Gopher::Rendering::Text]
+      expect(@s.find_template('foo')).to eq(["bar", Gopher::Rendering::Text])
     end
   end
 
@@ -37,7 +37,7 @@ describe Gopher::Application do
         @params
       end
 
-      @s.render(:foo).should == "xyz"
+      expect(@s.render(:foo)).to eq("xyz")
     end
 
     it "has access to request obj" do
@@ -46,7 +46,7 @@ describe Gopher::Application do
         @request
       end
 
-      @s.render(:foo).should == "abc"
+      expect(@s.render(:foo)).to eq("abc")
     end
 
     it "rendering text access to request obj" do
@@ -55,7 +55,7 @@ describe Gopher::Application do
         @request
       end
 
-      @s.render(:foo).should == "abc"
+      expect(@s.render(:foo)).to eq("abc")
     end
   end
 
@@ -66,11 +66,11 @@ describe Gopher::Application do
 
     it "should use custom template if provided" do
       @s.not_found do ; end
-      @s.not_found_template.should == :not_found
+      expect(@s.not_found_template).to eq(:not_found)
     end
 
     it "should use default otherwise" do
-      @s.not_found_template.should == :'internal/not_found'
+      expect(@s.not_found_template).to eq(:'internal/not_found')
     end
   end
 

data/spec/request_spec.rb

@@ -3,33 +3,39 @@ 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.input.should == "bar"
+    expect(request.selector).to eq("/foo")
+    expect(request.input).to eq("bar")
   end
 
   it "normalizes by adding a slash to the front" do
     request = Gopher::Request.new("foo")
-    request.selector.should == "/foo"
+    expect(request.selector).to eq("/foo")
   end
 
   it "should be ok with just selector" do
     request = Gopher::Request.new("/foo")
-    request.selector.should == "/foo"
-    request.input.should == nil
+    expect(request.selector).to eq("/foo")
+    expect(request.input).to eq(nil)
   end
 
   it "should accept ip_address" do
     request = Gopher::Request.new("foo", "bar")
-    request.ip_address.should == "bar"
+    expect(request.ip_address).to eq("bar")
   end
 
   it "valid? == true for valid selectors" do
     request = Gopher::Request.new("x" * 254, "bar")
-    request.valid?.should == true
+    expect(request.valid?).to eq(true)
   end
 
   it "valid? == false for invalid selectors" do
     request = Gopher::Request.new("x" * 255, "bar")
-    request.valid?.should == false
+    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

data/spec/response_spec.rb

@@ -8,17 +8,17 @@ describe Gopher::Response do
 
   it "gets size for string results" do
     @response.body = "hi"
-    @response.size.should == 2
+    expect(@response.size).to eq(2)
   end
 
   it "gets size for stringio results" do
     @response.body = StringIO.new("12345")
-    @response.size.should == 5
+    expect(@response.size).to eq(5)
   end
 
   it "defaults to 0 size for weird objects" do
-    @response.body = mock(Object)
-    @response.size.should == 0
+    @response.body = double(Object)
+    expect(@response.size).to eq(0)
   end
 
 
@@ -28,6 +28,6 @@ describe Gopher::Response do
     temp_file.flush
 
     @response.body = File.new(temp_file.path)
-    @response.size.should == 10
+    expect(@response.size).to eq(10)
   end
 end

data/spec/routing_spec.rb

@@ -16,30 +16,30 @@ describe Gopher::Application do
         "hi"
       end
       junk, block = @router.lookup("sfssfdfsfsd")
-      block.class.should eql(UnboundMethod)
+      expect(block.class).to eql(UnboundMethod)
     end
   end
 
   describe "globify" do
     it "should add glob if none yet" do
-      @router.globify("/foo").should == "/foo/?*"
+      expect(@router.globify("/foo")).to eq("/foo/?*")
     end
 
     it "should be ok with trailing slashes" do
-      @router.globify("/foo/").should == "/foo/?*"
+      expect(@router.globify("/foo/")).to eq("/foo/?*")
     end
 
     it "shouldn't add glob if there is one already" do
-      @router.globify("/foo/*").should == "/foo/*"
+      expect(@router.globify("/foo/*")).to eq("/foo/*")
     end
   end
 
   describe "mount" do
     before(:each) do
-      @h = mock(Gopher::Handlers::DirectoryHandler)
-      @h.should_receive(:application=).with(@router)
+      @h = double(Gopher::Handlers::DirectoryHandler)
+      expect(@h).to receive(:application=).with(@router)
 
-      Gopher::Handlers::DirectoryHandler.should_receive(:new).with({:bar => :baz, :mount_point => "/foo"}).and_return(@h)
+      expect(Gopher::Handlers::DirectoryHandler).to receive(:new).with({:bar => :baz, :mount_point => "/foo"}).and_return(@h)
     end
 
     it "should work" do
@@ -50,42 +50,42 @@ describe Gopher::Application do
   describe "compile" do
     it "should generate a basic string for routes without keys" do
       lookup, keys, block = @router.compile! "/foo" do; end
-      lookup.to_s.should == /^\/foo$/.to_s
-      keys.should == []
+      expect(lookup.to_s).to eq(/^\/foo$/.to_s)
+      expect(keys).to eq([])
     end
 
     context "with keys" do
       it "should generate a lookup and keys for routes with keys" do
         lookup, keys, block = @router.compile! "/foo/:bar" do; end
-        lookup.to_s.should == "(?-mix:^\\/foo\\/([^\\/?#]+)$)"
+        expect(lookup.to_s).to eq("(?-mix:^\\/foo\\/([^\\/?#]+)$)")
 
-        keys.should == ["bar"]
+        expect(keys).to eq(["bar"])
       end
 
       it "should match correctly" do
         lookup, keys, block = @router.compile! "/foo/:bar" do; end
-        lookup.to_s.should == "(?-mix:^\\/foo\\/([^\\/?#]+)$)"
+        expect(lookup.to_s).to eq("(?-mix:^\\/foo\\/([^\\/?#]+)$)")
 
-        lookup.match("/foo/baz").should_not be_nil
-        lookup.match("/foo2/baz").should be_nil
-        lookup.match("/baz/foo/baz").should be_nil
-        lookup.match("/foo/baz/bar").should be_nil
+        expect(lookup.match("/foo/baz")).not_to be_nil
+        expect(lookup.match("/foo2/baz")).to be_nil
+        expect(lookup.match("/baz/foo/baz")).to be_nil
+        expect(lookup.match("/foo/baz/bar")).to be_nil
       end
     end
 
     context "with splat" do
       it "should work with splats" do
         lookup, keys, block = @router.compile! "/foo/*" do; end
-        lookup.to_s.should == "(?-mix:^\\/foo\\/(.*?)$)"
-        keys.should == ["splat"]
+        expect(lookup.to_s).to eq("(?-mix:^\\/foo\\/(.*?)$)")
+        expect(keys).to eq(["splat"])
       end
 
       it "should match correctly" do
         lookup, keys, block = @router.compile! "/foo/*" do; end
 
-        lookup.match("/foo/baz/bar/bam").should_not be_nil
-        lookup.match("/foo2/baz").should be_nil
-        lookup.match("/baz/foo/baz").should be_nil
+        expect(lookup.match("/foo/baz/bar/bam")).not_to be_nil
+        expect(lookup.match("/foo2/baz")).to be_nil
+        expect(lookup.match("/baz/foo/baz")).to be_nil
       end
     end
   end

data/spec/server_spec.rb

@@ -18,20 +18,36 @@ if ENV["WITH_SERVER_SPECS"].to_i == 1
 
       @host = "0.0.0.0"
       @port = 12345
+      @environment = 'test'
 
       @application.config[:host] = @host
       @application.config[:port] = @port
+      @application.config[:env] = @environment
 
       @request = Gopher::Request.new("foo", "bar")
 
-      @response = Gopher::Response.new(@request)
+      @response = Gopher::Response.new
       @response.code = :success
       @response.body = "hi"
     end
 
+    it "returns host" do
+      @application.config[:host] = 'gopher-site.test'
+      expect(@application.host).to eql('gopher-site.test')
+    end
+
+    it "returns port" do
+      expect(@application.port).to eql(@port)
+    end
+
+    it "returns environment" do
+      expect(@application.env).to eql(@environment)
+    end
+   
+    
     it "should work in non-blocking mode" do
       @application.fake_response = @response
-      @application.stub!(:non_blocking?).and_return(false)
+      allow(@application).to receive(:non_blocking?).and_return(false)
 
       ::EM.run {
         server = Gopher::Server.new(@application)
@@ -42,7 +58,7 @@ if ENV["WITH_SERVER_SPECS"].to_i == 1
         socket.send_data("123\n")
 
         socket.onopen = lambda {
-          socket.data.last.chomp.should == "hi\r\n."
+          expect(socket.data.last.chomp).to eq("hi\r\n.")
           EM.stop
         }
       }
@@ -60,7 +76,7 @@ if ENV["WITH_SERVER_SPECS"].to_i == 1
         socket.send_data("123\n")
 
         socket.onopen = lambda {
-          socket.data.last.chomp.should == "hi\r\n."
+          expect(socket.data.last.chomp).to eq("hi\r\n.")
           EM.stop
         }
       }
@@ -78,7 +94,7 @@ if ENV["WITH_SERVER_SPECS"].to_i == 1
         socket.send_data("123\n")
 
         socket.onopen = lambda {
-          socket.data.last.chomp.should == "hi\r\n."
+          expect(socket.data.last.chomp).to eq("hi\r\n.")
           EM.stop
         }
       }
@@ -100,7 +116,7 @@ if ENV["WITH_SERVER_SPECS"].to_i == 1
         socket.send_data("123\n")
 
         socket.onopen = lambda {
-          socket.data.last.chomp.should == "hi"
+          expect(socket.data.last.chomp).to eq("hi")
           EM.stop
         }
       }
@@ -118,7 +134,7 @@ if ENV["WITH_SERVER_SPECS"].to_i == 1
         socket.send_data("123\n")
 
         socket.onopen = lambda {
-          socket.data.last.chomp.should == "hi\r\n."
+          expect(socket.data.last.chomp).to eq("hi\r\n.")
           EM.stop
         }
       }

metadata

@@ -1,126 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: gopher2000
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Colin Mitchell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18116460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18116460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &18115520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18115520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &18114820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18114820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18113580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18113580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18093380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18093380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18092340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :development
   prerelease: false
-  version_requirements: *18092340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &18086720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18086720
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &18032500 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+- !ruby/object:Gem::Dependency
+  name: artii
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
   prerelease: false
-  version_requirements: *18032500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &18031440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *18031440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &18029980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18029980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gopher2000 is a ruby-based Gopher server. It is built for speedy, enjoyable
   development of all sorts of gopher sites.
 email:
@@ -130,14 +173,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".ruby-version"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
 - bin/gopher2000
 - examples/default_route.rb
+- examples/figlet.rb
 - examples/nyan.rb
 - examples/simple.rb
 - examples/twitter.rb
@@ -179,33 +225,40 @@ files:
 homepage: https://github.com/muffinista/gopher2000
 licenses:
 - WTFPL
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -579980991170337830
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -579980991170337830
 requirements: []
-rubyforge_project: gopher2000
-rubygems_version: 1.8.17
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.8
+signing_key:
+specification_version: 4
 summary: Gopher2000 - A Gopher server for the next millenium
-test_files: []
-has_rdoc: 
+test_files:
+- spec/application_spec.rb
+- spec/dispatching_spec.rb
+- spec/dsl_spec.rb
+- spec/gopher_spec.rb
+- spec/handlers/directory_handler_spec.rb
+- spec/helpers_spec.rb
+- spec/rendering/base_spec.rb
+- spec/rendering/menu_spec.rb
+- spec/rendering_spec.rb
+- spec/request_spec.rb
+- spec/response_spec.rb
+- spec/routing_spec.rb
+- spec/sandbox/old/socks.txt
+- spec/sandbox/socks.txt
+- spec/server_spec.rb
+- spec/spec_helper.rb