dawanda_client 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/dawanda_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dawanda_client}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["DaWanda GmbH"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-09}
   s.description = %q{Provides a friendly ruby-like interface to the Dawanda API}
   s.email = %q{api@dawanda.com}
   s.extra_rdoc_files = [

data/lib/dawanda/model.rb

@@ -47,7 +47,8 @@ module Dawanda
       def find_all(parameter, endpoint)
         class_eval <<-CODE
           def self.find_all_by_#{parameter}(#{parameter}, params = {})
-            response = Request.get("#{endpoint}", params)
+            response = Request.get("#{endpoint}", params.reject{|key, value| key == :raw_response})
+            return response if params[:raw_response]
             response.result.map {|listing| new(listing) }
           end
         CODE
@@ -56,7 +57,8 @@ module Dawanda
       def find_one(parameter, endpoint)
         class_eval <<-CODE
           def self.find_by_#{parameter}(#{parameter}, params = {})
-            response = Request.get("#{endpoint}", params)
+            response = Request.get("#{endpoint}", params.reject{|key, value| key == :raw_response})
+            return response if params[:raw_response]
             new response.result
           end
         CODE

data/lib/dawanda/product.rb

@@ -26,8 +26,6 @@ module Dawanda
     finder :all, '/colors/:hex_search/products/search'
     finder :all, '/product/:method'
     
-    
-    
     finder :one, '/products/:id'
     
     attribute :created, :created_at
@@ -35,7 +33,7 @@ module Dawanda
     attribute :user_id, [ :user => :id ]
     
     attributes :id, :name, :description, :created_at, :view_count, :tags,
-               :ending, :quantity, :materials, :price, :restful_path, :product_url, :images
+               :ending, :quantity, :materials, :price, :restful_path, :product_url, :images, :user
 
  
     # Time that this product was created
@@ -74,7 +72,7 @@ module Dawanda
     end
     
     def shop(params = {})
-      Shop.find_by_user_id(user_id)
+      Shop.find_by_user_id(user["id"])
     end
   end
 end

data/lib/dawanda/request.rb

@@ -51,6 +51,5 @@ module Dawanda
       uri.query = query
       uri
     end
-    
   end
 end

data/lib/dawanda.rb

@@ -71,29 +71,29 @@ module Dawanda
     @country || 'de'
   end
   
-  # Find a user by username.  See Dawanda::User for more information.
-  def self.user(username_or_id)
-    User.find_by_user_id(username_or_id)
+  # 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)
   end
   
   # Find a shop by username.  See Dawanda::Shop for more information.
-  def self.shop(username_or_id)
-    Shop.find_by_user_id(username_or_id)
+  def self.shop(username_or_id, options={})
+    Shop.find_by_user_id(username_or_id, options)
   end
   
   # Find a product by id.  See Dawanda::Product for more information.
-  def self.product(product_id)
-    Product.find_by_id(product_id)
+  def self.product(product_id, options={})
+    Product.find_by_id(product_id, options)
   end
   
   # Find a category by id.  See Dawanda::Category for more information.
-  def self.category(category_id)
-    Category.find_by_id(category_id)
+  def self.category(category_id, options={})
+    Category.find_by_id(category_id, options)
   end
   
   # Find a shop_category by id.  See Dawanda::ShopCategory for more information.
-  def self.shop_category(shop_category_id)
-    ShopCategory.find_by_id(shop_category_id)
+  def self.shop_category(shop_category_id, options={})
+    ShopCategory.find_by_id(shop_category_id, options)
   end
   
 end

data/test/test_helper.rb

@@ -3,6 +3,9 @@ $:.reject! { |e| e.include? 'TextMate' }
 
 require 'rubygems'
 require 'throat_punch'
+require 'net/http'
+require 'json'
+require 'time'
 
 require File.dirname(__FILE__) + '/../lib/dawanda'
 
@@ -21,7 +24,7 @@ class Test::Unit::TestCase
     response = Dawanda::Response.new(stub())
 
     data = read_fixture(options[:data])
-    data = data.first if data.size == 1
+    data = data.to_a.first if data.size == 1
 
     response.stubs(:result).with().returns(data)
     Dawanda::Request.stubs(:get).with(options[:for], {}).returns(response)
@@ -50,4 +53,9 @@ class Test::Unit::TestCase
     end
   end
 
+  def response_from_fixture(method_name)
+    file = File.dirname(__FILE__) + "/fixtures/#{method_name}.json"
+    Dawanda::Response.new(File.read(file))
+  end
+
 end

data/test/unit/dawanda/category_test.rb

@@ -7,10 +7,9 @@ module Dawanda
 
       should "be able to find a category by :id" do
         id  = 5327518
-        response = mock_request_cycle :for => "/categories/#{id}", :data => 'getCategoryDetails'
+        response = mock_request_cycle({:for => "/categories/#{id}", :data => 'getCategoryDetails'})
 
         Category.expects(:new).with(response.result).returns('category')
-        
         Category.find_by_id(id, {}).should == 'category'
       end
 
@@ -19,7 +18,7 @@ module Dawanda
     context "An instance of the Category class" do
       when_populating Category,   :from => 'getCategoryDetails' do
         value_for :name,                    :is => '1003'
-        value_for :product_count,           :is => 754           
+        value_for :product_count,           :is => 754
         value_for :parent_id,               :is => 406
         value_for :id,                      :is => 418
       end

data/test/unit/dawanda/product_test.rb

@@ -31,7 +31,7 @@ module Dawanda
         user_id  = 5327518
         
         product = Product.new
-        product.expects(:user_id).returns(user_id).at_least_once
+        product.expects(:user).returns({"id" => user_id}).at_least_once
         response = mock_request_cycle :for => "/shops/#{user_id}", :data => 'getShopDetails'
         
         Shop.expects(:new).with(response.result).returns('shop')

data/test/unit/dawanda_test.rb

@@ -1,9 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class DawandaTest < Test::Unit::TestCase
-
   context "The Dawanda module" do
-    
     should "be able to set and retrieve the API key" do
       Dawanda.api_key = 'key'
       Dawanda.api_key.should == 'key'
@@ -17,38 +15,46 @@ class DawandaTest < Test::Unit::TestCase
     should "be able to find a user by username" do
       user = stub()
       
-      Dawanda::User.expects(:find_by_user_id).with('littletjane').returns(user)
+      Dawanda::User.expects(:find_by_user_id).with('littletjane', {}).returns(user)
       Dawanda.user('littletjane').should == user
     end
     
+    should "be able to get the raw response" do
+      response = response_from_fixture('getUserDetails')
+      Dawanda::Request.expects(:get).returns(response)
+      
+      user = Dawanda.user("meko", {:raw_response => true})
+      user.result.should_not == nil
+      user.pages.should_not == nil
+      user.entries.should_not == nil
+    end
+    
     should "be able to find a shop by username" do
       shop = stub()
       
-      Dawanda::Shop.expects(:find_by_user_id).with('littletjane').returns(shop)
+      Dawanda::Shop.expects(:find_by_user_id).with('littletjane', {}).returns(shop)
       Dawanda.shop('littletjane').should == shop
     end
     
     should "be able to find a product by id" do
       product = stub()
       
-      Dawanda::Product.expects(:find_by_id).with(15).returns(product)
+      Dawanda::Product.expects(:find_by_id).with(15, {}).returns(product)
       Dawanda.product(15).should == product
     end
     
     should "be able to find a category by id" do
       category = stub()
       
-      Dawanda::Category.expects(:find_by_id).with(16).returns(category)
+      Dawanda::Category.expects(:find_by_id).with(16, {}).returns(category)
       Dawanda.category(16).should == category
     end
     
     should "be able to find a shop category by id" do
       shop_category = stub()
       
-      Dawanda::ShopCategory.expects(:find_by_id).with(16).returns(shop_category)
+      Dawanda::ShopCategory.expects(:find_by_id).with(16, {}).returns(shop_category)
       Dawanda.shop_category(16).should == shop_category
     end
-    
   end
-
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - DaWanda GmbH
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +01:00
+date: 2010-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: []