cloudkit 0.9.0 → 0.9.1

data/CHANGES

@@ -1,2 +1,9 @@
+0.9.1
+- Fixed Rack::Lint/rackup errors related to Content-Type headers
+- Patched Rack to support StringIO#string in Rack::Lint::InputWrapper
+- Fixed server_url encoding in OpenIDStore
+- Added sqlite3-ruby dependency in gemspec
+- Updated documentation
+
 0.9.0
 - First public gem release

data/README

@@ -6,6 +6,10 @@ More specifically, CloudKit provides RESTful JSON storage with optional OpenID a
 
 CloudKit is Rack middleware and as such can be used on its own or alongside other Rack-based applications or middleware components like Rails, Merb or Sinatra.
 
+===Install
+
+  gem install cloudkit
+
 ===Examples
 
 In a rackup file called config.ru:
@@ -29,10 +33,34 @@ An explicit version of example 2, minus the default developer landing page:
   use CloudKit::OAuthFilter
   use CloudKit::OpenIDFilter
   use CloudKit::Service, :collections => [:notes, :todos]
-  run lambda {|env| [200, {}, ['HELLO']]}
+  run lambda {|env| [200, {'Content-Type' => 'text/html'}, ['HELLO']]}
+
+The same as above, using MySQL:
+
+  require 'cloudkit'
+  use Rack::Config { |env|
+    env['cloudkit.storage.uri'] = 'mysql://user:pass@localhost/cloudkit_example'
+  }
+  use Rack::Pool::Session
+  use CloudKit::OAuthFilter
+  use CloudKit::OpenIDFilter
+  use CloudKit::Service, :collections => [:notes, :todos]
+  run lambda {|env| [200, {'Content-Type' => 'text/html'}, ['HELLO']]}
 
 See the examples directory for more.
 
+===Online
+
+Main Site: http://getcloudkit.com
+
+Blog: http://blog.joncrosby.me
+
+Google Group: http://groups.google.com/group/cloudkit
+
+Source: http://github.com/jcrosby/cloudkit
+
+===License
+
 Copyright (c) 2008 Jon Crosby http://joncrosby.me
 
 Permission is hereby granted, free of charge, to any person obtaining

data/cloudkit.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.name              = "cloudkit"
-  s.version           = "0.9.0"
-  s.date              = "2008-12-22"
+  s.version           = "0.9.1"
+  s.date              = "2008-12-31"
   s.summary           = "An Open Web JSON Appliance."
   s.description       = "An Open Web JSON Appliance."
   s.authors           = ["Jon Crosby"]
