nervion 0.0.2 → 0.0.3

data/.gitignore

@@ -4,3 +4,5 @@
 coverage
 doc
 examples
+Gemfile.lock
+pkg

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# version 0.0.3
+
+- Allow Nervion to run without being responsible for EventMachine's event loop
+
 # version 0.0.2
 
 - Support for firehose endpoint

data/lib/nervion/client.rb

@@ -14,8 +14,12 @@ module Nervion
     end
 
     def stop
-      @stream.close
+      close_stream
       EM.stop
     end
+
+    def close_stream
+      @stream.close
+    end
   end
 end

data/lib/nervion/facade.rb

@@ -88,12 +88,18 @@ module Nervion
     stream firehose_endpoint(params), callback
   end
 
-  # Stops streaming
+  # Stops streaming and stops EventMachine's event loop
   def self.stop
-    raise 'Nervion is not running' if @client.nil?
+    check_for_running_client
     @client.stop
   end
 
+  # Stops streaming but keeps EventMachine's event loop running
+  def self.close_stream
+    check_for_running_client
+    @client.close_stream
+  end
+
   private
 
   def self.callback_table
@@ -131,6 +137,10 @@ module Nervion
     raise "You have to setup a message callback. Please, check out #{MSG_CALLBACK_README_URL}"
   end
 
+  def self.check_for_running_client
+    raise 'Nervion is not running' if @client.nil?
+  end
+
   STREAM_API_HOST   = 'stream.twitter.com'
   STREAM_API_PORT   = 443
   SAMPLE_ENDPOINT   = "https://#{STREAM_API_HOST}/1/statuses/sample.json"

data/lib/nervion/stream.rb

@@ -46,6 +46,7 @@ module Nervion
 
     def close
       @close_stream = true
+      close_connection
     end
 
     private

data/lib/nervion/version.rb

@@ -1,3 +1,3 @@
 module Nervion
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/nervion.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/nervion/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Javier Acero"]
   gem.email         = ["j4cegu@gmail.com"]
-  gem.description   = %q{A minimalistic Twitter Stream API Ruby client}
+  gem.description   = %q{A minimalistic Ruby client for the Public Streams of Twitter Streaming API}
   gem.summary       = %q{}
   gem.homepage      = "https://github.com/jacegu/nervion"
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Nervion::VERSION
 
-  gem.add_runtime_dependency 'eventmachine', '~> 1.0.0.beta.4'
+  gem.add_runtime_dependency 'eventmachine', '~> 1.0.0.rc.4'
   gem.add_runtime_dependency 'http_parser.rb', '~> 0.5.3'
   gem.add_runtime_dependency 'yajl-ruby', '~> 1.1.0'
   gem.add_development_dependency 'cucumber'

data/spec/nervion/client_spec.rb

@@ -43,11 +43,19 @@ describe Nervion::Client do
     subject.stream(request, callbacks)
   end
 
-  it 'stops streaming' do
+  it 'closes the stream and stops the event loop' do
     EM.stub(:connect).and_return(stream)
     stream.should_receive(:close).ordered
     EM.should_receive(:stop).ordered
     subject.stream(request, callbacks)
     subject.stop
   end
+
+  it 'closes the stream' do
+    EM.stub(:connect).and_return(stream)
+    stream.should_receive(:close)
+    EM.should_not_receive(:stop)
+    subject.stream(request, callbacks)
+    subject.close_stream
+  end
 end

data/spec/nervion/facade_spec.rb

@@ -98,7 +98,7 @@ describe "Facade that exposes Nervion's API" do
     end
 
     context 'stoping' do
-      it 'can stop the streaming' do
+      it 'stops the client and the event loop' do
         client.should_receive(:stop)
         Nervion.sample{}
         Nervion.stop
@@ -109,6 +109,20 @@ describe "Facade that exposes Nervion's API" do
         expect { Nervion.stop }.to raise_error
       end
     end
+
+    context 'closing the stream' do
+      it 'closes the stream but keeps the event loop running' do
+        client.should_receive(:close_stream)
+        Nervion.sample{}
+        Nervion.close_stream
+      end
+
+      it 'raises an error if it is not streaming' do
+        Nervion.instance_variable_set(:@client, nil)
+        expect { Nervion.close_stream }.to raise_error
+      end
+    end
+
   end
 
 end

data/spec/nervion/stream_spec.rb

@@ -48,6 +48,7 @@ describe Nervion::Stream do
 
   it 'can be closed' do
     subject.close_requested?.should be_false
+    subject.should_receive(:close_connection)
     subject.close
     subject.close_requested?.should be_true
   end
@@ -91,6 +92,7 @@ describe Nervion::Stream do
         handler.should_not_receive(:handle_network_error)
         scheduler.should_not_receive(:reconnect_after_http_error_in)
         scheduler.should_not_receive(:reconnect_after_network_error_in)
+        subject.stub(:close_connection)
         subject.close
         subject.unbind
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nervion
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.rc.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.rc.4
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A minimalistic Twitter Stream API Ruby client
+description: A minimalistic Ruby client for the Public Streams of Twitter Streaming
+  API
 email:
 - j4cegu@gmail.com
 executables: []
@@ -152,7 +153,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,50 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nervion (0.0.1)
-      eventmachine (~> 1.0.0.beta.4)
-      http_parser.rb (~> 0.5.3)
-      yajl-ruby (~> 1.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.0.0)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0.beta.4)
-    gherkin (2.11.0)
-      json (>= 1.4.6)
-    http_parser.rb (0.5.3)
-    json (1.7.3)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    yajl-ruby (1.1.0)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber
-  nervion!
-  rake
-  rspec
-  simplecov
-  yard