dawanda_client 0.1.10 → 0.1.11

data/.gems

@@ -0,0 +1 @@
+dawanda_client

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/dawanda_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dawanda_client}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["DaWanda GmbH"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-03-23}
   s.description = %q{Provides a friendly ruby-like interface to the Dawanda API}
   s.email = %q{api@dawanda.com}
   s.extra_rdoc_files = [
@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gems",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "config.ru",
      "dawanda_client.gemspec",
      "lib/dawanda.rb",
      "lib/dawanda/category.rb",

data/lib/dawanda.rb

@@ -82,6 +82,17 @@ module Dawanda
     @domain || 'dawanda.com'
   end
   
+  # retrieve HTTP Basic credentials
+  def self.http_basic
+    @http_basic || nil
+  end
+  
+  # set credetials for HTTP Basic Authentification
+  # like: Dawanda.http_basic = {:user => 'myusername', :password => 'mypassword'}
+  def self.http_basic= credentials=nil
+    @http_basic = credentials
+  end
+  
   # Find a user by username. See Dawanda::User for more information.
   def self.user(username_or_id, options={})
     User.find_by_user_id(username_or_id, options)

data/lib/dawanda/request.rb

@@ -15,7 +15,6 @@ module Dawanda
     # A Response object with the payload data
     # 
     def self.get(resource_path, parameters = {})
-      parameters = {:format => 'json'}.update(parameters)
       request = Request.new(resource_path, parameters)
       Response.new(request.get)
     end
@@ -29,7 +28,11 @@ module Dawanda
     # Perform a GET request against the API endpoint and return the raw
     # response data
     def get
-      response = Net::HTTP.get_response(endpoint_uri)
+      request = Net::HTTP::Get.new endpoint_uri.path
+      request.basic_auth Dawanda.http_basic[:user], Dawanda.http_basic[:password] if Dawanda.http_basic
+      request.set_form_data parameters
+      response = Net::HTTP.new(endpoint_uri.host, endpoint_uri.port).start {|http| http.request(request) }
+      
       case response
       when Net::HTTPSuccess, Net::HTTPRedirection
         return response.body
@@ -39,17 +42,11 @@ module Dawanda
     end
     
     def parameters # :nodoc:
-      @parameters.merge(:api_key => Dawanda.api_key)
-    end
-    
-    def query # :nodoc:
-      parameters.map {|k,v| "#{k}=#{v}"}.join('&')
+      @parameters.merge(:api_key => Dawanda.api_key, :format => 'json')
     end
     
     def endpoint_uri # :nodoc:
-      uri = URI.parse("#{self.class.base_url}#{@resource_path}")
-      uri.query = query
-      uri
+      URI.parse("#{self.class.base_url}#{@resource_path}")
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - DaWanda GmbH
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,11 +28,11 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gems
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
-- config.ru
 - dawanda_client.gemspec
 - lib/dawanda.rb
 - lib/dawanda/category.rb

data/config.ru

@@ -1,3 +0,0 @@
-require "lib/dawanda.rb"
-require "examples/shop/shop.rb"
-run Sinatra::Application