hi 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62905c572b1eec0a16b7e2eae36f284231c89bd
-  data.tar.gz: fad5a24a9be7b66e9be3046388454baa662afdfe
+  metadata.gz: fa67d1893f36e4de0d7869cd034c1a4f4c52fdf1
+  data.tar.gz: 52116bf9b6840792dcc49f35a3228ba19ebf9bd9
 SHA512:
-  metadata.gz: aae46842f2606ab3374933b9e265dd2649bef5cb09315549001b943df3f87c4d6c39199c06b4c5f5798af39586d05069ffd2b43ddc013548c27b57cb3d34d6a0
-  data.tar.gz: fb7a173ed1ebb24171829acd469d32a2606cb263425c4a7912733bc295b33469e2d3940c4e3535c780a0e2ab82c2d0f367875543daa9b5defdc993f44f262e64
+  metadata.gz: ec28a50bb9c90f4d03c4dbee1e6963f534294d6b36fa34e6a45709746e6b14b1f03b7cec5b74ce50db5d75d9ad5c881d682e091dfd96bb1b1792678f853b33f6
+  data.tar.gz: 64587eb574ae81a82e277c1e716dece6b6f2bf8c660c87e93d3aa4c2e9e555c13c4709380a32fe7a75f5a9d73f4687b18094c0834c48bbd4ea6f664da2ea1527

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+##v1.2.1
+*2014-01-04*
+
+- [#6](https://github.com/chrishunt/hi/pull/6) Extract logger
+
 ##v1.2.0
 *2013-12-29*
 

data/lib/hi/app.rb

@@ -1,29 +1,28 @@
-require 'awesome_print'
 require 'hi/request'
+require 'hi/logger'
 
 module Hi
   class App
-    attr_reader :port
+    attr_reader :port, :logger
 
     DEFAULT_PORT = 3000
 
-    def initialize(port = nil)
+    def initialize(port = nil, logger = Hi::Logger.new)
       @port = (port = port.to_i) > 0 ? port : DEFAULT_PORT
+      @logger = logger
     end
 
     def call(env)
-      log Hi::Request.new(env).to_h
+      request = Hi::Request.new(env).to_h
+
+      log "#{request[:request_method]} #{request[:url]} (#{Time.now})"
+      log request
 
       [ 200, { 'Content-Type' => 'text/plain' }, ['hi'] ]
     end
 
-    private
-
-    def log(request)
-      unless ENV['RACK_ENV'] == 'test'
-        ap "#{request[:request_method]} #{request[:url]} (#{Time.now})"
-        ap request
-      end
+    def log(message)
+      logger.log message
     end
   end
 end

data/lib/hi/logger.rb

@@ -0,0 +1,23 @@
+require 'awesome_print'
+
+module Hi
+  class Logger
+    def log(message)
+      print message unless testing
+    end
+
+    private
+
+    def print(message)
+      if message.is_a? String
+        puts message
+      else
+        ap message
+      end
+    end
+
+    def testing
+      ENV['RACK_ENV'] == 'test'
+    end
+  end
+end

data/lib/hi/server.rb

@@ -13,11 +13,11 @@ module Hi
     end
 
     def start(port = app.port, attempts = 1)
-      log "Starting server on port #{port}...\n\n"
+      app.log "Starting server on port #{port}...\n\n"
       start! port
     rescue RuntimeError => e
       if attempts < MAX_ATTEMPTS
-        log "\nUnable to start server, trying random port instead."
+        app.log "\nUnable to start server, trying random port instead."
         start random_port, attempts + 1
       else
         raise CantStartServerError.new(e)
@@ -33,9 +33,5 @@ module Hi
     def random_port
       1000 + Random.rand(9000)
     end
-
-    def log(message)
-      puts message unless ENV['RACK_ENV'] == 'test'
-    end
   end
 end

data/lib/hi/version.rb

@@ -1,3 +1,3 @@
 module Hi
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/hi.rb

@@ -1,4 +1,5 @@
 require 'hi/version'
+require 'hi/logger'
 require 'hi/request'
 require 'hi/app'
 require 'hi/server'

data/spec/hi/logger_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'hi/logger'
+
+describe Hi::Logger do
+  let(:logger)  { described_class.new }
+  let(:message) { 'Hello logger' }
+
+  context "when RACK_ENV is not 'test'" do
+    before do
+      ENV['RACK_ENV'] = 'the real deal'
+    end
+
+    it 'prints message to standard out' do
+      stdout = capture_stdout do
+        logger.log message
+      end
+
+      expect(stdout).to include message
+    end
+  end
+
+  context "when RACK_ENV is 'test'" do
+    before do
+      ENV['RACK_ENV'] = 'test'
+    end
+
+    it 'does not print message to standard out' do
+      stdout = capture_stdout do
+        logger.log message
+      end
+
+      expect(stdout).to be_empty
+    end
+  end
+
+  private
+
+  def capture_stdout
+    captured = StringIO.new
+    stdout = $stdout
+    $stdout = captured
+
+    yield
+
+    $stdout = stdout
+    captured.string
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -128,11 +128,13 @@ files:
 - hi.gemspec
 - lib/hi.rb
 - lib/hi/app.rb
+- lib/hi/logger.rb
 - lib/hi/request.rb
 - lib/hi/server.rb
 - lib/hi/version.rb
 - screenshot.png
 - spec/hi/app_spec.rb
+- spec/hi/logger_spec.rb
 - spec/hi/request_spec.rb
 - spec/hi/server_spec.rb
 - spec/spec_helper.rb
@@ -162,6 +164,7 @@ specification_version: 4
 summary: hi, I'm here to debug your HTTP
 test_files:
 - spec/hi/app_spec.rb
+- spec/hi/logger_spec.rb
 - spec/hi/request_spec.rb
 - spec/hi/server_spec.rb
 - spec/spec_helper.rb