rack-amf 0.0.3 → 0.0.4

data/Rakefile

@@ -23,10 +23,10 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name    = 'rack-amf'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.summary = 'AMF serializer/deserializer and AMF gateway packaged as a rack middleware'
 
-  s.files        = FileList['README.rdoc', 'Rakefile', 'lib/**/*.rb', 'spec/**/*.rb']
+  s.files        = FileList['README.rdoc', 'Rakefile', 'lib/**/*.rb', 'spec/**/*.rb', 'spec/**/*.bin', 'spec/spec.opts']
   s.require_path = 'lib'
   s.test_files   = Dir[*['spec/**/*_spec.rb']]
 
@@ -51,4 +51,4 @@ task :gemspec do
   File.open("#{spec.name}.gemspec", 'w') do |f|
     f.write spec.to_ruby
   end
-end
+end

data/lib/amf/version.rb

@@ -1,6 +1,6 @@
 module AMF
   # AMF version
-  VERSION         = '0.0.3'
+  VERSION         = '0.0.4'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/rack/amf.rb

@@ -18,51 +18,4 @@ module Rack::AMF
       raise "Invalide mode: #{options[:mode]}"
     end
   end
-end
-=begin
-require 'rack'
-require 'amf'
-require 'rack/amf/environment'
-
-# Rack::AMF middleware
-module Rack::AMF; end;
-
-# Bootstrap based on environment
-if defined?(Rails)
-  # Load in needed files
-  require 'rack/amf/middleware/rails'
-
-  #--
-  # Then we'll modify new to return the middleware to use in rails
-  module Rack::AMF
-    def self.new app, options={} #:nodoc:
-      Middleware::Rails.new(app, options)
-    end
-  end
-
-  # Set default configs
-  Rack::AMF::Environment.url = '/amf'
-  Rack::AMF::Environment.mode = :rails
-
-  # Install rails mods
-  Rack::AMF::Middleware::Rails.install_environment
-else
-  module Rack::AMF
-    def self.new app, options={} #:nodoc:
-      # Set default mode
-      options[:mode] = :service_manager if !options[:mode]
-
-      # Which version of the middleware?
-      if options[:mode] == :pass_through
-        require 'rack/amf/middleware/pass_through'
-        Middleware::PassThrough.new(app, options)
-      elsif options[:mode] == :service_manager
-        require 'rack/amf/middleware/service_manager'
-        Middleware::ServiceManager.new(app, options)
-      else
-        raise "Invalide mode: #{options[:mode]}"
-      end
-    end
-  end
-end
-=end
+end

data/spec/amf/deserializer_spec.rb

@@ -205,8 +205,6 @@ describe "when deserializing" do
         output.should == {:foo => "bar", :answer => 42}
       end
 
-      it "should deserialize an open struct as a dynamic anonymous object"
-
       it "should deserialize an empty array" do
         input = object_fixture("amf3-emptyArray.bin")
         output = AMF.deserialize(input, 3)

data/spec/amf/serializer_spec.rb

@@ -196,8 +196,6 @@ describe "when serializing" do
         output.should == expected
       end
 
-      it "should serialize an open struct as a dynamic anonymous object"
-
       it "should serialize an empty array" do
         expected = object_fixture("amf3-emptyArray.bin")
         input = []

data/spec/fixtures/objects/amf0-boolean.bin

@@ -0,0 +1 @@
+

data/spec/fixtures/objects/amf0-null.bin

@@ -0,0 +1 @@
+

data/spec/fixtures/objects/amf0-undefined.bin

@@ -0,0 +1 @@
+

data/spec/fixtures/objects/amf3-arrayRef.bin

@@ -0,0 +1 @@
+		
	

	
abc		

data/spec/fixtures/objects/amf3-dynObject.bin

@@ -0,0 +1,2 @@
+
+
/another_public_propertya_public_valuenil_property
property_onefooproperty_two

data/spec/fixtures/objects/amf3-emptyArray.bin

@@ -0,0 +1 @@
+	

data/spec/fixtures/objects/amf3-emptyArrayRef.bin

@@ -0,0 +1 @@
+		
	

	

		

data/spec/fixtures/objects/amf3-emptyStringRef.bin

@@ -0,0 +1 @@
+	



data/spec/fixtures/objects/amf3-false.bin

