knod 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b09d9944cc92075dfcc5bc5b55a264cccfaeba
-  data.tar.gz: 10cb27f04c4dd70c79866183b3de3b0515c13d0f
+  metadata.gz: 981cfd40acef82d01c9cf8be4dca564f15cf4a8e
+  data.tar.gz: b5287727a6d34b172d7239108eab4b6317522317
 SHA512:
-  metadata.gz: 1dc82b814c22560847fd189f48d83cd8a39873eb84d4d860267057e33aaedb4d33471ff606343a0d0ea6b3f9e3fb7b0c4063e8004ccc090c534394c5633d31bb
-  data.tar.gz: 1e968e34f546090eb583ce3d03458987c6c5c99d9789a4412c5019ed14f8792c20f9f3bddea4a1e1c7660ba714d4fc58e66b3ae0e7dddfc9e33e1f013c2dd78d
+  metadata.gz: a771a86adb892dc852ddfedd37db30f241bcdcd65247defadcd04969f437f21695f14fcd9ea227ab278596b05e4c568f9114ca9ff0ac091733ce2d6660bdc01a
+  data.tar.gz: 48eeb718da151b2a51ca6fc6c3da9a2d0533980f7e4096c5a82482d84f8c95ec1d667620bbda003bccdabf0c4b40c2039cdae3897e7f9246c2ea47c3d73d1de9

data/.travis.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    knod (0.5.2)
+    knod (0.6.1)
 
 GEM
   remote: https://rubygems.org/

data/Readme.md

