simple_oauth 0.1.9 → 0.2.0

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--fail-fast
+--order random

data/CONTRIBUTING.md

@@ -0,0 +1,8 @@
+## Contributing
+1. Fork the project.
+2. Create a topic branch.
+3. Add failing tests.
+4. Add code to pass the failing tests.
+5. Run `bundle exec rake`. If failing, repeat step 4.
+6. Commit and push your changes.
+7. Submit a pull request. Please do not include changes to the gemspec.

data/README.md

@@ -2,15 +2,6 @@
 
 Simply builds and verifies OAuth headers
 
-## Contributing
-1. Fork the project.
-2. Create a topic branch.
-3. Add failing tests.
-4. Add code to pass the failing tests.
-5. Run `bundle exec rake`. If failing, repeat step 4.
-6. Commit and push your changes.
-7. Submit a pull request. Please do not include changes to the gemspec.
-
 ## Supported Rubies
 This library aims to support and is [tested
 against](http://travis-ci.org/laserlemon/simple_oauth) the following Ruby

data/lib/simple_oauth/header.rb

@@ -6,32 +6,42 @@ require 'cgi'
 module SimpleOAuth
   class Header
     ATTRIBUTE_KEYS = [:callback, :consumer_key, :nonce, :signature_method, :timestamp, :token, :verifier, :version] unless defined? ::SimpleOAuth::Header::ATTRIBUTE_KEYS
+    attr_reader :method, :params, :options
 
-    def self.default_options
-      {
-        :nonce => OpenSSL::Random.random_bytes(16).unpack('H*')[0],
-        :signature_method => 'HMAC-SHA1',
-        :timestamp => Time.now.to_i.to_s,
-        :version => '1.0'
-      }
-    end
+    class << self
+      def default_options
+        {
+          :nonce => OpenSSL::Random.random_bytes(16).unpack('H*')[0],
+          :signature_method => 'HMAC-SHA1',
+          :timestamp => Time.now.to_i.to_s,
+          :version => '1.0'
+        }
+      end
 
-    def self.encode(value)
-      URI.encode(value.to_s, /[^a-z0-9\-\.\_\~]/i)
-    end
+      def parse(header)
+        header.to_s.sub(/^OAuth\s/, '').split(/,\s*/).inject({}) do |attributes, pair|
+          match = pair.match(/^(\w+)\=\"([^\"]*)\"$/)
+          attributes.merge(match[1].sub(/^oauth_/, '').to_sym => decode(match[2]))
+        end
+      end
 
-    def self.decode(value)
-      URI.decode(value.to_s)
-    end
+      def escape(value)
+        uri_parser.escape(value.to_s, /[^a-z0-9\-\.\_\~]/i)
+      end
+      alias encode escape
 
-    def self.parse(header)
-      header.to_s.sub(/^OAuth\s/, '').split(/,\s*/).inject({}) do |attributes, pair|
-        match = pair.match(/^(\w+)\=\"([^\"]*)\"$/)
-        attributes.merge(match[1].sub(/^oauth_/, '').to_sym => decode(match[2]))
+      def unescape(value)
+        uri_parser.unescape(value.to_s)
       end
-    end
+      alias decode unescape
 
-    attr_reader :method, :params, :options
+    private
+
+      def uri_parser
+        @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
+      end
+
+    end
 
     def initialize(method, url, params, oauth = {})
       @method = method.to_s.upcase
@@ -65,7 +75,7 @@ module SimpleOAuth
       attributes.merge(:oauth_signature => signature)
     end
 
-    private
+  private
 
     def normalized_attributes
       signed_attributes.sort_by{|k,v| k.to_s }.map{|k,v| %(#{k}="#{self.class.encode(v)}") }.join(', ')

data/simple_oauth.gemspec

@@ -1,20 +1,21 @@
 # encoding: utf-8
 
-Gem::Specification.new do |gem|
-  gem.name    = 'simple_oauth'
-  gem.version = '0.1.9'
+Gem::Specification.new do |spec|
+  spec.name    = 'simple_oauth'
+  spec.version = '0.2.0'
 
-  gem.authors     = ["Steve Richert", "Erik Michaels-Ober"]
-  gem.email       = ['steve.richert@gmail.com', 'sferik@gmail.com']
-  gem.description = 'Simply builds and verifies OAuth headers'
-  gem.summary     = gem.description
-  gem.homepage    = 'https://github.com/laserlemon/simple_oauth'
+  spec.authors     = ["Steve Richert", "Erik Michaels-Ober"]
+  spec.email       = ['steve.richert@gmail.com', 'sferik@gmail.com']
+  spec.description = 'Simply builds and verifies OAuth headers'
+  spec.summary     = spec.description
+  spec.homepage    = 'https://github.com/laserlemon/simple_oauth'
+  spec.licenses    = ['MIT']
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.0'
-  gem.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 2'
+  spec.add_development_dependency 'simplecov'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(/^test\//)
-  gem.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($\)
+  spec.test_files    = spec.files.grep(/^test\//)
+  spec.require_paths = ["lib"]
 end

data/spec/helper.rb

@@ -0,0 +1,21 @@
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter 'spec'
+  end
+end
+
+require 'simple_oauth'
+require 'rspec'
+
+def uri_parser
+  @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each{|f| require f }

data/spec/simple_oauth/header_spec.rb

@@ -1,50 +1,50 @@
-#  encoding: utf-8
+# encoding: utf-8
 
-require 'spec_helper'
+require 'helper'
 
 describe SimpleOAuth::Header do
-  describe '.default_options' do
+  describe ".default_options" do
     let(:default_options){ SimpleOAuth::Header.default_options }
 
-    it 'is different every time' do
-      SimpleOAuth::Header.default_options.should_not == default_options
+    it "is different every time" do
+      expect(SimpleOAuth::Header.default_options).not_to eq default_options
     end
 
-    it 'is used for new headers' do
+    it "is used for new headers" do
       SimpleOAuth::Header.stub(:default_options => default_options)
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json', {})
-      header.options.should == default_options
+      expect(header.options).to eq default_options
     end
 
-    it 'includes a signature method and an OAuth version' do
-      default_options[:signature_method].should_not be_nil
-      default_options[:version].should_not be_nil
+    it "includes a signature method and an OAuth version" do
+      expect(default_options[:signature_method]).not_to be_nil
+      expect(default_options[:version]).not_to be_nil
     end
   end
 
-  describe '.encode' do
-    it 'encodes (most) non-word characters' do
+  describe ".escape" do
+    it "escapes (most) non-word characters" do
       [' ', '!', '@', '#', '$', '%', '^', '&'].each do |character|
-        encoded = SimpleOAuth::Header.encode(character)
-        encoded.should_not == character
-        encoded.should == URI.encode(character, /.*/)
+        escaped = SimpleOAuth::Header.escape(character)
+        expect(escaped).not_to eq character
+        expect(escaped).to eq uri_parser.escape(character, /.*/)
       end
     end
 
-    it 'does not encode - . or ~' do
+    it "does not escape - . or ~" do
       ['-', '.', '~'].each do |character|
-        encoded = SimpleOAuth::Header.encode(character)
-        encoded.should == character
+        escaped = SimpleOAuth::Header.escape(character)
+        expect(escaped).to eq character
       end
     end
 
     def self.test_special_characters
-      it 'encodes non-ASCII characters' do
-        SimpleOAuth::Header.encode('é').should == '%C3%A9'
+      it "escapes non-ASCII characters" do
+        expect(SimpleOAuth::Header.escape('é')).to eq '%C3%A9'
       end
 
-      it 'encodes multibyte characters' do
-        SimpleOAuth::Header.encode('あ').should == '%E3%81%82'
+      it "escapes multibyte characters" do
+        expect(SimpleOAuth::Header.escape('あ')).to eq '%E3%81%82'
       end
     end
 
@@ -65,118 +65,118 @@ describe SimpleOAuth::Header do
     end
   end
 
-  describe '.decode' do
+  describe ".unescape" do
     pending
   end
 
-  describe '.parse' do
+  describe ".parse" do
     let(:header){ SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}) }
     let(:parsed_options){ SimpleOAuth::Header.parse(header) }
 
-    it 'returns a hash' do
-      parsed_options.should be_a(Hash)
+    it "returns a hash" do
+      expect(parsed_options).to be_a(Hash)
     end
 
-    it 'includes the options used to build the header' do
-      parsed_options.reject{|k,_| k == :signature }.should == header.options
+    it "includes the options used to build the header" do
+      expect(parsed_options.reject{|k,_| k == :signature }).to eq header.options
     end
 
-    it 'includes a signature' do
-      header.options.should_not have_key(:signature)
-      parsed_options.should have_key(:signature)
-      parsed_options[:signature].should_not be_nil
+    it "includes a signature" do
+      expect(header.options).not_to have_key(:signature)
+      expect(parsed_options).to have_key(:signature)
+      expect(parsed_options[:signature]).not_to be_nil
     end
 
-    it 'should handle optional "linear white space"' do
+    it "handles optional 'linear white space'" do
       parsed_header_with_spaces = SimpleOAuth::Header.parse 'OAuth oauth_consumer_key="abcd", oauth_nonce="oLKtec51GQy", oauth_signature="efgh%26mnop", oauth_signature_method="PLAINTEXT", oauth_timestamp="1286977095", oauth_token="ijkl", oauth_version="1.0"'
-      parsed_header_with_spaces.should be_a_kind_of(Hash)
-      parsed_header_with_spaces.keys.size.should eq 7
+      expect(parsed_header_with_spaces).to be_a_kind_of(Hash)
+      expect(parsed_header_with_spaces.keys.size).to eq 7
 
       parsed_header_with_tabs = SimpleOAuth::Header.parse 'OAuth oauth_consumer_key="abcd", oauth_nonce="oLKtec51GQy",  oauth_signature="efgh%26mnop",  oauth_signature_method="PLAINTEXT", oauth_timestamp="1286977095", oauth_token="ijkl", oauth_version="1.0"'
-      parsed_header_with_tabs.should be_a_kind_of(Hash)
-      parsed_header_with_tabs.keys.size.should eq 7
+      expect(parsed_header_with_tabs).to be_a_kind_of(Hash)
+      expect(parsed_header_with_tabs.keys.size).to eq 7
 
       parsed_header_with_spaces_and_tabs = SimpleOAuth::Header.parse 'OAuth oauth_consumer_key="abcd",  oauth_nonce="oLKtec51GQy",   oauth_signature="efgh%26mnop",   oauth_signature_method="PLAINTEXT",  oauth_timestamp="1286977095",  oauth_token="ijkl",  oauth_version="1.0"'
-      parsed_header_with_spaces_and_tabs.should be_a_kind_of(Hash)
-      parsed_header_with_spaces_and_tabs.keys.size.should eq 7
+      expect(parsed_header_with_spaces_and_tabs).to be_a_kind_of(Hash)
+      expect(parsed_header_with_spaces_and_tabs.keys.size).to eq 7
 
       parsed_header_without_spaces = SimpleOAuth::Header.parse 'OAuth oauth_consumer_key="abcd",oauth_nonce="oLKtec51GQy",oauth_signature="efgh%26mnop",oauth_signature_method="PLAINTEXT",oauth_timestamp="1286977095",oauth_token="ijkl",oauth_version="1.0"'
-      parsed_header_without_spaces.should be_a_kind_of(Hash)
-      parsed_header_without_spaces.keys.size.should eq 7
+      expect(parsed_header_without_spaces).to be_a_kind_of(Hash)
+      expect(parsed_header_without_spaces.keys.size).to eq 7
     end
   end
 
-  describe '#initialize' do
+  describe "#initialize" do
     let(:header){ SimpleOAuth::Header.new(:get, 'HTTPS://api.TWITTER.com:443/1/statuses/friendships.json?foo=bar#anchor', {}) }
 
-    it 'stringifies and uppercases the request method' do
-      header.method.should == 'GET'
+    it "stringifies and uppercases the request method" do
+      expect(header.method).to eq 'GET'
     end
 
-    it 'downcases the scheme and authority' do
-      header.url.should =~ %r(^https://api\.twitter\.com/)
+    it "downcases the scheme and authority" do
+      expect(header.url).to match %r(^https://api\.twitter\.com/)
     end
 
-    it 'ignores the query and fragment' do
-      header.url.should =~ %r(/1/statuses/friendships\.json$)
+    it "ignores the query and fragment" do
+      expect(header.url).to match %r(/1/statuses/friendships\.json$)
     end
   end
 
-  describe '#valid?' do
-    context 'using the HMAC-SHA1 signature method' do
-      it 'requires consumer and token secrets' do
+  describe "#valid?" do
+    context "using the HMAC-SHA1 signature method" do
+      it "requires consumer and token secrets" do
         secrets = {:consumer_secret => 'CONSUMER_SECRET', :token_secret => 'TOKEN_SECRET'}
         header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, secrets)
         parsed_header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, header)
-        parsed_header.should_not be_valid
-        parsed_header.should be_valid(secrets)
+        expect(parsed_header).not_to be_valid
+        expect(parsed_header).to be_valid(secrets)
       end
     end
 
-    context 'using the RSA-SHA1 signature method' do
-      it 'requires an identical private key' do
+    context "using the RSA-SHA1 signature method" do
+      it "requires an identical private key" do
         secrets = {:consumer_secret => rsa_private_key}
         header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, secrets.merge(:signature_method => 'RSA-SHA1'))
         parsed_header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, header)
         expect{ parsed_header.valid? }.to raise_error(TypeError)
-        parsed_header.should be_valid(secrets)
+        expect(parsed_header).to be_valid(secrets)
       end
     end
 
-    context 'using the RSA-SHA1 signature method' do
-      it 'requires consumer and token secrets' do
+    context "using the RSA-SHA1 signature method" do
+      it "requires consumer and token secrets" do
         secrets = {:consumer_secret => 'CONSUMER_SECRET', :token_secret => 'TOKEN_SECRET'}
         header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, secrets.merge(:signature_method => 'PLAINTEXT'))
         parsed_header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, header)
-        parsed_header.should_not be_valid
-        parsed_header.should be_valid(secrets)
+        expect(parsed_header).not_to be_valid
+        expect(parsed_header).to be_valid(secrets)
       end
     end
   end
 
-  describe '#normalized_attributes' do
+  describe "#normalized_attributes" do
     let(:header){ SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}) }
     let(:normalized_attributes){ header.send(:normalized_attributes) }
 
-    it 'returns a sorted-key, quoted-value and comma-separated list' do
+    it "returns a sorted-key, quoted-value and comma-separated list" do
       header.stub(:signed_attributes => {:d => 1, :c => 2, :b => 3, :a => 4})
-      normalized_attributes.should == 'a="4", b="3", c="2", d="1"'
+      expect(normalized_attributes).to eq 'a="4", b="3", c="2", d="1"'
     end
 
-    it 'url-encodes its values' do
+    it "URI encodes its values" do
       header.stub(:signed_attributes => {1 => '!', 2 => '@', 3 => '#', 4 => '$'})
-      normalized_attributes.should == '1="%21", 2="%40", 3="%23", 4="%24"'
+      expect(normalized_attributes).to eq '1="%21", 2="%40", 3="%23", 4="%24"'
     end
   end
 
-  describe '#signed_attributes' do
-    it 'includes the OAuth signature' do
+  describe "#signed_attributes" do
+    it "includes the OAuth signature" do
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {})
-      header.send(:signed_attributes).should have_key(:oauth_signature)
+      expect(header.send(:signed_attributes)).to have_key(:oauth_signature)
     end
   end
 
-  describe '#attributes' do
+  describe "#attributes" do
     let(:header) do
       options = {}
       SimpleOAuth::Header::ATTRIBUTE_KEYS.each{|k| options[k] = k.to_s.upcase }
