From f4540ed4ba8f6d4bf39fb272b3ccef47f2047106 Mon Sep 17 00:00:00 2001 From: Ben Greenberg Date: Sun, 18 Aug 2013 12:54:44 -0400 Subject: [PATCH] Changes to allow the gem to work on Ruby 1.8.7 --- lib/nacre/api.rb | 12 ++++++------ .../api/order_service_resources/order_search.rb | 6 +++--- lib/nacre/api/service_resource.rb | 2 +- lib/nacre/config.rb | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/nacre/api.rb b/lib/nacre/api.rb index e98fb4e..abca81b 100644 --- a/lib/nacre/api.rb +++ b/lib/nacre/api.rb @@ -11,9 +11,9 @@ class Api def initialize args @config = Nacre::Config.new(args) @connection = Nacre::Connection.new({ - auth_data: auth_data, - auth_url: @config.auth_url, - api_url: @config.api_url + :auth_data => auth_data, + :auth_url => @config.auth_url, + :api_url => @config.api_url }) @connection.authenticate @@ -29,9 +29,9 @@ def self.global_instance def auth_data { - apiAccountCredentials: { - emailAddress: @config.email, - password: @config.password + :apiAccountCredentials => { + :emailAddress => @config.email, + :password => @config.password } } end diff --git a/lib/nacre/api/order_service_resources/order_search.rb b/lib/nacre/api/order_service_resources/order_search.rb index bf11a2e..414a3e2 100644 --- a/lib/nacre/api/order_service_resources/order_search.rb +++ b/lib/nacre/api/order_service_resources/order_search.rb @@ -8,7 +8,7 @@ class OrderSearch def initialize(search_url, query = nil, max_results = 200, starting_page = 1) @search_url = search_url @query = query - @params = build_params( max_results: max_results, starting_page: starting_page ) + @params = build_params( :max_results => max_results, :starting_page => starting_page ) end def self.connection @@ -43,8 +43,8 @@ def build_params args def map_to_bp_param param_key bp_map = { - max_results: 'pageSize', - starting_page: 'firstResult' + :max_results => 'pageSize', + :starting_page => 'firstResult' } bp_map[param_key] || param_key.to_s end diff --git a/lib/nacre/api/service_resource.rb b/lib/nacre/api/service_resource.rb index 07fc81a..e5607f3 100644 --- a/lib/nacre/api/service_resource.rb +++ b/lib/nacre/api/service_resource.rb @@ -56,7 +56,7 @@ def self.find_many(id_set) def load_values(values) self.class.fields.each do |field| - self.public_send "#{field.to_s}=", values[field.to_s.camelize(:lower)].to_openstruct + self.send "#{field.to_s}=", values[field.to_s.camelize(:lower)].to_openstruct end end diff --git a/lib/nacre/config.rb b/lib/nacre/config.rb index 94d63f8..24f74ec 100644 --- a/lib/nacre/config.rb +++ b/lib/nacre/config.rb @@ -1,4 +1,4 @@ -require 'psych' +#require 'psych' module Nacre class Config @@ -47,7 +47,7 @@ def auth_url private def load_file file - config = Psych.load( File.open(file,'r').read ) + config = YAML.load( File.open(file,'r').read ) load_values config return true end