fluidinfo 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/fluidinfo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluidinfo}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Seidel"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-04-03}
   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 = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/gridaphobe/fluidinfo.rb}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.7.1}
   s.summary = %q{Provides a simple interface to fluidinfo}
   s.test_files = [
     "test/helper.rb",

data/lib/fluidinfo.rb

@@ -5,16 +5,18 @@ require "base64"
 require "set"
 
 module Fluidinfo
-  ITERABLE_TYPES = Set.new [Array, Hash]
+  ITERABLE_TYPES     = Set.new [Array, Hash]
   SERIALIZABLE_TYPES = Set.new [NilClass, String, Fixnum, Float, Symbol,
-    TrueClass, FalseClass]
+                                TrueClass, FalseClass]
+  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
@@ -44,7 +46,11 @@ module Fluidinfo
     def get(path, options={})
       url = build_url path, options
       response = RestClient.get url, @headers
-      JSON.parse response
+      if JSON_TYPES.include? response.headers[:content_type]
+        JSON.parse response
+      else
+        response
+      end
     end
 
     ##
@@ -80,7 +86,8 @@ module Fluidinfo
     def put(path, options={})
       url = build_url path, options
       payload = build_payload options
-      headers = @headers.merge :content_type => payload[:mime]
+      headers = @headers.merge(:content_type   => payload[:mime],
+                               :content_length => payload[:size])
       RestClient.put url, payload[:body], headers
     end
 
@@ -95,53 +102,59 @@ module Fluidinfo
       # 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}"
+    ##
+    # 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
-          arr
-        end.join('&')
-        if args != ''
-          URI.escape "#{@instance}#{path}?#{args}"
         else
-          "#{@instance}#{path}"
+          arr << "#{key}=#{val}"
         end
+      arr
+      end.join('&')
+      if args != ''
+        URI.escape "#{@instance}#{path}?#{args}"
+      else
+        "#{@instance}#{path}"
       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 :)
-          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
+    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
-          raise TypeError, "You must supply the mime-type"
+          payload[:size] = payload[:body].size
         end
+        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
   end
-  
+
   def self.version
     # This was borrowed from the rest-client gem :)
     version_path = File.dirname(__FILE__) + "/../VERSION"

data/test/test_fluidinfo.rb

@@ -123,7 +123,7 @@ class FluidinfoTest < Test::Unit::TestCase
     end
 
     context "/tags" do
-      should "update tag values" do
+      should "update primitive tag values" do
         new_ns = UUIDTools::UUID.random_create
         ns_body = {
           'description' => 'a test namespace',
@@ -154,6 +154,40 @@ class FluidinfoTest < Test::Unit::TestCase
         @fluid.delete "/tags/test/#{new_ns}/#{new_tag}"
         @fluid.delete "/namespaces/test/#{new_ns}"
       end
+
+      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
+
+        new_tag = UUIDTools::UUID.random_create
+        tag_body = {
+          'description' => 'a test tag',
+          'name' => new_tag,
+          'indexed' => false
+        }
+        resp = @fluid.post "/tags/test/#{new_ns}", :body => tag_body
+        file = File.new(__FILE__)
+        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)
+
+        # now cleanup
+        @fluid.delete "/tags/test/#{new_ns}/#{new_tag}"
+        @fluid.delete "/namespaces/test/#{new_ns}"
+      end
+
+      should "raise TypeError on malformed request" do
+        file = File.new(__FILE__)
+        assert_raise TypeError do
+          @fluid.put("/objects", :body => file)
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluidinfo
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Eric Seidel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
-default_executable: 
+date: 2011-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -30,8 +29,8 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  name: rest-client
   version_requirements: *id001
+  name: rest-client
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -46,8 +45,8 @@ dependencies:
         - 8
         - 2
         version: 0.8.2
-  name: yajl-ruby
   version_requirements: *id002
+  name: yajl-ruby
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -60,8 +59,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
   version_requirements: *id003
+  name: shoulda
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -76,8 +75,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
   version_requirements: *id004
+  name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -92,8 +91,8 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
   version_requirements: *id005
+  name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -106,8 +105,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
   version_requirements: *id006
+  name: rcov
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -122,8 +121,8 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  name: uuidtools
   version_requirements: *id007
+  name: uuidtools
   prerelease: false
   type: :development
 description: This gem provides a simple interface to fluidinfo, built on top of the rest-client gem.
@@ -147,7 +146,6 @@ files:
 - lib/fluidinfo.rb
 - test/helper.rb
 - test/test_fluidinfo.rb
-has_rdoc: true
 homepage: http://github.com/gridaphobe/fluidinfo.rb
 licenses: 
 - MIT
@@ -177,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: Provides a simple interface to fluidinfo