thrift-mavericks 0.8.0 → 0.9.0.1

data/spec/unix_socket_spec.rb

@@ -17,16 +17,15 @@
 # under the License.
 #
 
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'spec_helper'
 require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
 
-class ThriftUNIXSocketSpec < Spec::ExampleGroup
-  include Thrift
+describe 'UNIXSocket' do
 
-  describe UNIXSocket do
+  describe Thrift::UNIXSocket do
     before(:each) do
       @path = '/tmp/thrift_spec_socket'
-      @socket = UNIXSocket.new(@path)
+      @socket = Thrift::UNIXSocket.new(@path)
       @handle = mock("Handle", :closed? => false)
       @handle.stub!(:close)
       ::UNIXSocket.stub!(:new).and_return(@handle)
@@ -41,14 +40,14 @@ class ThriftUNIXSocketSpec < Spec::ExampleGroup
 
     it "should accept an optional timeout" do
       ::UNIXSocket.stub!(:new)
-      UNIXSocket.new(@path, 5).timeout.should == 5
+      Thrift::UNIXSocket.new(@path, 5).timeout.should == 5
     end
   end
 
-  describe UNIXServerSocket do
+  describe Thrift::UNIXServerSocket do
     before(:each) do
       @path = '/tmp/thrift_spec_socket'
-      @socket = UNIXServerSocket.new(@path)
+      @socket = Thrift::UNIXServerSocket.new(@path)
     end
 
     it "should create a handle when calling listen" do
@@ -63,7 +62,7 @@ class ThriftUNIXSocketSpec < Spec::ExampleGroup
       sock = mock("sock")
       handle.should_receive(:accept).and_return(sock)
       trans = mock("UNIXSocket")
-      UNIXSocket.should_receive(:new).and_return(trans)
+      Thrift::UNIXSocket.should_receive(:new).and_return(trans)
       trans.should_receive(:handle=).with(sock)
       @socket.accept.should == trans
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrift-mavericks
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0.1
 platform: ruby
 authors:
 - Thrift Developers
@@ -11,35 +11,77 @@ cert_chain: []
 date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: mongrel
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -62,6 +104,7 @@ extra_rdoc_files:
 - CHANGELOG
 - README
 - ext/binary_protocol_accelerated.c
+- ext/bytes.c
 - ext/compact_protocol.c
 - ext/memory_buffer.c
 - ext/protocol.c
@@ -69,6 +112,7 @@ extra_rdoc_files:
 - ext/struct.c
 - ext/thrift_native.c
 - ext/binary_protocol_accelerated.h
+- ext/bytes.h
 - ext/compact_protocol.h
 - ext/constants.h
 - ext/macros.h
@@ -77,6 +121,7 @@ extra_rdoc_files:
 - ext/strlcpy.h
 - ext/struct.h
 - ext/extconf.rb
+- lib/thrift/bytes.rb
 - lib/thrift/client.rb
 - lib/thrift/core_ext/fixnum.rb
 - lib/thrift/core_ext.rb
@@ -86,12 +131,14 @@ extra_rdoc_files:
 - lib/thrift/protocol/binary_protocol.rb
 - lib/thrift/protocol/binary_protocol_accelerated.rb
 - lib/thrift/protocol/compact_protocol.rb
+- lib/thrift/protocol/json_protocol.rb
 - lib/thrift/serializer/deserializer.rb
 - lib/thrift/serializer/serializer.rb
 - lib/thrift/server/base_server.rb
 - lib/thrift/server/mongrel_http_server.rb
 - lib/thrift/server/nonblocking_server.rb
 - lib/thrift/server/simple_server.rb
+- lib/thrift/server/thin_http_server.rb
 - lib/thrift/server/thread_pool_server.rb
 - lib/thrift/server/threaded_server.rb
 - lib/thrift/struct.rb
@@ -112,6 +159,7 @@ extra_rdoc_files:
 - lib/thrift/union.rb
 - lib/thrift.rb
 files:
+- lib/thrift/bytes.rb
 - lib/thrift/client.rb
 - lib/thrift/core_ext/fixnum.rb
 - lib/thrift/core_ext.rb
@@ -121,12 +169,14 @@ files:
 - lib/thrift/protocol/binary_protocol.rb
 - lib/thrift/protocol/binary_protocol_accelerated.rb
 - lib/thrift/protocol/compact_protocol.rb
+- lib/thrift/protocol/json_protocol.rb
 - lib/thrift/serializer/deserializer.rb
 - lib/thrift/serializer/serializer.rb
 - lib/thrift/server/base_server.rb
 - lib/thrift/server/mongrel_http_server.rb
 - lib/thrift/server/nonblocking_server.rb
 - lib/thrift/server/simple_server.rb
+- lib/thrift/server/thin_http_server.rb
 - lib/thrift/server/thread_pool_server.rb
 - lib/thrift/server/threaded_server.rb
 - lib/thrift/struct.rb
@@ -151,6 +201,7 @@ files:
 - spec/binary_protocol_accelerated_spec.rb
 - spec/binary_protocol_spec.rb
 - spec/binary_protocol_spec_shared.rb
+- spec/bytes_spec.rb
 - spec/client_spec.rb
 - spec/compact_protocol_spec.rb
 - spec/exception_spec.rb
@@ -158,7 +209,7 @@ files:
 - spec/gen-rb/thrift_spec_constants.rb
 - spec/gen-rb/thrift_spec_types.rb
 - spec/http_client_spec.rb
-- spec/mongrel_http_server_spec.rb
+- spec/json_protocol_spec.rb
 - spec/nonblocking_server_spec.rb
 - spec/processor_spec.rb
 - spec/serializer_spec.rb
@@ -167,7 +218,9 @@ files:
 - spec/socket_spec.rb
 - spec/socket_spec_shared.rb
 - spec/spec_helper.rb
+- spec/struct_nested_containers_spec.rb
 - spec/struct_spec.rb
+- spec/thin_http_server_spec.rb
 - spec/ThriftSpec.thrift
 - spec/types_spec.rb
 - spec/union_spec.rb
@@ -175,6 +228,7 @@ files:
 - CHANGELOG
 - README
 - ext/binary_protocol_accelerated.c
+- ext/bytes.c
 - ext/compact_protocol.c
 - ext/memory_buffer.c
 - ext/protocol.c
@@ -182,6 +236,7 @@ files:
 - ext/struct.c
 - ext/thrift_native.c
 - ext/binary_protocol_accelerated.h
+- ext/bytes.h
 - ext/compact_protocol.h
 - ext/constants.h
 - ext/macros.h
@@ -249,6 +304,7 @@ test_files:
 - spec/binary_protocol_accelerated_spec.rb
 - spec/binary_protocol_spec.rb
 - spec/binary_protocol_spec_shared.rb
+- spec/bytes_spec.rb
 - spec/client_spec.rb
 - spec/compact_protocol_spec.rb
 - spec/exception_spec.rb
@@ -256,7 +312,7 @@ test_files:
 - spec/gen-rb/thrift_spec_constants.rb
 - spec/gen-rb/thrift_spec_types.rb
 - spec/http_client_spec.rb
-- spec/mongrel_http_server_spec.rb
+- spec/json_protocol_spec.rb
 - spec/nonblocking_server_spec.rb
 - spec/processor_spec.rb
 - spec/serializer_spec.rb
@@ -265,7 +321,9 @@ test_files:
 - spec/socket_spec.rb
 - spec/socket_spec_shared.rb
 - spec/spec_helper.rb
+- spec/struct_nested_containers_spec.rb
 - spec/struct_spec.rb
+- spec/thin_http_server_spec.rb
 - spec/ThriftSpec.thrift
 - spec/types_spec.rb
 - spec/union_spec.rb

data/spec/mongrel_http_server_spec.rb

