fluidinfo 0.4.1 → 0.5.0

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -1,16 +1,13 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem "rest-client", ">= 1.6.1"
-gem "yajl-ruby", ">= 0.8.2"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem "rest-client", "~> 1.6.7"
+gem "yajl-ruby", "~> 1.0.0"
+
 group :development do
-  gem "shoulda", ">= 0"
+  gem "rake", "~> 0.9.2"
+  gem "rspec", "~> 2.6.0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem "uuidtools", ">= 2.1.2"
+  gem "jeweler", "~> 1.6.4"
+  gem "uuidtools", "~> 2.1.2"
+  gem "yard", "~> 0.7.2"
 end

data/Gemfile.lock

@@ -1,28 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     mime-types (1.16)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rest-client (1.6.1)
+    rake (0.9.2)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
-    shoulda (2.11.3)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
     uuidtools (2.1.2)
-    yajl-ruby (0.8.2)
+    yajl-ruby (1.0.0)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  rest-client (>= 1.6.1)
-  shoulda
-  uuidtools (>= 2.1.2)
-  yajl-ruby (>= 0.8.2)
+  jeweler (~> 1.6.4)
+  rake (~> 0.9.2)
+  rest-client (~> 1.6.7)
+  rspec (~> 2.6.0)
+  uuidtools (~> 2.1.2)
+  yajl-ruby (~> 1.0.0)
+  yard (~> 0.7.2)

data/Rakefile

@@ -26,28 +26,13 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'yard/rake/yardoc_task'
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']
+  t.options = ['--any', '--extra', '--opts']
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fluidinfo #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/fluidinfo.gemspec

@@ -4,20 +4,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fluidinfo}
-  s.version = "0.4.1"
+  s.name = "fluidinfo"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Seidel"]
-  s.date = %q{2011-06-09}
-  s.description = %q{This gem provides a simple interface to fluidinfo, built on top of the rest-client gem.}
-  s.email = %q{gridaphobe@gmail.com}
+  s.date = "2011-09-17"
+  s.description = "This gem provides a simple interface to fluidinfo, built on top of the rest-client gem."
+  s.email = "gridaphobe@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
   s.files = [
     ".document",
+    ".rspec",
     ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
@@ -27,47 +28,47 @@ Gem::Specification.new do |s|
     "VERSION",
     "fluidinfo.gemspec",
     "lib/fluidinfo.rb",
-    "test/helper.rb",
-    "test/test_fluidinfo.rb"
+    "lib/fluidinfo/client.rb",
+    "lib/fluidinfo/response.rb",
+    "spec/fluidinfo_spec.rb"
   ]
-  s.homepage = %q{http://github.com/gridaphobe/fluidinfo.rb}
+  s.homepage = "http://github.com/gridaphobe/fluidinfo.rb"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Provides a simple interface to fluidinfo}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_fluidinfo.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Provides a simple interface to fluidinfo"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.1"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.8.2"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+      s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<uuidtools>, [">= 2.1.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<uuidtools>, ["~> 2.1.2"])
+      s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
     else
