twitter_server 0.1.0 → 0.2.0

data/.gitignore

@@ -1,17 +1,21 @@
+## Move SYSTEM GENERAL .gitignore settings to system-wide area
+#
+#  git config --global core.excludesfile ~/.gitignore
+#
 ## MAC OS
-.DS_Store
-
+#.DS_Store
+#
 ## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
+#*.tmproj
+#tmtags
+#
+### EMACS
+#*~
+#\#*
+#.\#*
+#
 ## VIM
-*.swp
+#*.swp
 
 ## PROJECT::GENERAL
 coverage

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/twitter_server.rb

@@ -22,7 +22,9 @@ module Sinatra
   module TwitterServer
     module Helpers
       def api_options(*keys)
-        keys.inject({}) do |memo, key|
+        options = {}
+        options[:auth] = @auth if @auth
+        keys.inject(options) do |memo, key|
           params.include?(key.to_s) ? memo.update(key => params[key]) : memo
         end
       end
@@ -54,6 +56,14 @@ module Sinatra
       app.helpers Sinatra::TwitterServer::Helpers
     end
 
+    def twitter_basic_auth
+      before do
+        base64 = env['HTTP_AUTHORIZATION'].gsub(/Basic /, '')
+        user, pass = Base64.decode64(base64).split(":")
+        @auth = yield user, pass
+      end
+    end
+
     # http://apiwiki.twitter.com/Twitter-REST-API-Method%3A-statuses-home_timeline
     def twitter_statuses_home_timeline
       get "/statuses/home_timeline.:format" do
@@ -112,7 +122,8 @@ module Sinatra
     def twitter_account_verify_credentials
       get "/account/verify_credentials.:format" do
         format  = params[:format]
-        user    = yield
+        options = api_options
+        user    = yield options
         render_xml_user(user)
       end
     end

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'context'
+require 'base64'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/sinatra/basic_auth_test.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+
+class ApiBasicAuthTest < TwitterServer::TestCase
+  class BasicAuthApp < Sinatra::Base
+    register Sinatra::TwitterServer
+
+    twitter_basic_auth do |user, pass|
+      {:user => user, :pass => pass}
+    end
+
+    twitter_account_verify_credentials { |params| {:id => 1, :screen_name => "#{params[:auth][:user]} => #{params[:auth][:pass]}"} }
+  end
+
+  def app
+    BasicAuthApp
+  end
+
+  it "passes auth hash to requests" do
+    get '/account/verify_credentials.xml', {},
+      'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64("user:monkey")}".strip
+    assert_xml do |xml|
+      xml.user do
+        xml.id_ 1
+        xml.screen_name "user => monkey"
+      end
+    end
+  end
+end

data/twitter_server.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twitter_server}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["technoweenie"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/twitter_server.rb",
      "test/helper.rb",
      "test/sinatra/account_test.rb",
+     "test/sinatra/basic_auth_test.rb",
      "test/sinatra/help_test.rb",
      "test/sinatra/statuses_test.rb",
      "twitter_server.gemspec"
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
      "test/sinatra/account_test.rb",
+     "test/sinatra/basic_auth_test.rb",
      "test/sinatra/help_test.rb",
      "test/sinatra/statuses_test.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter_server
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - technoweenie
@@ -43,6 +43,7 @@ files:
 - lib/twitter_server.rb
 - test/helper.rb
 - test/sinatra/account_test.rb
+- test/sinatra/basic_auth_test.rb
 - test/sinatra/help_test.rb
 - test/sinatra/statuses_test.rb
 - twitter_server.gemspec
@@ -77,5 +78,6 @@ summary: Twitter API implementation on top of Sinatra
 test_files: 
 - test/helper.rb
 - test/sinatra/account_test.rb
+- test/sinatra/basic_auth_test.rb
 - test/sinatra/help_test.rb
 - test/sinatra/statuses_test.rb