infomeme_client 0.2.6 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.8

data/infomeme_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{infomeme_client}
-  s.version = "0.2.6"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infomeme Ltd."]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-04-26}
   s.description = %q{A RubyGem for implementing both Infomeme client and meme applications.
  More coming soon...}
   s.email = %q{infomeme@infomeme.com}
@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://api.infomeme.com}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{A RubyGem for implementing both Infomeme client and meme applications.}
   s.test_files = [
     "test/helper.rb",

data/lib/infomeme_client/communication.rb

@@ -1,75 +1,77 @@
 module InfomemeClient::Communication
-    def get(path, headers = {})
-	request(:get, path, headers)
+  def get(path, headers = {})
+    request(:get, path, headers)
+  end
+  
+  def post(path, body = "", headers = {})
+    request(:post, path, body, headers)
+  end
+  
+  def put(path, body = "", headers = {})
+    request(:put, path, body, headers)
+  end
+  
+  def request(method, path, *args)
+    token_request(token, method, path, *args)
+  end
+  
+  def handle_response(method, path, *args, &block)
+    response = request(method, path, *args)
+    response.raise_error
+    if block_given?
+      if block.arity == 1
+        yield response
+      else
+        yield unless response.error?
+      end
+    else
+      response
     end
-
-    def post(path, body = "", headers = {})
-	request(:post, path, body, headers)
+  end
+  
+  def extract_from_response(extract, method, path, *args)
+    handle_response(method, path, *args) do |resp|
+      resp.extract(extract) unless resp.error?
     end
-
-    def put(path, body = "", headers = {})
-	request(:put, path, body, headers)
+  end
+  
+  def extract_or_response(extract, method, path, options, headers = {})
+    no_extract = options[:no_extract] || false
+    options.delete(:no_extract)
+    if [:put, :post].include?(method.to_sym)
+      args = [method, path, options, headers]
+    else
+      args = [method, finalize_get_url(path, options), headers]
     end
-
-    def request(method, path, *args)
-	token_request(token, method, path, *args)
+    if no_extract
+      handle_response(*args)
+    else
+      extract_from_response(*args.unshift(extract))
     end
-
-    def handle_response(method, path, *args, &block)
-	response = request(method, path, *args)
-	response.raise_error
-	if block_given?
-	    if block.arity == 1
-		yield response
-	    else
-		yield unless response.error?
-	    end
-	else
-	    response
-	end
+  end
+  
+  private
+  def token_request(token, method, path, *args)
+    body = [:post, :put].include?(method.to_sym) ? (args.shift || {}) : {}
+    headers = args.shift || {}
+    headers.store("Accept", "application/json") #override to use json
+    if [:post, :put].include?(method.to_sym) && (! headers.key?("Content-Type") || headers["Content-Type"] == "application/json")
+      body = body.to_json unless body.is_a?(String)
+      headers.store("Content-Type", "application/json")
     end
-
-    def extract_from_response(extract, method, path, *args)
-	handle_response(method, path, *args) do |resp|
-	    resp.extract(extract) unless resp.error?
-	end
+    args.unshift headers
+    args.unshift body if [:post, :put].include?(method.to_sym)
+    begin
+      resp = token.request(method, path, *args).body
+      InfomemeClient::Response.new JSON.parse(resp)
+    rescue => e
+      InfomemeClient::Response.new e
     end
-
-    def extract_or_response(extract, method, path, options, headers = {})
-	no_extract = options[:no_extract] || false
-	options.delete(:no_extract)
-	if [:put, :post].include?(method.to_sym)
-	    args = [method, path, options, headers]
-	else
-	    args = [method, finalize_get_url(path, options), headers]
-	end
-	if no_extract
-	    handle_response *args
-	else
-	    extract_from_response *args.unshift(extract)
-	end
-    end
-
-    private
-	def token_request(token, method, path, *args)
-	    body = [:post, :put].include?(method.to_sym) ? (args.shift || {}) : {}
-	    headers = args.shift || {}
-	    headers.store("Accept", "application/json") #override to use json
-	    if [:post, :put].include?(method.to_sym) && (! headers.key?("Content-Type") || headers["Content-Type"] == "application/json")
-		body = body.to_json unless body.is_a?(String)
-		headers.store("Content-Type", "application/json")
-	    end
-	    args.unshift headers
-	    args.unshift body if [:post, :put].include?(method.to_sym)
-	    begin
-		resp = token.request(method, path, *args).body
-		InfomemeClient::Response.new JSON.parse(resp)
-	    rescue => e
-		InfomemeClient::Response.new e
-	    end
-	end
-
-	def finalize_get_url(url, params)
-	    url + (url.include?("?") ? "&" : "?") + params.collect {|key, val| "#{key.to_s}=#{CGI.escape(val.to_s)}"}.join("&")
-	end
+  end
+  
+  def finalize_get_url(url, params)
+    url ||= ""
+    url + (url.include?("?") ? "&" : "?") + params.collect {|key, val| "#{key.to_s}=#{CGI.escape(val.to_s)}"}.join("&")
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infomeme_client
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-29 00:00:00.000000000 +02:00
+date: 2011-04-26 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &6581460 !ruby/object:Gem::Requirement
+  requirement: &22466900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6581460
+  version_requirements: *22466900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &6580860 !ruby/object:Gem::Requirement
+  requirement: &22466400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6580860
+  version_requirements: *22466400
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &6580140 !ruby/object:Gem::Requirement
+  requirement: &22465900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6580140
+  version_requirements: *22465900
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &6579320 !ruby/object:Gem::Requirement
+  requirement: &22465400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6579320
+  version_requirements: *22465400
 description: ! "A RubyGem for implementing both Infomeme client and meme applications.\n
   More coming soon..."
 email: infomeme@infomeme.com
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A RubyGem for implementing both Infomeme client and meme applications.