etsy 0.2.0 → 0.2.1

data/test/fixtures/listing/getListing.multiple.json

@@ -0,0 +1 @@
+{"count":2,"results":[{"listing_id":59759273,"state":"active","user_id":7301949,"title":"Vinyl Wall Art Decal -- Multi-colored Flowers Set","description":"The listing is for a beautiful set of multi-colored flowers, colors as shown in the picture.\r\n\r\nExclusive design only from OrqueShaw's walldecors! you won't find this anywhere else on etsy!\r\n\r\nHeights of the 4 large flowers: 52in\/37in\/29in\/26in.\r\n\r\nAll of our decals are computer die-cut, there are no "edges" nor "backgrounds", all you will get is the lovely image! and after applying they will look like they are stenciled on with paint!\r\n\r\nuggested install areas: Walls, Mirrors, Metals, Woods, Plastic...Lightly textured surfaces would be just fine! \r\n\r\n\r\n\r\n\r\nABOUT US AND OUR BEAUTIFUL DECALS:\r\n\r\nWe want to transform your walls....and your lives.\r\nDid you know that you can save literally hundreds of dollars designing your own interior space? Seriously, got bored of painting walls,using stencils, applying borders, and putting up wallpapers?? Using our super convenient n' simply gorgeous wall art decals is a very cool and a great way to make a room shine (or to change a room) w\/out damaging your walls or the bank! great alternative to wall paper or a head board, and without any of the mess and hassle involved with painting. Especially nice if you rent and cannot paint your walls, You can even take your wall decals to work and redesign your office or cubical. Easy to apply even for the creative or somewhat domestically challenged . We carry a variety of colors, styles and themes which you could use to decorate every room for anyone in the family!\r\n\r\nOur wall art decals are hand made, they are easy and fun to install.These wall stickers affix on most smooth surfaces and can be removed without leaving any residues. Complete and simple step-by-step instructions are included with your order. \r\n\r\n\r\nSHIPPING:\r\n\r\n*We combine shipping for multiple purchases!\r\n\r\n*Orders usually ship within 2 business days after the clear of payment. \r\n\r\n*All of our shipments are packed in 3 ply spiral wound mailing tubes to ensure the maximum protection during deliveries.\r\n\r\n*Shipping rates: $9.75 for US and Canada $16.75 for other countries.\r\n\r\n*2-7 business days for shipping in Canada, 6-12 business days for shipping to US and other countries, we are not responsible for the delays caused by the custom clearance.\r\n\r\n*Faster delivery options are available upon request.\r\n\r\n*We ship worldwide except the following places: Africa, China, South & North Korea, Italy, Republic Of Serbia, Turkmenistan and Republic Of Montenegro.\r\n\r\n\r\nPAYMENT:\r\n\r\n*Please remit payment within 3 days. Your product will not be shipped until payment is received. Thank you!\r\n\r\n*If you are not 100% satisfied with your purchase, please return the item in its original condition(unopened) within 30 days of delivery of your shipment. Please note that we cannot accept the returns of opened items or items returned more than 30 days past delivery, shipping cost is not refundable and buyers are responsible for the return shipping fees at any case. \r\n","creation_tsz":1288738828,"ending_tsz":1299042000,"original_creation_tsz":1287867280,"last_modified_tsz":1288738828,"price":"42.00","currency_code":"USD","quantity":1,"tags":["children","wallpaper_graphic","nursery_playroom","red_orange_pink","green_lime_color","furniture","office_room","bedroom_bathroom","nature_garden","girl_boy_baby","everything_else","cheersandtears","front_page","soft_colors"],"materials":["self_adhesive_vinyl","decal_transfer_paper"],"shop_section_id":6489554,"featured_rank":null,"state_tsz":1288738828,"hue":0,"saturation":0,"brightness":100,"is_black_and_white":false,"url":"http:\/\/www.etsy.com\/listing\/59759273\/vinyl-wall-art-decal-multi-colored","views":202,"num_favorers":5},{"listing_id":33133147,"state":"active","user_id":6399616,"title":"Sketch","description":"Sketch is not your typical run-of-the mill\r\nguy.  He is completely self-effacing, but\r\nnot annoyingly so.  He draws little scketches\r\nof himself in his notes, in the sand, in the tree,\r\nanywhere really. He even has an embroidered \r\ntattoo of himself on his chest.\r\nTake him home and he will teach you to see \r\nthe lighter side of life.  \r\n\r\nHe stands approximately 10 1\/2" tall and 6 1\/2" wide.\r\n\r\n\r\n\r\n","creation_tsz":1287443905,"ending_tsz":1298005200,"original_creation_tsz":1256319445,"last_modified_tsz":1288933827,"price":"34.00","currency_code":"USD","quantity":1,"tags":["children","baby","toy","plush","boy"],"materials":["polyester_stuffing","polyester_thread","cotton_fabric","wool_felt_blend","cotton_embroidery_floss"],"shop_section_id":5861494,"featured_rank":null,"state_tsz":1288933827,"hue":0,"saturation":0,"brightness":100,"is_black_and_white":false,"url":"http:\/\/www.etsy.com\/listing\/33133147\/sketch","views":146,"num_favorers":1}],"params":{"listing_id":"59759273,33133147"},"type":"Listing"}

data/test/fixtures/listing/getListing.single.json

@@ -0,0 +1 @@
+{"count":1,"results":[{"listing_id":59759273,"state":"active","user_id":7301949,"title":"Vinyl Wall Art Decal -- Multi-colored Flowers Set","description":"The listing is for a beautiful set of multi-colored flowers, colors as shown in the picture.\r\n\r\nExclusive design only from OrqueShaw's walldecors! you won't find this anywhere else on etsy!\r\n\r\nHeights of the 4 large flowers: 52in\/37in\/29in\/26in.\r\n\r\nAll of our decals are computer die-cut, there are no "edges" nor "backgrounds", all you will get is the lovely image! and after applying they will look like they are stenciled on with paint!\r\n\r\nuggested install areas: Walls, Mirrors, Metals, Woods, Plastic...Lightly textured surfaces would be just fine! \r\n\r\n\r\n\r\n\r\nABOUT US AND OUR BEAUTIFUL DECALS:\r\n\r\nWe want to transform your walls....and your lives.\r\nDid you know that you can save literally hundreds of dollars designing your own interior space? Seriously, got bored of painting walls,using stencils, applying borders, and putting up wallpapers?? Using our super convenient n' simply gorgeous wall art decals is a very cool and a great way to make a room shine (or to change a room) w\/out damaging your walls or the bank! great alternative to wall paper or a head board, and without any of the mess and hassle involved with painting. Especially nice if you rent and cannot paint your walls, You can even take your wall decals to work and redesign your office or cubical. Easy to apply even for the creative or somewhat domestically challenged . We carry a variety of colors, styles and themes which you could use to decorate every room for anyone in the family!\r\n\r\nOur wall art decals are hand made, they are easy and fun to install.These wall stickers affix on most smooth surfaces and can be removed without leaving any residues. Complete and simple step-by-step instructions are included with your order. \r\n\r\n\r\nSHIPPING:\r\n\r\n*We combine shipping for multiple purchases!\r\n\r\n*Orders usually ship within 2 business days after the clear of payment. \r\n\r\n*All of our shipments are packed in 3 ply spiral wound mailing tubes to ensure the maximum protection during deliveries.\r\n\r\n*Shipping rates: $9.75 for US and Canada $16.75 for other countries.\r\n\r\n*2-7 business days for shipping in Canada, 6-12 business days for shipping to US and other countries, we are not responsible for the delays caused by the custom clearance.\r\n\r\n*Faster delivery options are available upon request.\r\n\r\n*We ship worldwide except the following places: Africa, China, South & North Korea, Italy, Republic Of Serbia, Turkmenistan and Republic Of Montenegro.\r\n\r\n\r\nPAYMENT:\r\n\r\n*Please remit payment within 3 days. Your product will not be shipped until payment is received. Thank you!\r\n\r\n*If you are not 100% satisfied with your purchase, please return the item in its original condition(unopened) within 30 days of delivery of your shipment. Please note that we cannot accept the returns of opened items or items returned more than 30 days past delivery, shipping cost is not refundable and buyers are responsible for the return shipping fees at any case. \r\n","creation_tsz":1288738828,"ending_tsz":1299042000,"original_creation_tsz":1287867280,"last_modified_tsz":1288738828,"price":"42.00","currency_code":"USD","quantity":1,"tags":["children","wallpaper_graphic","nursery_playroom","red_orange_pink","green_lime_color","furniture","office_room","bedroom_bathroom","nature_garden","girl_boy_baby","everything_else","cheersandtears","front_page","soft_colors"],"materials":["self_adhesive_vinyl","decal_transfer_paper"],"shop_section_id":6489554,"featured_rank":null,"state_tsz":1288738828,"hue":0,"saturation":0,"brightness":100,"is_black_and_white":false,"url":"http:\/\/www.etsy.com\/listing\/59759273\/vinyl-wall-art-decal-multi-colored","views":178,"num_favorers":5}],"params":{"listing_id":"59759273"},"type":"Listing"}

