conveyor 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.1 / 2008-01-31
+
+* Fix TCP binding.
+
 == 0.1.0 / 2008-01-29
 
 * Basic Channel implementation

data/Rakefile

@@ -8,12 +8,9 @@ Hoe.new('conveyor', Conveyor::VERSION) do |p|
   p.rubyforge_name = 'conveyor'
   p.author = 'Ryan King'
   p.email = 'ryan@theryanking.com'
-  p.summary = 'Like TiVo for your data.'
-  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.extra_deps << ['mongrel']
   p.extra_deps << ['activesupport']
+  p.extra_deps << ['json']
 end
 
 # vim: syntax=Ruby

data/bin/conveyor

@@ -8,4 +8,4 @@ end
 $: << 'lib'
 
 require 'conveyor/server'
-Conveyor::Server.new('localhost', ARGV[0], ARGV[1]).run.join
+Conveyor::Server.new('0.0.0.0', ARGV[0].to_i, ARGV[1]).run.join

data/docs/protocol.mkd

@@ -25,7 +25,7 @@ A post to a channel URL with the message in the body.
 ### Get by id ###
 
 Request
-: GET /channel/{channel name}/{id}
+: GET /channels/{channel name}/{id}
 
 Response
 : success: 200, failure: 404

data/lib/conveyor.rb

@@ -1,4 +1,4 @@
 module Conveyor
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   QUALITY = 'alpha'
 end

data/lib/conveyor/channel.rb

@@ -7,7 +7,7 @@ module Conveyor
   class Channel < BaseChannel
 
     # If +directory+ doesn't already exist, it will be created during initialization.
-    def initialize directory 
+    def initialize directory
       @group_iterators         = {}
       @group_iterators_files   = {}
       
@@ -67,6 +67,18 @@ module Conveyor
       r
     end
 
+    def status
+      {
+        :directory => @directory,
+        :index     => {
+          :size => @index.length
+        },
+        :data_files => @data_files.collect{|f| {:path => f.path, :bytes => File.size(f.path)}},
+        :iterator => {:position => @iterator},
+        :iterator_groups => @group_iterators.inject({}){|k,v, m| m[k] = v; m}
+      }
+    end
+
     private
     
     def group_iterators_file group

data/lib/conveyor/server.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'mongrel'
 require 'conveyor/channel'
 require 'fileutils'
+require 'json'
 
 class Mongrel::HttpRequest
   def put?
@@ -84,6 +85,10 @@ module Conveyor
                 else
                   headers, content = @channels[m.captures[0]].get_next
                 end
+              else
+                response.start(200) do |head, out|
+                  out.write @channels[m.captures[0]].status.to_json
+                end
               end
             end
           else

data/test/test_channel.rb

@@ -123,4 +123,24 @@ class TestConveyorChannel < Test::Unit::TestCase
     assert_equal 'bam', c.get_next_by_group('bar')[1]
     assert_equal nil, c.get_next_by_group('bar')
   end
+
+  def test_channel_status
+    FileUtils.rm_r('/tmp/bar') rescue nil
+    c = Channel.new('/tmp/bar')
+    c.post 'foo'
+    c.post 'bar'
+    c.post 'bam'
+    
+    status = {
+      :directory => '/tmp/bar', 
+      :index => {:size => 3},
+      :data_files => [
+        {:path => '/tmp/bar/0', :bytes => 210}
+        ],
+      :iterator => {:position => 0},
+      :iterator_groups => {}
+    }
+    
+    assert_equal(status, c.status)
+  end
 end

data/test/test_server.rb

@@ -90,4 +90,33 @@ class TestConveyorServer < Test::Unit::TestCase
       end
     end
   end
+
+  def test_status
+    Net::HTTP.start('localhost', 8888) do |h|
+      req = h.put('/channels/bar', '', {'Content-Type' => 'application/octet-stream'})
+      assert_equal Net::HTTPCreated, req.class
+
+      data =
+      ["ZqZyDN2SouQCYEHYS0LuM1XeqsF0MKIbFEBE6xQ972VqEcjs21wJSosvZMWEH1lq5ukTq4Ze"]
+        
+      data.each do |d|
+        req = h.post('/channels/bar', d, {'Content-Type' => 'application/octet-stream', 'Date' => Time.now.to_s})
+        assert_equal Net::HTTPAccepted, req.class
+      end
+
+      req = h.get("/channels/bar")
+      assert_kind_of Net::HTTPOK, req
+      json = {
+        "iterator_groups" => {},
+        "index"=>{"size"=>1},
+        "directory"=>"/tmp/asdf/bar",
+        "data_files"=>[{"path"=>"/tmp/asdf/bar/0","bytes"=>139}],
+        "iterator"=>{"position"=>0}
+      }
+      assert_equal json, JSON::parse(req.body)
+      
+    end
+
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: conveyor
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryan King
@@ -30,7 +30,7 @@ cert_chain:
   Zls3y84CmyAEGg==
   -----END CERTIFICATE-----
 
-date: 2008-01-30 00:00:00 -08:00
+date: 2008-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -58,9 +67,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.0
     version: 
-description: == Description  * Like TiVo for your data * A distributed rewindable multi-queue  == Overview  A Conveyor server provides an HTTP interface that allows for POSTing and GETing items in streams called Channels.
+description: "* Like TiVo for your data * A distributed rewindable multi-queue"
 email: ryan@theryanking.com
 executables: 
 - conveyor
@@ -91,7 +100,7 @@ files:
 - test/test_replicated_channel.rb
 - test/test_server.rb
 has_rdoc: true
-homepage: 
+homepage: by Ryan King (http://theryanking.com)
 post_install_message: 
 rdoc_options: 
 - --main
@@ -116,7 +125,7 @@ rubyforge_project: conveyor
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: Like TiVo for your data.
+summary: "* Like TiVo for your data * A distributed rewindable multi-queue"
 test_files: 
 - test/test_channel.rb
 - test/test_feeder-ng.rb