untappd 0.0.5 → 4.0.0

data/lib/untappd/brewery.rb

@@ -1,41 +1,23 @@
 module Untappd
-  
   class Brewery < Base
-    
-    # since (optional) - The numeric ID of the last recent check-in.
-    # offset (optional) - The offset that you like the dataset to begin with.
-    #   Each set returns 25 max records, so you can use that paginate the feed.
+    # options:
+    # * min_id (int, optional) - The numeric ID of the most recent check-in. New results
+    # will only be shown if there are checkins before this ID
+    # * max_id (int, optional) - The checkin ID that you want the results to start with
+    # * limit (int, optional) - The number of results to return, max of 50, default is 25
     def self.feed(brewery_id, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :brewery_id => brewery_id
-      })
-
-      response_to_mash get("/brewery_checkins", :query => options)
+      options.merge!(auth_options)
+      response_to_mash get("/brewery/checkins/#{brewery_id}", :query => options)
     end
-    
-    # This method will allow you to see extended information about a brewery.
-    def self.info(brewery_id, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :brewery_id => brewery_id
-      })
 
-      response_to_mash get("/brewery_info", :query => options)
+    def self.info(brewery_id)
+      response_to_mash get("/brewery/info/#{brewery_id}", :query => auth_options)
     end
-    
-    #
-    def self.search(q, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :q => q
-      })
 
-      response_to_mash get("/brewery_search", :query => options)
+    def self.search(q)
+      options = { :q => q }
+      options.merge!(auth_options)
+      response_to_mash get("/search/brewery", :query => options)
     end
-    
   end
-  
 end
-
-

data/lib/untappd/checkin.rb

@@ -1,109 +1,69 @@
 module Untappd
-  
   class Checkin < Base
-    
-    def self.info(checkin_id, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :id => checkin_id
-      })
-
-      response_to_mash get("/details", :query => options)
+    def self.info(checkin_id)
+      response_to_mash get("/checkin/view/#{checkin_id}", :query => auth_options)
     end
-    
-    # since (optional) - The numeric ID of the last recent check-in. This provided to you in the next_query attribute.
-    # geolat (optional) - The numeric Latitude to filter the public feed.
-    # geolng (optional) - The numeric Longitude to filter the public feed.
-    # offset (optional) - The offset that you like the dataset to begin with.
-    #    Each set returns 25 max records, so you can use that paginate the feed.
-    def self.feed(options={})
-      options.merge!({
-        :key => Untappd::apikey
-      })
 
+    # options:
+    # * since (int, optional) - The numeric ID of the most recent check-in.
+    # * lng (float, optional) - The numeric Latitude to filter the public feed.
+    # * lat (float, optional) - The numeric Longitude to filter the public feed.
+    # * radius (int, optional) - The max radius you would like the check-ins to start within
+    # * max_id (int, optional) - The checkin ID that you want the results to start with
+    # * limit (int, optional) - The number of results to return, max of 50, default is 25
+    def self.feed(options={})
+      options.merge!(auth_options)
       response_to_mash get("/thepub", :query => options)
     end