@@ -185,45 +185,45 @@ describe SimpleOAuth::Header do
     end
     let(:attributes){ header.send(:attributes) }
 
-    it 'prepends keys with "oauth_"' do
-      attributes.keys.should be_all{|k| k.to_s =~ /^oauth_/ }
+    it "prepends keys with 'oauth_'" do
+      expect(attributes.keys).to be_all{|k| k.to_s =~ /^oauth_/ }
     end
 
-    it 'excludes keys not included in the list of valid attributes' do
-      attributes.keys.should be_all{|k| k.is_a?(Symbol) }
-      attributes.should_not have_key(:oauth_other)
+    it "excludes keys not included in the list of valid attributes" do
+      expect(attributes.keys).to be_all{|k| k.is_a?(Symbol) }
+      expect(attributes).not_to have_key(:oauth_other)
     end
 
-    it 'preserves values for valid keys' do
-      attributes.size.should == SimpleOAuth::Header::ATTRIBUTE_KEYS.size
-      attributes.should be_all{|k,v| k.to_s == "oauth_#{v.downcase}" }
+    it "preserves values for valid keys" do
+      expect(attributes.size).to eq SimpleOAuth::Header::ATTRIBUTE_KEYS.size
+      expect(attributes).to be_all{|k,v| k.to_s == "oauth_#{v.downcase}" }
     end
   end
 