data/test/fixtures/payment_template/getPaymentTemplate.json

@@ -0,0 +1 @@
+{"count":1,"results":[{"payment_template_id":51,"allow_bt":false,"allow_check":false,"allow_mo":false,"allow_other":true,"allow_paypal":true,"allow_cc":false,"paypal_email":"user@example.com","name":"Example Template","first_line":null,"second_line":null,"city":"Chicago","state":"IL","zip":"60605","country_id":4,"user_id":14888443,"listing_payment_id":51}],"params":{"payment_template_id":"51"},"type":"PaymentTemplate","pagination":{}}

data/test/fixtures/profile/new.json

@@ -0,0 +1,28 @@
+{
+  "count":1,
+  "results":{
+    "user_profile_id":123,
+    "user_id":5327518,
+    "login_name":"littletjane",
+    "bio":"I make stuff",
+    "gender":"female",
+    "birth_month":"01",
+    "birth_day":"01",
+    "birth_year":"1970",
+    "join_tsz":1225392413,
+    "materials":"",
+    "country_id":209,
+    "city":"BigCity",
+    "region":"The Desert",
+    "location":"HQ",
+    "avatar_id":345,
+    "lat":39.5304,
+    "lon":-119.8144,
+    "transaction_buy_count":19,
+    "transaction_sold_count":16,
+    "is_seller":true,
+    "image_url_75x75":"some_image.jpg",
+    "first_name":"Tinker",
+    "last_name":"Bell"
+  }
+}

data/test/fixtures/section/getShopSection.json

@@ -0,0 +1,18 @@
+{
+  "count":1,
+  "results":[
+    {
+      "shop_section_id":11045327,
+      "title":"Blue Items",
+      "rank":3,
+      "user_id":9569349,
+      "active_listing_count":7
+    }
+  ],
+  "params":{
+    "shop_id":"6441123",
+    "shop_section_id":"11045327"
+  },
+  "type":"ShopSection",
+  "pagination":{}
+}

data/test/fixtures/shipping_template/getShippingTemplate.json

@@ -0,0 +1 @@
+{"count":1,"results":[{"shipping_template_id":212,"title":"Small Items","user_id":14888443}],"params":{"shipping_template_id":"212"},"type":"ShippingTemplate","pagination":{}}

data/test/fixtures/shop/getShop.single.json

@@ -25,8 +25,9 @@
       "policy_additional":"ok. well, that's about it! mostly, just be good, nice, honest, and fair, and this will return to you tenfold.\r\n\r\nif you have any questions, please don't hesitate to ask me.\r\n\r\nthanks a bunch, you! cheers!",
       "policy_updated_tsz":1249084871,
       "vacation_autoreply":null,
-      "image_url_760x100":
-      "http:\/\/ny-image2.etsy.com\/iusb_760x100.7358402.jpg"
+      "url" : "http://www.etsy.com/shop/littletjane",
+      "image_url_760x100" : "http://ny-image3.etsy.com/iusb_760x100.8484779.jpg",
+      "num_favorers" : 684
     }
   ]
-}
+}

data/test/fixtures/transaction/findAllShopTransactions.json

@@ -0,0 +1 @@
+{"count":2,"results":[{"transaction_id":27230877,"title":"git is my co-pilot. t-shirt (men's medium)","description":"Have an affinity for DVCSes? Has Git saved your bacon on multiple occasions? Show the world how you feel by wearing this t-shirt.\r\n\r\nThe simple statement "git is my co-pilot." printed on an asphalt American Apparel jersey T-shirt.\r\n\r\nSize: Men's Medium\r\n\r\nGarment Measurements (in inches):\r\nLength: 29.375\r\nWidth: 20\r\n\r\nManufacturer Suggested Body Measurements (in inches):\r\nChest: 38-40\r\nWaist: 32-34\r\nInseam: 32\r\n\r\n**Note** American Apparel shirts tend to fit a bit snug, so you may want to order a size larger than you normally wear.\r\n\r\nDesigned by Owen Shifflett (http:\/\/owenshifflett.com)","seller_user_id":53780,"buyer_user_id":9641557,"creation_tsz":1269957380,"paid_tsz":1269997470,"shipped_tsz":null,"price":"20.00","currency_code":"USD","quantity":1,"tags":["clothing","tshirt","men"],"materials":["cotton_shirt","ink"],"image_listing_id":126754470,"receipt_id":18791138,"shipping_cost":"2.50","listing_id":41680579,"seller_feedback_id":null,"buyer_feedback_id":null,"transaction_type":"listing","url":"http:\/\/www.etsy.com\/transaction\/27230877"},{"transaction_id":27230845,"title":"git is my co-pilot. t-shirt (men's medium)","description":"Have an affinity for DVCSes? Has Git saved your bacon on multiple occasions? Show the world how you feel by wearing this t-shirt.\r\n\r\nThe simple statement "git is my co-pilot." printed on an asphalt American Apparel jersey T-shirt.\r\n\r\nSize: Men's Medium\r\n\r\nGarment Measurements (in inches):\r\nLength: 29.375\r\nWidth: 20\r\n\r\nManufacturer Suggested Body Measurements (in inches):\r\nChest: 38-40\r\nWaist: 32-34\r\nInseam: 32\r\n\r\n**Note** American Apparel shirts tend to fit a bit snug, so you may want to order a size larger than you normally wear.\r\n\r\nDesigned by Owen Shifflett (http:\/\/owenshifflett.com)","seller_user_id":53780,"buyer_user_id":9641557,"creation_tsz":1269957313,"paid_tsz":null,"shipped_tsz":null,"price":"20.00","currency_code":"USD","quantity":1,"tags":["clothing","tshirt","men"],"materials":["cotton_shirt","ink"],"image_listing_id":126754470,"receipt_id":18791117,"shipping_cost":"2.50","listing_id":41680579,"seller_feedback_id":null,"buyer_feedback_id":null,"transaction_type":"listing","url":"http:\/\/www.etsy.com\/transaction\/27230845"}],"params":{"shop_id":"5818087","limit":25,"offset":0},"type":"Transaction"}

data/test/fixtures/user/getUser.single.withProfile.json

