riak-client 0.8.0.beta → 0.8.0.beta2

data/Gemfile

@@ -1,7 +1,7 @@
 # A sample Gemfile
 source :gemcutter
 
-gem 'activesupport', '~>2.3.5' # '3.0.0.rc'
+gem 'activesupport', '~>2.3.5' # '3.0.0'
 gem 'i18n'
 
 gem 'rspec', "~>2.0.0.beta.18"

data/lib/active_support/cache/riak_store.rb

@@ -0,0 +1,15 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+require 'riak'
+require 'riak/cache_store'

data/lib/riak.rb

@@ -37,7 +37,6 @@ module Riak
   # Cache store - only supports Rails 3 style
   if ActiveSupport::VERSION::STRING >= "3.0.0"
     autoload :CacheStore,      "riak/cache_store"
-    ::ActiveSupport::Cache.autoload :RiakStore, "riak/cache_store"
   end
 
   # Exceptions

data/lib/riak/cache_store.rb

@@ -17,6 +17,7 @@ module Riak
     attr_accessor :client
 
     def initialize(options = {})
+      super
       @bucket_name = options.delete(:bucket) || '_cache'
       @n_value = options.delete(:n_value) || 2
       @r = options.delete(:r) || 1

data/lib/riak/util/headers.rb

@@ -13,6 +13,26 @@
 #    limitations under the License.
 require 'riak'
 
+# Splits headers into < 8KB chunks
+module Net::HTTPHeader
+  def each_capitalized
+    # 1.9 check
+    respond_to?(:enum_for) and (block_given? or return enum_for(__method__))
+    @header.each do |k,v|
+      base_length = "#{k}: \r\n".length
+      values = v.map {|i| i.split(", ") }.flatten
+      while !values.empty?
+        current_line = ""
+        while values.first && current_line.length + base_length + values.first.length + 2 < 8192
+          val = values.shift.strip
+          current_line += current_line.empty? ? val : ", #{val}"
+        end
+        yield capitalize(k), current_line
+      end
+    end
+  end
+end
+
 module Riak
   module Util
     # Represents headers from an HTTP response

data/spec/riak/headers_spec.rb

@@ -23,12 +23,29 @@ describe Riak::Util::Headers do
   end
 
   it "should parse a header line into the key and value" do
-    Riak::Util::Headers.parse("Content-Type: text/plain\n").should == ["Content-Type", "text/plain"]
+    Riak::Util::Headers.parse("Content-Type: text/plain\r\n").should == ["Content-Type", "text/plain"]
   end
 
   it "should parse a header line and add it to the collection" do
     h = Riak::Util::Headers.new
-    h.parse("Content-Type: text/plain\n")
+    h.parse("Content-Type: text/plain\r\n")
     h.to_hash.should == {"content-type" => ["text/plain"]}
   end
+
+  it "should split headers larger than 8KB" do
+    # This really tests Net::HTTPHeader#each_capitalized, which is
+    # used by Net::HTTP to write the headers to the socket. It does
+    # not cover the case where a single value is larger than 8KB. If
+    # you're doing that, you have something else wrong.
+    h = Riak::Util::Headers.new
+    10.times do
+      h.add_field "Link", "f" * 820
+    end
+    count = 0
+    h.each_capitalized do |k,v|
+      count += 1
+      "#{k}: #{v}\r\n".length.should < 8192
+    end
+    count.should > 1
+  end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 8
   - 0
-  - beta
-  version: 0.8.0.beta
+  - beta2
+  version: 0.8.0.beta2
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -04:00
+date: 2010-08-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files: 
 - Gemfile
 - Gemfile.lock
+- lib/active_support/cache/riak_store.rb
 - lib/riak/bucket.rb
 - lib/riak/cache_store.rb
 - lib/riak/client/curb_backend.rb