-  describe '#signature' do
-    context 'calls the appropriate signature method' do
-      specify 'when using HMAC-SHA1' do
+  describe "#signature" do
+    context "calls the appropriate signature method" do
+      specify "when using HMAC-SHA1" do
         header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, :signature_method => 'HMAC-SHA1')
         header.should_receive(:hmac_sha1_signature).once.and_return('HMAC_SHA1_SIGNATURE')
-        header.send(:signature).should == 'HMAC_SHA1_SIGNATURE'
+        expect(header.send(:signature)).to eq 'HMAC_SHA1_SIGNATURE'
       end
 
-      specify 'when using RSA-SHA1' do
+      specify "when using RSA-SHA1" do
         header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, :signature_method => 'RSA-SHA1')
         header.should_receive(:rsa_sha1_signature).once.and_return('RSA_SHA1_SIGNATURE')
-        header.send(:signature).should == 'RSA_SHA1_SIGNATURE'
+        expect(header.send(:signature)).to eq 'RSA_SHA1_SIGNATURE'
       end
 
-      specify 'when using PLAINTEXT' do
+      specify "when using PLAINTEXT" do
         header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, :signature_method => 'PLAINTEXT')
         header.should_receive(:plaintext_signature).once.and_return('PLAINTEXT_SIGNATURE')
