anmo 0.0.22 → 0.0.23

data/lib/anmo/application.rb

@@ -1,4 +1,5 @@
 require "dalli"
+require "uri"
 
 module Anmo
   class ApplicationDataStore
@@ -35,6 +36,20 @@ module Anmo
       server.delete("requests")
     end
 
+    def self.find(path, query_string)
+      self.objects.each do |object|
+        object_path = object["path"].gsub(/(\?.*)$/, "")
+        if path == object_path
+          object_query_string = Rack::Utils.parse_query(object["path"].gsub(/(.*?)\?/, ""))
+
+          if query_string == object_query_string
+            p object
+            return object
+          end
+        end
+      end
+    end
+
     private
       def self.server
         @server ||= Dalli::Client.new "localhost:11211", {:namespace => Process.pid.to_s}
@@ -121,19 +136,27 @@ module Anmo
         actual_request_query = Rack::Utils.parse_query(actual_request.query_string)
 
         suspected_request = ApplicationDataStore.objects.find do |r|
-          r["path"].gsub(/\?.*/, "") == actual_request.path_info
+          uri = URI(r["path"])
+
+          query = Rack::Utils.parse_query(uri.query)
+          method = r["method"] || "GET"
+
+          if uri.query.nil?
+            uri.path == actual_request.path_info && method.upcase == actual_request.request_method.upcase
+          else
+            uri.path == actual_request.path_info && query == actual_request_query && method.upcase == actual_request.request_method.upcase
+          end
         end
 
-        if suspected_request
-          return unless request_has_same_method actual_request, suspected_request
-          return unless request_has_same_query actual_request, suspected_request
-          return unless request_has_required_headers actual_request, suspected_request
+        if !suspected_request.nil?
+          return unless request_has_required_headers(actual_request, suspected_request)
         end
+
         suspected_request
       end
 
       def request_has_same_method initial_request, suspected_request
-        return true if suspected_request["method"] == nil
+        return true if suspected_request["method"].nil?
         suspected_request["method"].upcase == initial_request.request_method
       end
 
@@ -144,7 +167,7 @@ module Anmo
       end
 
       def request_has_required_headers initial_request, suspected_request
-        required_headers = suspected_request["required_headers"] || []
+        required_headers = suspected_request["required_headers"] || {}
         required_headers.each do |name, value|
           if initial_request.env[convert_header_name_to_rack_style_name(name)] != value
             return false

data/lib/anmo/version.rb

@@ -1,3 +1,3 @@
 module Anmo
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/test/anmo/application_test.rb

@@ -72,6 +72,15 @@ module Anmo
       assert_equal 123, last_response.status
     end
 
+    def test_similar_query_string
+      save_object "/pulsar/assets?channel=foo.bar.baz.qux.quux.1", "Something", 200, nil, :get
+      save_object "/pulsar/assets?channel=foo.bar.baz.qux.quux.2", "Something else", 200, nil, :get
+
+      get "/pulsar/assets?channel=foo.bar.baz.qux.quux.1"
+
+      assert_equal 200, last_response.status
+    end
+
     def test_allows_deleting_all_objects
       save_object "/this/is/the/path.object", "please save this", nil, nil, nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anmo
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -206,3 +206,4 @@ test_files:
 - features/step_definitions/api_steps.rb
 - features/support/env.rb
 - test/anmo/application_test.rb
+has_rdoc: