fluidinfo 0.2.2 → 0.3.0

data/Gemfile

@@ -3,8 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "rest-client", ">= 1.6.1"
-gem "json", ">= 1.5.1"
-gem "crack"
+gem "yajl-ruby", ">= 0.8.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,13 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    crack (0.1.8)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.5.1)
     mime-types (1.16)
     rake (0.8.7)
     rcov (0.9.9)
@@ -15,16 +13,16 @@ GEM
       mime-types (>= 1.16)
     shoulda (2.11.3)
     uuidtools (2.1.2)
+    yajl-ruby (0.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  crack
   jeweler (~> 1.5.2)
-  json (>= 1.5.1)
   rcov
   rest-client (>= 1.6.1)
   shoulda
   uuidtools (>= 2.1.2)
+  yajl-ruby (>= 0.8.2)

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/fluidinfo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluidinfo}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Seidel"]
-  s.date = %q{2011-03-22}
+  s.date = %q{2011-03-23}
   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.extra_rdoc_files = [
@@ -44,8 +44,7 @@ Gem::Specification.new do |s|
 
     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<json>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<crack>, [">= 0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.8.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -53,8 +52,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<uuidtools>, [">= 2.1.2"])
     else
       s.add_dependency(%q<rest-client>, [">= 1.6.1"])
-      s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<crack>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0.8.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -63,8 +61,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rest-client>, [">= 1.6.1"])
-    s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<crack>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0.8.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/fluidinfo.rb

@@ -1,10 +1,14 @@
 require "rest-client"
 require "uri"
-require "json"
+require "yajl/json_gem"
 require "base64"
-require "crack/json"
+require "set"
 
 module Fluidinfo
+  ITERABLE_TYPES = Set.new [Array, Hash]
+  SERIALIZABLE_TYPES = Set.new [NilClass, String, Fixnum, Float, Symbol,
+    TrueClass, FalseClass]
+  
   class Client
     # The main fluidinfo instance.
     @@MAIN    = 'https://fluiddb.fluidinfo.com'
@@ -38,26 +42,9 @@ module Fluidinfo
     # consult the {Fluidinfo API documentation}[api.fluidinfo.com] for a list of
     # appropriate options
     def get(path, options={})
-      path = @instance + path
-      args = ''
-      options.each do |key, val|
-        if key == :tags
-          val.each do |tag|
-            args += "&tag=#{URI.escape tag.to_s}"
-          end
-        else
-          args += "&#{URI.escape key.to_s}=#{URI.escape val.to_s}"
-        end
-        args[0] = '?'
-      end
-      path += args
-      response = RestClient.get path, @headers
-      begin
-        JSON.load response.to_str
-      rescue JSON::ParserError
-        # this should mean that fluidinfo returned a non-hash/array primitive
-        Crack::JSON.parse response.to_str
-      end
+      url = build_url path, options
+      response = RestClient.get url, @headers
+      JSON.parse response
     end
 
     ##
@@ -76,11 +63,9 @@ module Fluidinfo
     def post(path, options={})
       path = @instance + path
       if options[:body]
-        body = options[:body]
-        mime = "application/json"
-        body = JSON.dump options[:body]
-        headers = @headers.merge :content_type => mime
-        JSON.parse(RestClient.post path, body, headers)
+        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)
       end
@@ -93,29 +78,10 @@ module Fluidinfo
     #
     # +options[:mime]+ contains the MIME-type unless the payload is JSON-encodable
     def put(path, options={})
-      path = @instance + path
-      if options[:query]
-        query = URI.escape options[:query]
-        path += "?query=#{query}"
-      end
-      body = options[:body]
-      if options[:mime]
-        mime = options[:mime]
-      else
-        mime = "application/json"
-        begin
-          body = JSON.dump options[:body]
-        rescue JSON::GeneratorError
-          if options[:body] == nil
-            body = "null"
-          else
-            body = options[:body].to_s
-          end
-        end
-      end
-      # nothing returned in response body for PUT
-      headers = @headers.merge :content_type => mime
-      RestClient.put path, body, headers
+      url = build_url path, options
+      payload = build_payload options
+      headers = @headers.merge :content_type => payload[:mime]
+      RestClient.put url, payload[:body], headers
     end
 
     ##
@@ -125,19 +91,62 @@ module Fluidinfo
     # consult the {Fluidinfo API documentation}[api.fluidinfo.com] for a list of
     # appropriate options
     def delete(path, options={})
-      path = @instance + path
-      if options[:query]
-        query = URI.escape options[:query]
-        path += "?query=#{query}"
+      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}=#{val}"
+          end
+          arr
+        end.join('&')
+        if args != ''
+          URI.escape "#{@instance}#{path}?#{args}"
+        else
+          "#{@instance}#{path}"
+        end
       end
-      if options[:tags]
-        options[:tags].each do |tag|
-          tag = URI.escape tag
-          path += "&tag=#{tag}"
+      
+      ##
+      # 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 :)
+          payload
+        elsif ITERABLE_TYPES.include? payload[:body].class
+          payload[:body] = JSON.dump payload[:body]
+          payload[:mime] = "application/json"
+          payload
+        elsif SERIALIZABLE_TYPES.include? payload[:body].class
+          payload[:body] = JSON.dump payload[:body]
+          payload[:mime] = "application/vnd.fluiddb.value+json"
+          payload
+        else
+          raise TypeError, "You must supply the mime-type"
         end
       end
-      # nothing returned in response body for DELETE
-      RestClient.delete path, @headers
-    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/test/test_fluidinfo.rb

@@ -73,6 +73,24 @@ class FluidinfoTest < Test::Unit::TestCase
                                           :returnNamespaces => true)
       end
     end
+    
+    context "/values" do
+      should "retrieve a set of tags" do
+        expected = {
+          "results" => {
+            "id"      => {
+              "e034d8c0-a2e4-4094-895b-3a8065f9696e" => {
+                "fluiddb/users/username" => { "value" => "gridaphobe" },
+                "fluiddb/about" => { "value" => "Object for the user named gridaphobe"}
+              }
+            }
+          }
+        }
+        assert_equal expected, @fluid.get("/values",
+                              :query => 'fluiddb/users/username="gridaphobe"',
+                              :tags => ['fluiddb/users/username', 'fluiddb/about'])
+      end
+    end
   end
 
   context "POST" do
@@ -126,9 +144,9 @@ class FluidinfoTest < Test::Unit::TestCase
         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 = [1, 1.1, "foo", true, nil, [1, '2', 3]]
         primitives.each do |p|
-          resp = @fluid.put path, :body => p
+          resp = @fluid.put(path, :body => p)
           assert_equal p, @fluid.get(path)
         end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Eric Seidel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
+date: 2011-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,13 +40,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 59
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  name: json
+        - 0
+        - 8
+        - 2
+        version: 0.8.2
+  name: yajl-ruby
   version_requirements: *id002
   prerelease: false
   type: :runtime
@@ -60,26 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: crack
-  version_requirements: *id003
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   name: shoulda
-  version_requirements: *id004
+  version_requirements: *id003
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,11 +77,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id005
+  version_requirements: *id004
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,11 +93,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id006
+  version_requirements: *id005
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +107,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id007
+  version_requirements: *id006
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
         - 2
         version: 2.1.2
   name: uuidtools
-  version_requirements: *id008
+  version_requirements: *id007
   prerelease: false
   type: :development
 description: This gem provides a simple interface to fluidinfo, built on top of the rest-client gem.