au_pair 1.0.2 → 1.0.4

data/README.md

@@ -27,6 +27,9 @@ To set up tokens, create a configuration file in config/initializers/au_pair.rb
 
     end
 
+(Note that for security reasons, you probably want to read in the tokens from an environment variable as opposed to storing
+them in your source code.)
+
 Then in your application controller, or in individual controllers if you want to limit authentication to certain actions:
 
     class ApplicationController < ActionController::Base

data/lib/au_pair/api_constraint.rb

@@ -1,6 +1,6 @@
 class AuPair::ApiConstraint
 
-  attr_accessor :numeric_version
+  attr_accessor :numeric_version, :path_part
 
   def initialize(path_part)
     @path_part = path_part.downcase
@@ -11,14 +11,12 @@ class AuPair::ApiConstraint
     path_matches?(request) || header_matches?(request) || param_matches?(request)
   end
 
-  private
-
   def path_matches?(request)
-    ! (request.path =~ /\/#{@path_part}\//).nil?
+    request.path =~ /\/#{@path_part}\//i
   end
 
   def header_matches?(request)
-    ! (request.headers['x-api-version'] =~ /#{@numeric_version}/).nil?
+    request.headers['x-api-version'] =~ /^[^\d]*#{numeric_version}$/
   end
 
   def param_matches?(request)

data/lib/au_pair/version.rb

@@ -1,3 +1,3 @@
 module AuPair
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/spec/api_constraint_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe AuPair::ApiConstraint do
+
+  class Request
+    attr_accessor :path, :headers, :request_parameters, :query_parameters
+  end
+
+  let(:constraint) { AuPair::ApiConstraint.new("") }
+  let(:request) { Request.new }
+  
+  before do 
+    constraint.stub(:request) { request }
+    request.headers = {}
+    request.request_parameters = {}    
+    request.query_parameters = {}
+  end
+
+  context 'path matching' do
+
+    it 'matches with mixed text and numbers' do
+      request.path = "/foo/version_1/bar"
+      constraint.path_part = "version_1"
+      expect(constraint.matches?(request)).to be_true
+    end
+
+  end
+
+  context 'param matching' do
+
+    it 'matches with numbers' do
+      request.request_parameters['api_version'] = "1"
+      constraint.numeric_version = 1
+      expect(constraint.matches?(request)).to be_true
+    end
+
+  end
+
+  context 'header matching' do
+
+    it 'matches with mixed text and numbers' do
+      request.headers['x-api-version'] = "version_1"
+      constraint.numeric_version = "1"
+      expect(constraint.matches?(request)).to be_true
+    end
+
+    it 'matches with numbers' do
+      request.headers['x-api-version'] = "11"
+      constraint.numeric_version = 11
+      expect(constraint.matches?(request)).to be_true
+    end
+
+    it 'with no false positives' do
+      request.headers['x-api-version'] = "1"
+      constraint.numeric_version = 21
+      expect(constraint.matches?(request)).to be_false
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au_pair
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -80,6 +80,7 @@ files:
 - lib/au_pair/authentication_token.rb
 - lib/au_pair/version.rb
 - spec/.rspec
+- spec/api_constraint_spec.rb
 - spec/authentication_token_spec.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3736725964287678646
+      hash: 1991329679706175588
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3736725964287678646
+      hash: 1991329679706175588
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -116,6 +117,7 @@ specification_version: 3
 summary: API versioning and token authentication
 test_files:
 - spec/.rspec
+- spec/api_constraint_spec.rb
 - spec/authentication_token_spec.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb