ordrin 0.1.1 → 0.1.2

data/lib/ordrin/normalize.rb

@@ -1,186 +1,186 @@
-require_relative 'errors'
-
-module Ordrin
-  module Normalize
-    class Normalizers
-      private
-      def regex(regex, error)
-        lambda do |value|
-          result = value.to_s[regex]
-          if result.nil?
-            raise error[value]
-          else
-            result
-          end
-        end
-      end
-
-      public
-      def phone(phone_number)
-        #strips out everything but digits from the phone number
-        phone = phone_number.to_s.gsub(/\D/, '')
-        if phone.length == 10
-          phone[/^(\d{3})(\d{3})(\d{4})$/]
-          "#{$1}-#{$2}-#{$3}"
-        else
-          raise Errors.phone[phone_number]
-        end
-      end
-
-      def money(money)
-        value = money.to_s.gsub(/,/, '')[/^\$?(\d+(\.\d+)?)$/, 1]
-        if value.nil?
-          raise Errors.money[money]
-        else
-          value
-        end
-      end
-
-      def datetime(date_time)
-        if date_time.to_s.upcase == 'ASAP'
-          'ASAP'
-        else
-          begin
-            date_time.strftime('%m-%d+%H:%M')
-          rescue NoMethodError
-            raise Errors.date_time[date_time]
-          end
-        end
-      end
-
-      def date(date)
-        if date.to_s.upcase == 'ASAP'
-          'ASAP'
-        else
-          begin
-            date.strftime('%m-%d')
-          rescue NoMethodError
-            raise Errors.date[date_time]
-          end
-        end
-      end
-
-      def time(time)
-        if time.to_s.upcase == 'ASAP'
-          'ASAP'
-        else
-          begin
-            time.strftime('%m-%d+%H:%M')
-          rescue NoMethodError
-            raise Errors.time[date_time]
-          end
-        end
-      end
-
-      def url(url)
-        url.to_s[/^(https?:\/\/)[-\w.~]+(:\d+)?(\/[-\w.~]+)*/]
-      end
-
-      def state(state)
-        state = state.to_s[/^[A-Za-z]{2}$/]
-        if state.nil?
-          raise Errors.state[state]
-        else
-          state.upcase
-        end
-      end
-
-      private
-      def cc_type(cc_number)
-        cc_map = {'American Express' => /^3[47]\d{13}$/,
-          'Visa' => /^4\d{12}(?:\d{3})?$/,
-          'Mastercard' => /^5[1-5]\d{14}$/,
-          'Discover' => /^6(?:011|5\d{2})\d{12}$/}
-
-        type = nil
-        cc_map.each {|key, value| type = key unless cc_number[value].nil?}
-        type
-      end
-
-      def luhn_checksum(card_number)
-        digits = card_number.to_s.scan(/./).map(&:to_i)
-        checksum = 0
-        digits.each_index do |index|
-          digit = digits[index]
-          if (digits.length-index)%2==1
-            checksum += digit
-          else
-            checksum += 2 * digit
-          end
-        end
-        checksum % 10
-      end
-
-      def luhn_valid?(card_number)
-        luhn_checksum(card_number) == 0
-      end
-
-      public
-      def credit_card(values)
-        number, cvc = values
-        num = number.to_s.gsub(/\D/, '')
-        unless luhn_valid?(num)
-          raise Errors.credit_card[number]
-        end
-        card_type = cc_type(num)
-        if card_type.nil?
-          raise Errors.credit_card[number]
-        else
-          if card_type=='American Express'
-            cvc_length = 4
-          else
-            cvc_length = 3
-          end
-          if cvc.length == cvc_length and !cvc.to_s[/^\d+$/].nil?
-            [num, cvc, card_type]
-          else
-            raise Errors.cvc[cvc]
-          end
-        end
-      end
-
-      def unchecked(value)
-        value.to_s
-      end
-
-      def name(value)
-        unchecked(value)
-      end
-
-      def zip(zip)
-        regex(/^\d{5}$/, Errors.zip)[zip]
-      end
-
-      def number(num)
-        regex(/^\d+/, Errors.number)[num]
-      end
-
-      def year(year)
-        regex(/^\d{4}$/, Errors.year)[year]
-      end
-
-      def month(mon)
-        regex(/^\d{2}$/, Errors.month)[mon]
-      end
-
-      def email(email)
-        regex(/^[^@\s]+@[^@\s]+\.[a-zA-Z]{2,3}/, Errors.email)[email]
-      end
-
-      def nick(nick)
-        regex(/^[-\w]+/, Errors.nick)[nick]
-      end
-
-      def alphanum(value)
-        regex(/^[a-zA-Z\d]+$/, Errors.alphanum)[value]
-      end
-    end
-
-    @@normalizer = Normalizers.new
-
-    public
-    def Normalize.normalize(value, normalizer)
-      @@normalizer.send(normalizer, value)
-    end
-  end
-end
+require_relative 'errors'
+
+module Ordrin
+  module Normalize
+    class Normalizers
+      private
+      def regex(regex, error)
+        lambda do |value|
+          result = value.to_s[regex]
+          if result.nil?
+            raise error[value]
+          else
+            result
+          end
+        end
+      end
+
+      public
+      def phone(phone_number)
+        #strips out everything but digits from the phone number
+        phone = phone_number.to_s.gsub(/\D/, '')
+        if phone.length == 10
+          phone[/^(\d{3})(\d{3})(\d{4})$/]
+          "#{$1}-#{$2}-#{$3}"
+        else
+          raise Errors.phone[phone_number]
+        end
+      end
+
+      def money(money)
+        value = money.to_s.gsub(/,/, '')[/^\$?(\d+(\.\d+)?)$/, 1]
+        if value.nil?
+          raise Errors.money[money]
+        else
+          value
+        end
+      end
+
+      def datetime(date_time)
+        if date_time.to_s.upcase == 'ASAP'
+          'ASAP'
+        else
+          begin
+            date_time.strftime('%m-%d+%H:%M')
+          rescue NoMethodError
+            raise Errors.date_time[date_time]
+          end
+        end
+      end
+
+      def date(date)
+        if date.to_s.upcase == 'ASAP'
+          'ASAP'
+        else
+          begin
+            date.strftime('%m-%d')
+          rescue NoMethodError
+            raise Errors.date[date_time]
+          end
+        end
+      end
+
+      def time(time)
+        if time.to_s.upcase == 'ASAP'
+          'ASAP'
+        else
+          begin
+            time.strftime('%m-%d+%H:%M')
+          rescue NoMethodError
+            raise Errors.time[date_time]
+          end
+        end
+      end
+
+      def url(url)
+        url.to_s[/^(https?:\/\/)[-\w.~]+(:\d+)?(\/[-\w.~]+)*/]
+      end
+
+      def state(state)
+        state = state.to_s[/^[A-Za-z]{2}$/]
+        if state.nil?
+          raise Errors.state[state]
+        else
+          state.upcase
+        end
+      end
+
+      private
+      def cc_type(cc_number)
+        cc_map = {'American Express' => /^3[47]\d{13}$/,
+          'Visa' => /^4\d{12}(?:\d{3})?$/,
+          'Mastercard' => /^5[1-5]\d{14}$/,
+          'Discover' => /^6(?:011|5\d{2})\d{12}$/}
+
+        type = nil
+        cc_map.each {|key, value| type = key unless cc_number[value].nil?}
+        type
+      end
+
+      def luhn_checksum(card_number)
+        digits = card_number.to_s.scan(/./).map(&:to_i)
+        checksum = 0
+        digits.each_index do |index|
+          digit = digits[index]
+          if (digits.length-index)%2==1
+            checksum += digit
+          else
+            checksum += 2 * digit
+          end
+        end
+        checksum % 10
+      end
+
+      def luhn_valid?(card_number)
+        luhn_checksum(card_number) == 0
+      end
+
+      public
+      def credit_card(values)
+        number, cvc = values
+        num = number.to_s.gsub(/\D/, '')
+        unless luhn_valid?(num)
+          raise Errors.credit_card[number]
+        end
+        card_type = cc_type(num)
+        if card_type.nil?
+          raise Errors.credit_card[number]
+        else
+          if card_type=='American Express'
+            cvc_length = 4
+          else
+            cvc_length = 3
+          end
+          if cvc.length == cvc_length and !cvc.to_s[/^\d+$/].nil?
+            [num, cvc, card_type]
+          else
+            raise Errors.cvc[cvc]
+          end
+        end
+      end
+
+      def unchecked(value)
+        value.to_s
+      end
+
+      def name(value)
+        unchecked(value)
+      end
+
+      def zip(zip)
+        regex(/^\d{5}$/, Errors.zip)[zip]
+      end
+
+      def number(num)
+        regex(/^\d+/, Errors.number)[num]
+      end
+
+      def year(year)
+        regex(/^\d{4}$/, Errors.year)[year]
+      end
+
+      def month(mon)
+        regex(/^\d{2}$/, Errors.month)[mon]
+      end
+
+      def email(email)
+        regex(/^[^@\s]+@[^@\s]+\.[a-zA-Z]{2,3}/, Errors.email)[email]
+      end
+
+      def nick(nick)
+        regex(/^[-\w]+/, Errors.nick)[nick]
+      end
+
+      def alphanum(value)
+        regex(/^[a-zA-Z\d]+$/, Errors.alphanum)[value]
+      end
+    end
+
+    @@normalizer = Normalizers.new
+
+    public
+    def Normalize.normalize(value, normalizer)
+      @@normalizer.send(normalizer, value)
+    end
+  end
+end

