ordrin 0.1.1 → 0.1.2

data/lib/ordrin/restaurant.rb

@@ -1,56 +1,56 @@
-require_relative 'ordrinapi'
-require_relative 'normalize'
-
-module Ordrin
-  # This object's methods access the ordr.in restaurant API. All return values
-  # are documented at http://ordr.in/developers/restaurant
-  class RestaurantApi < OrdrinApi
-    # Get a list of dicts representing restaurants that will deliver to the
-    # given address at the given time.
-    # Arguments:
-    # date_time -- Either 'ASAP' or a datetime object in the future
-    # address -- the address to deliver to. Should be an Ordrin::Data::Address object
-    def get_delivery_list(date_time, address)
-      dt = Normalize.normalize(date_time, :datetime)
-      return call_api(:get, ['dl', dt, address.zip, address.city, address.addr])
-    end
-
-    # Get data about a given restaurant, including whether it will deliver to
-    # the specified address at the specified time
-    # Arguments:
-    # restaurant_id -- Ordr.in's restaurant identifier
-    # date_time -- Either 'ASAP' or a datetime object in the future
-    # address -- the address to deliver to. Should be an Ordrin::Data::Address object
-    def get_delivery_check(restaurant_id, date_time, address)
-      dt = Normalize.normalize(date_time, :datetime)
-      restauant_id = Normalize.normalize(restaurant_id, :number)
-      return call_api(:get, ['dc', restaurant_id, dt, address.zip, address.city, address.addr])
-    end
-
-    # Get data about a given restaurant, including whether it will deliver to
-    # the specified address at the specified time, and what the fee will be on an
-    # order with the given subtotal and tip
-    # Arguments:
-    # restaurant_id -- Ordr.in's restaurant identifier
-    # subtotal -- the subtotal of the order
-    # tip -- the tip on the order
-    # date_time -- Either 'ASAP' or a datetime object in the future
-    # address -- the address to deliver to. Should be an Ordrin::Data::Address object
-    def get_fee(restaurant_id, subtotal, tip, date_time, address)
-      dt = Normalize.normalize(date_time, :datetime)
-      restaurant_id = Normalize.normalize(restaurant_id, :number)
-      subtotal = Normalize.normalize(subtotal, :money)
-      tip = Normalize.normalize(tip, :money)
-      return call_api(:get, ['fee', restaurant_id, subtotal, tip, dt, address.zip, address.city, address.addr])
-    end
-    
-    # Get details of the given restaurant, including contact information and
-    # the menu
-    # Arguments:
-    # restaurant_id -- Ordr.in's restaurant identifier
-    def get_details(restaurant_id)
-      restaurant_id = Normalize.normalize(restaurant_id, :number)
-      return call_api(:get, ['rd', restaurant_id])
-    end
-  end
-end
+require_relative 'ordrinapi'
+require_relative 'normalize'
+
+module Ordrin
+  # This object's methods access the ordr.in restaurant API. All return values
+  # are documented at http://ordr.in/developers/restaurant
+  class RestaurantApi < OrdrinApi
+    # Get a list of dicts representing restaurants that will deliver to the
+    # given address at the given time.
+    # Arguments:
+    # date_time -- Either 'ASAP' or a datetime object in the future
+    # address -- the address to deliver to. Should be an Ordrin::Data::Address object
+    def get_delivery_list(date_time, address)
+      dt = Normalize.normalize(date_time, :datetime)
+      return call_api(:get, ['dl', dt, address.zip, address.city, address.addr])
+    end
+
+    # Get data about a given restaurant, including whether it will deliver to
+    # the specified address at the specified time
+    # Arguments:
+    # restaurant_id -- Ordr.in's restaurant identifier
+    # date_time -- Either 'ASAP' or a datetime object in the future
+    # address -- the address to deliver to. Should be an Ordrin::Data::Address object
+    def get_delivery_check(restaurant_id, date_time, address)
+      dt = Normalize.normalize(date_time, :datetime)
+      restauant_id = Normalize.normalize(restaurant_id, :number)
+      return call_api(:get, ['dc', restaurant_id, dt, address.zip, address.city, address.addr])
+    end
+
+    # Get data about a given restaurant, including whether it will deliver to
+    # the specified address at the specified time, and what the fee will be on an
+    # order with the given subtotal and tip
+    # Arguments:
+    # restaurant_id -- Ordr.in's restaurant identifier
+    # subtotal -- the subtotal of the order
+    # tip -- the tip on the order
+    # date_time -- Either 'ASAP' or a datetime object in the future
+    # address -- the address to deliver to. Should be an Ordrin::Data::Address object
+    def get_fee(restaurant_id, subtotal, tip, date_time, address)
+      dt = Normalize.normalize(date_time, :datetime)
+      restaurant_id = Normalize.normalize(restaurant_id, :number)
+      subtotal = Normalize.normalize(subtotal, :money)
+      tip = Normalize.normalize(tip, :money)
+      return call_api(:get, ['fee', restaurant_id, subtotal, tip, dt, address.zip, address.city, address.addr])
+    end
+    
+    # Get details of the given restaurant, including contact information and
+    # the menu
+    # Arguments:
+    # restaurant_id -- Ordr.in's restaurant identifier
+    def get_details(restaurant_id)
+      restaurant_id = Normalize.normalize(restaurant_id, :number)
+      return call_api(:get, ['rd', restaurant_id])
+    end
+  end
+end

