panda 1.1.0 → 1.2.0

data/Gemfile

@@ -6,5 +6,5 @@ gem "json"
 
 gem "jeweler"
 gem "rake"
-gem "rspec"
-gem "webmock"
+gem "rspec", "1.3.1"
+gem "webmock", "1.6.1"

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/panda/api_authentication.rb

@@ -26,11 +26,9 @@ module Panda
 
     # param keys should be strings, not symbols please. return a string joined
     # by & in canonical order. 
-    def self.canonical_querystring(params)
-      # I hope this built-in sort sorts by byte order, that's what's required. 
-      params.keys.sort.collect {|key| [url_encode(key), url_encode(params[key])].join("=") }.join("&")
+    def self.canonical_querystring(h)
+      _recursion(h).join('&')
     end
-
     # Turns a hash into a query string, returns the query string.
     # url-encodes everything to Amazon's specifications. 
     def self.hash_to_query(hash)
@@ -42,5 +40,26 @@ module Panda
     def self.url_encode(string)
       CGI.escape(string.to_s).gsub("%7E", "~").gsub("+", "%20")
     end
+
+    def self._recursion(h, base = nil)
+      pairs = []
+      h.keys.sort.each do |key|
+        value = h[key]
+        if value.kind_of? Hash
+          pairs += _recursion(value, key)
+        else
+          new_pair = nil
+          if base
+            new_pair = "#{base}[#{url_encode(key)}]=#{url_encode(value)}"
+          else
+            new_pair = "#{url_encode(key)}=#{url_encode(value)}"
+          end
+          pairs << new_pair
+        end
+      end
+      pairs
+    end
+    
+    
   end
 end

data/lib/panda/base.rb

@@ -13,7 +13,7 @@ module Panda
         find(this_id)
       end
 
-      def end_class_name
+      def sti_name
         "#{name.split('::').last}"
       end
     end

data/lib/panda/modules/builders.rb

@@ -22,7 +22,7 @@ module Panda
 
       private
       def build_resource(attributes)
-        Panda::const_get("#{end_class_name}").new(attributes.merge(:cloud_id => cloud.id))
+        Panda::const_get("#{sti_name}").new(attributes.merge(:cloud_id => cloud.id))
       end
     end
 

data/lib/panda/modules/finders.rb

@@ -15,7 +15,7 @@ module Panda
 
       def find_by_path(url, map={})
         object = find_object_by_path(url, map)
-        kclass = Panda::const_get("#{end_class_name}")
+        kclass = Panda::const_get("#{sti_name}")
 
         if object.is_a?(Array)
           object.map{|o| kclass.new(o)}

data/lib/panda/modules/router.rb

@@ -10,7 +10,7 @@ module Panda
     module ClassMethods
 
       def resource_path
-        @url || "/#{end_class_name.downcase}s"
+        @url || "/#{sti_name.downcase}s"
       end
 
       def match(url)

data/lib/panda/proxies/proxy.rb

@@ -17,8 +17,8 @@ module Panda
       @parent.is_a?(Cloud) ? @parent : @parent.cloud
     end
 
-    def end_class_name
-      klass.end_class_name
+    def sti_name
+      klass.sti_name
     end
 
   end

data/lib/panda/proxies/scope.rb

@@ -81,7 +81,7 @@ module Panda
       end
 
       def parent_relation_name
-        "#{@parent.class.end_class_name.downcase}_id"
+        "#{@parent.class.sti_name.downcase}_id"
       end
   end
 end

data/lib/panda/resources/resource.rb

@@ -19,7 +19,7 @@ module Panda
 
       # delegate to the scope if the method exists
       def method_missing(method_symbol, *args, &block)
-        scope = Panda::const_get("#{end_class_name}Scope").new(self)
+        scope = Panda::const_get("#{sti_name}Scope").new(self)
         if scope.respond_to?(method_symbol)
            scope.send(method_symbol, *args, &block)
         else

data/panda.gemspec