@@ -0,0 +1,38 @@
+{
+  "count": 1,
+  "results": [{
+    "user_id": 5327518,
+    "login_name": "littletjane",
+    "creation_tsz": 1191381578,
+    "referred_by_user_id": null,
+    "feedback_info": {
+      "count": 417,
+      "score": 100
+    },
+    "Profile": {
+      "user_profile_id":123,
+      "user_id":5327518,
+      "login_name":"littletjane",
+      "bio":"I make stuff",
+      "gender":"female",
+      "birth_month":"01",
+      "birth_day":"01",
+      "birth_year":"1970",
+      "join_tsz":1225392413,
+      "materials":"",
+      "country_id":209,
+      "city":"BigCity",
+      "region":"The Desert",
+      "location":"HQ",
+      "avatar_id":345,
+      "lat":39.5304,
+      "lon":-119.8144,
+      "transaction_buy_count":19,
+      "transaction_sold_count":16,
+      "is_seller":true,
+      "image_url_75x75":"some_image.jpg",
+      "first_name":"Tinker",
+      "last_name":"Bell"
+    }
+  }]
+}

data/test/fixtures/user/getUser.single.withShops.json

@@ -0,0 +1,41 @@
+{
+  "count": 1,
+  "results": [{
+    "user_id": 5327518,
+    "login_name": "littletjane",
+    "creation_tsz": 1191381578,
+    "referred_by_user_id": null,
+    "feedback_info": {
+      "count": 417,
+      "score": 100
+    },
+    "Shops": [{
+      "shop_id":6952442,
+      "shop_name":"LittleJane",
+      "user_id":5327518,
+      "creation_tsz":1338484503,
+      "title":"",
+      "announcement":"",
+      "currency_code":"USD",
+      "is_vacation":false,
+      "vacation_message":null,
+      "sale_message":"",
+      "last_updated_tsz":1338490441,
+      "listing_active_count":1,
+      "login_name":"littletjane",
+      "alchemy_message":"",
+      "is_refusing_alchemy":false,
+      "policy_welcome":null,
+      "policy_payment":null,
+      "policy_shipping":null,
+      "policy_refunds":null,
+      "policy_additional":null,
+      "policy_seller_info":null,
+      "policy_updated_tsz":0,
+      "vacation_autoreply":null,
+      "url":"http://www.etsy.com/shop/LittleJane?utm_source=something&utm_medium=api&utm_campaign=api",
+      "image_url_760x100":null,
+      "num_favorers":0
+    }]
+  }]
+}

data/test/test_helper.rb

@@ -6,12 +6,12 @@ require 'test/unit'
 require 'shoulda'
 require 'matchy'
 require 'mocha'
+require 'cgi'
 
 require File.expand_path('../../lib/etsy', __FILE__)
 
 class Test::Unit::TestCase
 
-
   def raw_fixture_data(filename)
     file = File.dirname(__FILE__) + "/fixtures/#{filename}"
     File.read(file)
@@ -23,13 +23,18 @@ class Test::Unit::TestCase
 
   def mock_request(endpoint, options, resource, file)
     objects       = []
-    response_data = raw_fixture_data("#{resource.downcase}/#{file}")
+    underscored_fixture_filename = "#{resource.gsub(/([^^])([A-Z])/, '\1_\2').downcase}/#{file}"
+    response_data = raw_fixture_data(underscored_fixture_filename)
 
-    Etsy::Request.stubs(:new).with(endpoint, options).returns(stub(:get => stub(:body => response_data)))
+    Etsy::Request.stubs(:new).with(endpoint, options).returns(stub(:get => stub(:body => response_data, :code => '200')))
 
     JSON.parse(response_data)['results'].each_with_index do |result, index|
       object = "#{resource.downcase}_#{index}"
-      Etsy.const_get(resource).stubs(:new).with(result).returns(object)
+      if options[:access_token] && options[:access_secret]
+        Etsy.const_get(resource).stubs(:new).with(result, options[:access_token], options[:access_secret]).returns(object)
+      else
+        Etsy.const_get(resource).stubs(:new).with(result).returns(object)
+      end
       objects << object
     end
 

