riak-client 0.8.2 → 0.8.3

data/lib/riak/client/net_http_backend.rb

@@ -20,10 +20,19 @@ module Riak
     # be preferred when the 'curb' library is available.
     # Conforms to the Riak::Client::HTTPBackend interface.
     class NetHTTPBackend < HTTPBackend
+      def self.configured?
+        begin
+          require 'net/http'
+          true
+        rescue LoadError, NameError
+          false
+        end
+      end
+
       private
       def perform(method, uri, headers, expect, data=nil) #:nodoc:
         Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP.const_get(method.to_s.camelize).new(uri.request_uri, headers)
+          request = Net::HTTP.const_get(method.to_s.capitalize).new(uri.request_uri, headers)
           case data
           when String
             request.body = data
@@ -40,7 +49,7 @@ module Riak
                   result[:body] = response.body
                 end
               else
-                raise FailedRequest.new(method, expect, response.code, response.to_hash, response.body)
+                raise FailedRequest.new(method, expect, response.code.to_i, response.to_hash, response.body)
               end
             end
           end

data/lib/riak/core_ext.rb

@@ -0,0 +1,6 @@
+require 'riak/core_ext/blank'
+require 'riak/core_ext/extract_options'
+require 'riak/core_ext/slice'
+require 'riak/core_ext/stringify_keys'
+require 'riak/core_ext/symbolize_keys'
+require 'riak/core_ext/to_param'

data/lib/riak/core_ext/blank.rb

@@ -0,0 +1,39 @@
+unless Object.new.respond_to? :blank?
+  class Object
+    def blank?
+      false
+    end
+  end
+
+  class NilClass
+    def blank?
+      true
+    end
+  end
+
+  class Set
+    alias :blank? :empty?
+  end
+
+  class String
+    def blank?
+      not self =~ /[^\s]/
+    end
+  end
+
+  class Array
+    alias :blank? :empty?
+  end
+
+  class Hash
+    alias :blank? :empty?
+  end
+end
+
+unless Object.new.respond_to? :present?
+  class Object
+    def present?
+      not blank?
+    end
+  end
+end

data/lib/riak/core_ext/extract_options.rb

@@ -0,0 +1,7 @@
+unless Array.new.respond_to? :extract_options!
+  class Array
+    def extract_options!
+      last.is_a?(::Hash) ? pop : {}
+    end
+  end
+end

data/lib/riak/core_ext/slice.rb

@@ -0,0 +1,18 @@
+unless {}.respond_to? :slice
+  class Hash
+    def slice(*keys)
+      allowed = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
+      hash = {}
+      allowed.each { |k| hash[k] = self[k] if has_key?(k) }
+      hash
+    end
+
+    def slice!(*keys)
+      keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+      omit = slice(*self.keys - keys)
+      hash = slice(*keys)
+      replace(hash)
+      omit
+    end
+  end
+end

data/lib/riak/core_ext/stringify_keys.rb

@@ -0,0 +1,10 @@
+unless {}.respond_to? :stringify_keys
+  class Hash
+    def stringify_keys
+      inject({}) do |hash, pair| 
+        hash[pair[0].to_s] = pair[1]
+        hash
+      end
+    end
+  end
+end

data/lib/riak/core_ext/symbolize_keys.rb

@@ -0,0 +1,10 @@
+unless {}.respond_to? :symbolize_keys
+  class Hash
+    def symbolize_keys
+      inject({}) do |hash, pair| 
+        hash[pair[0].to_sym] = pair[1]
+        hash
+      end
+    end
+  end
+end

data/lib/riak/core_ext/to_param.rb

@@ -0,0 +1,31 @@
+unless Object.new.respond_to? :to_query and Object.new.respond_to? :to_param
+  class Object
+    def to_param
+      to_s
+    end
+
+    def to_query(key)
+      require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+      "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}"
+    end
+  end
+
+  class Array
+    def to_param
+      map(&:to_param).join('/')
+    end
+
+    def to_query(key)
+      prefix = "#{key}[]"
+      collect { |value| value.to_query(prefix) }.join '&'
+    end
+  end
+
+  class Hash
+    def to_param
+      map do |key, value|
+        value.to_query(key)
+      end.sort * '&'
+    end
+  end
+end

data/lib/riak/i18n.rb

@@ -11,10 +11,6 @@
 #    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.
-if ActiveSupport::VERSION::STRING >= "3.0"
-  require 'active_support/i18n'
-else
-  require 'i18n' # support ActiveSupport < 3
-end
+require 'i18n'
 
 I18n.load_path << File.expand_path("../locale/en.yml", __FILE__)

data/lib/riak/link.rb

@@ -17,13 +17,18 @@ module Riak
   # Represents a link from one object to another in Riak
   class Link
     include Util::Translation
-    # @return [String] the URL (relative or absolute) of the related resource
-    attr_accessor :url
+    include Util::Escape
+
+    # @return [String] the relationship tag (or "rel") of the other resource to this one
+    attr_accessor :tag
+    alias_method :rel, :tag
+    alias_method :rel=, :tag=
+
+    # @return [String] the bucket of the related resource
+    attr_accessor :bucket
 
-    # @return [String] the relationship ("rel") of the other resource to this one
-    attr_accessor :rel
-    alias :tag :rel
-    alias :tag= :rel=
+    # @return [String] the key of the related resource
+    attr_accessor :key
 
     # @param [String] header_string the string value of the Link: HTTP header from a Riak response
     # @return [Array<Link>] an array of Riak::Link structs parsed from the header
@@ -33,24 +38,36 @@ module Riak
       end
     end
 
-    def initialize(url, rel)
-      @url, @rel = url, rel
+    # @overload initialize(url, tag)
+    #   @param [String] url the url of the related resource
+    #   @param [String] tag the tag for the related resource
+    # @overload initialize(bucket, key, tag)
+    #   @param [String] bucket the bucket of the related resource
+    #   @param [String] key the key of the related resource
+    #   @param [String] tag the tag for the related resource
+    def initialize(*args)
+      raise ArgumentError unless (2..3).include?(args.size)
+      if args.size == 2
+        self.url, @tag = args
+      else
+        @bucket, @key, @tag = args
+      end
     end
 
-    # @return [String] bucket_name, if the Link url is a known Riak link ("/riak/<bucket>/<key>")
-    def bucket
-      CGI.unescape($1) if url =~ %r{^/[^/]+/([^/]+)/?}
+    # @return [String] the URL (relative or absolute) of the related resource
+    def url
+      "/riak/#{escape(bucket)}" + (key.blank? ? "" : "/#{escape(key)}")
     end
-    
-    # @return [String] key, if the Link url is a known Riak link ("/riak/<bucket>/<key>")
-    def key
-      CGI.unescape($1) if url =~ %r{^/[^/]+/[^/]+/([^/]+)/?}
+
+    def url=(value)
+      @bucket = CGI.unescape($1) if value =~ %r{^/[^/]+/([^/]+)/?}
+      @key = CGI.unescape($1) if value =~ %r{^/[^/]+/[^/]+/([^/]+)/?}
     end
 
     def inspect; to_s; end
 
     def to_s