-   
-    # foursquare_id (optional) - The MD5 hash ID of the Venue you want to attach 
-    #        the beer checkin. This HAS TO BE the MD5 non-numeric hash from the foursquare v2. Older numeric id will not be accepted.
-    # user_lat (optional) - The numeric Latitude of the user. This is required if you add a location.
-    # user_lng (optional) - The numeric Longitude of the user. This is required if you add a location.
-    # shout (optional) - The text you would like to include as a comment of the checkin. Max of 140 characters.
-    # facebook (optional) - Default = "off", Pass "on" to post to facebook
-    # twitter (optional) - Default = "off", Pass "on" to post to twitter
-    # foursquare (optional) - Default = "off", Pass "on" to checkin on foursquare
-    def self.create(username, password, beer_id, options={})
-      
-      options.merge!({
-        :gmt_offset => Untappd::gmt_offset,
-        :bid => beer_id
-      })
-      
-      response = post("/checkin", :query => { :key => Untappd::apikey },
-            :body => options, :basic_auth => auth_hash(username, password))
-            
-      Hashie::Mash.new(response)
-    end
-    
-    # foursquare_id (optional) - The MD5 hash ID of the Venue you want to attach the beer checkin.
-    #       This HAS TO BE the MD5 non-numeric hash from the foursquare v2. Older numeric id will not be accepted.
-    # user_lat (optional) - The numeric Latitude of the user. This is required if you add a location.
-    # user_lng (optional) - The numeric Longitude of the user. This is required if you add a location.
-    def self.test(username, password, beer_id, options={})
-      options.merge!({
-        :gmt_offset => Untappd::gmt_offset,
-        :bid => beer_id 
-      })
-      
-      response = post("/checkin_test", :query => { :key => Untappd::apikey },
-            :body => options, :basic_auth => auth_hash(username, password))
-      
-      Hashie::Mash.new(response)
-    end
-    
-    #
-    def self.add_comment(username, password, checkin_id, comment, options={})
+
+    # options:
+    # * foursquare_id (optional) - The MD5 hash ID of the Venue you want to attach the beer
+    # checkin. This HAS TO BE the MD5 non-numeric hash from the foursquare v2.
+    # * timezone - user timezone, defaults to 'PST'
+    # * gmt_offset - calculated from the timezone, but you may override
+    # * geolat (optional) - The numeric Latitude of the user. This is required if you add a location.
+    # * geolng (optional) - The numeric Longitude of the user. This is required if you add a location.
+    # * shout (optional) - The text you would like to include as a comment of the checkin.
+    # Max of 140 characters.
+    # * rating (optional) - The rating score you would like to add for the beer. This can only
+    # be 1 to 5 and whole numbers (no 4.2)
+    # * facebook (optional) - Default = "off", Pass "on" to post to facebook
+    # * twitter (optional) - Default = "off", Pass "on" to post to twitter
+    # * foursquare (optional) - Default = "off", Pass "on" to checkin on foursquare
+    def self.create(access_token, beer_id, options={})
+      timezone = options.fetch(:timezone, 'PST')
+      gmt_offset = options.fetch(:gmt_offset, Time.zone_offset(timezone))
+
       options.merge!({
-        :checkin_id => checkin_id,
-        :comment => comment 
+        :timezone     => timezone,
+        :gmt_offset   => gmt_offset,
+        :bid          => beer_id
       })
-      
-      response_to_mash post("/add_comment", :query => { :key => Untappd::apikey },
-            :body => options, :basic_auth => auth_hash(username, password))
+
+      response_to_mash post("/checkin/add",
+        :query => {:access_token => access_token},
+        :body => options
+      )
     end
-    
-    #
-    def self.remove_comment(username, password, comment_id, options={})
-      options.merge!({
-        :comment_id => comment_id
-      })
-      
-      response_to_mash post("/delete_comment", :query => { :key => Untappd::apikey },
-            :body => options, :basic_auth => auth_hash(username, password))
+
+    def self.add_comment(access_token, checkin_id, comment)
+      response_to_mash post("/checkin/addcomment/#{checkin_id}",
+        :query => { :access_token => access_token },
+        :body => { :comment => comment }
+      )
     end
-    
-    #
-    def self.toast(username, password, checkin_id, options={})
-      options.merge!({
-        :checkin_id => checkin_id
-      })
-      
-      response_to_mash post("/toast", :query => { :key => Untappd::apikey },
-            :body => options, :basic_auth => auth_hash(username, password))
+
+    def self.remove_comment(access_token, comment_id)
+      params = { :access_token => access_token }
+      response_to_mash post("/checkin/deletecomment/#{comment_id}", :query => params)
     end
-    
-    #
-    def self.untoast(username, password, checkin_id, options={})
-      options.merge!({
-        :checkin_id => checkin_id
-      })
-      
-      response_to_mash post("/delete_toast", :query => { :key => Untappd::apikey },
-            :body => options, :basic_auth => auth_hash(username, password))
+
+    def self.toggle_toast(access_token, checkin_id)
+      params = { :access_token => access_token }
+      response_to_mash post("/checkin/toast/#{checkin_id}", :query => params)
     end
-      
   end
-  
+
 end
 
 

data/lib/untappd/config.rb

@@ -0,0 +1,28 @@
+module Untappd
+  class << self
+    attr_accessor :configuration
+
+    def config
+      self.configuration ||= Untappd::Configuration.new
+    end
+
+    def reset_configuration
+      self.configuration = Untappd::Configuration.new
+    end
+
+    def configure
+      yield(config)
+    end
+  end
+end
+
+module Untappd
+  class Configuration
+    attr_accessor :client_id, :client_secret, :base_uri, :gmt_offset, :redirect_url
+
+    def base_uri
+      @base_uri || 'http://api.untappd.com/v4'
+    end
+
+  end
+end

data/lib/untappd/oauth.rb

@@ -0,0 +1,9 @@
+module Untappd
+  class OAuth < Base
+    def self.authenticate_url
+      raise "redirect_url not configured" unless Untappd.config.redirect_url
+
+      "https://untappd.com/oauth/authenticate/?client_id=#{Untappd.config.client_id}&response_type=token&redirect_url=#{Untappd.config.redirect_url}"
+    end
+  end
+end

data/lib/untappd/user.rb

@@ -1,76 +1,55 @@
 module Untappd
-  
   class User < Base
-    
-    def self.info(user, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :user => user
-      })
-
-      response_to_mash get("/user", :query => options)
+    # options:
+    # * max_id (int, optional) - The checkin ID that you want the results to start with
+    # * limit (int, optional) - The number of results to return, max of 50, default is 25
+    def self.feed(username, options={})
+      options.merge!(auth_options)
+      response_to_mash get("/user/checkins/#{username}", :query => options)
     end
-    
-    def self.badges(user, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :user => user
-      })
 
-      response_to_mash get("/user_badge", :query => options)
+    def self.info(username)
+      response_to_mash get("/user/info/#{username}", :query => auth_options)
     end
-    
-    def self.friends(user, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :user => user
-      })
 
-      response_to_mash get("/friends", :query => options)
+    # options:
+    # * offset (int, optional) - The numeric offset that you what results to start
+    def self.badges(username, options={})
+      options.merge!(auth_options)
+      response_to_mash get("/user/badges/#{username}", :query => options)
     end
-    
-    def self.wish_list(user, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :user => user
-      })
 
-      response_to_mash get("/wish_list", :query => options)
+    # options:
+    # * offset (int, optional) - The numeric offset that you what results to start
+    # limit (optional) - The number of records that you will return (max 50)
+    def self.friends(username, options={})
+      options.merge!(auth_options)
+      response_to_mash get("/user/friends/#{username}", :query => options)
     end
-    
-    def self.distinct(user, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :user => user
-      })
 
-      response_to_mash get("/distinct", :query => options)
+    # options:
+    # * offset (int, optional) - The numeric offset that you what results to start
+    def self.wish_list(username, options={})
+      options.merge!(auth_options)
+      response_to_mash get("/user/wishlist/#{username}", :query => options)
     end
-    
-    # since (optional) - The numeric ID of the last recent check-in.
-    # offset (optional) - The offset that you like the dataset to begin with.
-    #   Each set returns 25 max records, so you can use that paginate the feed.
-    def self.feed(user, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :user => user
-      })
 
-      response_to_mash get("/user_feed", :query => options)
+    # options:
+    # * sort (string, optional) - Your can sort the results using these values:
+    # date - sorts by date (default), checkin - sorted by highest checkin,
+    # global_rating - sorts by global rating, user_rating - sorted by the user's rating
+    # * offset (int, optional) - The numeric offset that you what results to start
+    def self.distinct(username, options={})
+      options.merge!(auth_options)
+      response_to_mash get("/user/beers/#{username}", :query => options)
     end
-    
-    # since (optional) - The numeric ID of the last recent check-in.
-    # offset (optional) - The offset that you like the dataset to begin with.
-    #   Each set returns 25 max records, so you can use that paginate the feed.
-    def self.friend_feed(username, password, options={})
-      options.merge!({
-        :key => Untappd::apikey
-      })
 