-        header.send(:signature).should == 'PLAINTEXT_SIGNATURE'
+        expect(header.send(:signature)).to eq 'PLAINTEXT_SIGNATURE'
       end
     end
   end
 
-  describe '#hmac_sha1_signature' do
-    it 'reproduces a successful Twitter GET' do
+  describe "#hmac_sha1_signature" do
+    it "reproduces a successful Twitter GET" do
       options = {
         :consumer_key => '8karQBlMg6gFOwcf8kcoYw',
         :consumer_secret => '3d0vcHyUiiqADpWxolW8nlDIpSWMlyK7YNgc5Qna2M',
@@ -234,10 +234,10 @@ describe SimpleOAuth::Header do
         :token_secret => 'T5qa1tF57tfDzKmpM89DHsNuhgOY4NT6DlNLsTFcuQ'
       }
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friends.json', {}, options)
-      header.to_s.should == 'OAuth oauth_consumer_key="8karQBlMg6gFOwcf8kcoYw", oauth_nonce="547fed103e122eecf84c080843eedfe6", oauth_signature="i9CT6ahDRAlfGX3hKYf78QzXsaw%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1286830180", oauth_token="201425800-Sv4sTcgoffmHGkTCue0JnURT8vrm4DiFAkeFNDkh", oauth_version="1.0"'
+      expect(header.to_s).to eq 'OAuth oauth_consumer_key="8karQBlMg6gFOwcf8kcoYw", oauth_nonce="547fed103e122eecf84c080843eedfe6", oauth_signature="i9CT6ahDRAlfGX3hKYf78QzXsaw%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1286830180", oauth_token="201425800-Sv4sTcgoffmHGkTCue0JnURT8vrm4DiFAkeFNDkh", oauth_version="1.0"'
     end
 
-    it 'reproduces a successful Twitter POST' do
+    it "reproduces a successful Twitter POST" do
       options = {
         :consumer_key => '8karQBlMg6gFOwcf8kcoYw',
         :consumer_secret => '3d0vcHyUiiqADpWxolW8nlDIpSWMlyK7YNgc5Qna2M',
@@ -248,41 +248,41 @@ describe SimpleOAuth::Header do
         :token_secret => 'T5qa1tF57tfDzKmpM89DHsNuhgOY4NT6DlNLsTFcuQ'
       }
       header = SimpleOAuth::Header.new(:post, 'https://api.twitter.com/1/statuses/update.json', {:status => 'hi, again'}, options)
