superbolt 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130ad90f4d01f0db9885e281506098ce7d94fbbd
-  data.tar.gz: 25b93e5f97684570de5cb06bfdd1d4ca4ba04ca3
+  metadata.gz: 28f631baf4151d4a8a1cc90a04c4605720fe7add
+  data.tar.gz: 512314e5212d36fcdba03dddd0cf8238460752dc
 SHA512:
-  metadata.gz: 42fae214ed7742f7e1645ad311e9447f9ee3d7090d3f46df9a3428463acba5f77f19c1a55992587cb2ceb86088db922f74546a978cee8e387d580eeaf19a2553
-  data.tar.gz: 076555ca2550d6c2c048814ac761a1dc3d7c74646b7dbd11627e3a004ea07f9bf83ae00a963eac6440e6c5a4516d14ca3f29233b1b72a846a32059ac26ba9e9a
+  metadata.gz: b52d7077b9d04ab8d8c0e262bd8f2bb9c88a189a8e7672c5e5d73a58137c769b3a4549bcfb7febce1433910f5314d3fe0ce294563278c1b4a3d36ee9f30c3fb6
+  data.tar.gz: 0c8e4857cc0874d2acb2e6f4b1eefb0d39b4fa3e41e4025288d3bfbbe84a0c988a13ddceb1a1ed9e1eb7d3711c3c3d58e0d37b39d80349a7845ba30a506a5f01

data/lib/superbolt.rb

@@ -1,5 +1,6 @@
 require 'json'
 
+require 'file_marshal'
 require 'bunny'
 require 'amqp'
 require 'eventmachine'
@@ -31,6 +32,10 @@ require "superbolt/app"
 require "superbolt/processor"
 require "superbolt/facade"
 require "superbolt/messenger"
+require "superbolt/file_manager"
+require "superbolt/file_unpacker"
+require "superbolt/file_packer"
+
 require "superbolt/spec_helpers"
 
 require "superbolt/router"

data/lib/superbolt/facade.rb

@@ -1,9 +1,10 @@
 module Superbolt
-  
+    
   def self.config=(options)
     @config = Config.new({
       env: env,
-      app_name: app_name
+      app_name: app_name,
+      file_matcher: file_matcher
     }.merge(options))
   end
 
@@ -16,7 +17,7 @@ module Superbolt
   end
 
   class << self
-    attr_writer :env
+    attr_writer :env, :file_matcher
     attr_accessor :app_name
   end
 
@@ -24,6 +25,10 @@ module Superbolt
     @env || 'development'
   end
 
+  def self.file_matcher
+    @file_matcher || /_file$/
+  end
+
   def self.message(args={})
     Superbolt::Messenger.new(args)
   end

data/lib/superbolt/file_manager.rb

@@ -0,0 +1,24 @@
+module Superbolt
+  class FileManager
+    attr_reader :hash
+
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def perform
+      file_keys.each do |key|
+        hash[key] = process_file(hash[key])
+      end
+      hash
+    end
+
+    def file_keys
+      @file_keys ||= hash.keys.find_all { |key| key.to_s.match(Superbolt.file_matcher) }
+    end
+
+    def process_file(arg)
+      raise NotImplementedError
+    end
+  end
+end

data/lib/superbolt/file_packer.rb

@@ -0,0 +1,7 @@
+module Superbolt
+  class FilePacker < FileManager
+    def process_file(file)
+      FileMarshal::Dumper.new(file).to_hash
+    end
+  end
+end

data/lib/superbolt/file_unpacker.rb

@@ -0,0 +1,7 @@
+module Superbolt
+  class FileUnpacker < FileManager
+    def process_file(file_hash)
+      FileMarshal::Loader.new(file_hash).tempfile
+    end
+  end
+end

data/lib/superbolt/incoming_message.rb

@@ -9,7 +9,8 @@ module Superbolt
     end
 
     def parse
-      JSON.parse(payload)
+      hash = JSON.parse(payload)
+      unpack_files(hash)
     rescue JSON::ParserError
       payload
     end
@@ -21,6 +22,11 @@ module Superbolt
     def ack
       channel.acknowledge(tag)
     end
-  end
-end
 
+    def unpack_files(hash)
+      return hash unless hash.is_a?(Hash) && hash["arguments"].is_a?(Hash)
+      hash['arguments'] = FileUnpacker.new(hash["arguments"]).perform
+      hash
+    end
+  end
+end

data/lib/superbolt/messenger.rb

@@ -47,9 +47,18 @@ module Superbolt
 
     def send!(args=nil)
       self.arguments = args if args
+      pack_files
       queue.push(message)
     end
 
+    def pack_files
+      return unless arguments.is_a?(Hash)
+      file_keys = arguments.keys.find_all { |key| key.to_s.match(Superbolt.file_matcher) }
+      file_keys.each do |key|
+        arguments[key] = FileMarshal::Dumper.new(arguments[key]).to_hash
+      end
+    end
+
     def queue
       unless name
         raise "no destination app name defined, please pass one in"

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/file_packer_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Superbolt::FilePacker do
+  let(:packer) { Superbolt::FilePacker.new(hash) }
+
+  let(:hash) { 
+    { 
+      my_file: file,
+      foo: 'bar'
+    }
+  }
+
+  let(:dumper) { double('dumper', to_hash: {}) }
+
+  let(:file) { double('file') }
+  
+  describe '#perform' do
+    it "makes matching keys into a file hash via FileMarshal" do
+      FileMarshal::Dumper.should_receive(:new).with(file).and_return(dumper)
+      dumper.should_receive(:to_hash)
+      packer.perform.should == {
+        foo: 'bar',
+        my_file: {}
+      }
+    end
+  end
+end

data/spec/file_unpacker_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Superbolt::FileUnpacker do
+  let(:unpacker){ Superbolt::FileUnpacker.new(hash) }
+  let(:file) { File.open(File.dirname(__FILE__) + '/support/commodore.jpg')}
+  let(:file_hash) {
+    # back and forth in JSON required due to Time.parse issues
+    JSON.parse(FileMarshal::Dumper.new(file).to_hash.to_json)
+  }
+  let(:hash) { 
+    { 
+      my_file: file_hash,
+      foo: 'bar'
+    }
+  }
+
+  describe "#perform" do 
+    it "makes the keys matching the Superbolt.file_matcher" do
+      unpacker.perform[:my_file].should be_a Tempfile
+    end
+
+    it "leaves everything else alone" do
+      unpacker.perform[:foo].should == "bar"
+    end
+  end
+end

data/spec/incoming_message_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Superbolt::IncomingMessage do
+  let(:message){ Superbolt::IncomingMessage.new(delivery_info, payload, channel) }
+  let(:payload){ { some: "message" }.to_json }
+  let(:delivery_info) { double("info", delivery_tag: "tag") }
+  let(:channel) { double("channel") }
+
+  describe '#parse' do
+    context 'payload is not json' do
+      let(:payload) { 'foo' }
+
+      it 'just returns the payload' do
+        message.parse.should == payload
+      end
+    end
+
+    context 'payload is json' do
+      it "parses it to a hash" do
+        message.parse.should == {'some' => 'message'}
+      end
+
+      context 'payload has a file' do
+        let(:payload) { { 'arguments' => {'some_file' => {'file_hash' => 'yup'}} }.to_json } 
+        let(:packer) { double('packer', perform: {'some_file' => 'some_file'} ) }
+        
+        it "uses FilePacker to rewrite files into a hash" do
+          Superbolt::FileUnpacker.should_receive(:new)
+            .with({'some_file' => {'file_hash' => 'yup'}})
+            .and_return(packer)
+          message.parse.should == {'arguments' => packer.perform}
+        end
+      end
+    end
+  end
+
+  describe '#reject' do
+    it "calls reject on the channel with the appropritate data and options" do
+      channel.should_receive(:reject).with('tag', true)
+
+      message.reject
+    end
+
+    it "can reject without requeuing" do
+      channel.should_receive(:reject).with('tag', false)
+
+      message.reject(false)
+    end
+  end
+
+  describe "#ack" do
+    it "calls acknowledge on the channel" do
+      channel.should_receive(:acknowledge).with('tag')
+
+      message.ack
+    end
+  end
+end

data/spec/messenger_spec.rb

@@ -82,6 +82,8 @@ describe Superbolt::Messenger do
   end
 
   describe 'send!' do
+    let(:image_file) { File.open(File.dirname(__FILE__) + '/support/commodore.jpg')}
+    
     before do
       messenger
         .to(name)
@@ -97,5 +99,14 @@ describe Superbolt::Messenger do
         'arguments' => 'none'
       }
     end
+
+    it "converts any values that have key ending in '_file' with FileMarshal" do
+      messenger.send!({
+        image_file: image_file
+      })
+
+      message = queue.pop
+      message['arguments']['image_file'].should be_a(Tempfile)
+    end
   end
 end

data/superbolt.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "amqp"
   spec.add_dependency "bunny"
   spec.add_dependency 'eventmachine'
+  spec.add_dependency 'file_marshal'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: file_marshal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,9 @@ files:
 - lib/superbolt/connection/base.rb
 - lib/superbolt/connection/queue.rb
 - lib/superbolt/facade.rb
+- lib/superbolt/file_manager.rb
+- lib/superbolt/file_packer.rb
+- lib/superbolt/file_unpacker.rb
 - lib/superbolt/incoming_message.rb
 - lib/superbolt/message_handler.rb
 - lib/superbolt/messenger.rb
@@ -150,11 +167,15 @@ files:
 - spec/app_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
+- spec/file_packer_spec.rb
+- spec/file_unpacker_spec.rb
+- spec/incoming_message_spec.rb
 - spec/messenger_spec.rb
 - spec/queue_spec.rb
 - spec/router_spec.rb
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
+- spec/support/commodore.jpg
 - spec/support/queue_helpers.rb
 - superbolt.gemspec
 homepage: ''
@@ -185,9 +206,13 @@ test_files:
 - spec/app_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
+- spec/file_packer_spec.rb
+- spec/file_unpacker_spec.rb
+- spec/incoming_message_spec.rb
 - spec/messenger_spec.rb
 - spec/queue_spec.rb
 - spec/router_spec.rb
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
+- spec/support/commodore.jpg
 - spec/support/queue_helpers.rb