airbrush 0.0.5.pre4 → 0.0.5.pre6

data/VERSION

@@ -1 +1 @@
-0.0.5.pre4
+0.0.5.pre6

data/lib/airbrush.rb

@@ -3,6 +3,8 @@ $:.unshift File.dirname(__FILE__)
 # required gems
 require 'active_support'
 require 'active_support/dependencies'
+require 'active_support/time'
+require 'active_support/core_ext'
 
 ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
 
@@ -14,17 +16,21 @@ ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
 Dir[File.dirname(__FILE__) + '/airbrush/core_ext/*.rb'].each { |e| require e }
 
 module Airbrush
+
 end
 
 class Object
   def log(out=$stdout)
-    @@__log__ ||= __create_logger__(out)
+     @@logger ||= __create_logger__(out)
   end
 
   private
 
     def __create_logger__(target)
-      @@__log__ = ActiveSupport::BufferedLogger.new(target, ActiveSupport::BufferedLogger::Severity::INFO)
+      @@logger = Logger.new(target)
+      @@logger.level = Logger::INFO
+      @@logger.formatter = Logger::Formatter.new
+      @@logger
     end
 
 end

data/lib/airbrush/listeners/zeromq.rb

@@ -0,0 +1,58 @@
+require 'zmq'
+
+module Airbrush
+  module Listeners
+    class ZeroMQ < Listener
+      DEFAULT_POLL_FREQUENCY = 1 # seconds
+
+      attr_reader :host, :poll_frequency, :socket
+
+      def initialize(host, frequency = DEFAULT_POLL_FREQUENCY)
+        @host = host
+        @poll_frequency = frequency
+        catch_signals(:int)
+      end
+
+      def start
+        @running = true
+        
+        z = ZMQ::Context.new
+        puts "Connecting to ZEROMQ socket..."
+        @socket = z.socket(ZMQ::UPSTREAM)
+        @socket.connect "tcp://127.0.0.1:4010"
+
+        log.debug 'Accepting incoming jobs'
+
+        loop do
+          poll do |operation|
+            process operation
+          end
+
+          break unless @running
+          sleep @poll_frequency
+        end
+      end
+
+      private
+
+        def poll
+          operation = @socket.recv #(DEFAULT_INCOMING_QUEUE)
+          yield operation if operation and block_given?
+        end
+        
+        def publish(results)
+          @socket.send(results)
+        end
+
+        def catch_signals(*signals)
+          signals.each do |signal|
+            sig = signal.to_s.upcase
+            Signal.trap(sig) do
+              @running = false
+              log.debug "Intercepted SIG#{sig}, exiting"
+            end
+          end
+        end
+    end
+  end
+end

data/spec/airbrush/core_ext/timestamped_logger_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-describe ActiveSupport::BufferedLogger, 'log statements' do
+describe 'log statements' do
 
   before do
     @time = Time.now
     Time.stub!(:now).and_return(@time)
     @target = StringIO.new
-    @logger = ActiveSupport::BufferedLogger.new(@target)
+    @logger = Object.log(@target)
     @statement = 'this is a test'
   end
 

data/spec/airbrush/processors/image/rmagick_spec.rb

@@ -123,7 +123,7 @@ describe Airbrush::Processors::Image::Rmagick do
     end
     
     it 'should return an image cropped to the crop marks' do
-      @rm_image.should_receive(:crop!).with(0,20,800,900).once
+      @rm_image.should_receive(:crop!).with(0,20,800,900, true).once
       @processor.resized_crop_mask(@image, {:x => 0, :y => 20, :width => 800, :height => 900 }, { :width => 2890, :height => 1940 }).should == {
       	:format => "JPEG", :image => "blob", :width => 1500, :height => 1000}
     end 

data/spec/spec.opts

@@ -1 +1 @@
---color
+--colour

metadata

@@ -1,125 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: airbrush
-version: !ruby/object:Gem::Version 
-  hash: -223651703
+version: !ruby/object:Gem::Version
+  version: 0.0.5.pre6
   prerelease: 6
-  segments: 
-  - 0
-  - 0
-  - 5
-  - pre
-  - 4
-  version: 0.0.5.pre4
 platform: ruby
-authors: 
+authors:
 - Marcus Crafter
 - Nick Marfleet
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-19 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: starling
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-06-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70293953083720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70293953083720
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: &70293953082680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.10
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70293953082680
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70293953081880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 0
-        - 10
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby2ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70293953081880
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: &70293953079900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70293953079900
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: &70293953079140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70293953079140
+- !ruby/object:Gem::Dependency
   name: live_ast
+  requirement: &70293953078500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70293953078500
+- !ruby/object:Gem::Dependency
+  name: starling
+  requirement: &70293953077780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70293953077780
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &70293953076580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70293953076580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70293953075540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
   type: :development
-  version_requirements: *id006
-description: An Image Processing Server
-email: nick@whatevernext.org
-executables: 
+  prerelease: false
+  version_requirements: *70293953075540
+description: 
+email: nick@blocksglobal.com
+executables:
 - airbrush
 - airbrush-example-client
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.txt
-files: 
+files:
 - .gitignore
 - History.txt
 - LICENSE
@@ -136,23 +137,18 @@ files:
 - lib/airbrush/handler.rb
 - lib/airbrush/listeners/listener.rb
 - lib/airbrush/listeners/memcache.rb
-- lib/airbrush/listeners/socket.rb
-- lib/airbrush/listeners/webservice.rb
+- lib/airbrush/listeners/zeromq.rb
 - lib/airbrush/processors/image/image_processor.rb
 - lib/airbrush/processors/image/profiles/cmyk-profile.icc
 - lib/airbrush/processors/image/profiles/srgb-profile.icc
 - lib/airbrush/processors/image/rmagick.rb
 - lib/airbrush/processors/processor.rb
-- lib/airbrush/publishers/http.rb
-- lib/airbrush/publishers/memcache.rb
-- lib/airbrush/publishers/publisher.rb
 - lib/airbrush/server.rb
 - lib/airbrush/version.rb
 - log/debug.log
 - script/destroy
 - script/generate
 - script/txt2html
-- setup.rb
 - spec/airbrush/client_spec.rb
 - spec/airbrush/core_ext/get_args_spec.rb
 - spec/airbrush/core_ext/timestamped_logger_spec.rb
@@ -168,48 +164,33 @@ files:
 - spec/airbrush_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/environment.rake
 - tasks/rspec.rake
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
-has_rdoc: true
-homepage: http://github.com/square-circle-triangle/airbush
+homepage: http://www.blocksglobal.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Image Processing Server
-test_files: 
+summary: Gem for providing messaging system for media processing
+test_files:
 - spec/airbrush/client_spec.rb
 - spec/airbrush/core_ext/get_args_spec.rb
 - spec/airbrush/core_ext/timestamped_logger_spec.rb

data/lib/airbrush/publishers/http.rb

@@ -1,13 +0,0 @@
-module Airbrush
-  module Publishers
-    class Http < Publisher
-      def initialize(target)
-        @target = target
-      end
-      
-      def publish(result)
-        # http post/put to target
-      end
-    end
-  end
-end