proximity 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d50c9dd93e7f7c305900b031fd2a309813fa3b
-  data.tar.gz: 7dc0a7fe4f64cbca804619630daef3cb283c1103
+  metadata.gz: 57061cf9b5b09837dec718504fe8fbfa6c2488f4
+  data.tar.gz: f1000c4fc3f1653b409c68845e6fc63f268d064d
 SHA512:
-  metadata.gz: 8a7564c57cf8b7eb0b0db32fa592fba05d8ef2cfa96db70204b9165bde1da38869365ea9efeede63ca65d4df4f52f1d466bbb49fd7e37f54a17cd0b1f6866b81
-  data.tar.gz: 3f528ffeb8f9c21e2a774c8e0adaf683fb4bf4a361585d9a7cc11dd372b1b07f020be0ecabcc584ce5a3e48543707d6ac97762040e5cf50d6c73abc63d01f997
+  metadata.gz: 601a50c2cf27e9f9b84e67897895eff2c0af315d7ba5e36720b37950c1e2150e2ffd482aef4f4b9bb59d9bd188be24c03e49d1bb47999d2d9c09e9aa0ef67d14
+  data.tar.gz: 75c5ab092c4c5a4fb78c1f3b643e263948bc78eff9c06373d5e2d2fba5015bb969bf5df4fcee79a3aec1b4134754bf65270b8be2ff47c77b03c2079957318939

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor/bundle

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - "2.0.0"
+  - "1.9.3"
+  - "jruby"
+script: bundle exec rspec spec

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in proximity.gemspec
 gemspec
+gem 'coveralls', require: false

data/README.md

