yield 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d791602cc5f874c95782c1d5578b4ce95e1cf0
-  data.tar.gz: 0dafa89c8e89067b2ccadd199e70293b80d7dee4
+  metadata.gz: 42f793b0009f6fae3875c945302b563eae95c07b
+  data.tar.gz: 5a578c3af1ea313dc0473376513d5665fc473087
 SHA512:
-  metadata.gz: b7ce56ace95800a23d0d0d8cc33423bb29e3f7b284bb858e7e80e9beeb0c5c9dc370a37f8342e0429f49db78eb8d74d31cd72c4fb394ce64c007f9fc5ee1e675
-  data.tar.gz: 2cfad2e74cead35ec8456895c8922fbe9727923ce35ea3ecfb817cb02eddc1aef6880480cbb40e6ca7ff19bd88cfedf8f4c1eb3a47b88e1d909eb862e77b58f0
+  metadata.gz: 95ec477cd689600e1280ca3b288061dafdab632a5dd8fa5d0d695a0b6f6a0cc360a00460796b6f4a090d093cf8cbc23a0d3ad36a322b6f65aafd3e1974306917
+  data.tar.gz: 5235056ce67a1aa88b38e8833f47d086c73c72f9795929e9467527d0fa8c225cf1675a951c2e9bac53346b0f912330ae17b57318ba341bb10c6246d79a3d57a3

data/Gemfile

@@ -4,5 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "sinatra", "1.4.3"
-gem "thin", "1.5.1"
 gem "launchy", "2.3.0"

data/README.md

@@ -10,7 +10,6 @@ Yield is a command line utility that generates a preview of README.md and markdo
 
 * [Ruby v1.9.3](http://www.ruby-lang.org/en/) or greater
 * [sinatra](http://sinatrarb.com)
-* [thin](http://code.macournoyer.com/thin/)
 * [launchy](https://github.com/copiousfreetime/launchy)
 
 Install the gem by issuing the following command:

data/lib/yield.rb

@@ -1,5 +1,4 @@
 require "sinatra"
-require "thin"
 require "launchy"
 require "net/https"
 require "uri"

data/lib/yield/markdown.rb

@@ -1,33 +1,29 @@
 module Yield
   class Markdown < Sinatra::Base
 
-    @@content = nil
-    @@filename = nil
+    @content = nil
+    @filename = nil
 
     def self.init(filename = 'README.md')
-      @@filename = filename.to_s
-      original_stdout = $stdout
-      $stdout = fake = StringIO.new
-      unless File.exist?(@@filename)
-        abort "Filename '#{@@filename}' doesn't exist."
-      end
+      @filename = filename.to_s
+      $stdout = StringIO.new
+      abort "Filename '#{@filename}' doesn't exist." unless File.exist?(@filename)
     end
 
     def self.convert_to_html(text)
       uri = URI('https://api.github.com/markdown')
       req = Net::HTTP::Post.new(uri.to_s)
-      req.body = { :text => "#{text}", :mode => "gfm" }.to_json
-      
-      response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) { |http| http.request(req) }
+      req.body = { text: "#{text}", mode: 'gfm' }.to_json
+      response = Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(req) }
       response.body
     end
 
-    def self.filename
-      @@filename
+    def self.filename 
+      @filename
     end
 
     def self.content
-      @@content
+      @content
     end
 
   end

data/lib/yield/server.rb

@@ -1,45 +1,37 @@
 module Yield
   class Server < Sinatra::Base
 
-    set :server, %w[thin]
+    set :server, 'webrick'
     set :port, 4000
 
     # Override run! method from Sinatra
-    def self.run!(options = {})
-      set options
-      handler         = detect_rack_handler
-      handler_name    = handler.name.gsub(/.*::/, '')
-      server_settings = settings.respond_to?(:server_settings) ? settings.server_settings : {}
-      handler.run self, server_settings.merge(:Port => port, :Host => bind) do |server|
-        unless handler_name =~ /cgi/i
-          $stderr.puts "=* Yield is serving your markdown at http://localhost:#{port}/"
-        end
-        [:INT, :TERM].each { |sig| trap(sig) { quit!(server, handler_name) } }
+    def self.run!()
+      settings = {}
+      detect_rack_handler.run self, settings.merge(Port: port, Host: bind, Logger: WEBrick::Log.new('/dev/null'), AccessLog: []) do |server|
+        $stderr.puts "=* Yield is serving your markdown at http://localhost:#{port}/"
+        [:INT, :TERM].each { |sig| trap(sig) { quit!(server) } }
         server.threaded = settings.threaded if server.respond_to? :threaded=
         set :running, true
         open_in_browser
         yield server if block_given?
       end
     rescue Errno::EADDRINUSE
-      $stderr.puts "=* Port #{port} is already being used!"
+      $stderr.puts "=* Port #{port} is already in use!"
     end
 
     # Override quit! method from Sinatra
-    def self.quit!(server, handler_name)
-      # Use Thin's hard #stop! if available, otherwise just #stop.
-      server.respond_to?(:stop!) ? server.stop! : server.stop
-      $stderr.puts "=* Stopping yield..." unless handler_name =~/cgi/i
+    def self.quit!(server)
+      server.stop
+      $stderr.puts '=* Stopping yield...'
     end
 
     get '/' do
-      @@content = Yield::Markdown.convert_to_html(File.read(Yield::Markdown.filename).to_s)
-      erb :index, locals: { content: @@content, filename: Yield::Markdown.filename }
-    end
-
-    not_found do
-      erb :'404', locals: { filename: params[:filename] }
+      filename = Markdown.filename
+      content = Markdown.convert_to_html(File.read(filename))
+      erb :index, locals: { content: content, filename: filename }
     end
 
+    not_found { erb :'404' }
 
     def self.open_in_browser
       Launchy.open("http://localhost:#{port}/")

data/lib/yield/version.rb

@@ -1,3 +1,3 @@
 module Yield
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/yield.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
 
   spec.add_dependency 'sinatra', '1.4.3'
-  spec.add_dependency 'thin', '1.5.1'
   spec.add_dependency 'launchy', '2.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yield
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Casey Scarborough
@@ -52,20 +52,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Yield is a command line utility written in Ruby that allows a user to render