spec/services/service_with_parameter_aliases.rb @@ -11,7 +11,7 @@ module Relax end def parameter(name, options={}) - unless @parameters.find { |parameter| parameter.name == name } + unless @parameters.find { |parameter| parameter.named?(name) } @parameters << Parameter.new(name, options) else raise ArgumentError.new("Duplicate parameter '#{name}'.") @@ -19,14 +19,19 @@ module Relax end def set(name, value) - if parameter = @parameters.find { |parameter| parameter.name == name } + if parameter = @parameters.find { |parameter| parameter.named?(name) } parameter.value = value end end def parser(root, options={}, &block) # :nodoc: - @parser ||= root.kind_of?(Class) ? root.new(options, &block) : - Relief::Parser.new(root, options, &block) + @parser ||= begin + if root.kind_of?(Class) + root.new(options, &block) + else + Relief::Parser.new(root, options, &block) + end + end end def parse(response) # :nodoc: lib/relax/context.rb @@ -8,12 +8,12 @@ module Relax def values(context) context.parameters.inject({}) do |values, parameter| - name = parameter.name + name = parameter.options[:as] || parameter.name - if value = @values[parameter.name] || parameter.value + if value = @values[name] || parameter.value values[parameter.name] = value elsif parameter.required? - raise ArgumentError.new("Missing value for '#{parameter.name}'.") + raise ArgumentError.new("Missing value for '#{name}'.") end values lib/relax/instance.rb @@ -8,6 +8,10 @@ module Relax @options = options end + def named?(name) + name == (@options[:as] || @name) + end + def value @value || @options[:default] end lib/relax/parameter.rb @@ -1,10 +1,13 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper') describe Relax::Context do - it "utilizes a custom parser for Class parsers" do service = ServiceWithCustomParser.new service.test.should == 'parsed' end - + + it "allows parameters with aliases" do + service = ServiceWithParameterAliases.new + service.test(:api_key => 'secret')[:stat].should == 'ok' + end end spec/relax/context_spec.rb @@ -1,23 +1,19 @@ class TestCustomParser - def initialize(options = {}, &block) end - + def parse(input) 'parsed' end - end class ServiceWithCustomParser < Relax::Service endpoint "http://test.local/rest" do - action :test do parser TestCustomParser do element :status, :attribute => :stat end end - end end spec/services/service_with_custom_parser.rb @@ -11,3 +11,4 @@ require 'fakeweb' require File.join(File.dirname(__FILE__), '..', 'lib', 'relax') require File.join(File.dirname(__FILE__), 'services', 'flickr') require File.join(File.dirname(__FILE__), 'services', 'service_with_custom_parser') +require File.join(File.dirname(__FILE__), 'services', 'service_with_parameter_aliases') spec/spec_helper.rb 60300e939db23ace5892f6cfbc868c43702c2502 Tyler Hunt tyler@tylerhunt.com http://github.com/tylerhunt/relax/commit/221af7ffd206ff75e57b8453b44b03013b6401cd 221af7ffd206ff75e57b8453b44b03013b6401cd 2009-06-29T18:11:29-07:00 2009-06-29T18:11:29-07:00 Added support for parameter name aliases. de54d2cfc2a4c3b3b400e05b63b9f7ab73d4d51d Tyler Hunt tyler@tylerhunt.com