rffw 0.0.1 → 0.0.2

data/lib/rffw/app/db.rb

@@ -1,19 +1,33 @@
-require 'dbm'
 require 'yaml'
 
-class RFFW::App::Db < DBM
+class RFFW::App::Db
   
   class OnlyHashAllowed < StandardError ; end
-  
-  EMPTY_MARSHAKED_HASH = Marshal.dump({})
+    
+  def initialize(filename)
+    @filename = filename
+  end
   
   def [](key)
-    value = Marshal.load(super(key) || EMPTY_MARSHAKED_HASH)
-    value.is_a?(Hash) ? value : {}
+    load_database[key] || {}
   end
   
   def []=(key,value)
     raise OnlyHashAllowed unless value.is_a?(Hash)
-    super(key, Marshal.dump(value))
+    database = load_database
+    database[key] = value
+    write_database(database)
+  end
+  
+  protected
+  
+  def load_database
+    return {} unless File.file? @filename
+    Marshal.load(File.read(@filename).force_encoding("BINARY"))
+  end
+  
+  def write_database(database)
+    File.open(@filename,'w'){|f| f.write Marshal.dump(database)}
   end
+  
 end

data/lib/rffw/version.rb

@@ -1,3 +1,3 @@
 module RFFW
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rffw
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -21,11 +21,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- Gemfile
 - README.md
-- Rakefile
 - bin/rffw
 - lib/rffw.rb
 - lib/rffw/app.rb
@@ -54,27 +50,6 @@ files:
 - lib/rffw/server/http_client.rb
 - lib/rffw/server/server.rb
 - lib/rffw/version.rb
-- rffw.db
-- rffw.gemspec
-- test/fixtures/image.jpg
-- test/fixtures/mime_image.data
-- test/fixtures/mime_image.png
-- test/fixtures/post_form_data.http
-- test/fixtures/raw_request.txt
-- test/fixtures/request.http
-- test/fixtures/upload.http
-- test/fixtures/upload_status_request.http
-- test/helper.rb
-- test/test_buffered_client.rb
-- test/test_client.rb
-- test/test_db.rb
-- test/test_http_client.rb
-- test/test_http_request.rb
-- test/test_mime_parser.rb
-- test/test_record.rb
-- test/test_upload_status_handler.rb
-- test/test_uploader_handler.rb
-- test/test_view_helpers.rb
 has_rdoc: true
 homepage: ''
 licenses: []
@@ -100,23 +75,4 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Recive files from webserver
-test_files:
-- test/fixtures/image.jpg
-- test/fixtures/mime_image.data
-- test/fixtures/mime_image.png
-- test/fixtures/post_form_data.http
-- test/fixtures/raw_request.txt
-- test/fixtures/request.http
-- test/fixtures/upload.http
-- test/fixtures/upload_status_request.http
-- test/helper.rb
-- test/test_buffered_client.rb
-- test/test_client.rb
-- test/test_db.rb
-- test/test_http_client.rb
-- test/test_http_request.rb
-- test/test_mime_parser.rb
-- test/test_record.rb
-- test/test_upload_status_handler.rb
-- test/test_uploader_handler.rb
-- test/test_view_helpers.rb
+test_files: []

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.DS_Store

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.2

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in rffw.gemspec
-gemspec

data/Rakefile

@@ -1,41 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = false
-end
-
-task :default do 
-  
-  begin 
-    require 'rubygems'
-    gem 'minitest'
-    require 'minitest/pride'
-  rescue LoadError, Gem::LoadError
-    $stderr.puts "Minitest gem not found. Usign ruby minitest."
-  end
-
-  base = File.expand_path("..", __FILE__)
-  $:.unshift File.join(base,"lib")
-  $:.unshift File.join(base,'test')
-  Dir[File.expand_path("../test/test_*", __FILE__)].each{|f| require f}
-  MiniTest::Unit.autorun
-  
-end
-
-desc "Run the server"
-task :run do
-  exec("ruby -rubygems -I lib bin/rffw")
-end
-
-
-task :commit do
-  system("git add . && git commit -m 'WIP' && git push origin master:master")
-end
-
-task :deploy => [:commit] do
-  system(%{ssh soundcloud "sudo su - guillermo ; cd rffw && git pull && sudo killall "})
-end

data/rffw.gemspec

@@ -1,21 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rffw/version"
-
-Gem::Specification.new do |s|
-  s.name        = "rffw"
-  s.version     = RFFW::VERSION
-  s.authors     = ["Guillermo Álvarez"]
-  s.email       = ["guillermo@cientifico.net"]
-  s.homepage    = ""
-  s.summary     = %q{Recive files from webserver}
-  s.description = %q{A simple program that listen at port 80 for uploads, and save the uploaded files to disk}
-
-  s.rubyforge_project = "rffw"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-end

data/test/fixtures/post_form_data.http

@@ -1,14 +0,0 @@
-POST /description HTTP/1.1
-Host: localhost:8080
-Origin: http://localhost:8080
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50
-Content-Type: application/x-www-form-urlencoded
-Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
-Referer: http://localhost:8080/
-Accept-Language: en-us
-Accept-Encoding: gzip, deflate
-Cookie: __utmz=111872281.1311554639.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); __utma=111872281.2010257729.1311554639.1312453997.1312460077.19
-Content-Length: 16
-Connection: keep-alive
-
-description=hola

data/test/fixtures/raw_request.txt

@@ -1,8 +0,0 @@
-GET / HTTP/1.1
-Host: localhost:9999
-User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1
-Accept: application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-Accept-Language: en-us
-Accept-Encoding: gzip, deflate
-Connection: keep-alive
-

data/test/fixtures/request.http

@@ -1,9 +0,0 @@
-GET / HTTP/1.1
-Host: localhost:8081
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50
-Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
-Accept-Language: en-us
-Accept-Encoding: gzip, deflate
-Cookie: __utmz=111872281.1311554639.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); __utma=111872281.2010257729.1311554639.1312453997.1312460077.19
-Connection: keep-alive
-

data/test/fixtures/upload_status_request.http

