lib/spigot/map/service.rb in spigot-0.2.2 vs lib/spigot/map/service.rb in spigot-0.3.0

- old
+ new

@@ -1,9 +1,8 @@ - module Spigot +module Spigot module Map class Service - attr_reader :name attr_accessor :resources def initialize(name) @name = name.to_s.underscore.to_sym @@ -15,11 +14,11 @@ service.instance_eval(&block) if block_given? current_map.update(name, service) end def self.resource(name, &block) - service(:any){ resource(name, &block) } + service(:any) { resource(name, &block) } end def self.find(name) current_map.service(name) end @@ -31,15 +30,17 @@ def reset @resources = [] end def [](name) - resources.detect{|r| r.instance_variable_get(:@name).to_sym == name.to_sym} + resources.find { |r| r.instance_variable_get(:@name).to_sym == name.to_sym } end def self.extract(params) return params if current_map.nil? + return [nil, params] if params.is_a?(Array) + name = params.keys.first service = current_map.service(name) if service.nil? return [nil, params] @@ -51,9 +52,8 @@ private def self.current_map Spigot.config.map end - end end end