-      header.to_s.should == 'OAuth oauth_consumer_key="8karQBlMg6gFOwcf8kcoYw", oauth_nonce="b40a3e0f18590ecdcc0e273f7d7c82f8", oauth_signature="mPqSFKejrWWk3ZT9bTQjhO5b2xI%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1286830181", oauth_token="201425800-Sv4sTcgoffmHGkTCue0JnURT8vrm4DiFAkeFNDkh", oauth_version="1.0"'
+      expect(header.to_s).to eq 'OAuth oauth_consumer_key="8karQBlMg6gFOwcf8kcoYw", oauth_nonce="b40a3e0f18590ecdcc0e273f7d7c82f8", oauth_signature="mPqSFKejrWWk3ZT9bTQjhO5b2xI%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1286830181", oauth_token="201425800-Sv4sTcgoffmHGkTCue0JnURT8vrm4DiFAkeFNDkh", oauth_version="1.0"'
     end
   end
 
-  describe '#secret' do
+  describe "#secret" do
     let(:header){ SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json', {}) }
     let(:secret){ header.send(:secret) }
 
-    it 'combines the consumer and token secrets with an ampersand' do
+    it "combines the consumer and token secrets with an ampersand" do
       header.stub(:options => {:consumer_secret => 'CONSUMER_SECRET', :token_secret => 'TOKEN_SECRET'})
-      secret.should == 'CONSUMER_SECRET&TOKEN_SECRET'
+      expect(secret).to eq 'CONSUMER_SECRET&TOKEN_SECRET'
     end
 
-    it 'URL encodes each secret value before combination' do
+    it "URI encodes each secret value before combination" do
       header.stub(:options => {:consumer_secret => 'CONSUM#R_SECRET', :token_secret => 'TOKEN_S#CRET'})
-      secret.should == 'CONSUM%23R_SECRET&TOKEN_S%23CRET'
+      expect(secret).to eq 'CONSUM%23R_SECRET&TOKEN_S%23CRET'
     end
   end
 
-  describe '#signature_base' do
+  describe "#signature_base" do
     let(:header){ SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json', {}) }
     let(:signature_base){ header.send(:signature_base) }
 
-    it 'combines the request method, URL and normalized parameters using ampersands' do
+    it "combines the request method, URL and normalized parameters using ampersands" do
       header.stub(:method => 'METHOD', :url => 'URL', :normalized_params => 'NORMALIZED_PARAMS')
-      signature_base.should == 'METHOD&URL&NORMALIZED_PARAMS'
+      expect(signature_base).to eq 'METHOD&URL&NORMALIZED_PARAMS'
     end
 
-    it 'URL encodes each value before combination' do
+    it "URI encodes each value before combination" do
       header.stub(:method => 'ME#HOD', :url => 'U#L', :normalized_params => 'NORMAL#ZED_PARAMS')
-      signature_base.should == 'ME%23HOD&U%23L&NORMAL%23ZED_PARAMS'
+      expect(signature_base).to eq 'ME%23HOD&U%23L&NORMAL%23ZED_PARAMS'
     end
   end
 
-  describe '#normalized_params' do
+  describe "#normalized_params" do
     let(:header) do
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json', {})
       header.stub(:signature_params => [['A', '4'], ['B', '3'], ['B', '2'], ['C', '1'], ['D[]', '0 ']])
@@ -291,26 +291,26 @@ describe SimpleOAuth::Header do
     let(:signature_params){ header.send(:signature_params) }
     let(:normalized_params){ header.send(:normalized_params) }
 
-    it 'joins key/value pairs with equal signs and ampersands' do
-      normalized_params.should be_a(String)
+    it "joins key/value pairs with equal signs and ampersands" do
+      expect(normalized_params).to be_a(String)
       parts = normalized_params.split('&')
-      parts.size.should == signature_params.size
+      expect(parts.size).to eq signature_params.size
       pairs = parts.map{|p| p.split('=') }
-      pairs.should be_all{|p| p.size == 2 }
+      expect(pairs).to be_all{|p| p.size == 2 }
     end
   end
 
-  describe '#signature_params' do
+  describe "#signature_params" do
     let(:header){ SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json', {}) }
     let(:signature_params){ header.send(:signature_params) }
 
-    it 'combines OAuth header attributes, body parameters and URL parameters into an flattened array of key/value pairs' do
+    it "combines OAuth header attributes, body parameters and URL parameters into an flattened array of key/value pairs" do
       header.stub(
         :attributes => {:attribute => 'ATTRIBUTE'},
         :params => {'param' => 'PARAM'},
         :url_params => [['url_param', '1'], ['url_param', '2']]
       )
-      signature_params.should == [
+      expect(signature_params).to eq [
         [:attribute, 'ATTRIBUTE'],
         ['param', 'PARAM'],
         ['url_param', '1'],
@@ -319,25 +319,25 @@ describe SimpleOAuth::Header do
     end
   end
 
-  describe '#url_params' do
-    it 'returns an empty array when the URL has no query parameters' do
+  describe "#url_params" do
+    it "returns an empty array when the URL has no query parameters" do
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json', {})
-      header.send(:url_params).should == []
+      expect(header.send(:url_params)).to eq []
     end
 
-    it 'returns an array of key/value pairs for each query parameter' do
+    it "returns an array of key/value pairs for each query parameter" do
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json?test=TEST', {})
-      header.send(:url_params).should == [['test', 'TEST']]
+      expect(header.send(:url_params)).to eq [['test', 'TEST']]
     end
 
-    it 'sorts values for repeated keys' do
+    it "sorts values for repeated keys" do
       header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/1/statuses/friendships.json?test=3&test=1&test=2', {})
-      header.send(:url_params).should == [['test', '1'], ['test', '2'], ['test', '3']]
+      expect(header.send(:url_params)).to eq [['test', '1'], ['test', '2'], ['test', '3']]
     end
   end
 
-  describe '#rsa_sha1_signature' do
-    it 'reproduces a successful OAuth example GET' do
+  describe "#rsa_sha1_signature" do
+    it "reproduces a successful OAuth example GET" do
       options = {
         :consumer_key => 'dpf43f3p2l4k3l03',
         :consumer_secret => rsa_private_key,
@@ -346,16 +346,16 @@ describe SimpleOAuth::Header do
         :timestamp => '1196666512'
       }
       header = SimpleOAuth::Header.new(:get, 'http://photos.example.net/photos', {:file => 'vacaction.jpg', :size => 'original'}, options)
-      header.to_s.should == 'OAuth oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="13917289812797014437", oauth_signature="jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D", oauth_signature_method="RSA-SHA1", oauth_timestamp="1196666512", oauth_version="1.0"'
+      expect(header.to_s).to eq 'OAuth oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="13917289812797014437", oauth_signature="jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D", oauth_signature_method="RSA-SHA1", oauth_timestamp="1196666512", oauth_version="1.0"'
     end
   end
 
-  describe '#private_key' do
+  describe "#private_key" do
     pending
   end
 
-  describe '#plaintext_signature' do
-    it 'reproduces a successful OAuth example GET' do
+  describe "#plaintext_signature" do
+    it "reproduces a successful OAuth example GET" do
       options = {
         :consumer_key => 'abcd',
         :consumer_secret => 'efgh',
@@ -366,7 +366,7 @@ describe SimpleOAuth::Header do
         :token_secret => 'mnop'
       }
       header = SimpleOAuth::Header.new(:get, 'http://host.net/resource?name=value', {:name => 'value'}, options)
-      header.to_s.should == 'OAuth oauth_consumer_key="abcd", oauth_nonce="oLKtec51GQy", oauth_signature="efgh%26mnop", oauth_signature_method="PLAINTEXT", oauth_timestamp="1286977095", oauth_token="ijkl", oauth_version="1.0"'
+      expect(header.to_s).to eq 'OAuth oauth_consumer_key="abcd", oauth_nonce="oLKtec51GQy", oauth_signature="efgh%26mnop", oauth_signature_method="PLAINTEXT", oauth_timestamp="1286977095", oauth_token="ijkl", oauth_version="1.0"'
     end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: simple_oauth
 version: !ruby/object:Gem::Version
-  version: 0.1.9
   prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Richert
@@ -10,56 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+        version: '2'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: simplecov
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Simply builds and verifies OAuth headers
 email:
 - steve.richert@gmail.com
@@ -70,8 +70,10 @@ extra_rdoc_files: []
 files:
 - .gemtest
 - .gitignore
+- .rspec
 - .travis.yml
 - .yardopts
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -79,28 +81,29 @@ files:
 - lib/simple_oauth.rb
 - lib/simple_oauth/header.rb
 - simple_oauth.gemspec
+- spec/helper.rb
 - spec/simple_oauth/header_spec.rb
-- spec/spec_helper.rb
 - spec/support/fixtures/rsa-private-key
 - spec/support/rsa.rb
 homepage: https://github.com/laserlemon/simple_oauth
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'spec'
-  end
-end
-
-require 'simple_oauth'
-
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each{|f| require f }