geppetto 0.9.5 → 0.9.6

data/lib/geppetto/cli.rb

@@ -151,7 +151,7 @@ module Geppetto
     def generate_images
       users_hash = get_test_users
       say "Posting images for #{users_hash.size} users", :white
-      progress = ProgressBar.new("Images", users_hash.size)
+      progress = ProgressBar.new("Images", users_hash.size*2)
       users_hash.each{|user_hash|
         # Get this user's feed
         @graph = Facebook::GraphAPI.new(get_token_for_user_id(user_hash['id']))

data/lib/geppetto/version.rb

@@ -1,3 +1,3 @@
 module Geppetto
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/lib/geppetto.rb

@@ -1,7 +1,10 @@
 require 'geppetto/version'
+require 'geppetto/logging'
 require 'net/http'
+require 'koala'
+require 'logger'
 
-# Mokey patch to suppress 'warning: peer certificate won't be verified in this SSL session'
+# Monkey patch to suppress 'warning: peer certificate won't be verified in this SSL session'
 class Net::HTTP
   alias_method :old_initialize, :initialize
   def initialize(*args)
@@ -10,3 +13,92 @@ class Net::HTTP
     @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
   end
 end
+
+
+module Geppetto
+  def self.log(msg)
+    @@log ||=  Logger.new("geppetto.log", 'daily')
+    # Filterout client secret
+    match = msg.match(/.*client_secret=([a-z0-9]+)/)
+    msg.sub!(match[1], '[filtered]') if match
+    @@log.debug(msg)
+  end
+
+  # Define our own http service using Net::HTTP so we can log requests for debugging purpose
+  module NetHTTPService
+      # this service uses Net::HTTP to send requests to the graph
+      def self.included(base)
+        base.class_eval do
+          require "net/http" unless defined?(Net::HTTP)
+          require "net/https"
+          require "net/http/post/multipart"
+
+          include Koala::HTTPService
+
+          def self.make_request(path, args, verb, options = {})
+            # We translate args to a valid query string. If post is specified,
+            # we send a POST request to the given path with the given arguments.
+
+            # by default, we use SSL only for private requests
+            # this makes public requests faster
+            private_request = args["access_token"] || @always_use_ssl || options[:use_ssl]
+
+            # if the verb isn't get or post, send it as a post argument
+            args.merge!({:method => verb}) && verb = "post" if verb != "get" && verb != "post"
+
+            http = create_http(server(options), private_request, options)
+            http.use_ssl = true if private_request
+
+            result = http.start do |http|
+              Geppetto.log("#{verb.upcase} #{path} #{encode_params(args)}")
+              response, body = if verb == "post"
+                if params_require_multipart? args
+                  http.request Net::HTTP::Post::Multipart.new path, encode_multipart_params(args)
+                else
+                  http.post(path, encode_params(args))
+                end
+              else
+                http.get("#{path}?#{encode_params(args)}")
+              end
+              Geppetto.log("#{response.code.to_i} #{body}")
+              Koala::Response.new(response.code.to_i, body, response)
+            end
+          end
+
+          protected
+          def self.encode_params(param_hash)
+            # unfortunately, we can't use to_query because that's Rails, not Ruby
+            # if no hash (e.g. no auth token) return empty string
+            ((param_hash || {}).collect do |key_and_value|
+              key_and_value[1] = key_and_value[1].to_json if key_and_value[1].class != String
+              "#{key_and_value[0].to_s}=#{CGI.escape key_and_value[1]}"
+            end).join("&")
+          end
+        
+          def self.encode_multipart_params(param_hash)
+            Hash[*param_hash.collect do |key, value| 
+              [key, value.kind_of?(Koala::UploadableIO) ? value.to_upload_io : value]
+            end.flatten]
+          end
+
+          def self.create_http(server, private_request, options)
+            if options[:proxy]
+              proxy = URI.parse(options[:proxy])
+              http  = Net::HTTP.new(server, private_request ? 443 : nil,
+                                    proxy.host, proxy.port, proxy.user, proxy.password)
+            else
+              http = Net::HTTP.new(server, private_request ? 443 : nil)
+            end
+            if options[:timeout]
+              http.open_timeout = options[:timeout]
+              http.read_timeout = options[:timeout]
+            end
+            http
+          end
+        end
+      end
+  end
+end
+
+Koala.http_service = Geppetto::NetHTTPService
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geppetto
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Georges Auberger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: geppetto
 dependencies: 
 - !ruby/object:Gem::Dependency