fluidinfo 0.3.1 → 0.4.0

data/README.rdoc

@@ -14,14 +14,19 @@ For now, check out Fluidinfo's extensive
 
 
 == Contributing to fluidinfo
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+
+* Check out the latest master to make sure the feature hasn't been implemented 
+  or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it 
+  and/or contributed it
 * Fork the project
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Make sure to add tests for it. This is important so I don't break it in a 
+  future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want 
+  to have your own version, or is otherwise necessary, that is fine, but please 
+  isolate to its own commit so I can cherry-pick around it.
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/fluidinfo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluidinfo}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Seidel"]
-  s.date = %q{2011-04-03}
+  s.date = %q{2011-04-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.extra_rdoc_files = [

data/lib/fluidinfo.rb

@@ -5,12 +5,12 @@ require "base64"
 require "set"
 
 module Fluidinfo
-  ITERABLE_TYPES     = Set.new [Array, Hash]
-  SERIALIZABLE_TYPES = Set.new [NilClass, String, Fixnum, Float, Symbol,
-                                TrueClass, FalseClass]
-  JSON_TYPES         = Set.new ["application/json",
-                                "application/vnd.fluiddb.value+json"]
-  
+  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'
@@ -24,13 +24,14 @@ module Fluidinfo
         @instance = @@MAIN
       end
       @headers = {
-        :accept => "*/*"
+        :accept => "*/*",
+        :user_agent => "fluidinfo.rb/#{Fluidinfo.version}"
       }
     end
 
     def login(user, pass)
-      auth = "Basic " + (Base64.encode64 "#{user}:#{pass}").strip
-      @headers[:authorization] = auth
+      @headers[:authorization] = "Basic " + 
+        (Base64.encode64 "#{user}:#{pass}").strip
     end
 
     def logout
@@ -58,7 +59,7 @@ module Fluidinfo
     # of a tag
     def head(path)
       path = @instance + path
-      RestClient.head path
+      RestClient.head path, @headers
     end
 
     ##
@@ -73,7 +74,7 @@ module Fluidinfo
         headers = @headers.merge :content_type => payload[:mime]
         JSON.parse(RestClient.post path, payload[:body], headers)
       else
-        JSON.parse(RestClient.post path, nil)
+        JSON.parse(RestClient.post path, nil, @headers)
       end
     end
 
@@ -82,7 +83,8 @@ module Fluidinfo
     #
     # +options[:body]+ contains the request payload.
     #
-    # +options[:mime]+ contains the MIME-type unless the payload is JSON-encodable
+    # +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
@@ -95,8 +97,8 @@ module Fluidinfo
     # 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
+    # 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
@@ -140,18 +142,34 @@ module Fluidinfo
         else
           payload[:size] = payload[:body].size
         end
-        payload
-      elsif ITERABLE_TYPES.include? payload[:body].class
+      elsif payload[:body].is_a? Hash
         payload[:body] = JSON.dump payload[:body]
         payload[:mime] = "application/json"
-        payload
-      elsif SERIALIZABLE_TYPES.include? payload[:body].class
+      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]
-        payload[:mime] = "application/vnd.fluiddb.value+json"
-        payload
       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
 

data/test/test_fluidinfo.rb

@@ -151,8 +151,11 @@ class FluidinfoTest < Test::Unit::TestCase
         end
 
         # now cleanup
-        @fluid.delete "/tags/test/#{new_ns}/#{new_tag}"
-        @fluid.delete "/namespaces/test/#{new_ns}"
+        response = @fluid.delete "/tags/test/#{new_ns}/#{new_tag}"
+        assert_equal 204, response.code
+      
+        response = @fluid.delete "/namespaces/test/#{new_ns}"
+        assert_equal 204, response.code
       end
 
       should "update opaque tag values" do
@@ -190,4 +193,29 @@ class FluidinfoTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "private functions" do
+    setup do
+      @fluid = Fluidinfo::Client.new
+      def @fluid.test_build_payload(*args)
+        build_payload(*args)
+      end
+    end
+    
+    context "build_payload" do
+      should "set 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]
+        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]
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluidinfo
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Eric Seidel
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 Z
+date: 2011-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +29,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  version_requirements: *id001
   name: rest-client
   prerelease: false
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +45,12 @@ dependencies:
         - 8
         - 2
         version: 0.8.2
-  version_requirements: *id002
   name: yajl-ruby
   prerelease: false
   type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
   name: shoulda
   prerelease: false
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +75,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id004
   name: bundler
   prerelease: false
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,12 +91,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id005
   name: jeweler
   prerelease: false
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +105,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
   name: rcov
   prerelease: false
   type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,10 +121,10 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  version_requirements: *id007
   name: uuidtools
   prerelease: false
   type: :development
+  requirement: *id007
 description: This gem provides a simple interface to fluidinfo, built on top of the rest-client gem.
 email: gridaphobe@gmail.com
 executables: []