smugmugapi 0.9.0 → 0.9.2

data/History.txt

@@ -1,4 +1,14 @@
+== 0.9.2 / 2007-12-04
+
+* Fixed "automatic" URL endpoint for 1.2.1 api
+* Added gzip support on http transport
+* Added sftp backup utility
+
+== 0.9.1 / 2007-12-03
+
+* Fixed a bug in xmlstruct processing
+  of "special" ids (ending in URL, etc)
+
 == 0.9.0 / 2007-12-03
 
 * Initial public release
-

data/lib/smugmug/core.rb

@@ -1,6 +1,9 @@
 require "rexml/document"
 require "uri"
 require "net/https"
+require "zlib"
+
+require "pp" if $DEBUG
 
 class SmugMugAPI
   class << self
@@ -21,7 +24,13 @@ class SmugMugAPI
     end
 
     def api_path
-      @url || "api.smugmug.com/hack/rest/#{api_version}/"
+      if @url
+        @url
+      elsif api_version == '1.2.1'
+        "api.smugmug.com/services/api/rest/#{api_version}/" 
+      else 
+        "api.smugmug.com/hack/rest/#{api_version}/"
+      end
     end
 
     def agent
@@ -44,7 +53,10 @@ class SmugMugAPI
       url = transport + "://" + api_path + "?" +
         params.map { |k,v| URI.encode("#{SmugMugAPI.camelize(k)}=#{v}") }.join("&")
       uri = URI.parse(url)
-      headers['User-Agent'] = agent
+      headers['User-Agent'] ||= agent
+      headers['Accept-Encoding'] ||= 'gzip, deflate'
+      
+      pp [:smugapi, params, headers, uri] if $DEBUG
       
       http = Net::HTTP.new(uri.host, uri.port)
       if transport == 'https'
@@ -60,9 +72,20 @@ class SmugMugAPI
     def parse_response(response)
       puts "HTTP #{response.code}: #{response.message}" if $DEBUG
       
-      raise SmugMugAPI::Error.new("HTTP #{response.code} on #{url}") unless response.code.to_i == 200
+      raise SmugMugAPI::Error.new("HTTP #{response.code}") unless response.code.to_i == 200
+
+      body = case response['content-encoding']
+        when 'gzip'
+          Zlib::GzipReader.new(StringIO.new(response.body)).read 
+        when 'deflate'
+          Zlib::Inflate.inflate(response.body)
+        when nil
+          response.body
+        else
+          raise "Unknown encoding #{response['content-encoding']}"
+      end
       
-      doc = REXML::Document.new(response.body)
+      doc = REXML::Document.new(body)
       if doc.root.attributes['stat'] != 'ok'
         err = doc.root.elements['/rsp/err']
         code = err.attributes['code']
@@ -81,7 +104,7 @@ class SmugMugAPI
       call(params, 'http')
     end
     
-    def call(params={}, transport = "http")
+    def call(params = {}, transport = "http")
       parse_response(get(params, {}, transport))
     end
   end

data/lib/smugmug/xmlstruct.rb

@@ -22,10 +22,7 @@ class SmugMugAPI
       when Fixnum
         key
       else
-        key = XMLStruct.camalize(key)
-        key = key.gsub(/ID$/i, "ID")
-        key = key.gsub(/EXIF/i, "EXIF")
-        key.gsub(/X(.?)Large/i) { "X#{$1}Large" }
+        SmugMugAPI.camelize(key)
       end
     end
     
@@ -37,6 +34,7 @@ class SmugMugAPI
         result
       else
         # key = XMLStruct.attrib_key(attrib)
+        # puts "Searching for #{key}"
         @xml.attributes[XMLStruct.attrib_key(attrib)]
       end
     end
@@ -68,7 +66,7 @@ class SmugMugAPI
     end
 
     def method_missing(*args)
-      method = XMLStruct.camalize(args.shift)
+      method = SmugMugAPI.camelize(args.shift)
       path = "#{method}"
       if node = @xml.elements[path]
         XMLStruct.new(node)
@@ -77,10 +75,6 @@ class SmugMugAPI
       end
     end
 
-    def self.camalize(str)
-      str.to_s.gsub(/(^|_)(.)/) { $2.upcase }
-    end
-
     def to_s
       @xml.to_s
     end

data/lib/smugmugapi.rb

@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), "smugmug/upload")
 require File.join(File.dirname(__FILE__), "smugmug/logon")
 
 class SmugMugAPI
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
   
   def initialize(base="smugmug")
     @base = base

data.tar.gz.sig

@@ -1,2 +1,5 @@
-2�e�3�鲌Ǡ��2#�v���r���8ܖz��1����C���z��<OW�a+��@�ɥ�XH�#	b�\���|JZ�x������4��QN���u���VԸ�"��7� I&���9��ؿ�޾����J����)�G���)��ݿ
-ø�b$#ٞ�����l+�8!�U��-t:���7w��K���r���(=L�+�
+���3�s�$	
+*P
+9�{!�4��\
+(�L*�m��N�xl���eX3�5#g�R��8����������"��W���]��o�ި5��%�F'P�O벋z�6^X��:���w�U��gT���ɦ!�R���'@�^#Fb|.
+��"���d��;�,�ܡ�*ޝ�*dx�S��Z/L!���ʬ��R�TY����^��%�M/c�Ż�P��P!�C*�t���/V�<�O{y

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smugmugapi
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2007-12-03 00:00:00 -05:00
+  version: 0.9.2
+date: 2007-12-05 00:00:00 -05:00
 summary: A very light wrapper around the SmugMug REST API
 require_paths: 
 - lib