data/lib/ordrin/user.rb

@@ -1,142 +1,142 @@
-require_relative 'ordrinapi'
-require_relative 'normalize'
-require_relative 'data'
-
-module Ordrin
-  # This class will be used to access the user API. All return values
-  # are documented at http://ordr.in/developers/user
-  class UserApi < OrdrinApi
-    # Gets account information for the user associated with login
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    def get(login)
-      return call_api(:get, ['u', login.email], login)
-    end
-
-    # Creates account for the user associated with login. Throws a relevant exception
-    # on failure.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # first_name -- the user's first name
-    # last_name -- the user's last name
-    def create(login, first_name, last_name)
-      data = {'email' => login.email,
-        'first_name' => Normalize.normalize(first_name, :name),
-        'last_name' => Normalize.normalize(last_name, :name),
-        'pw' => login.password}
-      return call_api(:post, ['u', login.email], nil, data)
-    end
-
-    # Updates account for the user associated with login. Throws a relevant exception
-    # on failure.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # first_name -- the user's first name
-    # last_name -- the user's last name
-    def update(login, first_name, last_name)
-      data = {'email' => login.email,
-        'first_name' => Normalize.normalize(first_name, :name),
-        'last_name' => Normalize.normalize(last_name, :name),
-        'pw' => login.password}
-      return call_api(:post, ['u', login.email], login, data)
-    end
-
-    # Get a list of all saved addresses for the user associated with login.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    def get_all_addresses(login)
-      return call_api(:get, ['u', login.email, 'addrs'], login)
-    end
-    
-    # Get a saved address belonging to the logged in user by nickname.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # addr_nick -- the nickname of the address to get
-    def get_address(login, addr_nick)
-      return call_api(:get, ['u', login.email, 'addrs', Normalize.normalize(addr_nick, :nick)], login)
-    end
-
-    # Save an address by nickname for the logged in user
-    # Throws a relevant exception on failure
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # addr_nick -- the nickname of the address to save
-    # address -- the address to save. Should be an Ordrin::Data::Address object
-    def set_address(login, addr_nick, address)
-      return call_api(:put, ['u', login.email, 'addrs', Normalize.normalize(addr_nick, :nick)], login, address.make_dict)
-    end
-
-    # Remove an address, saved by the logged in user, by nickname
-    # Throws a relevant exception on failure.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # addr_nick -- the nickname of the address to remove
-    def remove_address(login, addr_nick)
-      return call_api(:delete, ['u', login.email, 'addrs', Normalize.normalize(addr_nick, :nick)], login)
-    end
-
-    # Get a list of all saved credit cards for the user associated with login.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    def get_all_credit_cards(login)
-      return call_api(:get, ['u', login.email, 'ccs'], login)
-    end
-
-    # Get a saved credit card belonging to the logged in user by nickname.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # card_nick -- the nickname of the credit card to get
-    def get_credit_card(login, card_nick)
-      return call_api(:get, ['u', login.email, 'ccs', Normalize.normalize(card_nick, :nick)], login)
-    end
-
-    # Save an credit card by nickname for the logged in user
-    # Throws a relevant exception on failure
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # card_nick -- the nickname of the credit card to save
-    # credit_card -- the credit card to save. Should be an Ordrin::Data::CreditCard object
-    def set_credit_card(login, card_nick, credit_card)
-      card_nick = Normalize.normalize(card_nick, :nick)
-      data = credit_card.make_dict
-      data.merge!(login.make_dict)
-      data['nick'] = card_nick
-      return call_api(:put, ['u', login.email, 'ccs', card_nick], login, data)
-    end
-
-    # Remove an credit card, saved by the logged in user, by nickname
-    # Throws a relevant exception on failure.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # card_nick -- the nickname of the credit card to remove
-    def remove_credit_card(login, card_nick)
-      return call_api(:delete, ['u', login.email, 'ccs', Normalize.normalize(card_nick, :nick)], login)
-    end
-
-    # Get a list of previous orders by the logged in user.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    def get_order_history(login)
-      return call_api(:get, ['u', login.email, 'orders'], login)
-    end
-
-    # Get details of a particular previous order by the logged in user.
-    # Arguments:
-    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
-    # order_id -- The order ID
-    def get_order_detail(login, order_id)
-      return call_api(:get, ['u', login.email, 'orders', Normalize.normalize(order_id, :alphanum)], login)
-    end
-
-    # Change the logged in user's password.
-    # Arguments:
-    # login -- the user's current login information. Should be an Ordrin::Data::UserLogin object
-    # new_password -- the new password (in plain text)
-    def set_password(login, new_password)
-      data = {'email' => login.email,
-        'password' => Data::UserLogin.hash_password(new_password),
-        'previous_password' => login.password}
-      return self.call_api(:put, ['u', login.email, 'password'], login, data)
-    end
-  end
-end
+require_relative 'ordrinapi'
+require_relative 'normalize'
+require_relative 'data'
+
+module Ordrin
+  # This class will be used to access the user API. All return values
+  # are documented at http://ordr.in/developers/user
+  class UserApi < OrdrinApi
+    # Gets account information for the user associated with login
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    def get(login)
+      return call_api(:get, ['u', login.email], login)
+    end
+
+    # Creates account for the user associated with login. Throws a relevant exception
+    # on failure.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # first_name -- the user's first name
+    # last_name -- the user's last name
+    def create(login, first_name, last_name)
+      data = {'email' => login.email,
+        'first_name' => Normalize.normalize(first_name, :name),
+        'last_name' => Normalize.normalize(last_name, :name),
+        'pw' => login.password}
+      return call_api(:post, ['u', login.email], nil, data)
+    end
+
+    # Updates account for the user associated with login. Throws a relevant exception
+    # on failure.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # first_name -- the user's first name
+    # last_name -- the user's last name
+    def update(login, first_name, last_name)
+      data = {'email' => login.email,
+        'first_name' => Normalize.normalize(first_name, :name),
+        'last_name' => Normalize.normalize(last_name, :name),
+        'pw' => login.password}
+      return call_api(:post, ['u', login.email], login, data)
+    end
+
+    # Get a list of all saved addresses for the user associated with login.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    def get_all_addresses(login)
+      return call_api(:get, ['u', login.email, 'addrs'], login)
+    end
+    
+    # Get a saved address belonging to the logged in user by nickname.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # addr_nick -- the nickname of the address to get
+    def get_address(login, addr_nick)
+      return call_api(:get, ['u', login.email, 'addrs', Normalize.normalize(addr_nick, :nick)], login)
+    end
+
+    # Save an address by nickname for the logged in user
+    # Throws a relevant exception on failure
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # addr_nick -- the nickname of the address to save
+    # address -- the address to save. Should be an Ordrin::Data::Address object
+    def set_address(login, addr_nick, address)
+      return call_api(:put, ['u', login.email, 'addrs', Normalize.normalize(addr_nick, :nick)], login, address.make_dict)
+    end
+
+    # Remove an address, saved by the logged in user, by nickname
+    # Throws a relevant exception on failure.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # addr_nick -- the nickname of the address to remove
+    def remove_address(login, addr_nick)
+      return call_api(:delete, ['u', login.email, 'addrs', Normalize.normalize(addr_nick, :nick)], login)
+    end
+
+    # Get a list of all saved credit cards for the user associated with login.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    def get_all_credit_cards(login)
+      return call_api(:get, ['u', login.email, 'ccs'], login)
+    end
+
+    # Get a saved credit card belonging to the logged in user by nickname.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # card_nick -- the nickname of the credit card to get
+    def get_credit_card(login, card_nick)
+      return call_api(:get, ['u', login.email, 'ccs', Normalize.normalize(card_nick, :nick)], login)
+    end
+
+    # Save an credit card by nickname for the logged in user
+    # Throws a relevant exception on failure
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # card_nick -- the nickname of the credit card to save
+    # credit_card -- the credit card to save. Should be an Ordrin::Data::CreditCard object
+    def set_credit_card(login, card_nick, credit_card)
+      card_nick = Normalize.normalize(card_nick, :nick)
+      data = credit_card.make_dict
+      data.merge!(login.make_dict)
+      data['nick'] = card_nick
+      return call_api(:put, ['u', login.email, 'ccs', card_nick], login, data)
+    end
+
+    # Remove an credit card, saved by the logged in user, by nickname
+    # Throws a relevant exception on failure.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # card_nick -- the nickname of the credit card to remove
+    def remove_credit_card(login, card_nick)
+      return call_api(:delete, ['u', login.email, 'ccs', Normalize.normalize(card_nick, :nick)], login)
+    end
+
+    # Get a list of previous orders by the logged in user.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    def get_order_history(login)
+      return call_api(:get, ['u', login.email, 'orders'], login)
+    end
+
+    # Get details of a particular previous order by the logged in user.
+    # Arguments:
+    # login -- the user's login information. Should be an Ordrin::Data::UserLogin object
+    # order_id -- The order ID
+    def get_order_detail(login, order_id)
+      return call_api(:get, ['u', login.email, 'orders', Normalize.normalize(order_id, :alphanum)], login)
+    end
+
+    # Change the logged in user's password.
+    # Arguments:
+    # login -- the user's current login information. Should be an Ordrin::Data::UserLogin object
+    # new_password -- the new password (in plain text)
+    def set_password(login, new_password)
+      data = {'email' => login.email,
+        'password' => Data::UserLogin.hash_password(new_password),
+        'previous_password' => login.password}
+      return self.call_api(:put, ['u', login.email, 'password'], login, data)
+    end
+  end
+end

data/lib/ordrin.rb

@@ -1,58 +1,58 @@
-require_relative 'ordrin/restaurant'
-require_relative 'ordrin/user'
-require_relative 'ordrin/order'
-require_relative 'ordrin/data'
-
-module Ordrin
-  class APIs
-    
-    attr_reader :restaurant, :user, :order
-    
-    # Sets up this module to make API calls. The first argument is the developer's
-    # API key. The other three are the URLs corresponding to the three parts of the api.
-    # No API calls will work until this function is called. API objects will only be
-    # instantiated for URLs that are passed in.
-
-    # Arguments:
-    # api_key -- The developer's API key
-    # servers -- How the server URLs should be set. Must be :production, :test, or :custom
-    # restaurant_url -- The base url for the restaurant API. Can only be set if servers==:custom.
-    # user_url -- The base url for the user API. Can only be set if servers==:custom.
-    # order_url -- The base url for the order API. Can only be set if servers==:custom.
-    def initialize(api_key, servers, restaurant_url=nil, user_url=nil, order_url=nil)
-      @api_key = api_key
-      if servers!=:custom
-        unless restaurant_url.nil? and user_url.nil? and order_url.nil?
-          raise ArgumentError.new("Individual URL parameters can only be set if servers is set to :custom")
-        end
-      end
-      if servers==:production
-        restaurant_url = "https://r.ordr.in/"
-        user_url = "https://u.ordr.in/"
-        order_url = "https://o.ordr.in/"
-      elsif servers==:test
-        restaurant_url = "https://r-test.ordr.in/"
-        user_url = "https://u-test.ordr.in/"
-        order_url = "https://o-test.ordr.in/"
-      elsif servers!=:custom
-        raise ArgumentError.new("servers must be set to :production, :test, or :custom")
-      end
-      unless restaurant_url.nil?
-        @restaurant = RestaurantApi.new(api_key, restaurant_url)
-      end
-      unless user_url.nil?
-        @user = UserApi.new(api_key, user_url)
-      end
-      unless order_url.nil?
-        @order = OrderApi.new(api_key, order_url)
-      end
-    end
-
-    def config
-      return {"API key" => api_key,
-        "Restaurant URL" => @restaurant.base_url,
-        "User URL" => @user.base_url,
-        "Order URL" => @order.base_url}
-    end
-  end
-end
+require_relative 'ordrin/restaurant'
+require_relative 'ordrin/user'
+require_relative 'ordrin/order'
+require_relative 'ordrin/data'
+
+module Ordrin
+  class APIs
+    
+    attr_reader :restaurant, :user, :order
+    
+    # Sets up this module to make API calls. The first argument is the developer's
+    # API key. The other three are the URLs corresponding to the three parts of the api.
+    # No API calls will work until this function is called. API objects will only be
+    # instantiated for URLs that are passed in.
+
+    # Arguments:
+    # api_key -- The developer's API key
+    # servers -- How the server URLs should be set. Must be :production, :test, or :custom
+    # restaurant_url -- The base url for the restaurant API. Can only be set if servers==:custom.
+    # user_url -- The base url for the user API. Can only be set if servers==:custom.
+    # order_url -- The base url for the order API. Can only be set if servers==:custom.
+    def initialize(api_key, servers, restaurant_url=nil, user_url=nil, order_url=nil)
+      @api_key = api_key
+      if servers!=:custom
+        unless restaurant_url.nil? and user_url.nil? and order_url.nil?
+          raise ArgumentError.new("Individual URL parameters can only be set if servers is set to :custom")
+        end
+      end
+      if servers==:production
+        restaurant_url = "https://r.ordr.in/"
+        user_url = "https://u.ordr.in/"
+        order_url = "https://o.ordr.in/"
+      elsif servers==:test
+        restaurant_url = "https://r-test.ordr.in/"
+        user_url = "https://u-test.ordr.in/"
+        order_url = "https://o-test.ordr.in/"
+      elsif servers!=:custom
+        raise ArgumentError.new("servers must be set to :production, :test, or :custom")
+      end
+      unless restaurant_url.nil?
+        @restaurant = RestaurantApi.new(api_key, restaurant_url)
+      end
+      unless user_url.nil?
+        @user = UserApi.new(api_key, user_url)
+      end
+      unless order_url.nil?
+        @order = OrderApi.new(api_key, order_url)
+      end
+    end
+
+    def config
+      return {"API key" => api_key,
+        "Restaurant URL" => @restaurant.base_url,
+        "User URL" => @user.base_url,
+        "Order URL" => @order.base_url}
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ordrin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,7 +30,7 @@ dependencies:
 description: Ordrin API wrapper. Used to simplify making calls to the Ordr.in API
   in Ruby
 email:
-- tech@ordr.in
+- hackfood@ordr.in
 executables:
 - ordrindemo.rb
 extensions: []
@@ -44,6 +44,7 @@ files:
 - lib/ordrin/ordrinapi.rb
 - lib/ordrin/restaurant.rb
 - lib/ordrin/user.rb
+- lib/ordrin/cacert.pem
 - bin/ordrindemo.rb
 - LICENSE.txt
 - README.md
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ordrin API wrapper