@@ -0,0 +1 @@
+

data/spec/fixtures/objects/amf3-hash.bin

@@ -0,0 +1,2 @@
+
+

data/spec/fixtures/objects/amf3-max.bin

@@ -0,0 +1 @@
+����

data/spec/fixtures/objects/amf3-mixedArray.bin

@@ -0,0 +1,11 @@
+	

+
foo_onebar_one

+
foo_two


+
foo_three*

+



+

	

+
+
+	

*
	



+


+

data/spec/fixtures/objects/amf3-null.bin

@@ -0,0 +1 @@
+

data/spec/fixtures/objects/amf3-primArray.bin

@@ -0,0 +1 @@
+	



data/spec/fixtures/objects/amf3-string.bin

@@ -0,0 +1 @@
+String . String

data/spec/fixtures/objects/amf3-symbol.bin

@@ -0,0 +1 @@
+foo

data/spec/fixtures/objects/amf3-true.bin

@@ -0,0 +1 @@
+

data/spec/fixtures/objects/amf3-typedObject.bin

@@ -0,0 +1,2 @@
+
+#'org.rackAMF.ASClassbazfoo
bar

data/spec/rack/request_spec.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 require 'rack/amf'
+require 'rack/amf/request'
 
 describe Rack::AMF::Request do
 end

data/spec/rack/response_spec.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 require 'rack/amf'
+require 'rack/amf/response'
 
 describe Rack::AMF::Response do
   it "should serialize response when converted to string" do

data/spec/rack/service_manager_spec.rb

@@ -1,25 +1,24 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 require 'rack/amf'
+require 'rack/amf/middleware/service_manager'
 
-describe Rack::AMF::ServiceManager do
+describe Rack::AMF::Middleware::ServiceManager do
   before :each do
-    @manager = Rack::AMF::ServiceManager.new
+    @manager = Rack::AMF::Middleware::ServiceManager.new nil
   end
 
   it "should support mapped services" do
-    service = mock "Service"
-    @manager.register('path.Service', service)
-    service.should_receive('respond_to?').with('test').and_return(true)
-    service.should_receive('test').with('arg1', 'arg2').and_return('success')
+    service = mock "Service", :test => 'success'
+    Rack::AMF::Environment.register_service 'path.Service', service
+    service.should_receive('test').with('arg1', 'arg2')
 
     @manager.send(:handle_method, 'path.Service.test', ['arg1', 'arg2']).should == 'success'
   end
 
   it "should map '' to no path method calls" do
-    service = mock "Service"
-    @manager.register('', service)
-    service.should_receive('respond_to?').with('test').and_return(true)
-    service.should_receive('test').and_return('success')
+    service = mock "Service", :test => 'success'
+    Rack::AMF::Environment.register_service '', service
+    service.should_receive('test')
 
     @manager.send(:handle_method, 'test', []).should == 'success'
   end

data/spec/spec.opts

@@ -0,0 +1 @@
+--colour

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ def object_fixture(binary_path)
 end
 
 def create_rack_request(binary_path)
+  require 'rack/amf/request'
   env = {'rack.input' => StringIO.new(request_fixture(binary_path))}
   Rack::AMF::Request.new(env)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-amf
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tony Hillerson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -04:00
+date: 2009-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -40,10 +40,8 @@ files:
 - lib/amf.rb
 - lib/rack/amf/environment.rb
 - lib/rack/amf/middleware/pass_through.rb
-- lib/rack/amf/middleware/rails.rb
 - lib/rack/amf/middleware/service_manager.rb
 - lib/rack/amf/middleware.rb
-- lib/rack/amf/rails/rack_amf_controller.rb
 - lib/rack/amf/request.rb
 - lib/rack/amf/response.rb
 - lib/rack/amf.rb
@@ -58,6 +56,50 @@ files:
 - spec/rack/response_spec.rb
 - spec/rack/service_manager_spec.rb
 - spec/spec_helper.rb