data/test/unit/etsy/address_test.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+module Etsy
+  class AddressTest < Test::Unit::TestCase
+
+    context "The Address class" do
+
+      should "be able to find a user's addresses" do
+        addresses = mock_request('/users/littletjane/addresses', {}, 'Address', 'getUserAddresses.json')
+        Address.find('littletjane').should == addresses
+      end
+
+    end
+
+    context "An instance of the Address class" do
+
+      context "with response data" do
+        setup do
+          data = read_fixture('address/getUserAddresses.json')
+          @address = Address.new(data.first)
+        end
+
+        should "have a value for :id" do
+          @address.id.should == 123
+        end
+
+        should "have a value for :name" do
+          @address.name.should == "Tinker Bell"
+        end
+
+        should "have a value for :first_line" do
+          @address.first_line.should == "123 Fake St."
+        end
+
+        should "have a value for :second_line" do
+          @address.second_line.should == nil
+        end
+
+        should "have a value for :city" do
+          @address.city.should == 'BigCity'
+        end
+
+        should "have a value for :state" do
+          @address.state.should == 'XX'
+        end
+
+        should "have a value for :zip" do
+          @address.zip.should == '12345'
+        end
+
+        should "have a value for :country" do
+          @address.country.should == 'United States'
+        end
+
+        should "have a value for :country_id" do
+          @address.country_id.should == 209
+        end
+      end
+    end
+  end
+end

data/test/unit/etsy/category_test.rb

@@ -0,0 +1,106 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+module Etsy
+  class CategoryTest < Test::Unit::TestCase
+
+    context "The Category class" do
+
+      should "be able to find a single top-level category" do
+        categories = mock_request('/categories/accessories', {}, 'Category', 'getCategory.single.json')
+        Category.find_top('accessories').should == categories.first
+      end
+
+      should "be able to find multiple categories" do
+        categories = mock_request('/categories/accessories,art', {}, 'Category', 'getCategory.multiple.json')
+        Category.find_top('accessories', 'art').should == categories
+      end
+
+      should "be able to find all top-level categories" do
+        categories = mock_request('/taxonomy/categories', {}, 'Category', 'findAllTopCategory.json')
+        Category.all_top.should == categories
+      end
+
+      should "return an array of categories if there is only 1 result returned" do
+        categories = mock_request('/taxonomy/categories', {}, 'Category', 'findAllTopCategory.single.json')
+        Category.all_top.should == categories
+      end
+
+      context "within the scope of a top-level category" do
+
+        should "be able to find all subcategories" do
+          categories = mock_request('/taxonomy/categories/accessories', {}, 'Category', 'findAllTopCategoryChildren.json')
+          Category.find_all_subcategories('accessories').should == categories
+        end
+
+        should "be able to find the subcategories of a subcategory" do
+          categories = mock_request('/taxonomy/categories/accessories/apron', {}, 'Category', 'findAllSubCategoryChildren.json')
+          Category.find_all_subcategories('accessories/apron').should == categories
+        end
+
+        should "return nil when trying to find the subcategories of a subcategory of a subcategory" do
+          Category.find_all_subcategories('accessories/apron/women').should be_nil
+        end
+
+      end
+
+    end
+
+    context "An instance of the Category class" do
+
+      context "with response data" do
+        setup do
+          data = read_fixture('category/getCategory.single.json')
+          @category = Category.new(data.first)
+        end
+
+        should "have a value for :id" do
+          @category.id.should == 69150467
+        end
+
+        should "have a value for :page_description" do
+          @category.page_description.should == "Shop for unique, handmade accessories from our artisan community"
+        end
+
+        should "have a value for :page_title" do
+          @category.page_title.should == "Handmade accessories"
+        end
+
+        should "have a value for :category_name" do
+          @category.category_name.should == "accessories"
+        end
+
+        should "have a value for :short_name" do
+          @category.short_name.should == "Accessories"
+        end
+
+        should "have a value for :long_name" do
+          @category.long_name.should == "Accessories"
+        end
+
+        should "have a value for :children_count" do
+          @category.children_count.should == 27
+        end
+      end
+
+      should "have a collection of active listings" do
+        category = Category.new
+        category.stubs(:category_name).with().returns('accessories')
+
+        Listing.stubs(:find_all_active_by_category).with('accessories').returns('listings')
+
+        category.active_listings.should == 'listings'
+      end
+
+      should "have a collection of subcategories" do
+        category = Category.new
+        category.stubs(:category_name).with().returns('accessories')
+
+        Category.stubs(:find_all_subcategories).with('accessories').returns('categories')
+
+        category.subcategories.should == 'categories'
+      end
+
+    end
+
+  end
+end

