gopher2000 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c507fab7aaa1412d98ac4a18870fe786098aa9aa4e393bd1204cc476f111dfb
-  data.tar.gz: e767f8ea12042fc19a7c6f6fc25766b3d91838f053abf1abe97b17b8c99da4e5
+  metadata.gz: febb4c0d9036ca121d7ee16c85346ee7afa10ad7f09158d3b6c6c823d1256256
+  data.tar.gz: abfa74d3dd3742bc383a176770e0c68d24ec9ec458a0b0806a288fee7f096480
 SHA512:
-  metadata.gz: 3497713e468d3d6eefecafcb68cc7421c8af9db40bcd0e30c865f54e1a8a0e8ab0a8098fa8f5369a518cf4dfd391612ba3ada0d4a4ba51b17240934fa500275d
-  data.tar.gz: 89145000523a7d3d7c77ebad777a0421211b05edfe973c4bc3cbe45ea37d2541bfd773be0ed2c86cf114a0a6c47c1fa6a8e64b2ab76e9a8d278423d5b19cb80b
+  metadata.gz: 971a695d248ddad837c5e7ff17d36d70696729ea383842d09fa289e1d20516e75b7b5c2f40727bd45b28224b3c540af4e3c0e7bf90fb389522f616c792e7db84
+  data.tar.gz: b0290447843496e4cf77e435f523804824be33728ba45cc236465737f574f2e443a2cd8796dc2e01170b311ea91687e6a882a8e5b19dfda8edfc043ecc6ee80d

data/bin/gopher2000