@@ -1,10 +0,0 @@
-GET /upload_status.js?81242840-2736-2e05-7316-1c1ee25f7cff HTTP/1.1
-Host: localhost:8080
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50
-Accept: */*
-Referer: http://localhost:8080/
-Accept-Language: en-us
-Accept-Encoding: gzip, deflate
-Cookie: __utmz=111872281.1311554639.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); __utma=111872281.2010257729.1311554639.1312453997.1312460077.19
-Connection: keep-alive
-

data/test/helper.rb

@@ -1,97 +0,0 @@
-require 'minitest/unit'
-require 'minitest/mock'
-require 'rffw'
-require 'stringio'
-require 'tmpdir'
-
-class MiniTest::Unit::TestCase
-
-  def fixture(name)
-    File.expand_path("../fixtures/#{name}", __FILE__)
-  end
-
-  def read(name)
-    File.read(fixture(name))
-  end
-
-end
-
-
-class IntegrationTest < MiniTest::Unit::TestCase
-
-  def setup
-    @port = 64444
-    @server_pid = fork do
-      $stdout = File.open("/dev/null",'w')
-      $stderr = $stdout
-      RFFW::App.start(@port,"127.0.0.1", Dir.mktmpdir("rffw_test"))
-      exit(0)
-    end
-    sleep 0.1
-  end
-
-  def teardown
-    Process.kill('SIGINT', @server_pid)
-    Process.wait(@server_pid)
-  end
-
-
-
-  def upload_file(name)
-    Fiber.new do
-      fixture = read(name)
-      socket = TCPSocket.new('127.0.0.1', @port)
-      socket.write fixture[0..(fixture.size/3)]
-      Fiber.yield
-
-      socket.write fixture[(fixture.size/3)..(fixture.size/3*2)]
-      Fiber.yield
-
-      socket.write fixture[(fixture.size/3*2)..-1]
-      Fiber.yield
-
-      begin
-        data = socket.read_nonblock(1024*1024*1024)
-      rescue Errno::EAGAIN
-        retry
-      end
-
-      Fiber.yield data
-    end
-  end
-
-  def send_request(name)
-    socket = TCPSocket.new('127.0.0.1', @port)
-    socket.write read(name)
-    begin
-      content = socket.read_nonblock(1024*1024*1024).tap{ socket.close }.split("\r\n").last.strip
-    rescue EOFError,Errno::EAGAIN
-      retry
-    end
-  end
-
-  def upload_file(name)
-    Fiber.new do
-      fixture = read(name)
-      socket = TCPSocket.new('127.0.0.1', @port)
-      socket.write fixture[0..(fixture.size/3)]
-      Fiber.yield
-
-      socket.write fixture[(fixture.size/3)..(fixture.size/3*2)]
-      Fiber.yield
-
-      socket.write fixture[(fixture.size/3*2)..-1]
-      Fiber.yield
-
-      data = nil
-      while(data == nil)
-        data = socket.read_nonblock(1000000) rescue nil
-      end
-      data
-
-      Fiber.yield data
-    end
-  end
-
-
-end

data/test/test_buffered_client.rb

@@ -1,50 +0,0 @@
-require 'helper'
-
-class RFFW::Server::BufferedClientTest < MiniTest::Unit::TestCase
-  include RFFW::Server
-  def setup
-    @socket = StringIO.new
-    @client = BufferedClient.new(@socket)
-    def @client.read_nonblock(arg) ; "h"*1000  end
-    def @client.close ; end
-  end
-
-  def teardown
-    BufferedClient.disconnect_all!
-  end
-
-  def test_on_small_data
-    @client.on_data
-    assert_equal "h"*1000, @client.buffer
-    assert !@client.usign_temp_file?
-  end
-  
-  def test_on_data
-    def @client.read_nonblock(arg) ; "h"*2000  end
-    @client.on_data
-    assert_equal "h"*2000, @client.buffer
-    assert @client.usign_temp_file?
-  end
-  
-  def test_on_data_appending
-    @client.on_data
-    assert !@client.usign_temp_file?
-    @client.on_data
-    assert @client.usign_temp_file?
-    assert_equal "h"*2000, @client.buffer
-  end
-  
-  def test_clear_buffer
-    @client.on_data 
-    @client.clear_buffer
-    assert_equal '', @client.buffer
-  end
-  
-  def test_remove_file_on_clear_buffer
-    @client.on_data
-    @client.clear_buffer
-    assert !@client.usign_temp_file?
-  end
-  
-    
-end

data/test/test_client.rb

@@ -1,47 +0,0 @@
-require 'helper'
-
-class RFFW::Server::ClientTest < MiniTest::Unit::TestCase
-  include RFFW::Server
-
-  def setup
-    @socket = StringIO.new
-    def @socket.close; nil end
-  end
-
-  def teardown
-    Client.disconnect_all!
-  end
-
-  def test_initialize
-    client = Client.new(@socket)
-    assert client.instance_of?(Client)
-  end
-
-  def test_find
-    client = Client.new(@socket)
-    assert_equal Client.find(client), client
-  end
-
-  def test_is_enumerable
-    assert Client.singleton_class.included_modules.include?(Enumerable)
-  end
-
-  def test_each
-    expected = [Client.new(@socket), Client.new(@socket)]
-    result = []
-    Client.each{|c| result << c }
-    assert_equal expected, result
-  end
-
-  def test_all
-    expected = [Client.new(@socket), Client.new(@socket)]
-    assert_equal expected, Client.all
-  end
-
-  def test_on_disconnect
-    client = Client.new(@socket)
-    assert Client.all.any?
-    client.disconnect!
-    assert Client.all.empty?
-  end
-end

data/test/test_db.rb

@@ -1,21 +0,0 @@
-require 'helper'
-
-class RFFW::App::DbTest < MiniTest::Unit::TestCase
-
-  include RFFW::App
-  
-  def setup
-    Dir.chdir(Dir.mktmpdir("rffw-test")) do
-      @db = Db.new('test_db')
-    end
-  end
-
-  
-  def test_get_set
-    assert_equal( {}, @db['12345'])
-    assert_equal( {:a => 3}, (@db['12345'] = {:a => 3}), 'should retun value on set')
-    assert_equal( {:a => 3}, @db['12345'], 'should return previous stored value on get')
-  end
-  
-  
-end

data/test/test_http_client.rb

@@ -1,26 +0,0 @@
-require 'helper'
-
-class RFFW::Server::HttpClientTest < MiniTest::Unit::TestCase
-  include RFFW::Server
-
-  def setup
-    @mock_socket = MiniTest::Mock.new
-    @mock_socket.expect(:close, nil)
-    @mock_socket.expect(:read_nonblock, File.read(fixture('raw_request.txt')),[String])
-    @mock_socket.expect(:closed?, nil)
-    @mock_socket.expect(:write, nil,[String])
-  end
-
-  def teardown
-    HttpClient.disconnect_all!
-  end
-
-  def test_request
-    client = HttpClient.new(@mock_socket)
-    def client.buffer; File.read(File.expand_path("../fixtures/raw_request.txt",__FILE__)) ; end
-    client.on_data
-    assert File.read(fixture("raw_request.txt")), client.on_data
-  end
-
-
-end

data/test/test_http_request.rb

@@ -1,52 +0,0 @@
-require 'helper'
-
-class RFFW::Server::HttpRequestTest < MiniTest::Unit::TestCase
-
-  include RFFW::Parser
-
-  def setup
-    @simple_request = File.read(File.expand_path("../fixtures/raw_request.txt",__FILE__))
-    @request_headers = {"HTTP_METHOD"=>"GET",
-     "HTTP_PATH"=>"/",
-     "HTTP_VERSION"=>"1.1",
-     "Host"=>"localhost:9999",
-     "User-Agent"=>
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1",
-     "Accept"=>
-      "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
-     "Accept-Language"=>"en-us",
-     "Accept-Encoding"=>"gzip, deflate",
-     "Connection"=>"keep-alive"}
-  end
-
-  def test_parse_simple_request
-    request = HttpRequest.new(@simple_request.dup)
-    assert request.headers.is_a?(Hash), "headers should be a hash"
-    assert request.body.is_a?(String), "body should be a string"
-    assert request.finish?, "request should be finished"
-    assert_equal(@request_headers, request.headers)
-    %w(attachments upload_content_lenght body_size upload_progress).each do |method|
-      assert_raises(HttpRequest::OnlyForPosts, "#{method} should raise exception for get requests.") { request.send(method.to_sym) }
-    end
-
-    assert_equal "1.1", request.version
-    assert_equal "/", request.path
-    assert_equal true, request.keep_alive?
-    assert_equal "GET", request.method
-    assert_equal '', request.query
-    assert_equal '/', request.url
-    assert_kind_of URI, request.uri
-  end
-
-  def test_incomplete_request
-    raw_request = @simple_request[0..(@simple_request.size/2)]
-    request = HttpRequest.new(raw_request)
-    assert !request.finish?
-  end
-  
-  def test_post_form_data
-    request = HttpRequest.new(read('post_form_data.http'))
-    assert_equal( {"description"=>"hola"}, request.post_form_data)
-    
-  end
-end

data/test/test_mime_parser.rb

@@ -1,22 +0,0 @@
-require 'helper'
-
-class RFFW::Server::MimeTest < MiniTest::Unit::TestCase
-  include RFFW::Parser
-
-  def setup
-    @data = File.read(File.expand_path('../fixtures/mime_image.data', __FILE__))
-    @image_data = File.read(File.expand_path('../fixtures/mime_image.png', __FILE__)).force_encoding("BINARY")
-  end
-
-  def test_mime_parser
-    attachments     = MimeParser.parse(@data)
-    attachment      = attachments.first
-    expected_header = "form-data; name=\"file\"; filename=\"Screen shot 2011-08-05 at 5.42.34 AM.png\""
-    image_type      = "image/png"
-    
-    assert_equal 1, attachments.size
-    assert_equal expected_header, attachment.content_disposition
-    assert_equal image_type, attachment.content_type
-    assert_equal @image_data, attachment.to_s, "to be equal"
-  end
-end

data/test/test_record.rb

@@ -1,49 +0,0 @@
-require 'helper'
-
-class RecordTest < MiniTest::Unit::TestCase
-  include RFFW::App
-  
-  def setup
-     RFFW::App.start_db(Dir.mktmpdir("rffw_test"))
-  end
-    
-  def test_update_or_create_by_id_on_create
-    record = Record.update_or_create_by_id('1234', {"mime_type" => "text/plain", "filename" => "hello_world.txt"}, 'HOLA MUNDO')
-    assert_equal '1234', record.id
-    assert_equal 'text/plain', record.mime_type
-    assert_equal 'hello_world.txt', record.filename
-    assert_equal 'HOLA MUNDO', record.body
-  end
-  
-  
-  
-  def test_update_or_create_by_id_on_update
-    record = Record.update_or_create_by_id('1234', {"mime_type" => "text/plain", "filename" => "hello_world.txt"}, 'HOLA MUNDO')
-    record = Record.update_or_create_by_id('1234', {"description" => "good file"})
-    
-    assert_equal 'good file', record.description
-    assert_equal '1234', record.id
-    assert_equal 'text/plain', record.mime_type
-    assert_equal 'hello_world.txt', record.filename
-    assert_equal 'HOLA MUNDO', record.body
-  end
-  
-  def test_find_by_id
-    record = Record.update_or_create_by_id('1234', {"mime_type" => "text/plain", "filename" => "hello_world.txt"}, 'HOLA MUNDO')
-    
-    record = Record.find_by_id('1234')
-    assert_equal nil, record.description
-    assert_equal '1234', record.id
-    assert_equal 'text/plain', record.mime_type
-    assert_equal 'hello_world.txt', record.filename
-    assert_equal 'HOLA MUNDO', record.body
-  end
-  
-  def test_new
-    record = Record.new('123', {'asdf' => 3})
-    assert record.new?, "should be new"
-    
-    record = Record.update_or_create_by_id('890123', {'asdf' => 3})
-    assert !record.new?, "should not be new on existing record"
-  end
-end

data/test/test_upload_status_handler.rb

@@ -1,18 +0,0 @@
-require 'helper'
-
-class RFFW::App::UploadStatusHandlerTest < IntegrationTest
-  def test_upload_status
-    uploader = upload_file("upload.http")
-
-    assert_equal "Not found upload.", send_request("upload_status_request.http")
-
-    uploader.resume #send chunk one
-    assert_equal "{ \"progress\": \"6759/21534\" }", send_request("upload_status_request.http")
-    
-    uploader.resume
-    assert_equal "{ \"progress\": \"14162/21534\" }", send_request("upload_status_request.http")
-    
-    uploader.resume
-    assert_equal "{ \"mime_type\": \"application/pdf\", \"filename\": \"guillermoalvarez.pdf\" }", send_request("upload_status_request.http")
-  end
-end

data/test/test_uploader_handler.rb

@@ -1,10 +0,0 @@
-require 'helper'
-
-class RFFW::App::UploadHandlerTest < IntegrationTest
-  include RFFW::App::UploadHandler
-  
-  def test_upload_status
-    response = send_request("upload.http")
-    assert_equal 'So... Ok. Excelent.',response
-  end
-end

data/test/test_view_helpers.rb

@@ -1,24 +0,0 @@
-# encoding: UTF-8
-require 'helper'
-
-
-class RFFW::App::ViewHelpersTest < MiniTest::Unit::TestCase
-  
-  include RFFW::App::ViewHelpers
-  
-  
-  def test_uri_unescape
-    string = "Hola+Mundo.%0D%0A%0D%0A%3Cscript%3Ealert%28%27hey%27%29%3B%3C%2Fscript%3E"
-    expected = "Hola Mundo.
-
-<script>alert('hey');</script>"
-    assert_equal expected, uri_unescape(string)
-  end
-  
-  
-  def test_uri_escape
-    string = "hola ++  que tal € ‰"
-    expected ='hola+%2B%2B++que+tal+%80+%89'
-    assert_equal  expected, uri_escape(string)
-  end
-end