cloudkit 0.11.0 → 0.11.1

data/CHANGES

@@ -1,3 +1,10 @@
+0.11.1
+- Added a block option for configuring OpenID bypassed routes (Devlin Daley)
+- Added write locks for Tokyo Tyrant Tables
+- Added Tokyo Tyrant Table example
+- Fixed POST method tunneling bug (Saimon Moore)
+- Fixed escaping of nested JSON Objects and Arrays
+
 0.11.0
 - Added Tokyo Cabinet storage
 - Added MemoryTable development-time storage

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.11.0"
-  s.date              = "2008-03-09"
+  s.version           = "0.11.1"
+  s.date              = "2008-03-24"
   s.summary           = "An Open Web JSON Appliance."
   s.description       = "An Open Web JSON Appliance."
   s.authors           = ["Jon Crosby"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     examples/3.ru
     examples/4.ru
     examples/5.ru
+    examples/6.ru
     examples/TOC
     lib/cloudkit.rb
     lib/cloudkit/constants.rb

data/doc/curl.html

@@ -38,13 +38,13 @@ If you haven't already installed the gem:
 </p>
 
 <p>
-If you already have the gem, make sure you're running the latest version (0.11.0):
+If you already have the gem, make sure you're running the latest version (0.11.1):
   <div class="code">
     $ gem list cloudkit<br/>
-    cloudkit (0.9.1) &lt;-- need to upgrade<br/>
+    cloudkit (0.10.0) &lt;-- need to upgrade<br/>
     $ gem update cloudkit<br/>
     $ gem list cloudkit<br/>
-    cloudkit (0.11.0, 0.9.1) &lt;-- 0.11.0 is now in the list
+    cloudkit (0.11.1, 0.10.0) &lt;-- 0.11.1 is now in the list
   </div>
 </p>
 

data/doc/index.html

@@ -24,7 +24,7 @@
   </div>
   <div class="meta">
     <p class="wrapper">
-      Version 0.11 released with Tokyo Cabinet support. Install with <em>gem install cloudkit</em>.
+      Version 0.11.1 released with Tokyo Cabinet support. Install with <em>gem install cloudkit</em>.
     </p>
   </div>
   <div class="wrapper intro-row">

data/examples/6.ru

@@ -0,0 +1,11 @@
+$:.unshift File.expand_path(File.dirname(__FILE__)) + '/../lib'
+require 'cloudkit'
+require 'rufus/tokyo/tyrant' # gem install rufus-tokyo
+# start Tokyo Tyrant with a table store...
+# ttserver data.tct
+CloudKit.setup_storage_adapter(Rufus::Tokyo::TyrantTable.new('127.0.0.1', 1978))
+use Rack::Session::Pool
+use CloudKit::OAuthFilter
+use CloudKit::OpenIDFilter
+use CloudKit::Service, :collections => [:notes]
+run lambda{|env| [200, {'Content-Type' => 'text/html', 'Content-Length' => '5'}, ['HELLO']]}

data/examples/TOC

@@ -4,7 +4,7 @@ Index of Examples
 When using the gem version of CloudKit, the first line of each example can be
 removed.
 
-1. Expose Notes      - Mount a JSON "notes" API. Uses in-memory SQLite.
+1. Expose Notes      - Mount a JSON "notes" API. Uses in-memory store.
 
 2. Contain Notes     - Same as #1, adding OpenID and OAuth.
 
@@ -13,3 +13,5 @@ removed.
 4. Notes with OAuth  - Same as #1 using only OAuth.
 
 5. Tokyo Notes       - Same as #2 with a Tokyo Cabinet Table store.
+
+6. Tyrant Notes      - Same as #2 with a Tokyo Tyrant Table store.

data/lib/cloudkit.rb

@@ -34,11 +34,11 @@ require 'cloudkit/user_store'
 include CloudKit::Constants
 
 module CloudKit
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 
   # Sets up the storage adapter. Defaults to development-time
   # CloudKit::MemoryTable. Also supports Rufus Tokyo Table instances. See the
-  # examples directory for a demonstration.
+  # examples directory for Cabinet and Tyrant Table examples.
   def self.setup_storage_adapter(adapter_instance=nil)
     @storage_adapter = adapter_instance || CloudKit::MemoryTable.new
   end

data/lib/cloudkit/openid_filter.rb

@@ -19,9 +19,10 @@ module CloudKit
     @@lock  = Mutex.new
     @@store = nil
 
-    def initialize(app, options={})
+    def initialize(app, options={}, &bypass_route_callback)
       @app     = app
       @options = options
+      @bypass_route_callback = bypass_route_callback || Proc.new {|url| url == '/'}
     end
 
     def call(env)
@@ -213,12 +214,12 @@ module CloudKit
     end
 
     def allow?(uri)
-      @options[:allow] && @options[:allow].include?(uri)
+      @bypass_route_callback.call(uri) || 
+        @options[:allow] && @options[:allow].include?(uri)
     end
 
     def bypass?(request)
-      root_request?(request) ||
-        allow?(request.path_info) ||
+      allow?(request.path_info) ||
         valid_auth_key?(request) ||
         logged_in?(request)
     end

data/lib/cloudkit/request.rb

@@ -17,7 +17,9 @@ module CloudKit
     # Return the JSON content from the request body
     def json
       self.body.rewind
-      self.body.read
+      raw = self.body.read
+      # extract the json from the body to avoid tunneled _method param from being parsed as json
+      (matches = raw.match(/(\{.*\})/)) ? matches[1] : raw
     end
 
     # Return a CloudKit::URI instance representing the rack request's path info.

data/lib/cloudkit/service.rb

@@ -66,7 +66,7 @@ module CloudKit
 
     def post(request)
       if tunnel_methods.include?(request['_method'].try(:upcase))
-        return send(request['_method'].downcase)
+        return send(request['_method'].downcase, request)
       end
       @store.post(
         request.uri,

data/lib/cloudkit/store/memory_table.rb

@@ -59,12 +59,6 @@ module CloudKit
       q.run(self)
     end
 
-    # Simulate a transaction. This development-mode transaction merely yields
-    # to its block.
-    def transaction
-      yield
-    end
-
     protected 
 
     def valid?(record)

data/lib/cloudkit/store/resource.rb

@@ -49,7 +49,7 @@ module CloudKit
     # modify resources that are not current.
     def update(json, remote_user=nil)
       raise HistoricalIntegrityViolation unless current?
-      CloudKit.storage_adapter.transaction do
+      transaction do
         record = CloudKit.storage_adapter[@id]
         record['uri'] = "#{@uri.string}/versions/#{@etag}"
         record['archived'] = escape(true)
@@ -65,7 +65,7 @@ module CloudKit
     # are not current.
     def delete
       raise HistoricalIntegrityViolation unless current?
-      CloudKit.storage_adapter.transaction do
+      transaction do
         original_uri = @uri
         record = CloudKit.storage_adapter[@id]
         record['uri'] = "#{@uri.string}/versions/#{@etag}"
@@ -223,6 +223,8 @@ module CloudKit
         "null"
       when Fixnum, Bignum, Float
         value.to_s
+      when Array, Hash
+        JSON.generate(value) # temporary bug fix prior to JSONQuery support
       else
         value
       end
@@ -252,5 +254,16 @@ module CloudKit
     def escape_values(hash)
       hash.inject({}) { |memo, pair| memo.merge({pair[0] => escape(pair[1])}) }
     end
+
+    def transaction
+      open('.lock', 'w+') do |f|
+        f.flock(File::LOCK_EX)
+        begin 
+          yield
+        ensure
+          f.flock(File::LOCK_UN)
+        end
+      end
+    end
   end
 end

data/spec/openid_filter_spec.rb

@@ -22,6 +22,20 @@ describe "An OpenIDFilter" do
     response.status.should == 200
   end
 
+  it "should allow pass through of URIs defined in bypass route callback" do
+    openid_app = Rack::Builder.new {
+      use Rack::Lint
+      use Rack::Session::Pool
+      use CloudKit::OpenIDFilter, :allow => ['/foo'] do |url|
+        ['/bar'].include? url
+      end
+      run echo_env(CLOUDKIT_AUTH_KEY)
+    }
+    request = Rack::MockRequest.new(openid_app)
+    response = request.get('/bar')
+    response.status.should == 200
+  end
+
   it "should redirect to the login page if authorization is required" do
     response = @request.get('/protected')
     response.status.should == 302
@@ -61,4 +75,5 @@ describe "An OpenIDFilter" do
     end
 
   end
+
 end

data/spec/resource_spec.rb

@@ -93,19 +93,38 @@ describe "A Resource" do
 
   describe "on create" do
 
-    before(:each) do
-      resource = CloudKit::Resource.create(
+    def store_json(hash)
+      CloudKit::Resource.create(
         CloudKit::URI.new('/items/123'),
-        JSON.generate({:foo => 'bar'}),
+        JSON.generate(hash),
         'http://eric.dolphy.info')
-      @result = CloudKit.storage_adapter.query { |q|
+      CloudKit.storage_adapter.query { |q|
         q.add_condition 'uri', :eql, '/items/123'
       }
     end
 
     it "should save the resource" do
-      @result.size.should == 1
-      @result.first['json'].should == "{\"foo\":\"bar\"}"
+      result = store_json({:foo => 'bar'})
+      result.size.should == 1
+      result.first['json'].should == "{\"foo\":\"bar\"}"
+    end
+
+    it "should accept nested array values" do
+      result = store_json({:foo => [1,2]})
+      result.size.should == 1
+      result.first['json'].should == '{"foo":[1,2]}'
+    end
+
+    it "should accept nested hash values" do
+      result = store_json({:foo => {:bar => 'baz'}})
+      result.size.should == 1
+      result.first['json'].should == '{"foo":{"bar":"baz"}}'
+    end
+
+    it "should accept recursively nested array/hash values" do
+      result = store_json({:foo => [1,{:bar => [2,3]}]})
+      result.size.should == 1
+      result.first['json'].should == '{"foo":[1,{"bar":[2,3]}]}'
     end
 
   end

data/spec/service_spec.rb

@@ -736,6 +736,21 @@ describe "A CloudKit::Service" do
         new_etag.should_not == etag
       end
 
+      describe "using POST method tunneling" do
+
+        it "should behave like a PUT" do
+          json = JSON.generate(:this => 'thing')
+          response = @request.post(
+            '/items/xyz?_method=PUT',
+            {:input => json}.merge(VALID_TEST_AUTH))
+          response.status.should == 201
+          result = @request.get('/items/xyz', VALID_TEST_AUTH)
+          result.status.should == 200
+          JSON.parse(result.body)['this'].should == 'thing'
+        end
+
+      end
+
     end
 
     describe "on DELETE /:collection/:id" do
@@ -848,6 +863,20 @@ describe "A CloudKit::Service" do
         json['total'].should == 1
       end
 
+      describe "using POST method tunneling" do
+
+        it "should behave like a DELETE" do
+          response = @request.post(
+            '/items/abc?_method=DELETE',
+            'HTTP_IF_MATCH'   => @etag,
+            CLOUDKIT_AUTH_KEY => TEST_REMOTE_USER)
+          response.status.should == 200
+          result = @request.get('/items/abc', VALID_TEST_AUTH)
+          result.status.should == 410
+        end
+
+      end
+
     end
 
     describe "on OPTIONS /:collection" do
@@ -866,6 +895,16 @@ describe "A CloudKit::Service" do
         methods.sort.should == ['GET', 'HEAD', 'OPTIONS', 'POST']
       end
 
+      describe "using POST method tunneling" do
+
+        it "should behave like an OPTIONS request" do
+          response = @request.post('/items?_method=OPTIONS', VALID_TEST_AUTH)
+          response['Allow'].should_not be_nil
+          methods = response['Allow'].split(', ')
+          methods.sort.should == ['GET', 'HEAD', 'OPTIONS', 'POST']
+        end
+      end
+
     end
 
     describe "on OPTIONS /:collection/_resolved" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudkit
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors: 
 - Jon Crosby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-09 00:00:00 -08:00
+date: 2008-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,7 @@ files:
 - examples/3.ru
 - examples/4.ru
 - examples/5.ru
+- examples/6.ru
 - examples/TOC
 - lib/cloudkit.rb
 - lib/cloudkit/constants.rb