@@ -1,117 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
-require 'thrift/server/mongrel_http_server'
-
-class ThriftHTTPServerSpec < Spec::ExampleGroup
-  include Thrift
-
-  Handler = MongrelHTTPServer::Handler
-
-  describe MongrelHTTPServer do
-    it "should have appropriate defaults" do
-      mock_factory = mock("BinaryProtocolFactory")
-      mock_proc = mock("Processor")
-      BinaryProtocolFactory.should_receive(:new).and_return(mock_factory)
-      Mongrel::HttpServer.should_receive(:new).with("0.0.0.0", 80).and_return do
-        mock("Mongrel::HttpServer").tee do |mock|
-          handler = mock("Handler")
-          Handler.should_receive(:new).with(mock_proc, mock_factory).and_return(handler)
-          mock.should_receive(:register).with("/", handler)
-        end
-      end
-      MongrelHTTPServer.new(mock_proc)
-    end
-
-    it "should understand :ip, :port, :path, and :protocol_factory" do
-      mock_proc = mock("Processor")
-      mock_factory = mock("ProtocolFactory")
-      Mongrel::HttpServer.should_receive(:new).with("1.2.3.4", 1234).and_return do
-        mock("Mongrel::HttpServer").tee do |mock|
-          handler = mock("Handler")
-          Handler.should_receive(:new).with(mock_proc, mock_factory).and_return(handler)
-          mock.should_receive(:register).with("/foo", handler)
-        end
-      end
-      MongrelHTTPServer.new(mock_proc, :ip => "1.2.3.4", :port => 1234, :path => "foo",
-                                             :protocol_factory => mock_factory)
-    end
-
-    it "should serve using Mongrel::HttpServer" do
-      BinaryProtocolFactory.stub!(:new)
-      Mongrel::HttpServer.should_receive(:new).and_return do
-        mock("Mongrel::HttpServer").tee do |mock|
-          Handler.stub!(:new)
-          mock.stub!(:register)
-          mock.should_receive(:run).and_return do
-            mock("Mongrel::HttpServer.run").tee do |runner|
-              runner.should_receive(:join)
-            end
-          end
-        end
-      end
-      MongrelHTTPServer.new(nil).serve
-    end
-  end
-
-  describe MongrelHTTPServer::Handler do
-    before(:each) do
-      @processor = mock("Processor")
-      @factory = mock("ProtocolFactory")
-      @handler = Handler.new(@processor, @factory)
-    end
-
-    it "should return 404 for non-POST requests" do
-      request = mock("request", :params => {"REQUEST_METHOD" => "GET"})
-      response = mock("response")
-      response.should_receive(:start).with(404)
-      response.should_not_receive(:start).with(200)
-      @handler.process(request, response)
-    end
-
-    it "should serve using application/x-thrift" do
-      request = mock("request", :params => {"REQUEST_METHOD" => "POST"}, :body => nil)
-      response = mock("response")
-      head = mock("head")
-      head.should_receive(:[]=).with("Content-Type", "application/x-thrift")
-      IOStreamTransport.stub!(:new)
-      @factory.stub!(:get_protocol)
-      @processor.stub!(:process)
-      response.should_receive(:start).with(200).and_yield(head, nil)
-      @handler.process(request, response)
-    end
-
-    it "should use the IOStreamTransport" do
-      body = mock("body")
-      request = mock("request", :params => {"REQUEST_METHOD" => "POST"}, :body => body)
-      response = mock("response")
-      head = mock("head")
-      head.stub!(:[]=)
-      out = mock("out")
-      protocol = mock("protocol")
-      transport = mock("transport")
-      IOStreamTransport.should_receive(:new).with(body, out).and_return(transport)
-      @factory.should_receive(:get_protocol).with(transport).and_return(protocol)
-      @processor.should_receive(:process).with(protocol, protocol)
-      response.should_receive(:start).with(200).and_yield(head, out)
-      @handler.process(request, response)
-    end
-  end
-end