-      %Q[<#{@url}>; riaktag="#{@rel}"]
+      %Q[<#{url}>; riaktag="#{tag}"]
     end
 
     def hash
@@ -62,12 +79,12 @@ module Riak
     end
 
     def ==(other)
-      other.is_a?(Link) && url == other.url && rel == other.rel
+      other.is_a?(Link) && url == other.url && tag == other.tag
     end
 
     def to_walk_spec
-      raise t("bucket_link_conversion") if @rel == "up" || key.nil?
-      WalkSpec.new(:bucket => bucket, :tag => @rel)
+      raise t("bucket_link_conversion") if tag == "up" || key.nil?
+      WalkSpec.new(:bucket => bucket, :tag => tag)
     end
   end
 end

data/lib/riak/locale/en.yml

@@ -19,8 +19,8 @@ en:
     empty_map_reduce_query: "Specify one or more query phases to your MapReduce."
     failed_request: "Expected %{expected} from Riak but received %{code}. %{body}"
     hash_type: "invalid argument %{hash} is not a Hash"
+    http_configuration: "The %{backend} HTTP backend cannot be used. Please check its requirements."
     hostname_invalid: "host must be a valid hostname"
-    install_curb: "curb library not found! Please `gem install curb` for better performance."
     invalid_client_id: "Invalid client ID, must be a string or between 0 and %{max_id}"
     invalid_function_value: "invalid value for function: %{value}"
     invalid_phase_type: "type must be :map, :reduce, or :link"

data/lib/riak/map_reduce.rb

@@ -137,10 +137,10 @@ module Riak
 
     # Convert the job to JSON for submission over the HTTP interface.
     # @return [String] the JSON representation
-    def to_json(options={})
-      hash = {"inputs" => inputs.as_json, "query" => query.map(&:as_json)}
+    def to_json(*a)
+      hash = {"inputs" => inputs, "query" => query.map(&:as_json)}
       hash['timeout'] = @timeout.to_i if @timeout
-      ActiveSupport::JSON.encode(hash, options)
+      hash.to_json(*a)
     end
 
     # Executes this map-reduce job.
@@ -148,9 +148,10 @@ module Riak
     def run
       raise MapReduceError.new(t("empty_map_reduce_query")) if @query.empty?
       response = @client.http.post(200, @client.mapred, to_json, {"Content-Type" => "application/json", "Accept" => "application/json"})
-      if response.try(:[], :headers).try(:[],'content-type').include?("application/json")
-        ActiveSupport::JSON.decode(response[:body])
-      else
+      begin
+        raise unless response[:headers]['content-type'].include?('application/json')
+        JSON.parse(response[:body])
+      rescue
         response
       end
     rescue FailedRequest => fr
@@ -220,8 +221,8 @@ module Riak
 
       # Converts the phase to JSON for use while invoking a job.
       # @return [String] a JSON representation of the phase
-      def to_json(options=nil)
-        ActiveSupport::JSON.encode(as_json, options)
+      def to_json(*a)
+        as_json.to_json(*a)
       end
 
       # Converts the phase to its JSON-compatible representation for job invocation.

data/lib/riak/robject.rb

@@ -33,7 +33,6 @@ module Riak
 
     # @return [String] the Riak vector clock for the object
     attr_accessor :vclock
-    alias_attribute :vector_clock, :vclock
 
     # @return [Set<Link>] a Set of {Riak::Link} objects for relationships between this object and other resources
     attr_accessor :links
@@ -88,7 +87,7 @@ module Riak
         end
         h
       end
-      @conflict = response[:code].try(:to_i) == 300 && content_type =~ /multipart\/mixed/
+      @conflict = (response[:code].to_i == 300 && content_type =~ /multipart\/mixed/) rescue false
       @siblings = nil
       self.raw_data = response[:body] if response[:body].present?
       self
@@ -250,7 +249,7 @@ module Riak
       return payload if IO === payload
       case @content_type
       when /json/
-        ActiveSupport::JSON.encode(payload)
+        payload.to_json
       when /yaml/
         YAML.dump(payload)
       when "application/x-ruby-marshal"
@@ -270,7 +269,7 @@ module Riak
     def deserialize(body)
       case @content_type
       when /json/
-        ActiveSupport::JSON.decode(body)
+        JSON.parse(body)
       when /yaml/
         YAML.load(body)
       when "application/x-ruby-marshal"
@@ -282,7 +281,12 @@ module Riak
 
     # @return [String] A representation suitable for IRB and debugging output
     def inspect
-      "#<#{self.class.name} #{url} [#{@content_type}]:#{@data.inspect}>"
+      body = if @data || content_type =~ /json|yaml|marshal/
+               data.inspect
+             else
+               @raw_data && "(#{@raw_data.size} bytes)"
+             end
+      "#<#{self.class.name} #{url} [#{@content_type}]:#{body}>"
     end
 
     # Walks links from this object to other objects in Riak.
@@ -303,7 +307,7 @@ module Riak
     # to it
     # @param [String] tag the tag to apply to the link
     def to_link(tag)
-      Link.new(@bucket.client.http.path(@bucket.client.prefix, escape(@bucket.name), escape(@key)).path, tag)
+      Link.new(@bucket.name, @key, tag)
     end
 
     # Generates a URL representing the object according to the client, bucket and key.
@@ -315,6 +319,9 @@ module Riak
       @bucket.client.http.path(*segments).to_s
     end
 
+    alias :vector_clock :vclock
+    alias :vector_clock= :vclock=
+
     protected
     def load_map_reduce_value(hash)
       metadata = hash['metadata']

data/lib/riak/search.rb

@@ -52,7 +52,7 @@ module Riak
       path = [solr, index, "select", {"q" => query, "wt" => "json"}.merge(options.stringify_keys), {}].compact
       response = http.get(200, *path)
       if response[:headers]['content-type'].include?("application/json")
-        ActiveSupport::JSON.decode(response[:body])
+        JSON.parse(response[:body])
       else
         response[:body]
       end
@@ -98,7 +98,12 @@ module Riak
     # @raise [ArgumentError] if any document specs don't include 'id' or 'query' keys
     def remove(*args)
       index = args.shift if String === args.first
-      raise ArgumentError.new(t("search_remove_requires_id_or_query")) unless args.all? {|s| s.stringify_keys.key?("id") || s.stringify_keys.key?("query") }
+      raise ArgumentError.new(t("search_remove_requires_id_or_query")) unless args.all? { |s|
+        s.include? :id or 
+        s.include? 'id' or 
+        s.include? :query or 
+        s.include? 'query'
+      }
       xml = Builder::XmlMarkup.new
       xml.delete do
         args.each do |spec|

data/lib/riak/test_server.rb

@@ -88,6 +88,7 @@ module Riak
         @mutex.synchronize do
           @cin, @cout, @cerr, @cpid = Open3.popen3("#{@riak_script} console")
           @cin.puts
+          @cin.flush
           wait_for_erlang_prompt
           @started = true
         end
@@ -100,6 +101,7 @@ module Riak
         @mutex.synchronize do
           begin
             @cin.puts "init:stop()."
+            @cin.flush
           rescue Errno::EPIPE
           ensure
             register_stop
@@ -122,9 +124,11 @@ module Riak
           begin
             if @app_config[:riak_kv][:storage_backend] == :riak_kv_test_backend
               @cin.puts "riak_kv_test_backend:reset()."
+              @cin.flush
               wait_for_erlang_prompt
             else
               @cin.puts "init:restart()."
+              @cin.flush
               wait_for_erlang_prompt
               wait_for_startup
             end
@@ -224,7 +228,7 @@ module Riak
     def register_stop
       %w{@cin @cout @cerr}.each {|io| if instance_variable_get(io); instance_variable_get(io).close; instance_variable_set(io, nil) end }
       _cpid = @cpid; @cpid = nil
-      at_exit { _cpid.join if _cpid.alive? }
+      at_exit { _cpid.join if _cpid && _cpid.alive? }
       @started = false
     end
   end

data/riak-client.gemspec

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{riak-client}
+  s.version = "0.8.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sean Cribbs"]
+  s.date = %q{2010-12-13}
+  s.description = %q{riak-client is a rich client for Riak, the distributed database by Basho. It supports the full HTTP interface including storage operations, bucket configuration, link-walking and map-reduce.}
+  s.email = %q{sean@basho.com}
+  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/invalid_response.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-with-body.txt", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/object_spec.rb", "spec/riak/search_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example"]
+  s.homepage = %q{http://seancribbs.github.com/ripple}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{riak-client is a rich client for Riak, the distributed database by Basho.}
+  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/object_spec.rb", "spec/riak/search_spec.rb", "spec/riak/walk_spec_spec.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 1.2"])
+      s.add_development_dependency(%q<rack>, [">= 1.0"])
+      s.add_development_dependency(%q<curb>, [">= 0.6"])
+      s.add_development_dependency(%q<excon>, ["~> 0.3.4"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<fakeweb>, [">= 1.2"])
+      s.add_dependency(%q<rack>, [">= 1.0"])
+      s.add_dependency(%q<curb>, [">= 0.6"])
+      s.add_dependency(%q<excon>, ["~> 0.3.4"])
+      s.add_dependency(%q<i18n>, [">= 0.4.0"])
+      s.add_dependency(%q<builder>, ["~> 2.1.2"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<fakeweb>, [">= 1.2"])
+    s.add_dependency(%q<rack>, [">= 1.0"])
+    s.add_dependency(%q<curb>, [">= 0.6"])
+    s.add_dependency(%q<excon>, ["~> 0.3.4"])
+    s.add_dependency(%q<i18n>, [">= 0.4.0"])
+    s.add_dependency(%q<builder>, ["~> 2.1.2"])
+  end
+end