data/test/unit/etsy/country_test.rb

@@ -0,0 +1,64 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+module Etsy
+  class CountryTest < Test::Unit::TestCase
+    context "The Country class" do
+      should "be findable by ISO3166-1 Alpha-2 codes" do
+        united_states = mock
+        united_states.stubs(:iso_country_code => "US")
+
+        great_britain = mock
+        great_britain.stubs(:iso_country_code => "GB")
+
+        Country.stubs(:find_all).returns([great_britain, united_states])
+        Country.find_by_alpha2("us").should == united_states
+      end
+
+      should "be findable by world bank country codes" do
+        united_states = mock
+        united_states.stubs(:world_bank_country_code => "USA")
+
+        great_britain = mock
+        great_britain.stubs(:world_bank_country_code => "GBR")
+
+        Country.stubs(:find_all).returns([great_britain, united_states])
+        Country.find_by_world_bank_country_code("gbr").should == great_britain
+      end
+    end
+
+    context "An instance of the Country class" do
+      setup do
+        data = read_fixture('country/getCountry.json')
+        @listing = Country.new(data.first)
+      end
+
+      should "have an id" do
+        @listing.id.should == 55
+      end
+
+      should "have an iso_country_code" do
+        @listing.iso_country_code.should == "AF"
+      end
+
+      should "have an world_bank_country_code" do
+        @listing.world_bank_country_code.should == "AFG"
+      end
+
+      should "have an name" do
+        @listing.name.should == "Afghanistan"
+      end
+
+      should "have an slug" do
+        @listing.slug.should == "afghanistan"
+      end
+
+      should "have an lat" do
+        @listing.lat.should == 33.78
+      end
+
+      should "have an lon" do
+        @listing.lon.should == 66.17
+      end
+    end
+  end
+end

data/test/unit/etsy/listing_test.rb

@@ -5,9 +5,96 @@ module Etsy
 
     context "The Listing class" do
 
