panda 0.6.2 → 0.6.3

data/README.md

@@ -104,6 +104,17 @@ To do this, a method `signed_params()` is supported:
     #  'some_param' => 'some_value',
     #  'timestamp' => '2010-02-26T15:04:27.039620'}
 
+## Hash or JSON
+Since Panda 0.6, PandaGem returns a Hash by default. If you want PandaGem to return JSON do the following:
+
+    Panda.connect!({
+      :cloud_id => 'cloud_id',
+      :access_key => 'access_key',
+      :secret_key => 'secret_key',
+      :format => 'json'
+    })
+
+
 Copyright
 ---------
 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/panda/panda.rb

@@ -1,5 +1,5 @@
 require 'restclient'
-require 'json'
+require 'json' unless defined?(ActiveSupport::JSON)
 
 class Panda
   
@@ -56,10 +56,10 @@ class Panda
       @format = "hash"
       
       if auth_params.class == String
-        self.format = options["format"]
+        self.format = options[:format] || options["format"]
         init_from_url(auth_params)
       else
-        self.format = auth_params["format"]
+        self.format = auth_params[:format] || auth_params["format"]
         init_from_hash(auth_params)
       end
       
@@ -69,7 +69,7 @@ class Panda
     def format=(ret_format)
       if ret_format 
         raise "Format unknown" if !["json", "hash"].include?(ret_format.to_s)
-        @format = ret_format
+        @format = ret_format.to_s
       end
     end
     
@@ -147,7 +147,11 @@ class Panda
       
       def format_to(response)
         if self.format == "json"
-          return response
+          response
+
+        elsif defined?(ActiveSupport::JSON)
+          ActiveSupport::JSON.decode(response)
+
         else
           JSON.parse(response)
         end
@@ -180,4 +184,4 @@ class Panda
         @prefix     = params["prefix_url"]  || "v#{@api_version}"
       end
   end
-end
+end

data/panda.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-06-11}
+  s.date = %q{2010-07-01}
   s.description = %q{Panda Client}
   s.email = %q{info@pandastream.com}
   s.extra_rdoc_files = [

data/spec/panda_spec.rb

@@ -116,6 +116,14 @@ describe Panda do
    it_should_behave_like "Connected"
   end
 
+  describe "Panda.connect with symbols" do
+    before(:each) do
+      @panda = Panda.connect!({:access_key => "my_access_key", :secret_key => "my_secret_key", :api_host => "myapihost", :api_port => 85, :cloud_id => 'my_cloud_id', :format => "json" })
+    end
+   it_should_behave_like "Connected"
+  end
+
+
   describe "Panda.connect with PANDASTREAM_URL" do
      before(:each) do
        Panda.connect!('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id', "format" => "json")
@@ -134,8 +142,6 @@ describe Panda do
   describe "Using hash as a return format" do
     
     before(:each) do
-      puts "here"
-      
       @panda = Panda::Connection.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
     end
     
@@ -145,6 +151,22 @@ describe Panda do
     end
     
   end
+
+  describe "ActiveSupport::JSON parsing" do
+
+    it "should use active support if it has been defined" do
+      @panda = Panda::Connection.new('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id')
+      stub_http_request(:get, "myapihost:85/v2/videos?timestamp=2009-11-04T17%3A54%3A11%2B00%3A00&signature=CxSYPM65SeeWH4CE%2FLcq7Ny2NtwxlpS8QOXG2BKe4p8%3D&access_key=my_access_key&cloud_id=my_cloud_id").to_return(:body => "abc")
+
+
+      module ActiveSupport
+        class JSON; end
+      end
+
+      ActiveSupport::JSON.should_receive(:decode).with("abc").and_return("blah")
+      @panda.get("/videos").should == "blah"
+    end
+  end
   
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - New Bamboo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +01:00
+date: 2010-07-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency