fluidinfo 0.4.0 → 0.4.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.2@fluidinfo.rb

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/fluidinfo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluidinfo}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Seidel"]
-  s.date = %q{2011-04-09}
+  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.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -32,7 +33,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.7.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Provides a simple interface to fluidinfo}
   s.test_files = [
     "test/helper.rb",

data/lib/fluidinfo.rb

@@ -1,5 +1,6 @@
 require "rest-client"
 require "uri"
+require "cgi"
 require "yajl/json_gem"
 require "base64"
 require "set"
@@ -13,15 +14,15 @@ module Fluidinfo
 
   class Client
     # The main fluidinfo instance.
-    @@MAIN    = 'https://fluiddb.fluidinfo.com'
+    MAIN    = 'https://fluiddb.fluidinfo.com'
     # The sandbox instance, test your code here.
-    @@SANDBOX = 'https://sandbox.fluidinfo.com'
+    SANDBOX = 'https://sandbox.fluidinfo.com'
 
     def initialize(instance=:main)
       if instance == :sandbox
-        @instance = @@SANDBOX
+        @instance = SANDBOX
       else
-        @instance = @@MAIN
+        @instance = MAIN
       end
       @headers = {
         :accept => "*/*",
@@ -119,12 +120,17 @@ module Fluidinfo
             arr << "tag=#{tag}"
           end
         else
-          arr << "#{key}=#{val}"
+          arr << "#{key}=#{CGI.escape val.to_s}"
         end
-      arr
+        arr
       end.join('&')
+      # fix for /about API
+      if path.start_with? '/about/'
+        about = path[7..-1]
+        path = "/about/#{CGI.escape about}"
+      end
       if args != ''
-        URI.escape "#{@instance}#{path}?#{args}"
+        "#{@instance}#{path}?#{args}"
       else
         "#{@instance}#{path}"
       end

data/test/test_fluidinfo.rb

@@ -175,7 +175,7 @@ class FluidinfoTest < Test::Unit::TestCase
           'indexed' => false
         }
         resp = @fluid.post "/tags/test/#{new_ns}", :body => tag_body
-        file = File.new(__FILE__)
+        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)
@@ -200,8 +200,29 @@ class FluidinfoTest < Test::Unit::TestCase
       def @fluid.test_build_payload(*args)
         build_payload(*args)
       end
+      def @fluid.test_build_url(*args)
+        build_url(*args)
+      end
     end
     
+    context "build_url" do
+      should "escape &'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)
+        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)
+      end
+
+      should "escape &'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')
+      end
+    end
+
     context "build_payload" do
       should "set proper mime-types" do
         primitives = [1, 1.1, true, false, nil, ["1", "2", "hi"]]

metadata

@@ -1,141 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fluidinfo
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Eric Seidel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-06-09 00:00:00.000000000 -04:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &14319540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
-  name: rest-client
-  prerelease: false
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14319540
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &14318660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.2
-  name: yajl-ruby
-  prerelease: false
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: shoulda
   prerelease: false
+  version_requirements: *14318660
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &14317480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14317480
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &14316120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  prerelease: false
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14316120
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &14314720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  name: jeweler
-  prerelease: false
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
   prerelease: false
+  version_requirements: *14314720
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &14313480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14313480
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &14304960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2
-  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.
+  prerelease: false
+  version_requirements: *14304960
+description: This gem provides a simple interface to fluidinfo, built on top of the
+  rest-client gem.
 email: gridaphobe@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -146,39 +110,35 @@ files:
 - lib/fluidinfo.rb
 - test/helper.rb
 - test/test_fluidinfo.rb
+has_rdoc: true
 homepage: http://github.com/gridaphobe/fluidinfo.rb
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -424493676000588461
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provides a simple interface to fluidinfo
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_fluidinfo.rb