data/lib/ordrin/order.rb

@@ -1,79 +1,79 @@
-require_relative 'ordrinapi'
-require_relative 'normalize'
-require_relative 'data'
-
-module Ordrin
-  # This class will be used to access the order API. All return values
-  # are documented at http://ordr.in/developers/order
-  class OrderApi < OrdrinApi
-
-    private
-
-    #Put all of the data that needs to be passed to the POST request normalized into a dict.
-    def build_dict(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email, login=nil)
-      data = {'restaurant_id' => Normalize.normalize(restaurant_id, :number),
-        'tray' => tray.to_s,
-        'tip' => Normalize.normalize(tip, :money),
-        'delivery_date' => Normalize.normalize(delivery_date_time, :date)}
-      if data['delivery_date'] != 'ASAP'
-        data['delivery_time'] = Normalize.normalize(delivery_date_time, :time)
-      end
-      data['first_name'] = Normalize.normalize(first_name, :name)
-      data['last_name'] = Normalize.normalize(last_name, :name)
-      begin
-        data.merge!(address.make_dict)
-      rescue NoMethodError=>e
-        data['nick'] = Normalize.normalize(address, :nick)
-      end
-      if login.nil?
-        data['em'] = Normalize.normalize(email, :email)
-      end
-      begin
-        credit_card.make_dict.each_pair do |key, value|
-          data["card_#{key}"] = value
-        end
-      rescue NoMethodError=>e
-        data['card_nick'] = Normalize.normalize(credit_card, :nick)
-      end
-      data['type'] = 'res'
-      return data
-    end
-
-    public
-    # Place an order, either anonymously or as a logged in user. At least one
-    # of email and login must be passed. If both are passed, email will be ignored.
-    # Arguments:
-    # restaurant_id -- Ordr.in's restaurant identifier
-    # tray -- A tray of food to order. Should be an ordrin.data.Tray object
-    # tip -- The tip amount
-    # delivery_date_time -- Either 'ASAP' or a datetime object in the future
-    # first_name -- The orderer's first name
-    # last_name -- The orderer's last name
-    # address -- An address object (Ordrin::Data::Address) or the nickname of a saved address
-    # credit_card -- A credit card object (Ordrin::Data::CreditCard) or the nickname of a saved credit card
-    # email -- The email address of an anonymous user
-    # login -- The logged in user's login information. Should be an ordrin.data.UserLogin object
-    def order(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email=nil, login=nil)
-      data = build_dict(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email, login)
-      return call_api(:post, ['o', restaurant_id], login, data)
-    end
-
-    # Place an order and create a user account
-    # Arguments:
-    # restaurant_id -- Ordr.in's restaurant identifier
-    # tray -- A tray of food to order. Should be an ordrin.data.Tray object
-    # tip -- The tip amount
-    # delivery_date_time -- Either 'ASAP' or a datetime object in the future
-    # first_name -- The orderer's first name
-    # last_name -- The orderer's last name
-    # address -- An address object (Ordrin::Data::Address) or the nickname of a saved address
-    # credit_card -- A credit card object (Ordrin::Data::CreditCard) or the nickname of a saved credit card
-    # email -- The email address of the user
-    # password -- The user's password (in plain text)
-    def order_create_user(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email, password)
-      data = build_dict(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email)
-      data['pw'] = Data::UserLogin.hash_password(password)
-      return call_api(:post, ['o', restaurant_id], nil, data)
-    end
-  end
-end
+require_relative 'ordrinapi'
+require_relative 'normalize'
+require_relative 'data'
+
+module Ordrin
+  # This class will be used to access the order API. All return values
+  # are documented at http://ordr.in/developers/order
+  class OrderApi < OrdrinApi
+
+    private
+
+    #Put all of the data that needs to be passed to the POST request normalized into a dict.
+    def build_dict(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email, login=nil)
+      data = {'restaurant_id' => Normalize.normalize(restaurant_id, :number),
+        'tray' => tray.to_s,
+        'tip' => Normalize.normalize(tip, :money),
+        'delivery_date' => Normalize.normalize(delivery_date_time, :date)}
+      if data['delivery_date'] != 'ASAP'
+        data['delivery_time'] = Normalize.normalize(delivery_date_time, :time)
+      end
+      data['first_name'] = Normalize.normalize(first_name, :name)
+      data['last_name'] = Normalize.normalize(last_name, :name)
+      begin
+        data.merge!(address.make_dict)
+      rescue NoMethodError=>e
+        data['nick'] = Normalize.normalize(address, :nick)
+      end
+      if login.nil?
+        data['em'] = Normalize.normalize(email, :email)
+      end
+      begin
+        credit_card.make_dict.each_pair do |key, value|
+          data["card_#{key}"] = value
+        end
+      rescue NoMethodError=>e
+        data['card_nick'] = Normalize.normalize(credit_card, :nick)
+      end
+      data['type'] = 'res'
+      return data
+    end
+
+    public
+    # Place an order, either anonymously or as a logged in user. At least one
+    # of email and login must be passed. If both are passed, email will be ignored.
+    # Arguments:
+    # restaurant_id -- Ordr.in's restaurant identifier
+    # tray -- A tray of food to order. Should be an ordrin.data.Tray object
+    # tip -- The tip amount
+    # delivery_date_time -- Either 'ASAP' or a datetime object in the future
+    # first_name -- The orderer's first name
+    # last_name -- The orderer's last name
+    # address -- An address object (Ordrin::Data::Address) or the nickname of a saved address
+    # credit_card -- A credit card object (Ordrin::Data::CreditCard) or the nickname of a saved credit card
+    # email -- The email address of an anonymous user
+    # login -- The logged in user's login information. Should be an ordrin.data.UserLogin object
+    def order(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email=nil, login=nil)
+      data = build_dict(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email, login)
+      return call_api(:post, ['o', restaurant_id], login, data)
+    end
+
+    # Place an order and create a user account
+    # Arguments:
+    # restaurant_id -- Ordr.in's restaurant identifier
+    # tray -- A tray of food to order. Should be an ordrin.data.Tray object
+    # tip -- The tip amount
+    # delivery_date_time -- Either 'ASAP' or a datetime object in the future
+    # first_name -- The orderer's first name
+    # last_name -- The orderer's last name
+    # address -- An address object (Ordrin::Data::Address) or the nickname of a saved address
+    # credit_card -- A credit card object (Ordrin::Data::CreditCard) or the nickname of a saved credit card
+    # email -- The email address of the user
+    # password -- The user's password (in plain text)
+    def order_create_user(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email, password)
+      data = build_dict(restaurant_id, tray, tip, delivery_date_time, first_name, last_name, address, credit_card, email)
+      data['pw'] = Data::UserLogin.hash_password(password)
+      return call_api(:post, ['o', restaurant_id], nil, data)
+    end
+  end
+end

data/lib/ordrin/ordrinapi.rb

@@ -1,66 +1,66 @@
-require_relative 'normalize'
-require 'net/http'
-require 'json'
-require 'digest'
-
-module Ordrin
-  # A base object for calling one part of the ordr.in API
-  class OrdrinApi
-
-    attr_reader :base_url
-    
-    # Save the url and key parameters in the object
-    # Arguments:
-    # key -- The developer's API key
-    # base_url -- the url that all API call urls will expand from
-    def initialize(key, base_url)
-      @key = key
-      @base_url = Normalize.normalize(base_url, :url)
-    end
-
-    protected
-
-    # Calls the api at the saved url and returns the return value as Python data structures.
-    # Rethrows any api error as a Ruby exception
-    def call_api(method, arguments, login=nil, data=nil)
-      methods = {:get => Net::HTTP::Get,
-        :post => Net::HTTP::Post,
-        :put => Net::HTTP::Put,
-        :delete => Net::HTTP::Delete}
-      method = methods[method]
-      uri = ('/'+(arguments.collect {|a| URI.encode a.to_s})*'/')
-      full_url = URI.parse(base_url+uri)
-      req = method.new(full_url.request_uri)
-      unless data.nil?
-        req.body = URI.encode_www_form(data)
-      end
-      unless @key.empty?
-        req['X-NAAMA-CLIENT-AUTHENTICATION'] = "id=\"#{@key}\", version=\"1\""
-      end
-      unless login.nil?
-        hash_code = Digest::SHA256.new.hexdigest("#{login.password}#{login.email}#{uri}")
-        req['X-NAAMA-AUTHENTICATION'] = "username=\"#{login.email}\", response=\"#{hash_code}\", version=\"1\""
-      end
-      http = Net::HTTP.new(full_url.host, full_url.port)
-      if full_url.scheme == "https"
-        http.use_ssl = true
-        http.ca_file = File.join(File.dirname(__FILE__), "cacert.pem")
-      end
-      res = http.start {|http| http.request(req)}
-      #error if not OK response
-      res.value
-      result = JSON.parse(res.body)
-      if result.is_a? Hash
-        if result.has_key?('_error') and result['_error']!=0
-          if result.has_key?('text')
-            raise Errors::ApiError.new(result['msg'], result['text'])
-          else
-            raise Errors::ApiError.new(result['msg'])
-          end
-          result
-        end
-      end
-      result
-    end
-  end
-end
+require_relative 'normalize'
+require 'net/http'
+require 'json'
+require 'digest'
+
+module Ordrin
+  # A base object for calling one part of the ordr.in API
+  class OrdrinApi
+
+    attr_reader :base_url
+    
+    # Save the url and key parameters in the object
+    # Arguments:
+    # key -- The developer's API key
+    # base_url -- the url that all API call urls will expand from
+    def initialize(key, base_url)
+      @key = key
+      @base_url = Normalize.normalize(base_url, :url)
+    end
+
+    protected
+
+    # Calls the api at the saved url and returns the return value as Python data structures.
+    # Rethrows any api error as a Ruby exception
+    def call_api(method, arguments, login=nil, data=nil)
+      methods = {:get => Net::HTTP::Get,
+        :post => Net::HTTP::Post,
+        :put => Net::HTTP::Put,
+        :delete => Net::HTTP::Delete}
+      method = methods[method]
+      uri = ('/'+(arguments.collect {|a| URI.encode a.to_s})*'/')
+      full_url = URI.parse(base_url+uri)
+      req = method.new(full_url.request_uri)
+      unless data.nil?
+        req.body = URI.encode_www_form(data)
+      end
+      unless @key.empty?
+        req['X-NAAMA-CLIENT-AUTHENTICATION'] = "id=\"#{@key}\", version=\"1\""
+      end
+      unless login.nil?
+        hash_code = Digest::SHA256.new.hexdigest("#{login.password}#{login.email}#{uri}")
+        req['X-NAAMA-AUTHENTICATION'] = "username=\"#{login.email}\", response=\"#{hash_code}\", version=\"1\""
+      end
+      http = Net::HTTP.new(full_url.host, full_url.port)
+      if full_url.scheme == "https"
+        http.use_ssl = true
+        http.ca_file = File.join(File.dirname(__FILE__), "cacert.pem")
+      end
+      res = http.start {|http| http.request(req)}
+      #error if not OK response
+      res.value
+      result = JSON.parse(res.body)
+      if result.is_a? Hash
+        if result.has_key?('_error') and result['_error']!=0
+          if result.has_key?('text')
+            raise Errors::ApiError.new(result['msg'], result['text'])
+          else
+            raise Errors::ApiError.new(result['msg'])
+          end
+          result
+        end
+      end
+      result
+    end
+  end
+end