-      response_to_mash get("/feed", :basic_auth => auth_hash(username, password),
-                            :query => options)
+    # options:
+    # * max_id (int, optional) - The checkin ID that you want the results to start with
+    # * limit (int, optional) - The number of results to return, max of 50, default is 25
+    def self.friend_feed(access_token, options={})
+      options.merge!({:access_token => access_token})
+      response_to_mash get("/checkin/recent", :query => options)
     end
-    
   end
-  
 end

data/lib/untappd/venue.rb

@@ -1,29 +1,17 @@
 module Untappd
-  
   class Venue < Base
-    
-    # since (optional) - The numeric ID of the last recent check-in.
-    # offset (optional) - The offset that you like the dataset to begin with.
-    #   Each set returns 25 max records, so you can use that paginate the feed.
+    # options:
+    # * min_id (int, optional) - The numeric ID of the most recent check-in. New results
+    # will only be shown if there are checkins before this ID
+    # * max_Id (int, optional) - The checkin ID that you want the results to start with
+    # * limit (int, optional) - The number of results to return, max of 50, default is 25
     def self.feed(venue_id, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :venue_id => venue_id
-      })
-
-      response_to_mash get("/venue_checkins", :query => options)
+      options.merge!(auth_options)
+      response_to_mash get("/venue/checkins/#{venue_id}", :query => options)
     end
-    
-    #
-    def self.info(venue_id, options={})
-      options.merge!({
-        :key => Untappd::apikey,
-        :venue_id => venue_id
-      })
 
-      response_to_mash get("/venue_info", :query => options)
+    def self.info(venue_id)
+      response_to_mash get("/venue/info/#{venue_id}", :query => auth_options)
     end
-    
   end
-  
 end

data/lib/untappd/version.rb

@@ -1,3 +1,3 @@
 module Untappd
-  VERSION = "0.0.5"
+  VERSION = "4.0.0"
 end

data/spec/beer_spec.rb

@@ -1,75 +1,30 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Beer" do
-  
-  before(:all) do
-    Untappd.configure do |config|
-        config.apikey = '6666666666666666666666'
-    end
+  before do
+    configure_untappd
   end
-    
-  before(:each) do
-    @response = {:results =>[]}
-    @response.stub(:code => 200)
-    Untappd::Beer.stub(:get => @response)
-  end
-  
-  it "get feed" do
-    @response[:results] << {:checkin_id => "610208",
-                            :beer_id => "18099",
-                            :beer_name => "Arrogant Bastard Ale",
-                            :brewery_name => "Stone Brewing Co."}
 
-    Untappd::Beer.should_receive(:get).with("/beer_checkins", anything())
-    
-    checkins = Untappd::Beer.feed(18099)    
-    checkins.first.beer_name.should == "Arrogant Bastard Ale"
+  it "get feed", :vcr do
+    checkins = Untappd::Beer.feed(18099)
+    checkins.checkins.items.first.beer.beer_name.should == "Arrogant Bastard Ale"
   end
-  
-  it "get info" do
-    @response[:results] = {:brewery_id => "1204",
-                            :beer_id => "18099",
-                            :name => "Arrogant Bastard Ale",
-                            :brewery => "Stone Brewing Co."}
 
-    Untappd::Beer.should_receive(:get).with("/beer_info", anything())
-    
-    info = Untappd::Beer.info(18099)    
-    info.name.should == "Arrogant Bastard Ale"
-  end
-  
-  it "get search" do
-    @response[:results] << {:beer_id => "18099",
-                            :beer_name => "Arrogant Bastard Ale",
-                            :brewery_name => "Stone Brewing Co."}
-    
-    Untappd::Beer.should_receive(:get).with("/beer_search", anything())
-    
-    search = Untappd::Beer.search('stone')    
-    search.first.beer_name.should == "Arrogant Bastard Ale"
+  it "get info", :vcr do
+    info = Untappd::Beer.info(18099)
+    info.beer.beer_name.should == "Arrogant Bastard Ale"
   end