@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.homepage          = "http://getcloudkit.com"
   s.files             = %w[
     CHANGES
-    cloudkit.gemspec
     COPYING
     README
     Rakefile
     TODO
+    cloudkit.gemspec
     doc/curl.html
     doc/images/example-code.gif
     doc/images/json-title.gif
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     lib/cloudkit/openid_filter.rb
     lib/cloudkit/openid_store.rb
     lib/cloudkit/rack/builder.rb
+    lib/cloudkit/rack/lint.rb
     lib/cloudkit/rack/router.rb
     lib/cloudkit/request.rb
     lib/cloudkit/service.rb
@@ -79,4 +80,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'oauth', '>= 0.2.7'
   s.add_dependency 'ruby-openid', '= 2.1.2'
   s.add_dependency 'json', '= 1.1.3'
+  s.add_dependency 'sqlite3-ruby', '= 1.2.4'
 end

data/doc/curl.html

@@ -74,6 +74,7 @@ See what we can do with these note resources:
     $ curl -i -XOPTIONS http://localhost:3000/notes<br/>
     HTTP/1.1 200 OK<br/>
     Content-Length: 0<br/>
+    Content-Type: application/json<br/>
     Allow: GET, HEAD, POST, OPTIONS<br/>
     Connection: keep-alive<br/>
   </div>
@@ -94,10 +95,6 @@ List the currently available notes:
   </div>
 </p>
 
-<p>
-The Link header will be explained momentarily.
-</p>
-
 <p>
 Create a note using <a href="http://tools.ietf.org/html/rfc2616#section-9.5">POST</a>:
   <div class="code">
@@ -179,9 +176,7 @@ Along with the usual metadata, individual resources also provide discovery
 information via
 <a href="http://www.mnot.net/drafts/draft-nottingham-http-link-header-03.txt">Link Headers</a>
 as shown above. These links allow user agents to find related resources such as
-the complete history of a document and its
-<a href="http://tools.ietf.org/html/rfc2616#section-14.19">ETags</a>.
-The utility of these items will be demonstrated momentarily.
+the complete history of a document.
 </p>
 
 <p>
@@ -218,8 +213,9 @@ Succeed in updating by being specific:
 </p>
 
 <p>
-(Note: Your ETag will likely be different so substitute the one that curl
-provided when you created your own "abc" resource.)
+(Note: Your <a href="http://tools.ietf.org/html/rfc2616#section-14.19">ETag</a>
+will likely be different so substitute the one that curl provided when you
+created your own "abc" resource.)
 </p>
 
 <p>

data/doc/index.html

@@ -22,6 +22,11 @@
       <div class="subtitle">An Open Web JSON Appliance</div>
     </div>
   </div>
+  <div class="meta">
+    <p class="wrapper">
+      Version 0.9.1 released. Install with <em>gem install cloudkit</em>.
+    </p>
+  </div>
   <div class="wrapper intro-row">
     <div class="column-one">
       <div class="block-header">

data/doc/main.css

@@ -118,7 +118,7 @@ a {
   font-family: 'Courier New', monospace;
   color: #00ff00;
   background-color: black;
-  font-size: 13px;
+  font-size: 12px;
   width: 100%;
   margin-left: 20px;
   margin-bottom: 30px;

data/examples/3.ru

@@ -3,4 +3,4 @@ require 'cloudkit'
 use Rack::Session::Pool
 use CloudKit::OpenIDFilter
 use CloudKit::Service, :collections => [:notes]
-run lambda{|env| [200, {}, ['HELLO']]}
+run lambda{|env| [200, {'Content-Type' => 'text/html'}, ['HELLO']]}

data/examples/4.ru

@@ -2,4 +2,4 @@ $:.unshift File.expand_path(File.dirname(__FILE__)) + '/../lib'
 require 'cloudkit'
 use CloudKit::OAuthFilter
 use CloudKit::Service, :collections => [:notes]
-run lambda{|env| [200, {}, ['HELLO']]}
+run lambda{|env| [200, {'Content-Type' => 'text/html'}, ['HELLO']]}

data/examples/5.ru

@@ -7,4 +7,4 @@ use Rack::Session::Pool
 use CloudKit::OAuthFilter
 use CloudKit::OpenIDFilter
 use CloudKit::Service, :collections => [:notes]
-run lambda{|env| [200, {}, ['HELLO']]}
+run lambda{|env| [200, {'Content-Type' => 'text/html'}, ['HELLO']]}

data/examples/6.ru

@@ -1,10 +1,10 @@
 $:.unshift File.expand_path(File.dirname(__FILE__)) + '/../lib'
 require 'cloudkit'
 use Rack::Config do |env|
-  env['cloudkit.storage.uri'] = 'mysql://root:@localhost/cloudkit_example'
+  env['cloudkit.storage.uri'] = 'mysql://user:pass@localhost/cloudkit_example'
 end
 use Rack::Session::Pool
 use CloudKit::OAuthFilter
 use CloudKit::OpenIDFilter
 use CloudKit::Service, :collections => [:notes]
-run lambda{|env| [200, {}, ['HELLO']]}
+run lambda{|env| [200, {'Content-Type' => 'text/html'}, ['HELLO']]}

data/lib/cloudkit.rb

@@ -27,6 +27,7 @@ require 'cloudkit/oauth_store'
 require 'cloudkit/openid_filter'
 require 'cloudkit/openid_store'
 require 'cloudkit/rack/builder'
+require 'cloudkit/rack/lint'
 require 'cloudkit/rack/router'
 require 'cloudkit/request'
 require 'cloudkit/service'

data/lib/cloudkit/oauth_filter.rb

@@ -99,7 +99,7 @@ module CloudKit
       @@store.put(
         "/cloudkit_oauth_request_tokens/#{token_id}",
         :json => request_token)
-      [201, {}, ["oauth_token=#{token_id}&oauth_token_secret=#{secret}"]]
+      [201, {'Content-Type' => 'text/html'}, ["oauth_token=#{token_id}&oauth_token_secret=#{secret}"]]
     end
 
     def request_authorization(request)
@@ -186,7 +186,7 @@ module CloudKit
       @@store.delete(
         "/cloudkit_oauth_request_tokens/#{request[:oauth_token]}",
         :etag => request_token_response.etag)
-      [201, {}, ["oauth_token=#{token_id}&oauth_token_secret=#{secret}"]]
+      [201, {'Content-Type' => 'text/html'}, ["oauth_token=#{token_id}&oauth_token_secret=#{secret}"]]
     end
 
     def inject_user_or_challenge(request)
@@ -232,7 +232,8 @@ module CloudKit
     def challenge_headers(request)
       {
         'WWW-Authenticate' => "OAuth realm=\"http://#{request.env['HTTP_HOST']}\"",
-        'Link' => discovery_link(request)
+        'Link' => discovery_link(request),
+        'Content-Type' => 'application/json'
       }
     end
 
@@ -242,7 +243,7 @@ module CloudKit
 
     def login_redirect(request)
       request.session['return_to'] = request.url if request.session
-      [302, {'Location' => request.login_url}, []]
+      [302, {'Location' => request.login_url, 'Content-Type' => 'text/html'}, []]
     end
 
     def load_user_from_session(request)

data/lib/cloudkit/openid_filter.rb

@@ -11,7 +11,7 @@ module CloudKit
   class OpenIDFilter
     include Util
 
-    @@lock = Mutex.new
+    @@lock  = Mutex.new
     @@store = nil
 
     def initialize(app, options={})
@@ -21,7 +21,7 @@ module CloudKit
     def call(env)
       @@lock.synchronize do
         @@store = OpenIDStore.new(env[storage_uri_key])
-        @users = UserStore.new(env[storage_uri_key])
+        @users  = UserStore.new(env[storage_uri_key])
         @@store.get_association('x') rescue nil # refresh sqlite3
       end unless @@store
 
@@ -39,7 +39,11 @@ module CloudKit
         else
           if request.env[challenge_key]
             store_location(request)
-            erb(request, :openid_login, request.env[challenge_key], 401)
+            erb(
+              request,
+              :openid_login,
+              request.env[challenge_key].merge('Content-Type' => 'text/html'),
+              401)
           elsif !request.via.include?(oauth_filter_key)
             store_location(request)
             login_redirect(request)
@@ -61,7 +65,10 @@ module CloudKit
 
       request.env[auth_key] = nil
       request.flash['info'] = 'You have been logged out.'
-      response = Rack::Response.new([], 302, {'Location' => request.login_url})
+      response = Rack::Response.new(
+        [],
+        302,
+        {'Location' => request.login_url, 'Content-Type' => 'text/html'})
       response.delete_cookie('remember_me')
       response.finish
     end
@@ -72,14 +79,14 @@ module CloudKit
 
     def begin_openid_login(request)
       begin
-        response = openid_consumer(request).begin request[:openid_url]
+        response = openid_consumer(request).begin(request[:openid_url])
       rescue => e
         request.flash[:error] = e
         return login_redirect(request)
       end
 
       redirect_url = response.redirect_url(base_url(request), full_url(request))
-      [302, {'Location' => redirect_url}, []]
+      [302, {'Location' => redirect_url, 'Content-Type' => 'text/html'}, []]
     end
 
     def complete_openid_login(request)
@@ -116,10 +123,13 @@ module CloudKit
         user['remember_me_token'] = Base64.encode64(
           OpenSSL::Random.random_bytes(32)).gsub(/\W/,'')
         url      = request.session.delete('return_to')
-        response = Rack::Response.new([], 302, {'Location' => (url || '/')})
+        response = Rack::Response.new(
+          [],
+          302,
+          {'Location' => (url || '/'), 'Content-Type' => 'text/html'})
         response.set_cookie(
           'remember_me', {
-            :value => user['remember_me_token'],
+            :value   => user['remember_me_token'],
             :expires => Time.at(user['remember_me_expiration']).utc})
         json = JSON.generate(user)
         @users.put(user_uri, :etag => user_result.etag, :json => json)
@@ -132,7 +142,7 @@ module CloudKit
     end
 
     def login_redirect(request)
-      [302, {'Location' => request.login_url}, []]
+      [302, {'Location' => request.login_url, 'Content-Type' => 'text/html'}, []]
     end
 
     def base_url(request)

data/lib/cloudkit/openid_store.rb

@@ -72,9 +72,11 @@ module CloudKit
     def use_nonce(server_url, timestamp, salt) #:nodoc:
       return false if (timestamp - Time.now.to_i).abs > OpenID::Nonce.skew
 
-      fragment = URI.escape([server_url, timestamp, salt].join('-'))
-      uri      = "/cloudkit_openid_nonces/#{fragment}"
-      result   = @@store.put(uri, :json => '{}')
+      fragment = URI.escape(
+        [server_url, timestamp, salt].join('-'), 
+        Regexp.union(URI::REGEXP::UNSAFE, '/', ':'))
+      uri    = "/cloudkit_openid_nonces/#{fragment}"
+      result = @@store.put(uri, :json => '{}')
       return (result.status == 201)
     end
 

data/lib/cloudkit/rack/builder.rb

@@ -10,7 +10,7 @@ module Rack #:nodoc:
         if (env['PATH_INFO'] == '/')
           [200, {'Content-Type' => 'text/html'}, [welcome]]
         else
-          [404, {}, []]
+          [404, {'Content-Type' => 'text/html'}, []]
         end
       end
       @ins << default_app if @last_cloudkit_id == @ins.last.object_id

data/lib/cloudkit/rack/lint.rb

@@ -0,0 +1,12 @@
+module Rack #:nodoc:
+  class Lint #:nodoc:
+    class InputWrapper
+
+      # Rack::Lint wraps StringIO but does not pass #string to the underlying
+      # object. This patch fixes the issue.
+      def string
+        @input.string
+      end
+    end
+  end
+end

data/lib/cloudkit/store/response_helpers.rb

@@ -39,7 +39,9 @@ module CloudKit::ResponseHelpers
   end
 
   def allow(methods)
-    CloudKit::Response.new(200, {'Allow' => methods.join(', ')})
+    CloudKit::Response.new(
+      200, 
+      {'Allow' => methods.join(', '), 'Content-Type' => 'application/json'})
   end
 
   def response(status, content='', etag=nil, last_modified=nil, options={})

data/test/helper.rb

@@ -21,6 +21,7 @@ end
 
 def plain_service
   Rack::Builder.new do
+    use Rack::Lint
     use Rack::Config do |env|
       env['cloudkit.storage.uri'] = 'sqlite://service.db'
     end
@@ -31,6 +32,7 @@ end
 
 def authed_service
   Rack::Builder.new do
+    use Rack::Lint
     use Rack::Config do |env|
       env['cloudkit.storage.uri'] = 'sqlite://service.db'
       r = CloudKit::Request.new(env)
@@ -43,6 +45,7 @@ end
 
 def openid_app
   Rack::Builder.new do
+    use Rack::Lint
     use Rack::Session::Pool
     use CloudKit::OpenIDFilter
     run echo_env(auth_key)

data/test/service_test.rb

@@ -14,7 +14,17 @@ class ServiceTest < Test::Unit::TestCase
     should "return a 501 for unimplemented methods" do
       response = @request.request('TRACE', '/items')
       assert_equal 501, response.status
-      response = @request.request('REJUXTAPOSE', '/items')
+
+      # disable Rack::Lint so that an invalid HTTP method
+      # can be tested
+      app = Rack::Builder.new {
+        use Rack::Config do |env|
+          env['cloudkit.storage.uri'] = 'sqlite://service.db'
+        end
+        use CloudKit::Service, :collections => [:items, :things]
+        run echo_text('nothing')
+      }
+      response = Rack::MockRequest.new(app).request('REJUXTAPOSE', '/items')
       assert_equal 501, response.status
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudkit
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Jon Crosby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2008-12-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.4
+    version: 
 description: An Open Web JSON Appliance.
 email: jon@joncrosby.me
 executables: []
@@ -92,11 +102,11 @@ extra_rdoc_files: []
 
 files: 
 - CHANGES
-- cloudkit.gemspec
 - COPYING
 - README
 - Rakefile
 - TODO
+- cloudkit.gemspec
 - doc/curl.html
 - doc/images/example-code.gif
 - doc/images/json-title.gif
@@ -119,6 +129,7 @@ files:
 - lib/cloudkit/openid_filter.rb
 - lib/cloudkit/openid_store.rb
 - lib/cloudkit/rack/builder.rb
+- lib/cloudkit/rack/lint.rb
 - lib/cloudkit/rack/router.rb
 - lib/cloudkit/request.rb
 - lib/cloudkit/service.rb