+- spec/fixtures/objects/amf0-boolean.bin
+- spec/fixtures/objects/amf0-date.bin
+- spec/fixtures/objects/amf0-ecma-ordinal-array.bin
+- spec/fixtures/objects/amf0-hash.bin
+- spec/fixtures/objects/amf0-null.bin
+- spec/fixtures/objects/amf0-number.bin
+- spec/fixtures/objects/amf0-object.bin
+- spec/fixtures/objects/amf0-ref-test.bin
+- spec/fixtures/objects/amf0-strict-array.bin
+- spec/fixtures/objects/amf0-string.bin
+- spec/fixtures/objects/amf0-typed-object.bin
+- spec/fixtures/objects/amf0-undefined.bin
+- spec/fixtures/objects/amf0-untyped-object.bin
+- spec/fixtures/objects/amf3-0.bin
+- spec/fixtures/objects/amf3-arrayRef.bin
+- spec/fixtures/objects/amf3-bigNum.bin
+- spec/fixtures/objects/amf3-date.bin
+- spec/fixtures/objects/amf3-datesRef.bin
+- spec/fixtures/objects/amf3-dynObject.bin
+- spec/fixtures/objects/amf3-emptyArray.bin
+- spec/fixtures/objects/amf3-emptyArrayRef.bin
+- spec/fixtures/objects/amf3-emptyStringRef.bin
+- spec/fixtures/objects/amf3-false.bin
+- spec/fixtures/objects/amf3-graphMember.bin
+- spec/fixtures/objects/amf3-hash.bin
+- spec/fixtures/objects/amf3-largeMax.bin
+- spec/fixtures/objects/amf3-largeMin.bin
+- spec/fixtures/objects/amf3-max.bin
+- spec/fixtures/objects/amf3-min.bin
+- spec/fixtures/objects/amf3-mixedArray.bin
+- spec/fixtures/objects/amf3-null.bin
+- spec/fixtures/objects/amf3-objRef.bin
+- spec/fixtures/objects/amf3-primArray.bin
+- spec/fixtures/objects/amf3-string.bin
+- spec/fixtures/objects/amf3-stringRef.bin
+- spec/fixtures/objects/amf3-symbol.bin
+- spec/fixtures/objects/amf3-true.bin
+- spec/fixtures/objects/amf3-typedObject.bin
+- spec/fixtures/request/acknowledge-response.bin
+- spec/fixtures/request/amf0-error-response.bin
+- spec/fixtures/request/commandMessage.bin
+- spec/fixtures/request/remotingMessage.bin
+- spec/fixtures/request/simple-response.bin
+- spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/warhammerkid/rack-amf
 licenses: []

data/lib/rack/amf/middleware/rails.rb

@@ -1,39 +0,0 @@
-require 'rack/amf/middleware'
-
-module Rack::AMF::Middleware #:nodoc:
-  class Rails
-    include Rack::AMF::Middleware
-
-    def initialize app, options={}
-      @app = app
-
-      options.delete(:url) # Too late to modify the URL
-      Rack::AMF::Environment.populate options
-    end
-
-    def handle env
-      @app.call env
-    end
-
-    def self.install_environment
-      return if @installed
-      @installed = true
-
-      # Load in files
-      extras_dir = File.dirname(__FILE__)+'/../rails'
-      Dir["#{extras_dir}/*.rb"].each {|f| require f}
-
-      # Install route
-      ActionController::Routing::RouteSet.class_eval do
-        next if self.instance_methods.include? 'draw_with_rackamf'
-        def draw_with_rackamf
-          draw_without_rackamf do |map|
-            map.rack_amf Rack::AMF::Environment.url, :controller => 'rack_amf', :action => 'handle'
-            yield map
-          end
-        end
-        alias_method_chain :draw, :rackamf
-      end
-    end
-  end
-end

data/lib/rack/amf/rails/rack_amf_controller.rb

@@ -1,23 +0,0 @@
-class RackAmfController < ApplicationController
-  def handle
-    if request.env['rack-amf.request']
-      RAILS_DEFAULT_LOGGER.info "[rack-amf] Handle request"
-      request.env['rack-amf.response'].each_method_call do |method, args|
-        handle_call method, args
-      end
-    else
-      render :text => '<html><body>Rack::AMF Gateway</body></html>'
-    end
-  end
-
-  private
-  def handle_call method, args
-    path = method.split('.')
-    raise "Invalid method '#{method}': Methods must look like this 'ServiceController.method'" if path.length != 2
-
-    action = path.pop
-    controller = path.pop
-
-    
-  end
-end