@@ -2,12 +2,18 @@
 
 [![Gem Version](https://badge.fury.io/rb/knod.svg)](http://badge.fury.io/rb/knod) [![Build Status](https://travis-ci.org/moserrya/knod.svg?branch=master)](https://travis-ci.org/moserrya/knod) [![Code Climate](https://codeclimate.com/github/moserrya/knod.png)](https://codeclimate.com/github/moserrya/knod)
 
-Knod is a lightweight HTTP server designed to facilitate front end development when the corresponding back end is missing or incomplete. It responds to GET, PUT, POST, PATCH, and DELETE, serving up, writing to, and deleting from the directory of your choosing. Knod has no dependencies outside of the Ruby standard library.
+Knod is a lightweight HTTP server designed to help with front end development when the corresponding back end is missing or incomplete. It responds to GET, PUT, POST, PATCH, and DELETE, serving up, writing to, and deleting from the directory of your choice. Knod has no dependencies outside of the Ruby standard library.
 
 ## Installation
 
+Ruby 2.1 and above:
+
 ```gem install knod```
 
+Older versions of Ruby:
+
+```gem install knod -v 0.4.4``` (does not support PATCH)
+
 ## Usage
 
 The Knod gem comes with an executable; you can run it from the command line with `knod`. Knod will default to port 4444 and the current directory. You can change these with command line arguments (-p and -d, respectively).

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-05-27'
+  gem.date          = '2014-06-01'
   gem.authors       = ['Ryan Moser']
   gem.email         = 'ryanpmoser@gmail.com'
   gem.homepage      = 'https://github.com/moserrya/knod'
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '>= 2.1'
+  gem.required_ruby_version = '>= 2.0'
 
   gem.add_development_dependency "rake", '~> 10'
 end

data/lib/knod.rb

@@ -2,6 +2,8 @@ require 'socket'
 require 'uri'
 require 'fileutils'
 require 'json'
+require 'forwardable'
+require 'knod/file_utilities'
 require 'knod/request'
 require 'knod/patch_merge'
 require 'knod/server'

data/lib/knod/file_utilities.rb

@@ -0,0 +1,18 @@
+module Knod
+  module FileUtilities
+    extend Forwardable
+
+    def_delegator :FileUtils, :mkdir_p, :create_directory
+
+    def_delegator :File, :delete, :delete_file
+    def_delegator :File, :join,   :join_path
+    def_delegator :File, :read,   :read_file
+    def_delegator :File, :write,  :write_file
+
+    def_delegators :File, :file?, :dirname, :directory?
+
+    def file_extension(path)
+      File.extname(path).split('.').last
+    end
+  end
+end

data/lib/knod/server.rb

@@ -1,6 +1,7 @@
 module Knod
   class Server
-    using HashWithPatchMerge
+    include FileUtilities
+
     attr_reader :server, :socket, :request
 
     DEFAULT_PORT = 4444
@@ -35,9 +36,9 @@ module Knod
 
     def do_GET(head=false)
       path = requested_path
-      path = File.join(path, 'index.html') if File.directory?(path)
+      path = join_path(path, 'index.html') if directory?(path)
 
-      if File.file?(path)
+      if file?(path)
         File.open(path, 'rb') do |file|
           socket.print file_response_header(file)
           IO.copy_stream(file, socket) unless head
@@ -54,33 +55,35 @@ module Knod
 
     def do_DELETE
       path = requested_path
-      File.delete(path) if File.file?(path)
+      delete_file(path) if file?(path)
       respond 204
     end
 
     def do_PUT
-      write_to_path(requested_path) do |path|
-        File.write(path, request.body)
-      end
+      write_to_path(requested_path, request.body)
+      respond(200, "\"Success\"")
     end
 
-    def do_PATCH
-      write_to_path(requested_path) do |path|
-        if File.file?(path)
-          merged_data = merge_json(File.read(path), request.body)
-          File.write(path, merged_data)
-        else
-          File.write(path, request.body)
-        end
+    if RUBY_VERSION.to_f >= 2.1
+      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
     end
 
     def do_POST
       path = requested_path
-      FileUtils.mkdir_p(path)
-      records = Dir.glob(path + "/*.json")
-      next_id = (records.map {|r| File.basename(r, ".json") }.map(&:to_i).max || 0) + 1
-      File.write(File.join(path, "#{next_id}.json"), request.body)
+      create_directory(path)
+      next_id = max_id_in_path(path) + 1
+      write_file(join_path(path, "#{next_id}.json"), request.body)
       respond(201, "{\"id\":#{next_id}}")
     end
 
@@ -90,11 +93,15 @@ module Knod
 
     private
 
-    def write_to_path(path)
-      directory = File.dirname(path)
-      FileUtils.mkdir_p(directory)
-      yield path
-      respond(200, "\"Success\"")
+    def write_to_path(path, data)
+      directory_name = dirname(path)
+      create_directory(directory_name)
+      write_file(path, data)
+    end
+
+    def max_id_in_path(path)
+      records = Dir.glob(path + "/*.json")
+      records.map {|r| File.basename(r, ".json") }.map(&:to_i).max || 0
     end
 
     def merge_json(file, request_body)
@@ -154,7 +161,7 @@ module Knod
     DEFAULT_CONTENT_TYPE = 'application/octet-stream'
 
     def content_type(path)
-      ext = File.extname(path).split('.').last
+      ext = file_extension(path)
       CONTENT_TYPE_MAPPING[ext] || DEFAULT_CONTENT_TYPE
     end
 

data/lib/knod/version.rb

@@ -1,3 +1,3 @@
 module Knod
-  VERSION = '0.5.2'
+  VERSION = '0.6.1'
 end

data/test/test_knod.rb

@@ -134,35 +134,37 @@ describe Knod, "a tiny http server" do
     end
   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}}}
-
-    before do
-      FileUtils.mkdir_p(directory)
-      File.write(path, existing_data.to_json)
-    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 '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
+      it 'responds with 200 on success' do
+        response = connection.patch path, patch_data
+        response.code.must_equal '200'
+      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 '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
 
-    after do
-      FileUtils.remove_entry(directory, true)
+      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.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Ryan Moser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -41,6 +41,7 @@ files:
 - bin/knod
 - knod.gemspec
 - lib/knod.rb
+- lib/knod/file_utilities.rb
 - lib/knod/patch_merge.rb
 - lib/knod/request.rb
 - lib/knod/server.rb
@@ -59,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="