@@ -4,6 +4,12 @@
 [`Journey`](https://github.com/rails/journey) for routing.  `Journey` is
 vendored into `ActionPack` as of [`Rails`](https://github.com/rails/rails/tree/master/actionpack/lib/action_dispatch/journey)4.
 
+[![Gem Version](https://badge.fury.io/rb/proximity.png)](http://badge.fury.io/rb/proximity)
+[![Code Climate](https://codeclimate.com/github/adamhunter/proximity.png)](https://codeclimate.com/github/adamhunter/proximity)
+[![Build Status](https://travis-ci.org/adamhunter/proximity.png?branch=master)](https://travis-ci.org/adamhunter/proximity)
+[![Coverage Status](https://coveralls.io/repos/adamhunter/proximity/badge.png)](https://coveralls.io/r/adamhunter/proximity)
+[![Dependency Status](https://gemnasium.com/adamhunter/proximity.png)](https://gemnasium.com/adamhunter/proximity)
+
 ## Usage
 1. Create your own subclass of `Rack::Proxy`.
 2. `include Proximity` into that class.
@@ -17,12 +23,18 @@ vendored into `ActionPack` as of [`Rails`](https://github.com/rails/rails/tree/m
 ## Example
 ```ruby
 # my_proxy.rb
-class MyProxy < RackProxy
+class MyProxy < Rack::Proxy
   include Proximity
 end
 
 # proxies.rb
 MyProxy.routes.draw do
+  route 'example' => 'example.com/api' do
+    proxy 'active'                => 'accounts/active'
+    proxy 'accounts'              => same, formats %w[json csv]
+    proxy 'accounts/:account_id'  => same
+    proxy 'crazy/:id/:account_id' => 'fluffy/kitties/:id-:account_id'
+  end
 end
 ```
 

data/lib/proximity/proxy.rb

@@ -7,11 +7,11 @@ module Proximity
     end
 
     def target
-      with_format "#{route_set.target}#{@target == Same ? @source : @target}"
+      with_format "#{route_set.target}#{slashify determine_target}"
     end
 
     def source
-      with_format "#{route_set.source}#{@source}"
+      with_format "#{route_set.source}#{slashify @source}"
     end
 
     def pattern
@@ -24,10 +24,19 @@ module Proximity
 
     private
 
+    def slashify(path)
+      return if path.blank?
+      "/#{path}"
+    end
+
     def with_format(url)
       format.nil? ? url : "#{url}.#{format}"
     end
 
+    def determine_target
+      @target == Same ? @source : @target
+    end
+
     attr_reader :route_set
 
     Same = Class.new

data/lib/proximity/proxy_set.rb

@@ -43,14 +43,13 @@ module Proximity
     end
 
     def normalize_source(source)
-      source = source.starts_with?('/') ? source : "/#{source}"
-      source = source.ends_with?('/')   ? source : "#{source}/"
+      source.starts_with?('/') ? source : "/#{source}"
     end
 
     def normalize_target(target)
       uri = URI.parse(target)
       target = uri.scheme.nil? ? "#{self.class.default_scheme}://#{target}" : target
-      env_tld target.ends_with?('/') ? target : "#{target}/"
+      env_tld target
     end
 
     def env_tld(url)

data/lib/proximity/version.rb

@@ -1,3 +1,3 @@
 module Proximity
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/proximity.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'action_dispatch/journey'
+require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/starts_ends_with'
 
 require "proximity/version"

data/spec/proximity/proxy_set_spec.rb

@@ -8,11 +8,11 @@ describe Proximity::ProxySet do
   let(:proxy)     { route.proxy }
 
   it "will set the source prefix on the route set" do
-    expect(proxy_set.source).to eq('/example/')
+    expect(proxy_set.source).to eq('/example')
   end
 
   it "will set the target prefix on the route set" do
-    expect(proxy_set.target).to eq('http://example.local/api/')
+    expect(proxy_set.target).to eq('http://example.local/api')
   end
 
   it "will create a route with the given prefix for its source" do
@@ -26,7 +26,7 @@ describe Proximity::ProxySet do
 
   describe "protocol" do
     it "will be added to the target prefix if missing" do
-      expect(proxy_set.target).to eq('http://example.local/api/')
+      expect(proxy_set.target).to eq('http://example.local/api')
     end
 
     it "will not add a protocol if provided in the target prefix" do
@@ -44,7 +44,7 @@ describe Proximity::ProxySet do
       let(:environment) { 'development' }
 
       it "will convert .com into .local" do
-        expect(proxy_set.target).to eq('http://example.local/api/')
+        expect(proxy_set.target).to eq('http://example.local/api')
       end
     end
 
@@ -52,7 +52,7 @@ describe Proximity::ProxySet do
       let(:environment) { 'test' }
 
       it "will convert .com into .local" do
-        expect(proxy_set.target).to eq('http://example.local/api/')
+        expect(proxy_set.target).to eq('http://example.local/api')
       end
     end
 
@@ -60,7 +60,7 @@ describe Proximity::ProxySet do
       let(:environment) { 'production' }
 
       it "will not convert .com into .local" do
-        expect(proxy_set.target).to eq('http://example.com/api/')
+        expect(proxy_set.target).to eq('http://example.com/api')
       end
     end
   end

data/spec/proximity/proxy_spec.rb

@@ -5,11 +5,16 @@ describe Proximity::Proxy do
   let(:route)     { router.routes[0].proxy }
   let(:same)      { router.routes[1].proxy }
   let(:format)    { router.routes[2].proxy }
+  let(:blank)     { router.routes[6].proxy }
 
-  it "prefixes the source with the route set source" do
+  it "prefixes the source with the route set source and a slash" do
     expect(route.source).to eq('/example/active')
   end
 
+  it "does not add a slash to the route set source if source is blank" do
+    expect(blank.source). to eq('/example')
+  end
+
   it "prefixes the target with the route set target" do
     expect(route.target).to eq('http://example.local/api/are/you/active')
   end

data/spec/spec_helper.rb

@@ -2,6 +2,16 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'proximity'
 require 'rack/proxy'
 require 'pry'
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start
+Coveralls.wear!
 
 class SpecProxy < Rack::Proxy
   include Proximity
@@ -22,6 +32,7 @@ def mock_routes
         proxy 'accounts'                                => same, formats: %w[json csv]
         proxy 'accounts/:account_id'                    => same
         proxy 'accounts/:account_id/members/:member_id' => 'accounts-members/:account_id-:member_id'
+        proxy ''                                        => same
       end
     end
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proximity
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Hunter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Proximity provides a router to applications utilizing Rack::Proxy to coordinate