@@ -31,7 +31,7 @@ params = {
 
 opts.on('-d', '--debug', "run in debug mode")    { params[:debug] = true }
 opts.on('-p port',   'set the port (default is 70)')                { |val| params[:port] = Integer(val) }
-opts.on('-o addr',   'set the host (default is 0.0.0.0)')             { |val| params[host] = val }
+opts.on('-o addr',   'set the host (default is 0.0.0.0)')             { |val| params[:host] = val }
 opts.on('-e env',    'set the environment (default is development)')  { |val| params[:env] = val.to_sym }
 
 opts.on_tail("-h", "--help", "Show this message") do

data/lib/gopher2000/base.rb

@@ -54,6 +54,13 @@ module Gopher
       config[:port] ||= 70
     end
 
+    #
+    # return the application environment
+    #
+    def env
+      config[:env] ||= 'development'
+    end
+
     #
     # are we in debugging mode?
     #

data/lib/gopher2000/request.rb

@@ -8,9 +8,9 @@ module Gopher
 
     def initialize(raw, ip_addr=nil)
       @selector, @input = raw.chomp.split("\t")
-
-	  @selector = Gopher::Application.sanitize_selector(@selector)
-	  @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/server.rb

@@ -13,7 +13,7 @@ module Gopher
     def initialize(a)
       @app = a
     end
-
+ 
     #
     # @return [String] name of the host specified in our config
     #
@@ -28,6 +28,13 @@ module Gopher
       @app.config[:port] ||= 70
     end
 
+    #
+    # @return [String] environment specified in config
+    #
+    def env
+      @app.config[:env] || 'development'
+    end
+    
     #
     # main app loop. called via at_exit block defined in DSL
     #
@@ -77,8 +84,8 @@ module Gopher
       require 'optparse'
       OptionParser.new { |op|
         op.on('-p port',   'set the port (default is 70)')                { |val| set :port, Integer(val) }
-        op.on('-o addr',   'set the host (default is 0.0.0.0)')             { |val| set :bind, val }
-        op.on('-e env',    'set the environment (default is development)')  { |val| set :environment, val.to_sym }
+        op.on('-o addr',   'set the host (default is 0.0.0.0)')             { |val| set :host, val }
+        op.on('-e env',    'set the environment (default is development)')  { |val| set :env, val.to_sym }
       }.parse!(ARGV.dup)
     end
   end

data/lib/gopher2000/version.rb

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

data/spec/dsl_spec.rb

@@ -14,103 +14,112 @@ describe Gopher::DSL do
 
     @server = FakeServer.new(@app)
     @server.send :require, 'gopher2000/dsl'
-    allow(@server).to receive(:application).and_return(@app)
-    @app.reset!
   end
 
-
-  describe "set" do
-    it "should set a config var" do
-      @server.set :foo, 'bar'
-      expect(@app.config[:foo]).to eq('bar')
+  describe "application" do
+    it "should return a Gopher::Application" do
+      expect(@server.application).to be_a(Gopher::Application)
     end
   end
 
-  describe "route" do
-    it "should pass a lookup and block to the app" do
-      expect(@app).to receive(:route).with('/foo')
-      @server.route '/foo' do
-        "hi"
+  context "with application" do
+    before do
+      allow(@server).to receive(:application).and_return(@app)
+      @app.reset!
+    end
+
+    describe "set" do
+      it "should set a config var" do
+        @server.set :foo, 'bar'
+        expect(@app.config[:foo]).to eq('bar')
       end
     end
-  end
 
-  describe "default_route" do
-    it "should pass a default block to the app" do
-      expect(@app).to receive(:default_route)
-      @server.default_route do
-        "hi"
+    describe "route" do
+      it "should pass a lookup and block to the app" do
+        expect(@app).to receive(:route).with('/foo')
+        @server.route '/foo' do
+          "hi"
+        end
       end
     end
-  end
 
-  describe "mount" do
-    it "should pass a route, path, and some opts to the app" do
-      expect(@app).to receive(:mount).with('/foo', {:path => "/bar"})
-      @server.mount "/foo" => "/bar"
+    describe "default_route" do
+      it "should pass a default block to the app" do
+        expect(@app).to receive(:default_route)
+        @server.default_route do
+          "hi"
+        end
+      end
     end
 
-    it "should pass a route, path, filter, and some opts to the app" do
-      expect(@app).to receive(:mount).with('/foo', {:path => "/bar", :filter => "*.jpg"})
-      @server.mount "/foo" => "/bar", :filter => "*.jpg"
+    describe "mount" do
+      it "should pass a route, path, and some opts to the app" do
+        expect(@app).to receive(:mount).with('/foo', {:path => "/bar"})
+        @server.mount "/foo" => "/bar"
+      end
+
+      it "should pass a route, path, filter, and some opts to the app" do
+        expect(@app).to receive(:mount).with('/foo', {:path => "/bar", :filter => "*.jpg"})
+        @server.mount "/foo" => "/bar", :filter => "*.jpg"
+      end
     end
-  end
 
-  describe "menu" do
-    it "should pass a menu key and block to the app" do
-      expect(@app).to receive(:menu).with('/foo')
-      @server.menu '/foo' do
-        "hi"
+    describe "menu" do
+      it "should pass a menu key and block to the app" do
+        expect(@app).to receive(:menu).with('/foo')
+        @server.menu '/foo' do
+          "hi"
+        end
       end
     end
-  end
 
-  describe "text" do
-    it "should pass a text_template key and block to the app" do
-      expect(@app).to receive(:text).with('/foo')
-      @server.text '/foo' do
-        "hi"
+    describe "text" do
+      it "should pass a text_template key and block to the app" do
+        expect(@app).to receive(:text).with('/foo')
+        @server.text '/foo' do
+          "hi"
+        end
       end
     end
-  end
 
-  describe "helpers" do
-    it "should pass a block to the app" do
-      expect(@app).to receive(:helpers)
-      @server.helpers do
-        "hi"
+    describe "helpers" do
+      it "should pass a block to the app" do
+        expect(@app).to receive(:helpers)
+        @server.helpers do
+          "hi"
+        end
       end
     end
-  end
 
-  describe "watch" do
-    it "should pass a script app for watching" do
-      expect(@app.scripts).to receive(:<<).with("foo")
-      @server.watch("foo")
+    describe "watch" do
+      it "should pass a script app for watching" do
+        expect(@app.scripts).to receive(:<<).with("foo")
+        @server.watch("foo")
+      end
     end
-  end
 
-  describe "run" do
-    it "should set any incoming opts" do
-      expect(@server).to receive(:set).with(:x, 1)
-      expect(@server).to receive(:set).with(:y, 2)
-      allow(@server).to receive(:load)
+    describe "run" do
+      it "should set any incoming opts" do
+        expect(@server).to receive(:set).with(:x, 1)
+        expect(@server).to receive(:set).with(:y, 2)
+        allow(@server).to receive(:load)
 
-      @server.run("foo", {:x => 1, :y => 2})
-    end
+        @server.run("foo", {:x => 1, :y => 2})
+      end
 
-    it "should turn on script watching if in debug mode" do
-      @app.config[:debug] = true
-      expect(@server).to receive(:watch).with("foo.rb")
-      expect(@server).to receive(:load).with("foo.rb")
+      it "should turn on script watching if in debug mode" do
+        @app.config[:debug] = true
+        expect(@server).to receive(:watch).with("foo.rb")
+        expect(@server).to receive(:load).with("foo.rb")
 
-      @server.run("foo.rb")
-    end
+        @server.run("foo.rb")
+      end
 
-    it "should load the script" do
-      expect(@server).to receive(:load).with("foo.rb")
-      @server.run("foo.rb")
+      it "should load the script" do
+        expect(@server).to receive(:load).with("foo.rb")
+        @server.run("foo.rb")
+      end
     end
   end
-
 end

data/spec/rendering/menu_spec.rb

@@ -54,9 +54,25 @@ describe Gopher::Rendering::Menu do
   end
 
   describe "link" do
-    it "should get type with determine_type" do
-      expect(@ctx).to receive(:determine_type).with("foo.txt").and_return("A")
-      expect(@ctx.link("FILE", "foo.txt")).to eq("AFILE\tfoo.txt\thost\t1234\r\n")
+    context "with filepath" do
+      it "should get type with determine_type" do
+        expect(@ctx).to receive(:determine_type).with("foo.txt").and_return("A")
+        expect(@ctx.link("FILE", "thing", "external-server.com", 70, "foo.txt")).to eq("AFILE\tthing\texternal-server.com\t70\r\n")
+      end
+    end
+
+    context "without filepath" do
+      it "should get type with determine_type" do
+        expect(@ctx).to receive(:determine_type).with("foo.txt").and_return("A")
+        expect(@ctx.link("FILE", "foo.txt")).to eq("AFILE\tfoo.txt\thost\t1234\r\n")
+      end
+    end
+    
+  end
+
+  describe "text_link" do
+    it "should work" do
+      expect(@ctx.text_link("text link", "/files/foo.txt")).to eq("0text link\t/files/foo.txt\thost\t1234\r\n")
     end
   end
 

data/spec/server_spec.rb

@@ -18,17 +18,33 @@ 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
       allow(@application).to receive(:non_blocking?).and_return(false)

metadata

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