-  
-  it "get trending beers" do
-    @response[:results] << {:beer_id => "18099",
-                            :beer_name => "Arrogant Bastard Ale",
-                            :brewery_name => "Stone Brewing Co."}
-    
-    Untappd::Beer.should_receive(:get).with("/trending", anything())
-    
-    trending = Untappd::Beer.trending()    
-    trending.first.beer_name.should == "Arrogant Bastard Ale"
+
+  it "get search", :vcr do
+    search = Untappd::Beer.search('stone')
+    search.beers.items.first.beer.beer_name == "Stone IPA"
+    search.breweries.items.first.brewery.brewery_name.should == "Stone Fly Rye"
   end
-  
-end
 
-#beer trending JSON
-# {"http_code":200,"results":[{"beer_name":"Samuel Adams Noble Pils","beer_id":"5743","brewery_id":"157","count":"66","brewery_name":"Boston Beer Company","img":"https:\/\/untappd.s3.amazonaws.com\/site\/beer_logos\/beer-saNobilePils.jpg"},{"beer_name":"Bud Light","beer_id":"3784","brewery_id":"44","count":"55","brewery_name":"Anheuser-Busch","img":"https:\/\/untappd.s3.amazonaws.com\/site\/beer_logos\/beer-budLight.jpg"},{"beer_name":"Miller Lite","beer_id":"3811","brewery_id":"863","count":"55","brewery_name":"Miller Brewing Company","img":"https:\/\/untappd.s3.amazonaws.com\/site\/beer_logos\/beer-millerLite.jpg"},
-  
-#beer checkin JSON
-#{"next_query":"http:\/\/api.untappd.com\/v3\/beer_checkins?bid=18099&since=610053","next_page":"http:\/\/api.untappd.com\/v3\/beer_checkins?bid=18099&offset=25","http_code":200,"results":[{"user":{"user_name":"micek","first_name":"Cory","last_name":"M.","user_avatar":"https:\/\/untappd.s3.amazonaws.com\/profile\/0d781dfce6d3acfdfbbe9f2692a0d0e4_thumb.jpg","location":"San Diego, CA","bio":"interactive designer\/developer\/creativist, obsessed with user experience, loose leaf teas and micro brews","is_friends":null,"url":""},"checkin_id":"618853","beer_id":"18099","brewery_id":"1204","beer_name":"Arrogant Bastard Ale","brewery_name":"Stone Brewing Co.","created_at":"Sat, 09 Apr 2011 05:27:09 +0000","check_in_comment":"","checkin_link":"http:\/\/untappd.com\/user\/micek\/checkin\/BETZs89","beer_stamp":"https:\/\/untappd.s3.amazonaws.com\/site\/beer_logos\/beer-arrogantBastardAle.jpg","venue_name":"El Take It Easy","venue_id":"272","venue_lat":"32.749","venue_lng":"-117.13"}
-  
-#beer info JSON
-# {"http_code":200,"results":{"name":"Arrogant Bastard Ale","beer_id":"18099","brewery":"Stone Brewing Co.","brewery_id":"1204","img":"https:\/\/untappd.s3.amazonaws.com\/site\/beer_logos\/beer-arrogantBastardAle.jpg","total_count":"1553","unique_count":"1041","monthly_count":"193","weekly_count":"161","beer_abv":"7.2","beer_created":"Mon, 27 Dec 2010 20:34:38 +0000","type":"American Strong Ale","beer_creator":"Firmansyah","beer_creator_id":"9041"}}
+  it "get trending beers", :vcr do
+    trending = Untappd::Beer.trending
+    trending.macro.items.first.beer.beer_name.should == "Guinness Draught"
+    trending.micro.items.first.beer.beer_name.should == "Celebration Ale (2012)"
+  end
 
-#beer search JSON
-#{"search_term":"stone","http_code":200,"returned_results":25,"next_page":"http:\/\/api.untappd.com\/v3\/beer_search?q=stone&offset=25","results":[{"beer_id":"29100","beer_name":" Arrogant Bastard Ale Aged In Bourbon Barrels","beer_stamp":"https:\/\/untappd.s3.amazonaws.com\/site\/assets\/images\/temp\/badge-beer-default.png","brewery_id":"1204","brewery_name":"Stone Brewing Co.","brewery_stamp":"https:\/\/untappd.s3.amazonaws.com\/site\/assets\/images\/temp\/badge-brewery-default.png","country_name":"United States","total_count":"11"}
+end