simple_oauth 0.1.1 → 0.1.2

data/.gitignore

@@ -1,22 +1,4 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
+.bundle
 coverage
-rdoc
 pkg
-
-## PROJECT::SPECIFIC
-.bundle
+rdoc

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    simple_oauth (0.1.0)
+    simple_oauth (0.1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    mocha (0.9.8)
+    mocha (0.9.9)
       rake
     rake (0.8.7)
 

data/Rakefile

@@ -1,26 +1,9 @@
-require './lib/simple_oauth'
-require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'bundler'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'simple_oauth'
-    gem.version = SimpleOAuth::Version::STRING
-    gem.summary = 'Simply builds and verifies OAuth headers'
-    gem.description = 'Simply builds and verifies OAuth headers'
-    gem.email = 'steve.richert@gmail.com'
-    gem.homepage = 'http://github.com/laserlemon/simple_oauth'
-    gem.authors = ['Steve Richert']
-    gem.add_development_dependency 'mocha'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler is not available. Install it with: gem install jeweler'
-end
+Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new do |test|
   test.libs << 'lib' << 'test'
@@ -28,10 +11,16 @@ Rake::TestTask.new do |test|
   test.verbose = true
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
+Rake::RDocTask.new do |rdoc|
+  version = SimpleOAuth::Version::STRING
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "simple_oauth #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |rcov|
@@ -46,10 +35,14 @@ rescue LoadError
   end
 end
 
-Rake::RDocTask.new do |rdoc|
-  version = SimpleOAuth::Version::STRING
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "simple_oauth #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+def gemspec
+  @gemspec ||= begin
+    file = File.expand_path('../simple_oauth.gemspec', __FILE__)
+    eval(File.read(file), binding, file)
+  end
+end
+
+desc 'Validate the gemspec'
+task :gemspec do
+  gemspec.validate
 end

data/VERSION

@@ -0,0 +1 @@
+0.0.0

data/lib/simple_oauth.rb

@@ -7,7 +7,7 @@ module SimpleOAuth
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     STRING = [MAJOR, MINOR, PATCH].join('.')
   end
 
@@ -24,7 +24,7 @@ module SimpleOAuth
     end
 
     def self.encode(value)
-      URI.encode(value.to_s, /[^\w\-\.\~]/)
+      URI.encode(value.to_s, /[^a-z0-9\-\.\_\~]/i)
     end
 
     def self.decode(value)
@@ -67,15 +67,15 @@ module SimpleOAuth
       valid
     end
 
+    def signed_attributes
+      attributes.merge(:oauth_signature => signature)
+    end
+
     private
       def normalized_attributes
         signed_attributes.sort_by{|k,v| k.to_s }.map{|k,v| %(#{k}="#{self.class.encode(v)}") }.join(', ')
       end
 
-      def signed_attributes
-        attributes.merge(:oauth_signature => signature)
-      end
-
       def attributes
         ATTRIBUTE_KEYS.inject({}){|a,k| options.key?(k) ? a.merge(:"oauth_#{k}" => options[k]) : a }
       end

data/simple_oauth.gemspec

@@ -1,56 +1,19 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/simple_oauth', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{simple_oauth}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steve Richert"]
-  s.date = %q{2010-10-13}
-  s.description = %q{Simply builds and verifies OAuth headers}
-  s.email = %q{steve.richert@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "init.rb",
-     "lib/simple_oauth.rb",
-     "simple_oauth.gemspec",
-     "test/helper.rb",
-     "test/rsa_private_key",
-     "test/simple_oauth_test.rb"
-  ]
-  s.homepage = %q{http://github.com/laserlemon/simple_oauth}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simply builds and verifies OAuth headers}
-  s.test_files = [
-    "test/helper.rb",
-     "test/simple_oauth_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
+Gem::Specification.new do |spec|
+  spec.add_development_dependency('mocha', '>= 0')
+  spec.author = 'Steve Richert'
+  spec.description = 'Simply builds and verifies OAuth headers'
+  spec.email = 'steve.richert@gmail.com'
+  spec.extra_rdoc_files = ['README.rdoc']
+  spec.files = `git ls-files`.split("\n")
+  spec.homepage = 'http://github.com/laserlemon/simple_oauth'
+  spec.name = 'simple_oauth'
+  spec.rdoc_options = ['--charset=UTF-8']
+  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_rubygems_version = '>= 1.2.0'
+  spec.summary = 'Simply builds and verifies OAuth headers'
+  spec.test_files = `git ls-files -- test/**/*_test.rb`.split("\n")
+  spec.version = SimpleOAuth::Version::STRING
 end
-

data/test/helper.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
 require 'simple_oauth'
 require 'rubygems'
 require 'mocha'
+require 'test/unit'

data/test/simple_oauth_test.rb

@@ -30,6 +30,19 @@ class SimpleOAuthTest < Test::Unit::TestCase
     ['-', '.', '~'].each do |character|
       assert_equal character, SimpleOAuth::Header.encode(character)
     end
+
+    major, minor, patch = RUBY_VERSION.split('.')
+    new_ruby = major.to_i >= 2 || major.to_i == 1 && minor.to_i >= 9
+    old_kcode = $KCODE if !new_ruby
+    begin
+      %w(n N e E s S u U).each do |kcode|
+        $KCODE = kcode if !new_ruby
+        assert_equal '%E3%81%82', SimpleOAuth::Header.encode('あ'), "Failed to correctly escape Japanese under $KCODE = #{kcode}"
+        assert_equal '%C3%A9', SimpleOAuth::Header.encode('é'), "Failed to correctly escape e+acute under $KCODE = #{kcode}"
+      end
+    ensure
+      $KCODE = old_kcode if !new_ruby
+    end
   end
 
   def test_decode

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_oauth
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Steve Richert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -04:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,7 +39,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - .gitignore
@@ -48,6 +47,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
 - init.rb
 - lib/simple_oauth.rb
 - simple_oauth.gemspec
@@ -68,19 +68,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 31
       segments: 
+      - 1
+      - 2
       - 0
-      version: "0"
+      version: 1.2.0
 requirements: []
 
 rubyforge_project: 
@@ -88,6 +92,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simply builds and verifies OAuth headers
-test_files: 
-- test/helper.rb
-- test/simple_oauth_test.rb
+test_files: []
+