-      s.add_dependency(%q<rest-client>, [">= 1.6.1"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0.8.2"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+      s.add_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<uuidtools>, [">= 2.1.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<uuidtools>, ["~> 2.1.2"])
+      s.add_dependency(%q<yard>, ["~> 0.7.2"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 1.6.1"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0.8.2"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+    s.add_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<uuidtools>, [">= 2.1.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<uuidtools>, ["~> 2.1.2"])
+    s.add_dependency(%q<yard>, ["~> 0.7.2"])
   end
 end
 

data/lib/fluidinfo/client.rb

@@ -0,0 +1,182 @@
+require "rest-client"
+require "cgi"
+require "yajl"
+require "base64"
+require "set"
+
+module Fluidinfo
+  ITERABLE_TYPES      = Set.new [Array]
+  SERIALIZEABLE_TYPES = Set.new [NilClass, String, Fixnum, Float, Symbol,
+                                 TrueClass, FalseClass, Array]
+  JSON_TYPES          = Set.new ["application/json",
+                                 "application/vnd.fluiddb.value+json"]
+
+  class Client
+    # The main fluidinfo instance.
+    MAIN    = 'https://fluiddb.fluidinfo.com'
+    # The sandbox instance, test your code here.
+    SANDBOX = 'https://sandbox.fluidinfo.com'
+
+    def initialize(instance=:main)
+      if instance == :sandbox
+        @instance = SANDBOX
+      else
+        @instance = MAIN
+      end
+      @headers = {
+        :accept => "*/*",
+        :user_agent => "fluidinfo.rb/#{Fluidinfo.version}"
+      }
+    end
+
+    def login(user, pass)
+      @headers[:authorization] = "Basic " + 
+        (Base64.encode64 "#{user}:#{pass}").strip
+    end
+
+    def logout
+      @headers.delete :authorization
+    end
+
+    ##
+    # Call GET on one of the APIs
+    #
+    # +options+ contains URI arguments that will be appended to +path+
+    # consult the {Fluidinfo API documentation}[api.fluidinfo.com] for a list of
+    # appropriate options
+    def get(path, options={})
+      url = build_url path, options
+      Response.new(RestClient.get url, @headers)
+    end
+
+    ##
+    # Call HEAD on the /about or /object API to test for the existence
+    # of a tag
+    def head(path)
+      path = @instance + path
+      Response.new(RestClient.head path, @headers)
+    end
+
+    ##
+    # Call POST on one of the APIs
+    #
+    # +options[:body]+ contains the request payload. For some API
+    # calls this may be empty.
+    def post(path, options={})
+      path = @instance + path
+      if options[:body]
+        payload = build_payload options
+        headers = @headers.merge :content_type => payload[:mime]
+        Response.new(RestClient.post path, payload[:body], headers)
+      else
+        Response.new(RestClient.post path, nil, @headers)
+      end
+    end
+
+    ##
+    # Call PUT on one of the APIs
+    #
+    # +options[:body]+ contains the request payload.
+    #
+    # +options[:mime]+ contains the MIME-type unless the payload is 
+    # JSON-encodable
+    def put(path, options={})
+      url = build_url path, options
+      payload = build_payload options
+      headers = @headers.merge(:content_type   => payload[:mime],
+                               :content_length => payload[:size])
+      Response.new(RestClient.put url, payload[:body], headers)
+    end
+
+    ##
+    # Call DELETE on one of the APIs
+    #
+    # +options+ contains URI arguments that will be appended to +path+
+    # consult the {Fluidinfo API documentation}[api.fluidinfo.com] for a list 
+    # of appropriate options
+    def delete(path, options={})
+      url = build_url path, options
+      # nothing returned in response body for DELETE
+      Response.new(RestClient.delete url, @headers)
+    end
+
+    private
+    ##
+    # Build a url from the given path and url args
+    def build_url(path, options={})
+      opts = options.reject do |key, val|
+        [:body, :mime].include? key
+      end
+      args = opts.inject([]) do |arr, (key, val)|
+        if key == :tags
+          # dealing with tag list
+          val.each do |tag|
+            arr << "tag=#{tag}"
+          end
+        else
+          arr << "#{key}=#{CGI.escape val.to_s}"
+        end
+        arr
+      end.join('&')
+      # fix for /about API
+      if path.start_with? '/about/'
+        path = path.split("/").map{|x| CGI.escape x}.join("/")
+      end
+      if args != ''
+        "#{@instance}#{path}?#{args}"
+      else
+        "#{@instance}#{path}"
+      end
+    end
+
+    ##
+    # Build the payload from the options hash
+    def build_payload(options)
+      payload = options.reject {|k,v| !([:body, :mime].include? k)}
+      if payload[:mime]
+        # user set mime-type, let them deal with it :)
+        # fix for ruby 1.8
+        if payload[:body].is_a? File
+          payload[:size] = payload[:body].path.size
+        else
+          payload[:size] = payload[:body].size
+        end
+      elsif payload[:body].is_a? Hash
+        payload[:body] = Yajl.dump payload[:body]
+        payload[:mime] = "application/json"
+      elsif SERIALIZEABLE_TYPES.include? payload[:body].class
+        if ITERABLE_TYPES.include? payload[:body].class
+          if is_set_of_strings? payload[:body]
+            # set of strings is primitive
+            payload[:mime] = "application/vnd.fluiddb.value+json"
+          else
+            # we have an Array with some non-String items
+            payload[:mime] = "application/json"
+          end
+        else
+          # primitive type
+          payload[:mime] = "application/vnd.fluiddb.value+json"
+        end
+        payload[:body] = Yajl.dump payload[:body]
+      else
+        raise TypeError, "You must supply the mime-type"
+      end
+      payload
+    end
+    
+    ##
+    # Check if payload is a "set of strings"
+    def is_set_of_strings?(list)
+      # are all elements unique strings?
+      list.all? { |x| x.is_a? String } && list == list.uniq
+    end
+  end
+
+  def self.version
+    # This was borrowed from the rest-client gem :)
+    version_path = File.dirname(__FILE__) + "/../../VERSION"
+    return File.read(version_path).chomp if File.file?(version_path)
+    "0.0.0"
+  end
+
+end

data/lib/fluidinfo/response.rb

@@ -0,0 +1,24 @@
+require "yajl"
+
+module Fluidinfo
+  class Response
+    attr_reader :status, :headers, :content, :value, :response
+
+    def initialize(response)
+      @response = response
+      @status   = response.code
+      @headers  = response.headers
+      @content  = response.body
+      @value    = if JSON_TYPES.include? @headers[:content_type]
+                    Yajl.load @content
+                  else
+                    @content
+                  end
+    end
+
+    def [](key)
+      @value[key]
+    end
+    
+  end
+end

data/lib/fluidinfo.rb

@@ -1,189 +1,2 @@
-require "rest-client"
-require "uri"
-require "cgi"
-require "yajl/json_gem"
-require "base64"
-require "set"
-
-module Fluidinfo
-  ITERABLE_TYPES      = Set.new [Array]
-  SERIALIZEABLE_TYPES = Set.new [NilClass, String, Fixnum, Float, Symbol,
-                                 TrueClass, FalseClass, Array]
-  JSON_TYPES          = Set.new ["application/json",
-                                 "application/vnd.fluiddb.value+json"]
-
-  class Client
-    # The main fluidinfo instance.
-    MAIN    = 'https://fluiddb.fluidinfo.com'
-    # The sandbox instance, test your code here.
-    SANDBOX = 'https://sandbox.fluidinfo.com'
-
-    def initialize(instance=:main)
-      if instance == :sandbox
-        @instance = SANDBOX
-      else
-        @instance = MAIN
-      end
-      @headers = {
-        :accept => "*/*",
-        :user_agent => "fluidinfo.rb/#{Fluidinfo.version}"
-      }
-    end
-
-    def login(user, pass)
-      @headers[:authorization] = "Basic " + 
-        (Base64.encode64 "#{user}:#{pass}").strip
-    end
-
-    def logout
-      @headers.delete :authorization
-    end
-
-    ##
-    # Call GET on one of the APIs
-    #
-    # +options+ contains URI arguments that will be appended to +path+
-    # consult the {Fluidinfo API documentation}[api.fluidinfo.com] for a list of
-    # appropriate options
-    def get(path, options={})
-      url = build_url path, options
-      response = RestClient.get url, @headers
-      if JSON_TYPES.include? response.headers[:content_type]
-        JSON.parse response
-      else
-        response
-      end
-    end
-
-    ##
-    # Call HEAD on the /about or /object API to test for the existence
-    # of a tag
-    def head(path)
-      path = @instance + path
-      RestClient.head path, @headers
-    end
-
-    ##
-    # Call POST on one of the APIs
-    #
-    # +options[:body]+ contains the request payload. For some API
-    # calls this may be empty.
-    def post(path, options={})
-      path = @instance + path
-      if options[:body]
-        payload = build_payload options
-        headers = @headers.merge :content_type => payload[:mime]
-        JSON.parse(RestClient.post path, payload[:body], headers)
-      else
-        JSON.parse(RestClient.post path, nil, @headers)
-      end
-    end
-
-    ##
-    # Call PUT on one of the APIs
-    #
-    # +options[:body]+ contains the request payload.
-    #
-    # +options[:mime]+ contains the MIME-type unless the payload is 
-    # JSON-encodable
-    def put(path, options={})
-      url = build_url path, options
-      payload = build_payload options
-      headers = @headers.merge(:content_type   => payload[:mime],
-                               :content_length => payload[:size])
-      RestClient.put url, payload[:body], headers
-    end
-
-    ##
-    # Call DELETE on one of the APIs
-    #
-    # +options+ contains URI arguments that will be appended to +path+
-    # consult the {Fluidinfo API documentation}[api.fluidinfo.com] for a list 
-    # of appropriate options
-    def delete(path, options={})
-      url = build_url path, options
-      # nothing returned in response body for DELETE
-      RestClient.delete url, @headers
-    end
-
-    private
-    ##
-    # Build a url from the given path and url args
-    def build_url(path, options={})
-      opts = options.reject do |key, val|
-        [:body, :mime].include? key
-      end
-      args = opts.inject([]) do |arr, (key, val)|
-        if key == :tags
-          # dealing with tag list
-          val.each do |tag|
-            arr << "tag=#{tag}"
-          end
-        else
-          arr << "#{key}=#{CGI.escape val.to_s}"
-        end
-        arr
-      end.join('&')
-      # fix for /about API
-      if path.start_with? '/about/'
-        about = path[7..-1]
-        path = "/about/#{CGI.escape about}"
-      end
-      if args != ''
-        "#{@instance}#{path}?#{args}"
-      else
-        "#{@instance}#{path}"
-      end
-    end
-
-    ##
-    # Build the payload from the options hash
-    def build_payload(options)
-      payload = options.reject {|k,v| !([:body, :mime].include? k)}
-      if payload[:mime]
-        # user set mime-type, let them deal with it :)
-        # fix for ruby 1.8
-        if payload[:body].is_a? File
-          payload[:size] = payload[:body].path.size
-        else
-          payload[:size] = payload[:body].size
-        end
-      elsif payload[:body].is_a? Hash
-        payload[:body] = JSON.dump payload[:body]
-        payload[:mime] = "application/json"
-      elsif SERIALIZEABLE_TYPES.include? payload[:body].class
-        if ITERABLE_TYPES.include? payload[:body].class
-          if is_set_of_strings? payload[:body]
-            # set of strings is primitive
-            payload[:mime] = "application/vnd.fluiddb.value+json"
-          else
-            # we have an Array with some non-String items
-            payload[:mime] = "application/json"
-          end
-        else
-          # primitive type
-          payload[:mime] = "application/vnd.fluiddb.value+json"
-        end
-        payload[:body] = JSON.dump payload[:body]
-      else
-        raise TypeError, "You must supply the mime-type"
-      end
-      payload
-    end
-    
-    ##
-    # Check if payload is a "set of strings"
-    def is_set_of_strings?(list)
-      # are all elements unique strings?
-      list.all? { |x| x.is_a? String } && list == list.uniq
-    end
-  end
-
-  def self.version
-    # This was borrowed from the rest-client gem :)
-    version_path = File.dirname(__FILE__) + "/../VERSION"
-    return File.read(version_path).chomp if File.file?(version_path)
-    "0.0.0"
-  end
-
-end
+require File.join(File.dirname(__FILE__), "/fluidinfo/client")
+require File.join(File.dirname(__FILE__), "/fluidinfo/response")

data/{test/test_fluidinfo.rb → spec/fluidinfo_spec.rb}

@@ -1,64 +1,69 @@
-require 'helper'
+require 'fluidinfo'
 require 'uuidtools'
 
-class FluidinfoTest < Test::Unit::TestCase
-  context "GET" do
-    setup do
+describe Fluidinfo do
+  describe "GET" do
+    before(:each) do
       @fluid = Fluidinfo::Client.new
     end
 
-    context "/objects" do
-      should "retrieve tags correctly" do
+    it "should return a Fluidinfo::Response" do
+      r = @fluid.get("/about/fluidinfo")
+      r.should be_a(Fluidinfo::Response)
+      r.should respond_to(:status, :content, :headers, :value, :response)
+    end
+
+    describe "/objects" do
+      it "should retrieve tags correctly" do
         uid = "e034d8c0-a2e4-4094-895b-3a8065f9696e"
-        tag = "gridaphobe/given-name"
-        assert_equal "Eric", @fluid.get("/objects/#{uid}/#{tag}")
+        tag = "fluiddb/users/username"
+        @fluid.get("/objects/#{uid}/#{tag}").value.should eq("gridaphobe")
       end
 
-      should "process queries correctly" do
+      it "should process queries correctly" do
         query = 'fluiddb/users/username = "gridaphobe"'
         expected = {
           "ids" => ["e034d8c0-a2e4-4094-895b-3a8065f9696e"]
         }
-        assert_equal expected, @fluid.get("/objects", :query => query)
+        @fluid.get("/objects", :query => query).value.should eq(expected)
       end
 
-      should "retrieve objects with about tag" do
+      it "should retrieve objects with about tag" do
         uid = "206b5ca5-cd69-469a-9aba-44b28cfb455e"
         expected = {
           "about"=>nil,
           "tagPaths"=>["gridaphobe/test/test_tag"]
         }
-        assert_equal expected, @fluid.get("/objects/#{uid}", :showAbout => true)
+        @fluid.get("/objects/#{uid}",
+                   :showAbout => true).value.should eq(expected)
       end
-      
-      should "retrieve objects without about tag" do
+
+      it "should retrieve objects without about tag" do
         uid = "206b5ca5-cd69-469a-9aba-44b28cfb455e"
         expected = {
           "tagPaths"=>["gridaphobe/test/test_tag"]
         }
-        assert_equal expected, @fluid.get("/objects/#{uid}")
+        @fluid.get("/objects/#{uid}").value.should eq(expected)
       end
-      
-      should "raise 404 errors on bad request" do
+
+      it "should raise 404 errors on bad request" do
         uid = "1"
         tag = "gridaphobe/given-name"
-        assert_raise RestClient::ResourceNotFound do
-          @fluid.get "/objects/#{uid}/#{tag}"
-        end
+        expect{@fluid.get "/objects/#{uid}/#{tag}"}.to raise_error(RestClient::ResourceNotFound)
       end
     end
 
-    context "/namespaces" do
-      should "show basic information about namespaces" do
+    describe "/namespaces" do
+      it "should show basic information about namespaces" do
         user = "gridaphobe"
         ns   = "test"
         expected = {
           "id"             =>"9c16dcbe-87fd-4fe9-ae0e-699be84f1105"
         }
-        assert_equal expected, @fluid.get("/namespaces/#{user}/#{ns}")
+        @fluid.get("/namespaces/#{user}/#{ns}").value.should eq(expected)
       end
 
-      should "show detailed information about namespaces" do
+      it "should show detailed information about namespaces" do
         user = "gridaphobe"
         ns   = "test"
         expected = {
@@ -67,15 +72,15 @@ class FluidinfoTest < Test::Unit::TestCase
           "id"             =>"9c16dcbe-87fd-4fe9-ae0e-699be84f1105",
           "description"    =>"test"
         }
-        assert_equal expected, @fluid.get("/namespaces/#{user}/#{ns}",
-                                          :returnDescription => true,
-                                          :returnTags => true,
-                                          :returnNamespaces => true)
+        @fluid.get("/namespaces/#{user}/#{ns}",
+                   :returnDescription => true,
+                   :returnTags => true,
+                   :returnNamespaces => true).value.should eq(expected)
       end
     end
-    
-    context "/values" do
-      should "retrieve a set of tags" do
+
+    describe "/values" do
+      it "should retrieve a set of tags" do
         expected = {
           "results" => {
             "id"      => {
@@ -86,53 +91,67 @@ class FluidinfoTest < Test::Unit::TestCase
             }
           }
         }
-        assert_equal expected, @fluid.get("/values",
-                              :query => 'fluiddb/users/username="gridaphobe"',
-                              :tags => ['fluiddb/users/username', 'fluiddb/about'])
+        @fluid.get("/values",
+                   :query => 'fluiddb/users/username="gridaphobe"',
+                   :tags => ['fluiddb/users/username',
+                             'fluiddb/about']).value.should eq(expected)
       end
     end
   end
 
-  context "POST" do
-    setup do
-      @fluid = Fluidinfo::Client.new :sandbox
+  describe "POST" do
+    before(:each) do
+      @fluid = Fluidinfo::Client.new
       @fluid.login 'test', 'test'
     end
 
-    context "/namespaces" do
-      should "create new namespaces" do
+    it "should return a Fluidinfo::Response" do
+      r = @fluid.post("/objects")
+      r.should be_a(Fluidinfo::Response)
+      r.should respond_to(:status, :content, :headers, :value, :response)
+    end
+
+    describe "/namespaces" do
+      it "should create new namespaces" do
         new_ns = UUIDTools::UUID.random_create
         body = {
           'description' => 'a test namespace',
           'name'        => new_ns
         }
         resp = @fluid.post "/namespaces/test", :body => body
-        # assert_equal 201, resp.code
-        assert_not_nil resp["id"]
-        
+        resp.status.should eq(201)
+        resp["id"].should_not be_nil
+
         # now cleanup
         @fluid.delete "/namespaces/test/#{new_ns}"
       end
     end
   end
 
-  context "PUT" do
-    setup do
-      @fluid = Fluidinfo::Client.new :sandbox
+  describe "PUT" do
+    before(:each) do
+      @fluid = Fluidinfo::Client.new
       @fluid.login 'test', 'test'
     end
 
-    context "/tags" do
-      should "update primitive tag values" do
+    it "should return a Fluidinfo::Response" do
+      r = @fluid.put("/about/fluidinfo/test/tag", :body => nil)
+      r.should be_a(Fluidinfo::Response)
+      r.should respond_to(:status, :content, :headers, :value, :response)
+      @fluid.delete("/about/fluidinfo/test/tag")
+    end
+
+    describe "/tags" do
+      it "should update primitive tag values" do
         new_ns = UUIDTools::UUID.random_create
         ns_body = {
           'description' => 'a test namespace',
           'name' => new_ns
         }
         resp = @fluid.post '/namespaces/test', :body => ns_body
-        assert_not_nil resp["id"]
-        ns_id = resp["id"]      # for later use
+        resp["id"].should_not be_nil
 
+        ns_id = resp["id"]      # for later use
         new_tag = UUIDTools::UUID.random_create
         tag_body = {
           'description' => 'a test tag',
@@ -140,34 +159,35 @@ class FluidinfoTest < Test::Unit::TestCase
           'indexed' => false
         }
         resp = @fluid.post "/tags/test/#{new_ns}", :body => tag_body
-        assert_not_nil resp["id"]
+        resp["id"].should_not be_nil
+
         path = "/objects/#{ns_id}/test/#{new_ns}/#{new_tag}"
         # Make sure that all primitive values are properly encoded and
         # sent to Fluidinfo
         primitives = [1, 1.1, "foo", true, nil, [1, '2', 3]]
         primitives.each do |p|
           resp = @fluid.put(path, :body => p)
-          assert_equal p, @fluid.get(path)
+          @fluid.get(path).value.should eq(p)
         end
 
         # now cleanup
         response = @fluid.delete "/tags/test/#{new_ns}/#{new_tag}"
-        assert_equal 204, response.code
-      
+        response.status.should eq(204)
+
         response = @fluid.delete "/namespaces/test/#{new_ns}"
-        assert_equal 204, response.code
+        response.status.should eq(204)
       end
 
-      should "update opaque tag values" do
+      it "should update opaque tag values" do
         new_ns = UUIDTools::UUID.random_create
         ns_body = {
           'description' => 'a test namespace',
           'name' => new_ns
         }
         resp = @fluid.post '/namespaces/test', :body => ns_body
-        assert_not_nil resp["id"]
-        ns_id = resp["id"]      # for later use
+        resp["id"].should_not be_nil
 
+        ns_id = resp["id"]      # for later use
         new_tag = UUIDTools::UUID.random_create
         tag_body = {
           'description' => 'a test tag',
@@ -178,24 +198,22 @@ class FluidinfoTest < Test::Unit::TestCase
         file = File.new(__FILE__).read
         path = "/objects/#{ns_id}/test/#{new_ns}/#{new_tag}"
         resp = @fluid.put path, :body => file, :mime => "text/ruby"
-        assert_equal File.new(__FILE__).read, @fluid.get(path)
+        File.new(__FILE__).read.should eq(@fluid.get(path).value)
 
         # now cleanup
         @fluid.delete "/tags/test/#{new_ns}/#{new_tag}"
         @fluid.delete "/namespaces/test/#{new_ns}"
       end
 
-      should "raise TypeError on malformed request" do
+      it "should raise TypeError on malformed request" do
         file = File.new(__FILE__)
-        assert_raise TypeError do
-          @fluid.put("/objects", :body => file)
-        end
+        expect {@fluid.put "/objects", :body => file}.to raise_error(TypeError)
       end
     end
   end
-  
-  context "private functions" do
-    setup do
+
+  describe "private functions" do
+    before(:each) do
       @fluid = Fluidinfo::Client.new
       def @fluid.test_build_payload(*args)
         build_payload(*args)
@@ -204,37 +222,40 @@ class FluidinfoTest < Test::Unit::TestCase
         build_url(*args)
       end
     end
-    
-    context "build_url" do
-      should "escape &'s in query tag-values" do
+
+    describe "build_url" do
+      it "escapes &'s in query tag-values" do
         query = "test/tag=\"1&2\""
-        assert_equal "https://fluiddb.fluidinfo.com/objects?query=test%2Ftag%3D%221%262%22",
-          @fluid.test_build_url("/objects", :query => query)
+        expected = "https://fluiddb.fluidinfo.com/objects?query=test%2Ftag%3D%221%262%22"
+        @fluid.test_build_url("/objects", :query => query).should eq(expected)
+
         query = "oreilly.com/title=\"HTML & CSS: The Good Parts\""
         tags = ["oreilly.com/isbn"]
-        assert_equal "https://fluiddb.fluidinfo.com/values?query=oreilly.com%2Ftitle%3D%22HTML+%26+CSS%3A+The+Good+Parts%22&tag=oreilly.com/isbn",
-          @fluid.test_build_url("/values", :query => query, :tags => tags)
+        expected = "https://fluiddb.fluidinfo.com/values?query=oreilly.com%2Ftitle%3D%22HTML+%26+CSS%3A+The+Good+Parts%22&tag=oreilly.com/isbn"
+        @fluid.test_build_url("/values",
+                              :query => query,
+                              :tags => tags).should eq(expected)
       end
 
-      should "escape &'s in about-values" do
+      it "escapes &'s in about-values" do
         about = "tom & jerry"
-        assert_equal "https://fluiddb.fluidinfo.com/about/tom+%26+jerry",
-          @fluid.test_build_url('/about/tom & jerry')
+        expected = "https://fluiddb.fluidinfo.com/about/tom+%26+jerry"
+        @fluid.test_build_url('/about/tom & jerry').should eq(expected)
       end
     end
 
-    context "build_payload" do
-      should "set proper mime-types" do
+    describe "build_payload" do
+      it "sets proper mime-types" do
         primitives = [1, 1.1, true, false, nil, ["1", "2", "hi"]]
         primitives.each do |p|
           h = @fluid.test_build_payload :body => p
-          assert_equal "application/vnd.fluiddb.value+json", h[:mime]
+          h[:mime].should eq("application/vnd.fluiddb.value+json")
         end
-        
+
         non_primitives = [[1, 2, 3], {"hi" => "there"}]
         non_primitives.each do |n|
           h = @fluid.test_build_payload :body => n
-          assert_equal "application/json", h[:mime]
+          h[:mime].should eq("application/json")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidinfo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,45 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-09 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-09-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &14319540 !ruby/object:Gem::Requirement
+  requirement: &70220778276580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *14319540
+  version_requirements: *70220778276580
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &14318660 !ruby/object:Gem::Requirement
+  requirement: &70220778275920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14318660
+  version_requirements: *70220778275920
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &14317480 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70220778275320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *14317480
+  version_requirements: *70220778275320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70220778274720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *70220778274720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14316120 !ruby/object:Gem::Requirement
+  requirement: &70220778274120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,40 +65,40 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14316120
+  version_requirements: *70220778274120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14314720 !ruby/object:Gem::Requirement
+  requirement: &70220778273520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *14314720
+  version_requirements: *70220778273520
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &14313480 !ruby/object:Gem::Requirement
+  name: uuidtools
+  requirement: &70220778272920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *14313480
+  version_requirements: *70220778272920
 - !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: &14304960 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &70220778272320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *14304960
+  version_requirements: *70220778272320
 description: This gem provides a simple interface to fluidinfo, built on top of the
   rest-client gem.
 email: gridaphobe@gmail.com
@@ -99,6 +109,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -108,9 +119,9 @@ files:
 - VERSION
 - fluidinfo.gemspec
 - lib/fluidinfo.rb
-- test/helper.rb
-- test/test_fluidinfo.rb
-has_rdoc: true
+- lib/fluidinfo/client.rb
+- lib/fluidinfo/response.rb
+- spec/fluidinfo_spec.rb
 homepage: http://github.com/gridaphobe/fluidinfo.rb
 licenses:
 - MIT
@@ -126,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -424493676000588461
+      hash: 3187277794314220845
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,10 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provides a simple interface to fluidinfo
-test_files:
-- test/helper.rb
-- test/test_fluidinfo.rb
+test_files: []

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'fluidinfo'
-
-class Test::Unit::TestCase
-end