@@ -1,74 +1,72 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-10-19}
+  s.date = %q{2010-11-25}
   s.description = %q{Panda Client}
   s.email = %q{info@pandastream.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/panda.rb",
-     "lib/panda/api_authentication.rb",
-     "lib/panda/base.rb",
-     "lib/panda/connection.rb",
-     "lib/panda/error.rb",
-     "lib/panda/modules/associations.rb",
-     "lib/panda/modules/builders.rb",
-     "lib/panda/modules/cloud_connection.rb",
-     "lib/panda/modules/finders.rb",
-     "lib/panda/modules/router.rb",
-     "lib/panda/modules/short_status.rb",
-     "lib/panda/modules/updatable.rb",
-     "lib/panda/panda.rb",
-     "lib/panda/proxies/encoding_scope.rb",
-     "lib/panda/proxies/profile_scope.rb",
-     "lib/panda/proxies/proxy.rb",
-     "lib/panda/proxies/scope.rb",
-     "lib/panda/proxies/video_scope.rb",
-     "lib/panda/resources/cloud.rb",
-     "lib/panda/resources/encoding.rb",
-     "lib/panda/resources/profile.rb",
-     "lib/panda/resources/resource.rb",
-     "lib/panda/resources/video.rb",
-     "panda.gemspec",
-     "spec/cloud_spec.rb",
-     "spec/encoding_spec.rb",
-     "spec/heroku_spec.rb",
-     "spec/panda_spec.rb",
-     "spec/profile_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/video_spec.rb"
+    "Gemfile",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/panda.rb",
+    "lib/panda/api_authentication.rb",
+    "lib/panda/base.rb",
+    "lib/panda/connection.rb",
+    "lib/panda/error.rb",
+    "lib/panda/modules/associations.rb",
+    "lib/panda/modules/builders.rb",
+    "lib/panda/modules/cloud_connection.rb",
+    "lib/panda/modules/finders.rb",
+    "lib/panda/modules/router.rb",
+    "lib/panda/modules/short_status.rb",
+    "lib/panda/modules/updatable.rb",
+    "lib/panda/panda.rb",
+    "lib/panda/proxies/encoding_scope.rb",
+    "lib/panda/proxies/profile_scope.rb",
+    "lib/panda/proxies/proxy.rb",
+    "lib/panda/proxies/scope.rb",
+    "lib/panda/proxies/video_scope.rb",
+    "lib/panda/resources/cloud.rb",
+    "lib/panda/resources/encoding.rb",
+    "lib/panda/resources/profile.rb",
+    "lib/panda/resources/resource.rb",
+    "lib/panda/resources/video.rb",
+    "panda.gemspec",
+    "spec/cloud_spec.rb",
+    "spec/encoding_spec.rb",
+    "spec/heroku_spec.rb",
+    "spec/panda_spec.rb",
+    "spec/profile_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/video_spec.rb"
   ]
   s.homepage = %q{http://github.com/newbamboo/panda_gem}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Panda Client}
   s.test_files = [
     "spec/cloud_spec.rb",
-     "spec/encoding_spec.rb",
-     "spec/heroku_spec.rb",
-     "spec/panda_spec.rb",
-     "spec/profile_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/video_spec.rb"
+    "spec/encoding_spec.rb",
+    "spec/heroku_spec.rb",
+    "spec/panda_spec.rb",
+    "spec/profile_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/video_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -76,15 +74,36 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ruby-hmac>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>, ["= 1.3.1"])
+      s.add_runtime_dependency(%q<webmock>, ["= 1.6.1"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4"])
       s.add_runtime_dependency(%q<json>, [">= 1.2"])
     else
+      s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 1.3.1"])
+      s.add_dependency(%q<webmock>, ["= 1.6.1"])
       s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_dependency(%q<rest-client>, [">= 1.4"])
       s.add_dependency(%q<json>, [">= 1.2"])
     end
   else
+    s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 1.3.1"])
+    s.add_dependency(%q<webmock>, ["= 1.6.1"])
     s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
     s.add_dependency(%q<rest-client>, [">= 1.4"])
     s.add_dependency(%q<json>, [">= 1.2"])

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'spec'
 require 'spec/autorun'
 
 require 'webmock/rspec'
-include WebMock
+include WebMock::API
 
 def hputs(*args)
   puts ERB::Util.html_escape(args.join("\n")).gsub(/\r?\n/, '<br/>') + '<br/>'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +01:00
+date: 2010-11-25 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +31,115 @@ dependencies:
         - 2
         version: 0.3.2
   type: :runtime
+  name: ruby-hmac
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
   name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: json
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: jeweler
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: rake
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :runtime
+  name: rspec
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
+  type: :runtime
+  name: webmock
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
+        version: 0.3.2
+  type: :runtime
+  name: ruby-hmac
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +150,11 @@ dependencies:
         - 4
         version: "1.4"
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
+  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,7 +165,9 @@ dependencies:
         - 2
         version: "1.2"
   type: :runtime
-  version_requirements: *id003
+  name: json
+  prerelease: false
+  version_requirements: *id010
 description: Panda Client
 email: info@pandastream.com
 executables: []
@@ -74,7 +178,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -117,8 +220,8 @@ homepage: http://github.com/newbamboo/panda_gem
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC