knod 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24db330e2ed1cad1a1765169a47239723f4387da
-  data.tar.gz: c744a80528dfeb1dc3e9597299239362a7782aaa
+  metadata.gz: bdbb4e14fe3660fb4bb030db3d9aa1f866375f68
+  data.tar.gz: c7bdf61f293efebf3088d693ff5cedb20299af3e
 SHA512:
-  metadata.gz: a5b9650afbf606e35421ca86390e43812db7fe922e74fae0f8a93d55e9aa8f5624c3839260566ed767c779ba3ed0ae8d0032c6207687b5e4e28814a6aa07ba5f
-  data.tar.gz: f4e6215b5e0d7252427c829e1049140ec9158ec762f7e89adbe1c0d1fc006c27efd71bcc62c9b140a0e2be98806e8f56e5d59582942ffc584db0f306f69ae8f8
+  metadata.gz: f167fd7a82546afa06f6e866ac5b3f2be6932e9c3fa24ad088c86decb65af88dad1de86496565e24f09e03261cad79899fcf2e43f40326993ac6bcb7b0e2b074
+  data.tar.gz: b6aa207913a06d2d66f8e94259dee7ca4a03c48d1c4c04cdc70e105b74563868caebde8d81805198adcb2562b9e5886c2fba7b7d339f82d6c08df1640cded5ac

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.2.5
+  - 2.3.1

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    knod (0.8.0)
+    knod (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    minitest (5.8.4)
     rake (10.3.1)
 
 PLATFORMS
@@ -13,4 +14,8 @@ PLATFORMS
 
 DEPENDENCIES
   knod!
+  minitest (~> 5)
   rake (~> 10)
+
+BUNDLED WITH
+   1.11.2

data/knod.gemspec

@@ -6,7 +6,7 @@ require 'knod/version'
 Gem::Specification.new do |gem|
   gem.name          = 'knod'
   gem.version       = Knod::VERSION
-  gem.date          = '2014-06-25'
+  gem.date          = '2016-09-11'
   gem.authors       = ['Ryan Moser']
   gem.email         = 'ryanpmoser@gmail.com'
   gem.homepage      = 'https://github.com/moserrya/knod'
@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '>= 2.0'
+  gem.required_ruby_version = '>= 2.1'
 
-  gem.add_development_dependency "rake", '~> 10'
+  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'minitest', '~> 5'
 end

data/lib/knod/file_utilities.rb

@@ -17,7 +17,7 @@ module Knod
 
     def concat_json(path)
       files = Dir.glob(join_path(path, "*")).sort
-      data = files.map { |f| File.read(f) }
+      data = files.map { |f| read_file(f) }
       json_data = '[' + data.join(',') + ']'
     end
   end

data/lib/knod/server.rb

@@ -2,7 +2,7 @@ module Knod
   class Server
     include FileUtilities
 
-    attr_reader :server, :socket, :request
+    attr_reader :server, :client, :request
 
     DEFAULT_PORT = 4444
     DEFAULT_WEB_ROOT = './'
@@ -17,13 +17,15 @@ module Knod
     def start
       log "Starting server on port #{port}"
       loop do
-        accept_request_and_respond
+        Thread.start(server.accept) do |client|
+          dup.accept_request_and_respond(client)
+        end
       end
     end
 
-    def accept_request_and_respond
-      @socket = server.accept
-      @request = Request.new(socket)
+    def accept_request_and_respond(client)
+      @client = client
+      @request = Request.new(client)
       log request_line
       public_send "do_#{request.method}"
     rescue => e
@@ -31,7 +33,7 @@ module Knod
       log e.backtrace
       respond 500
     ensure
-      socket.close if socket
+      client.close if client
     end
 
     def do_GET(head = false)
@@ -39,8 +41,8 @@ module Knod
 
       if file?(path)
         File.open(path, 'rb') do |file|
-          socket.print file_response_header(file)
-          IO.copy_stream(file, socket) unless head
+          client.print file_response_header(file)
+          IO.copy_stream(file, client) unless head
         end
       elsif directory?(path)
         respond(200, concat_json(path))
@@ -65,19 +67,17 @@ module Knod
       respond(200, "\"Success\"")
     end
 
-    if RUBY_VERSION.to_f >= 2.1
-      using HashWithPatchMerge
+    using HashWithPatchMerge
 
-      def do_PATCH
-        path = requested_path
-        data = if file?(path)
-                 merge_json(read_file(path), request.body)
-               else
-                 request.body
-               end
-        write_to_path(path, data)
-        respond(200, "\"Success\"")
-      end
+    def do_PATCH
+      path = requested_path
+      data = if file?(path)
+               merge_json(read_file(path), request.body)
+             else
+               request.body
+             end
+      write_to_path(path, data)
+      respond(200, "\"Success\"")
     end
 
     def do_POST
@@ -137,8 +137,8 @@ module Knod
     end
 
     def respond(status_code, message = '')
-      socket.print response_header(status_code, message)
-      socket.print message unless message.empty?
+      client.print response_header(status_code, message)
+      client.print message unless message.empty?
     end
 
     def file_response_header(file)
@@ -165,7 +165,7 @@ module Knod
 
     def content_type(path)
       ext = file_extension(path)
-      CONTENT_TYPE_MAPPING[ext] || DEFAULT_CONTENT_TYPE
+      CONTENT_TYPE_MAPPING.fetch(ext) { DEFAULT_CONTENT_TYPE }
     end
 
     def requested_path

data/lib/knod/version.rb

@@ -1,3 +1,3 @@
 module Knod
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'
 end

data/test/connection.rb

@@ -9,16 +9,16 @@ class Connection
   end
 
   VERB_MAP = {
-    get:    Net::HTTP::Get,
-    post:   Net::HTTP::Post,
-    put:    Net::HTTP::Put,
-    patch:  Net::HTTP::Patch,
-    delete: Net::HTTP::Delete,
-    head:   Net::HTTP::Head,
+    get:     Net::HTTP::Get,
+    post:    Net::HTTP::Post,
+    put:     Net::HTTP::Put,
+    patch:   Net::HTTP::Patch,
+    delete:  Net::HTTP::Delete,
+    head:    Net::HTTP::Head,
     options: Net::HTTP::Options
   }
 
-  VERB_MAP.keys.each do |method|
+  VERB_MAP.each_key do |method|
     define_method method, ->(path, params=nil) {request_json method, path, params}
   end
 
@@ -32,13 +32,13 @@ class Connection
     response
   end
 
-  def request(method, path, params = {})
+  def request(method, path, params)
     case method
     when :get, :head
-      full_path = encode_path_params(path, params)
-      request = VERB_MAP[method.to_sym].new(full_path)
+      encoded_path = encode_path_params(path, params)
+      request = VERB_MAP[method].new(encoded_path)
     else
-      request = VERB_MAP[method.to_sym].new(path)
+      request = VERB_MAP[method].new(path)
       request.body = params.to_json
     end
 

data/test/test_knod.rb

@@ -67,7 +67,7 @@ describe Knod, "a tiny http server" do
       response['Access-Control-Allow-Origin'].must_equal '*'
     end
 
-    describe 'contatenates files into a json array' do
+    describe 'concatenates files into a json array' do
       let(:path) {'index'}
       let(:data) { 3.times.map { |i| { id: i+1, state: 'squiddy' } } }
 
@@ -158,56 +158,35 @@ describe Knod, "a tiny http server" do
     end
   end
 
-  if RUBY_VERSION.to_f >= 2.1
-    describe 'PATCH' do
-      let(:directory) {'index'}
-      let(:path) {"#{directory}/13.json"}
-      let(:existing_data) {{base: 3, nested: {a: 1, c: 3}}}
-      let(:patch_data) {{nested: {a: nil, b: 2}}}
-
-      before do
-        FileUtils.mkdir_p(directory)
-        File.write(path, existing_data.to_json)
-      end
-
-      it 'creates the file if it does not exist' do
-        File.delete(path)
-        connection.patch path, patch_data
-        File.file?(path).must_equal true
-      end
-
-      it 'responds with 200 on success' do
-        response = connection.patch path, patch_data
-        response.code.must_equal '200'
-      end
+  describe 'PATCH' do
+    let(:directory) {'index'}
+    let(:path) {"#{directory}/13.json"}
+    let(:existing_data) {{base: 3, nested: {a: 1, c: 3}}}
+    let(:patch_data) {{nested: {a: nil, b: 2}}}
 
-      it 'merges the request data with existing data' do
-        connection.patch path, patch_data
-        parse_json_file(path).must_equal({:base=>3, :nested=>{:c=>3, :b=>2}})
-      end
+    before do
+      FileUtils.mkdir_p(directory)
+      File.write(path, existing_data.to_json)
+    end
 
-      after do
-        FileUtils.remove_entry(directory, true)
-      end
+    it 'creates the file if it does not exist' do
+      File.delete(path)
+      connection.patch path, patch_data
+      File.file?(path).must_equal true
     end
-  end
 
-  describe 'error handling' do
-    before do
-      def $knod.do_HEAD
-        raise 'boom!'
-      end
+    it 'responds with 200 on success' do
+      response = connection.patch path, patch_data
+      response.code.must_equal '200'
     end
 
-    after do
-      def $knod.do_HEAD
-        do_GET(head=true)
-      end
+    it 'merges the request data with existing data' do
+      connection.patch path, patch_data
+      parse_json_file(path).must_equal({:base=>3, :nested=>{:c=>3, :b=>2}})
     end
 
-    it 'responds to server errors with a 500' do
-      response = connection.head '/index.html'
-      response.code.must_equal '500'
+    after do
+      FileUtils.remove_entry(directory, true)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knod
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryan Moser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: An http server built using Ruby's standard library
 email: ryanpmoser@gmail.com
 executables:
@@ -60,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -68,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A tiny RESTful http server