-      should "be able to find all listings for a shop" do
-        listings = mock_request('/shops/1/listings/active', {}, 'Listing', 'findAllShopListingsActive.json')
-        Listing.find_all_by_shop_id(1).should == listings
+      should "be able to find a single listing" do
+        listings = mock_request('/listings/123', {}, 'Listing', 'getListing.single.json')
+        Listing.find(123).should == listings.first
+      end
+
+      should "be able to find multiple listings" do
+        listings = mock_request('/listings/123,456', {}, 'Listing', 'getListing.multiple.json')
+        Listing.find('123', '456').should == listings
+      end
+
+      context "within the scope of a shop" do
+
+        should "be able to find the first 25 active listings" do
+          listings = mock_request('/shops/1/listings/active', {}, 'Listing', 'findAllShopListings.json')
+          Listing.find_all_by_shop_id(1).should == listings
+        end
+
+        should "be able to find expired listings" do
+          listings = mock_request('/shops/1/listings/expired', {}, 'Listing', 'findAllShopListings.json')
+          Listing.find_all_by_shop_id(1, :state => :expired).should == listings
+        end
+
+        should "be able to find inactive listings" do
+          listings = mock_request('/shops/1/listings/inactive', {}, 'Listing', 'findAllShopListings.json')
+          Listing.find_all_by_shop_id(1, :state => :inactive).should == listings
+        end
+
+        should "be able to find featured listings" do
+          listings = mock_request('/shops/1/listings/featured', {}, 'Listing', 'findAllShopListings.json')
+          Listing.find_all_by_shop_id(1, :state => :featured).should == listings
+        end
+
+        should "be able to find sold listings" do
+          transaction_1 = stub(:listing_id => 1)
+          transaction_2 = stub(:listing_id => 2)
+          transaction_3 = stub(:listing_id => 1)
+
+          transactions = [transaction_1, transaction_2, transaction_3]
+
+          Transaction.stubs(:find_all_by_shop_id).with(1, {}).returns(transactions)
+          Listing.stubs(:find).with([1, 2], {}).returns(['listings'])
+
+          Listing.find_all_by_shop_id(1, :state => :sold).should == ['listings']
+        end
+
+        should "defer associations to listings from transaction (sold listings)" do
+          transaction_1 = stub(:listing_id => 1)
+          transaction_2 = stub(:listing_id => 2)
+
+          Transaction.stubs(:find_all_by_shop_id).with(1, {}).returns [transaction_1, transaction_2]
+          Listing.stubs(:find).with([1, 2], {:includes => :an_association}).returns(['listings'])
+
+          Listing.find_all_by_shop_id(1, :state => :sold, :includes => :an_association).should == ['listings']
+        end
+
+        should "pass options through to the listing call" do
+          transaction_1 = stub(:listing_id => 1)
+          transaction_2 = stub(:listing_id => 2)
+
+          Transaction.stubs(:find_all_by_shop_id).with(1, {:other => :params}).returns [transaction_1, transaction_2]
+          Listing.stubs(:find).with([1, 2], {:other => :params}).returns(['listings'])
+
+          Listing.find_all_by_shop_id(1, :state => :sold, :other => :params).should == ['listings']
+
+        end
+
+        should "not ask the API for listings if there are no transactions" do
+          Transaction.stubs(:find_all_by_shop_id).with(1, {}).returns([])
+          Listing.expects(:find).never
+          Listing.sold_listings(1, {})
+        end
+
+        should "be able to override limit and offset" do
+          options = {:limit => 100, :offset => 100}
+          listings = mock_request('/shops/1/listings/active', options, 'Listing', 'findAllShopListings.json')
+          Listing.find_all_by_shop_id(1, options).should == listings
+        end
+
+        should "raise an exception when calling with an invalid state" do
+          options = {:state => :awesome}
+          lambda { Listing.find_all_by_shop_id(1, options) }.should raise_error(ArgumentError)
+        end
+
+      end
+
+      context "within the scope of a category" do
+        should "be able to find active listings" do
+          active_listings = mock_request('/listings/active', {:category => 'accessories'}, 'Listing', 'findAllListingActive.category.json')
+          Listing.find_all_active_by_category('accessories').should == active_listings
+        end
       end
 
     end
@@ -16,7 +103,7 @@ module Etsy
 
       context "with response data" do
         setup do
-          data = read_fixture('listing/findAllShopListingsActive.json')
+          data = read_fixture('listing/findAllShopListings.json')
           @listing = Listing.new(data.first)
         end
 
@@ -48,6 +135,10 @@ module Etsy
           @listing.created_at.should == Time.at(1287602289)
         end
 
+        should "have a value for :modified_at" do
+          @listing.modified_at.should == Time.at(1287602289)
+        end
+
         should "have a value for :price" do
           @listing.price.should == "15.00"
         end
@@ -71,6 +162,22 @@ module Etsy
         should "have a value for :materials" do
           @listing.materials.should == %w(material_1 material_2)
         end
+
+        should "have a value for :hue" do
+          @listing.hue.should == 0
+        end
+
+        should "have a value for :saturation" do
+          @listing.saturation.should == 0
+        end
+
+        should "have a value for :brightness" do
+          @listing.brightness.should == 100
+        end
+
+        should "have a value for :black_and_white?" do
+          @listing.black_and_white?.should == false
+        end
       end
 
       %w(active removed sold_out expired alchemy).each do |state|
@@ -107,4 +214,4 @@ module Etsy
 
     end
   end
-end
+end