cloudkit 0.10.0 → 0.10.1

data/CHANGES

@@ -1,3 +1,9 @@
+0.10.1
+- Updated oauth and sequel gem dependencies
+- Fixed 410 responses for stale PUT operations
+- Fixed MySQL content encoding (Harry Weppner)
+- Various fixes for filter_merge!, rekey!, and excluding (Cameron Walters)
+
 0.10.0
 - Updated for Rack 0.9
 - Added batch URI resolution for resource collections
@@ -12,4 +18,4 @@
 - Updated documentation
 
 0.9.0
-- First public gem release
+- First public gem release

data/TODO

@@ -1,6 +1,4 @@
 1.0
-- jquery.cloudkit
-    titanium/gears
 - openid sreg
 - oauth token management
 - oauth consumer registration

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.10.0"
-  s.date              = "2008-01-09"
+  s.version           = "0.10.1"
+  s.date              = "2008-01-27"
   s.summary           = "An Open Web JSON Appliance."
   s.description       = "An Open Web JSON Appliance."
   s.authors           = ["Jon Crosby"]
@@ -76,8 +76,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack', '~> 0.9'
   s.add_dependency 'rack-config', '>= 0.9'
   s.add_dependency 'uuid', '= 2.0.1'
-  s.add_dependency 'sequel', '= 2.6.0'
-  s.add_dependency 'oauth', '>= 0.2.7'
+  s.add_dependency 'sequel', '~> 2.9'
+  s.add_dependency 'oauth', '~> 0.3'
   s.add_dependency 'ruby-openid', '= 2.1.2'
   s.add_dependency 'json', '= 1.1.3'
   s.add_dependency 'sqlite3-ruby', '= 1.2.4'

data/doc/index.html

@@ -24,7 +24,7 @@
   </div>
   <div class="meta">
     <p class="wrapper">
-      Version 0.10.0 <a href="http://blog.joncrosby.me">released</a>. Install with <em>gem install cloudkit</em>.
+      Version 0.10.1 released. Install with <em>gem install cloudkit</em>.
     </p>
   </div>
   <div class="wrapper intro-row">

data/lib/cloudkit.rb

@@ -3,7 +3,6 @@ require 'erb'
 require 'json'
 require 'md5'
 require 'openid'
-gem 'sequel', '=2.6.0'
 require 'sequel'
 require 'time'
 require 'uuid'
@@ -36,7 +35,7 @@ require 'cloudkit/user_store'
 include CloudKit::Constants
 
 module CloudKit
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end
 
 class Object
@@ -52,21 +51,25 @@ class Hash
   # For each key in 'other' that has a non-nil value, merge it into the current
   # Hash.
   def filter_merge!(other={})
-    other.each_pair{|k,v| self.merge!(k => v) if v}
+    other.each_pair{|k,v| self.merge!(k => v) unless v.nil?}
+
     self
   end
 
   # Change the key 'oldkey' to 'newkey'
   def rekey!(oldkey, newkey)
-    if self[oldkey]
+    if self.has_key? oldkey
       self[newkey] = self.delete(oldkey)
     end
+    
+    nil
   end
 
   # Return a new Hash, excluding the specified list of keys.
   def excluding(*keys)
     trimmed = self.dup
     keys.each{|k| trimmed.delete(k)}
+    
     trimmed
   end
 end
@@ -76,6 +79,7 @@ class Array
   # Return a new Array, excluding the specified list of values.
   def excluding(*keys)
     trimmed = self.dup
-    trimmed.reject{|v| keys.include?(v)}
+    
+    trimmed - keys
   end
 end

data/lib/cloudkit/openid_filter.rb

@@ -1,5 +1,5 @@
 module CloudKit
-  
+
   # An OpenIDFilter provides OpenID authentication, listening for upstream
   # OAuth authentication and bypassing if already authorized.
   #

data/lib/cloudkit/rack/router.rb

@@ -3,7 +3,7 @@ module Rack #:nodoc:
   # A minimal router providing just what is needed for the OAuth and OpenID
   # filters.
   class Router
-    
+
     # Create an instance of Router to match on method, path and params.
     def initialize(method, path, params=[])
       @method = method.to_s.upcase; @path = path; @params = params

data/lib/cloudkit/store.rb

@@ -114,6 +114,7 @@ module CloudKit
       return data_required       unless options[:json]
       current_resource = resource(uri, options.excluding(:json, :etag, :remote_user))
       return update_resource(uri, options) if current_resource.status == 200
+      return current_resource if current_resource.status == 410
       create_resource(uri, options)
     end
 
@@ -303,7 +304,7 @@ module CloudKit
     # Clear all contents of the store. Used mostly for testing.
     def reset!
       @db.schema.keys.each do |table|
-        @db[table].delete
+        @db[table.gsub('`','').to_sym].delete
       end
     end
 

data/lib/cloudkit/store/extraction_view.rb

@@ -1,5 +1,5 @@
 module CloudKit
-  
+
   # An ExtractionView observes a resource collection and extracts specified
   # elements for querying.
   class ExtractionView

data/lib/cloudkit/store/response.rb

@@ -24,7 +24,7 @@ module CloudKit
     # Translate to the standard Rack representation: [status, headers, content]
     def to_rack
       meta['Content-Length'] = content.length.to_s
-      [status, meta, [content]]
+      [status, meta, [content.to_s]]
     end
 
     # Parse and return the JSON content

data/test/ext_test.rb

@@ -10,6 +10,14 @@ class ExtTest < Test::Unit::TestCase
       x.rekey!(:d, :b)
       assert x == {:a => 1, :c => 2}
     end
+    
+    should "re-key false and nil values" do
+      x = {:a => false, :b => nil}
+      x.rekey!(:b, :c)
+      assert x == {:a => false, :c => nil}
+      x.rekey!(:d, :b)
+      assert x == {:a => false, :c => nil}
+    end
 
     should "merge conditionally" do
       x = {:a => 1}
@@ -22,6 +30,17 @@ class ExtTest < Test::Unit::TestCase
       assert x == {:a => 1}
     end
 
+    should "merge false values correctly" do
+      x = {:a => 1}
+      y = {:b => 2}
+      x.filter_merge!(:c => false)
+      assert x == {:a => 1, :c => false}
+      x.filter_merge!(:c => y[:b])
+      assert x == {:a => 1, :c => 2}
+      x = {}.filter_merge!(:a => false)
+      assert x == {:a => false}
+    end
+
     should "exclude pairs using a single key" do
       x = {:a => 1, :b => 2}
       y = x.excluding(:b)

data/test/service_test.rb

@@ -655,6 +655,25 @@ class ServiceTest < Test::Unit::TestCase
           assert_equal 'thing', JSON.parse(result.body)['this']
         end
 
+        should "not create new resources using deleted resource URIs" do
+          # This situation occurs when a stale client attempts to update
+          # a resource that has been removed. This test verifies that CloudKit
+          # does not attempt to create a new item with a URI equal to the
+          # removed item.
+          etag = JSON.parse(@response.body)['etag'];
+          @request.delete(
+            '/items/abc',
+            'HTTP_IF_MATCH'   => etag,
+            CLOUDKIT_AUTH_KEY => TEST_REMOTE_USER)
+          json = JSON.generate(:foo => 'bar')
+          response = @request.put(
+            '/items/abc',
+            :input            => json,
+            'HTTP_IF_MATCH'   => etag,
+            CLOUDKIT_AUTH_KEY => TEST_REMOTE_USER)
+          assert_equal 410, response.status
+        end
+
         should "update the document if it already exists" do
           assert_equal 200, @response.status
           result = @request.get('/items/abc', VALID_TEST_AUTH)
@@ -723,9 +742,9 @@ class ServiceTest < Test::Unit::TestCase
           json = JSON.generate(:this => 'updated')
           response = @request.put(
             '/items/abc',
-            :input          => json,
-            'HTTP_IF_MATCH' => @json['etag'],
-            CLOUDKIT_AUTH_KEY        => TEST_REMOTE_USER)
+            :input             => json,
+            'HTTP_IF_MATCH'    => @json['etag'],
+            CLOUDKIT_AUTH_KEY  => TEST_REMOTE_USER)
           assert_equal 200, response.status
           etag = JSON.parse(response.body)['etag']
           json = JSON.generate(:this => 'updated again')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudkit
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Jon Crosby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-09 00:00:00 -08:00
+date: 2008-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        version: "2.9"
     version: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -58,9 +58,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.7
+        version: "0.3"
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-openid