runscope-rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a0fc3d67f49af706c3a49c307b89165e850c14
-  data.tar.gz: 0877e9330940e4632d7069967cb04c87cc1ece01
+  metadata.gz: 3fc8642038dfa6f69a61cf84a141b626bbc6e763
+  data.tar.gz: 4d8f409e1c8e50c82b7a1ee6e624893b979a13be
 SHA512:
-  metadata.gz: 88e0c2104b9fb8b4bdecf3432da22732260102f38d298ab634f98846398d7be1b543cbe3ad2269df535357faaefeb4a329ac081ff8414b6f4f8bf905cb8f5c00
-  data.tar.gz: f58555248bc025fb441f628db2dd350981acd9772750209ba1b2feb1ee330a60c606f07167b2df4db0224d838e806c56e3ad3c307e4e49418f7fc7b8f611ebc2
+  metadata.gz: 49d1c17c412606f283ad46d65fa89f8eebec2e0a8f7b3e0729116956d6c27837a04e1ea13fe747581c0935a9432ae1fab89a2bcebbaba6a6fa3244d0accbb498
+  data.tar.gz: faa85b5aca3fed00a512036ad9bb782073883f296c64dea2922748ab53c6b889c9d0bd9945850e39ad4d6ee1fc7af516045e1e95bd8c7226c113b90bd7d78f60

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
+.ruby-gemset

data/.rspec

@@ -0,0 +1,2 @@
+--format Fuubar
+--color

data/README.md

@@ -1,5 +1,7 @@
 # runscope-rb
 
+[![Dependency Status](https://gemnasium.com/chriswarren/runscope-rb.png)](https://gemnasium.com/chriswarren/runscope-rb)
+
 A gem to quickly get up and running with Runscope in a few lines of code.
 
 runscope-rb currently supports Net::HTTP requests. Requests made using other HTTP libraries, such as libcurl or sockets, won't be modified. If you want to add support for another HTTP library that would be fantastic. See the section on Contributing at the end of the readme.
@@ -8,15 +10,15 @@ runscope-rb currently supports Net::HTTP requests. Requests made using other HTT
 
 Add this line to your application's Gemfile:
 
-  gem 'runscope', '~> 0.0.2'
+    gem 'runscope', '~> 0.0.3'
 
 And then execute:
 
-  $ bundle
+    $ bundle
 
 Or install it yourself as:
 
-  $ gem install runscope
+    $ gem install runscope
 
 ## Usage
 

data/lib/ext/net_http.rb

@@ -6,12 +6,15 @@ module Net
 
     def request_with_runscope(request, body=nil, &block)
       if ::Runscope.monitor?(self.address)
+        if ::Runscope.is_non_standard_port?(@port)
+          request = ::Runscope.add_port_header_to_request(request, @port)
+          @port = 80
+        end
         @address = ::Runscope.proxy_domain(self.address)
       end
       request_without_runscope(request, body, &block)
     end
     alias_method :request_without_runscope, :request
     alias_method :request, :request_with_runscope
-
   end
 end

data/lib/{runscope → runscope-rb}/version.rb

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

data/lib/{runscope.rb → runscope-rb.rb}

@@ -1,5 +1,5 @@
-require "runscope/version"
-require "runscope/configuration"
+require "runscope-rb/version"
+require "runscope-rb/configuration"
 require "ext/net_http"
 
 module Runscope
@@ -30,6 +30,19 @@ module Runscope
     "#{subdomain}-#{bucket}.runscope.net"
   end
 
+  def self.add_port_header_to_request(request, port)
+    headers = request.instance_variable_get('@header')
+    request.instance_variable_set(
+      '@header',
+      headers.merge('Runscope-Request-Port' => "#{port}")
+    )
+    request
+  end
+
+  def self.is_non_standard_port?(port)
+    port != 443 && port != 80
+  end
+
   def self.enabled?
     Runscope.enabled
   end

data/runscope-rb.gemspec

@@ -1,8 +1,5 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'runscope'
-require 'runscope/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "runscope-rb/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "runscope-rb"
@@ -22,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~>2.13.0"
-  spec.add_development_dependency "fakeweb", "~> 1.3.0"
+  spec.add_development_dependency "webmock", "~> 1.13.0"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "debugger", "~> 1.6.1"
+  spec.add_development_dependency "fuubar", "~> 1.1.1"
 end

data/spec/ext/net_http_spec.rb

@@ -17,20 +17,25 @@ describe Net::HTTP do
     end
 
     context "to a url monitored by runscope" do
-      it "should modify a to a url that matches a string" do
-        FakeWeb.register_uri(:get, "http://api-stackexchange-com-#{@bucket}.runscope.net", :body => "test")
+      it "modifies a url that matches a string" do
+        stub_request(:get, "http://api-stackexchange-com-#{@bucket}.runscope.net")
         Net::HTTP.get_response(URI.parse("http://api.stackexchange.com"))
       end
 
-      it "should modify a request to a url that matches a regexp" do
-        FakeWeb.register_uri(:get, "http://test-desk-com-#{@bucket}.runscope.net", :body => "test")
+      it "modifies a url that matches a regexp" do
+        stub_request(:get, "http://test-desk-com-#{@bucket}.runscope.net")
         Net::HTTP.get_response(URI.parse("http://test.desk.com"))
       end
+
+      it "sets a header if the url specifies a port" do
+        stub_request(:get, "http://test-desk-com-#{@bucket}.runscope.net").with(headers: {'Runscope-Request-Port' => 401})
+        Net::HTTP.get_response(URI.parse("http://test.desk.com:401"))
+      end
     end
 
     context "to a url not monitored by runscope" do
-      it "should not modify a request to a url that doesn't match" do
-        FakeWeb.register_uri(:get, "http://api.twitter.com", :body => "test")
+      it "doesn't modify a url that doesn't match" do
+        stub_request(:any, "http://api.twitter.com")
         Net::HTTP.get_response(URI.parse("http://api.twitter.com"))
       end
     end

data/spec/runscope-rb/configuration_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Runscope::Configuration do
+  let(:domains){["api.stackexchange.com", /\S+\.desk\.com/]}
+  let(:bucket){"1234abcd"}
+
+  before(:each) do
+    Runscope.configure do |config|
+      config.domains = domains
+      config.bucket = bucket
+    end
+  end
+
+  after(:each) do
+    Runscope.reset
+  end
+
+  it{expect(Runscope.enabled).to eq(true)}
+  it{expect(Runscope.domains).to eq(domains)}
+  it{expect(Runscope.bucket).to eq(bucket)}
+
+  it{expect(Runscope.options).to include({bucket: bucket})}
+  it{expect(Runscope.options).to include({domains: domains})}
+  it{expect(Runscope.options).to include({enabled: true})}
+end

data/spec/runscope-rb_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe Runscope do
+  describe '#version_string' do
+    it 'should return correct version string' do
+      Runscope.version_string.should eq("Runscope version #{Runscope::VERSION}")
+    end
+  end
+
+  describe '#monitor?' do
+    before(:each){
+      Runscope.domains = ["api.stackexchange.com", /\S+\.desk\.com/]
+    }
+    after(:each){ Runscope.reset }
+    context "when enabled" do
+      before{ Runscope.enabled = true }
+      it{expect(Runscope.monitor?("api.stackexchange.com")).to eq(true)}
+      it{expect(Runscope.monitor?("api.twitter.com")).to eq(false)}
+    end
+
+    context "when disabled" do
+      before(:each){ Runscope.enabled = false }
+      it{expect(Runscope.monitor?("api.stackexchange.com")).to eq(false)}
+      it{expect(Runscope.monitor?("api.twitter.com")).to eq(false)}
+    end
+  end
+
+  describe '#monitor_domain?' do
+    before(:each){
+      Runscope.domains = ["api.stackexchange.com", /\S+\.desk\.com/]
+    }
+
+    it{expect(Runscope.monitor_domain?("api.stackexchange.com")).to eq(true)}
+    it{expect(Runscope.monitor_domain?("test.desk.com")).to eq(true)}
+    it{expect(Runscope.monitor_domain?("api.twitter.com")).to eq(false)}
+    it "should raise an error if no domains are set" do
+      Runscope.domains = nil
+      expect {Runscope.monitor_domain?("api.stackexchange.com")}.to(
+        raise_error(NoDomainsSetError)
+      )
+    end
+  end
+
+  describe '#proxy_domain' do
+    before(:each) do
+      @bucket = "1234abcd"
+      Runscope.bucket = @bucket
+    end
+
+    it{expect(Runscope.proxy_domain("api.stackexchange.com")).to(
+      eq("api-stackexchange-com-#{@bucket}.runscope.net")
+    )}
+
+    it "should raise an error if no bucket is set" do
+      Runscope.bucket = nil
+      expect {
+        Runscope.proxy_domain("api.stackexchange.com")
+      }.to raise_error(BucketNotSetError)
+    end
+  end
+
+  describe '#add_port_header_to_request' do
+    let(:port){ 4000 }
+    let(:request){ Net::HTTP::Get.new('http://example.com') }
+    it 'sets the Runscope-Request-Port header' do
+      modified_request = Runscope.add_port_header_to_request(request, port)
+      expect(modified_request.instance_variable_get('@header')).to(
+        include({'Runscope-Request-Port' => "#{port}"})
+      )
+    end
+  end
+
+  describe '#is_non_standard_port?' do
+    it{expect(Runscope.is_non_standard_port?(80)).to be_false}
+    it{expect(Runscope.is_non_standard_port?(443)).to be_false}
+    it{expect(Runscope.is_non_standard_port?(6000)).to be_true}
+  end
+end

data/spec/spec_helper.rb

@@ -2,13 +2,10 @@ require 'simplecov'
 SimpleCov.start
 
 require 'rspec'
-require 'fakeweb'
-require 'runscope'
+require 'webmock/rspec'
+require 'runscope-rb'
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.formatter     = 'documentation'
   config.order = "random"
 end
-
-FakeWeb.allow_net_connect = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runscope-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Warren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: Start using Runscope to monitor your API traffic in minutes
 email:
 - chris@expectless.com
@@ -88,18 +116,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/ext/net_http.rb
-- lib/runscope.rb
-- lib/runscope/configuration.rb
-- lib/runscope/version.rb
+- lib/runscope-rb.rb
+- lib/runscope-rb/configuration.rb
+- lib/runscope-rb/version.rb
 - runscope-rb.gemspec
 - spec/ext/net_http_spec.rb
-- spec/runscope/configuration_spec.rb
-- spec/runscope_spec.rb
+- spec/runscope-rb/configuration_spec.rb
+- spec/runscope-rb_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/chriswarren/runscope-rb
 licenses:
@@ -127,6 +156,6 @@ specification_version: 4
 summary: Start using Runscope to monitor your API traffic in minutes
 test_files:
 - spec/ext/net_http_spec.rb
-- spec/runscope/configuration_spec.rb
-- spec/runscope_spec.rb
+- spec/runscope-rb/configuration_spec.rb
+- spec/runscope-rb_spec.rb
 - spec/spec_helper.rb

data/spec/runscope/configuration_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Runscope::Configuration do
-  after(:each) do
-    Runscope.reset
-  end
-
-  it 'should set options when passed a block' do
-    domains = ["api.stackexchange.com", /\S+\.desk\.com/]
-    bucket = "1234abcd"
-
-    Runscope.configure do |config|
-      config.domains = domains
-      config.bucket = bucket
-    end
-
-    Runscope.enabled.should eq(true)
-    Runscope.domains.should eq(domains)
-    Runscope.bucket.should eq(bucket)
-  end
-end

data/spec/runscope_spec.rb

@@ -1,91 +0,0 @@
-require 'spec_helper'
-
-describe Runscope do
-  context "basic methods" do
-    it 'should return correct version string' do
-      Runscope.version_string.should eq("Runscope version #{Runscope::VERSION}")
-    end
-  end
-
-  context 'monitoring' do
-    before(:each) do
-      Runscope.domains = ["api.stackexchange.com", /\S+\.desk\.com/]
-    end
-
-    after(:each) do
-      Runscope.reset
-    end
-
-    context "when enabled" do
-      before(:each) do
-        Runscope.enabled = true
-      end
-
-      it "should be true if the domain is monitored" do
-        Runscope.monitor?("api.stackexchange.com").should eq(true)
-      end
-
-      it "should be false if the domain is not monitored" do
-        Runscope.monitor?("api.twitter.com").should eq(false)
-      end
-    end
-
-    context "when disabled" do
-      before(:each) do
-        Runscope.enabled = false
-      end
-
-      it "should be false if the domain is monitored" do
-        Runscope.monitor?("api.stackexchange.com").should eq(false)
-      end
-
-      it "should be false if the domain is not monitored" do
-        Runscope.monitor?("api.twitter.com").should eq(false)
-      end
-    end
-  end
-
-  context 'matching domains' do
-    before(:each) do
-      Runscope.domains = ["api.stackexchange.com", /\S+\.desk\.com/]
-    end
-
-    it "should match when stored as a string" do
-      Runscope.monitor_domain?("api.stackexchange.com").should eq(true)
-    end
-
-    it "should match when stored as a Regexp" do
-      Runscope.monitor_domain?("test.desk.com").should eq(true)
-    end
-
-    it "should not match domains that aren't set" do
-      Runscope.monitor_domain?("api.twitter.com").should eq(false)
-    end
-
-    it "should raise an error if no domains are set" do
-      Runscope.domains = nil
-      expect {
-        Runscope.monitor_domain?("api.stackexchange.com")
-      }.to raise_error(NoDomainsSetError)
-    end
-  end
-
-  context 'generating a runscope proxy domain' do
-    before(:each) do
-      @bucket = "1234abcd"
-      Runscope.bucket = @bucket
-    end
-
-    it "should return a domain to runscope" do
-      Runscope.proxy_domain("api.stackexchange.com").should
-        eq("api-stackexchange-com-#{@bucket}.runscope.net")
-    end
-
-    it "should raise an error if no bucket is set" do
-      Runscope.bucket = nil
-      expect {
-        Runscope.proxy_domain("api.stackexchange.com")
-      }.to raise_error(BucketNotSetError)
-    end
-  end
-end