ruby_fs 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d348f43f6d10b00d99167d5acb31ad6290773d23
-  data.tar.gz: a15e0e300a7842d26e7c2fc2b6d0339bbe156eba
+  metadata.gz: 32b68c933f40664fb0b884507a542b4d10914e91
+  data.tar.gz: e7e1821584741db70d7040deeadd2017f15bc1f3
 SHA512:
-  metadata.gz: 4a0d84722ff7c6676f2c16e34d69c1b1e3bfae9787165f87da562f655a42c8918003469ed88715166b0eb6fcccb7c59a9a77704eebdbef067a25fb38f3c4bc5a
-  data.tar.gz: 932ae43643c522ce909c06c3b7adebd7649923576dd09cf429e54af1926af961b4480cd0e38273ae0227b5629831000f0ea4f95e9be7c410cbcdb8c3dcb3b6f2
+  metadata.gz: 4a1ddf66fe30a97596f9bf9f83fcde3909e69aeb3fb05480e21781eb0207af4c811ef345c8768b7b1d9ff1da8e05a8b88d963f3fea7475d34e8bc559fe729bc8
+  data.tar.gz: 9f138ddc9b654c4e9f7188ace388920413fceefa08461ec959cf76f055b096027139ebdd41677d7b4c3f28895fedd1833207eb655da45309aec20e2a619cb8d1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # develop
 
+# 1.0.5
+  * Bugfix: Allow sending large app arguments. Application arguments (headers in general) are limited to 2048 bytes. The work-around is to send them in the body of the message with a content-length header.
+  * CS: Avoid Celluloid deprecation warnings
+
 # 1.0.4
   * Bugfix: Loosen celluloid dependency
 

data/lib/ruby_fs/stream.rb

@@ -17,6 +17,8 @@ module RubyFS
 
     include Celluloid::IO
 
+    finalizer :finalize
+
     def initialize(host, port, secret, event_callback, events = true)
       super()
       @host, @port, @secret, @event_callback, @events = host, port, secret, event_callback, events
@@ -60,9 +62,11 @@ module RubyFS
       uuid = SecureRandom.uuid
       @command_callbacks << (callback || lambda { |reply| signal uuid, reply })
       string = "#{command}\n"
+      body_value = options.delete :command_body_value
       options.each_pair do |key, value|
         string << "#{key.to_s.gsub '_', '-'}: #{value}\n" if value
       end
+      string << "\n" << body_value << "\n" if body_value
       string << "\n"
       send_data string
       wait uuid unless callback
@@ -108,21 +112,19 @@ module RubyFS
     #
     # @return [RubyFS::Response] response the application's response object
     def application(call, appname, options = nil)
-      sendmsg call, :call_command => 'execute', :execute_app_name => appname, :execute_app_arg => options
+      opts = {call_command: 'execute', execute_app_name: appname}
+      if options
+        opts[:content_type]       = 'text/plain'
+        opts[:content_length]     = options.bytesize
+        opts[:command_body_value] = options
+      end
+      sendmsg call, opts
     end
 
     #
     # Shutdown the stream and disconnect from the socket
     alias :shutdown :terminate
 
-    # @private
-    def finalize
-      logger.debug "Finalizing stream"
-      @socket.close if @socket
-      @state = :stopped
-      fire_event Disconnected.new
-    end
-
     #
     # Fire an event to the specified callback
     #
@@ -145,6 +147,13 @@ module RubyFS
 
     private
 
+    def finalize
+      logger.debug "Finalizing stream"
+      @socket.close if @socket
+      @state = :stopped
+      fire_event Disconnected.new
+    end
+
     def receive_data(data)
       logger.trace "[RECV] #{data}"
       @lexer << data
@@ -159,7 +168,7 @@ module RubyFS
         @command_callbacks.pop.call CommandReply.new(headers, (content == '' ? nil : content))
       when 'auth/request'
         command "auth #{@secret}" do
-          command! "event json ALL" if @events
+          async.command "event json ALL" if @events
         end
       when 'text/disconnect-notice'
         terminate

data/lib/ruby_fs/version.rb

@@ -1,3 +1,3 @@
 module RubyFS
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/ruby_fs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.12"]
+  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.13"]
   s.add_runtime_dependency %q<json>
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/spec/ruby_fs/stream_spec.rb

@@ -34,7 +34,7 @@ module RubyFS
       mock_target.should_receive(:receive_data).send(*(times ? [:exactly, times] : [:at_least, 1])).with &block
       s = ServerMock.new '127.0.0.1', server_port, mock_target
       @stream = Stream.new '127.0.0.1', server_port, secret, lambda { |m| client.message_received m }, events
-      @stream.run!
+      @stream.async.run
       sleep 0.1
       fake_client.call s if fake_client.respond_to? :call
       Celluloid::Actor.join s
@@ -156,7 +156,7 @@ Reply-Text: +OK accepted
     it "can send commands with options" do
       expect_connected_event
       expect_disconnected_event
-      mocked_server(1, lambda { |server| @stream.command! 'foo', :one => 1, :foo_bar => :doo_dah }) do |val, server|
+      mocked_server(1, lambda { |server| @stream.async.command 'foo', :one => 1, :foo_bar => :doo_dah }) do |val, server|
         val.should == %Q(foo
 one: 1
 foo-bar: doo_dah
@@ -231,7 +231,7 @@ Reply-Text: +OK accepted
       end
     end
 
-    it "can execute applications on calls with options and returns the response" do
+    it "can execute applications on calls with options (in the body) and returns the response" do
       expect_connected_event
       expect_disconnected_event
       reply = CommandReply.new(:content_type => 'command/reply', :reply_text => '+OK accepted')
@@ -239,7 +239,10 @@ Reply-Text: +OK accepted
         val.should == %Q(SendMsg aUUID
 call-command: execute
 execute-app-name: playback
-execute-app-arg: /tmp/test.wav
+content-type: text/plain
+content-length: 13
+
+/tmp/test.wav
 
 )
         server.send_data %Q(

data/spec/support/mock_server.rb

@@ -3,11 +3,13 @@ MockServer = Class.new
 class ServerMock
   include Celluloid::IO
 
+  finalizer :finalize
+
   def initialize(host, port, mock_target = MockServer.new)
     @server = TCPServer.new host, port
     @mock_target = mock_target
     @clients = []
-    run!
+    async.run
   end
 
   def finalize
@@ -18,7 +20,7 @@ class ServerMock
 
   def run
     after(1) { terminate }
-    loop { handle_connection! @server.accept }
+    loop { async.handle_connection @server.accept }
   end
 
   def handle_connection(socket)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_fs
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement