armstrong 0.2.1 → 0.2.4

data/Gemfile

@@ -0,0 +1,4 @@
+gem 'lazy'
+gem 'open-uri'
+gem 'ffi'
+gem 'ffi-rzmq'

data/README.md

@@ -16,9 +16,13 @@ This is possible because of Mongrel2 and ZeroMQ. Mongrel2 acts as your server an
 Go grab the zip from [zeromq/zeromq2-1](https://github.com/zeromq/zeromq2-1), unzip it, and in the directory run:
 	
 	./autogen.sh; ./configure; make; sudo make install
+	
+#### Armstrong as a gem ####
+
+	gem install armstrong
 
 #### ZMQ and other gems ####
-	gem install zmq
+	gem install ffi-rzmq
 	gem install lazy
 
 it should also install `ffi` and `ffi-rzmq` which are to dynamically load libs and call functions from them. Interesting stuff, but out of the scope of this measly README.

data/Rakefile

@@ -0,0 +1,26 @@
+desc "Push actors to github, switch to master, merge actors, push master to github"
+namespace :super do
+  task :push do
+    `git push github`
+    `go master`
+    `git merge actors`
+    `git push github`
+    `go actors`
+  end
+end
+
+namespace :g do
+  desc "Build gem"
+  task :b do
+    `gem build armstrong.gemspec`
+  end
+
+  desc "Push gem"
+  task :p do
+    Rake::Task["g:b"].invoke
+    gem_file = `ls *.gem`.to_a.first
+    puts "pushing #{gem_file}"
+    gets
+    `gem push #{gem_file}`
+  end
+end

data/armstrong.gemspec

@@ -0,0 +1,12 @@
+Gem::Specification.new 'armstrong', '0.2.4' do |s|
+  s.description       = "Armstrong is an Mongrel2 fronted, actor-based web development framework similar in style to sinatra. With natively-threaded interpreters (Rubinius2), Armstrong provides true concurrency and high stability, by design."
+  s.summary           = "Highly concurrent, sinatra-like framework"
+  s.author            = "Artem Titoulenko"
+  s.email             = "artem.titoulenko@gmail.com"
+  s.homepage          = "https://www.github.com/artemtitoulenko/armstrong"
+  s.files             = `git ls-files`.split("\n") - %w[.gitignore .travis.yml response_benchmark.rb demo/config.sqlite]
+
+  s.add_dependency 'ffi',            '~> 1.0', '>= 1.0.10'
+  s.add_dependency 'ffi-rzmq', '~> 0.9', '>= 0.9.0'
+  s.add_dependency 'lazy', '>= 0.9.6'
+end

data/lib/armstrong/connection.rb

@@ -25,21 +25,19 @@ class Connection
   def recv
     msg = ""
     @request_sock.recv_string msg
-    return msg
+    msg
   end
   
   #parse the request, this is the best way to get stuff back, as a Hash
   def receive
-    data = parse(self.recv)
-    return data
+    parse(self.recv)
   end
   
   def send(uuid, conn_id, msg)
     header = "%s %d:%s" % [uuid, conn_id.join(' ').length, conn_id.join(' ')]
     string =  header + ', ' + msg 
-    puts "\t\treplying to #{conn_id} with: ", string.inspect
+    #puts "\t\treplying to #{conn_id} with: ", string
     @response_sock.send_string string, ZMQ::NOBLOCK
-    puts "send string"
   end
   
   def reply(request, message)
@@ -60,7 +58,6 @@ class Connection
   
   def parse(msg)
     if(msg.empty?)
-      puts "msg is nil: [#{msg}]"
       return nil
     end
     

data/lib/armstrong/main_actors.rb

@@ -14,7 +14,7 @@ def process_route(route, pattern, keys, values = [])
   if values.any?
     keys.zip(values) { |k,v| (params[k] ||= '') << v if v }
   end
-  return params
+  params
 end
 
 Aleph::Base.replier = Proc.new do   
@@ -73,12 +73,12 @@ Aleph::Base.request_handler = Proc.new do
             failure = false
           end
         end
-        Actor[:replier] << Reply.new(r.data, "404") if failure
+        Actor[:replier] << Reply.new(r.data, "404", 404, {'Content-type'=>'text/html'}) if failure
       end
 
-      f.when(Actor::DeadActorError) do |exit|
-        puts "#{exit.actor} died with reason: [#{exit.reason}]"
-      end
+      # f.when(Actor::DeadActorError) do |exit|
+      #         puts "#{exit.actor} died with reason: [#{exit.reason}]"
+      #       end
     end
   end
 end

data/lib/armstrong.rb

@@ -105,13 +105,13 @@ module Aleph
         done = true
       end)
 
-      puts "","="*56,"Armstrong has launched on #{Time.now}","="*56, "" if done
+      if Actor[:supervisor] && Actor[:request_handler] && Actor[:replier] && done
+        puts "","="*56,"Armstrong has launched on #{Time.now}","="*56, ""
+      end
       
-      puts "s:#{Actor[:supervisor]} h:#{Actor[:request_handler]} r: #{Actor[:replier]}"
       # main loop
       loop do
         req = @conn.receive
-        puts "s:#{Actor[:supervisor]} h:#{Actor[:request_handler]} r: #{Actor[:replier]}"
         Actor[:request_handler] << Request.new(req) if !req.nil?
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: armstrong
 version: !ruby/object:Gem::Version 
-  hash: 2998277272998775549
+  hash: 62131057062410167
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Artem Titoulenko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2011-11-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -88,7 +88,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
 - README.md
+- Rakefile
+- armstrong.gemspec
 - demo/armstrong_test.rb
 - demo/mongrel2.conf
 - lib/armstrong.rb