mordor-auditing 0.0.12 → 0.0.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mordor-auditing (0.0.11)
+    mordor-auditing (0.0.12)
       mordor (= 0.2.9)
 
 GEM

data/auditing.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name    = "mordor-auditing"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.0.12"
+  s.version = "0.0.13"
   s.date    = "2012-01-04"
 
   s.summary     = "mordor-auditing"

data/lib/auditing/request.rb

@@ -36,20 +36,30 @@ module Auditing
       end
     end
 
-    def self.find_by_url_parts(params = {})
-      parts_params = {}
-      params.each do |key, value|
-        parts_params["url_parts.#{key}"] = value
+    def self.find_by_url_parts(params = {}, options = {})
+      query = {}
+      if parts_value = params.delete(:value)
+        query = params_to_query_params(parts_value).merge(params)
+      else
+        query = params_to_query_params(params)
       end
-      Mordor::Collection.new(self, self.collection.find(parts_params))
+      col = perform_collection_find(query, options)
+      Mordor::Collection.new(self, col)
     end
 
     private
-
     def self.collection_name
       'audit_requests'
     end
 
+    def self.params_to_query_params(hash)
+      result = {}
+      hash.each do |key, value|
+        result["url_parts.#{key}"] = value
+      end
+      result
+    end
+
     def url_to_parts(url)
       result = {}
       if url

data/spec/auditing/request_spec.rb

@@ -282,7 +282,7 @@ describe "with respect to auditing requests" do
       request.url_parts.keys.should_not include "week"
     end
 
-    it "should corretly retrieve requests based on parts of the url" do
+    it "should correctly retrieve requests based on parts of the url" do
       options = {
         :url => '/week/2011-9/staffing_agencies/1234/customers/12/arrangements/123',
         :method => 'get',
@@ -331,7 +331,39 @@ describe "with respect to auditing requests" do
 
       match = (results.first._id == request._id || results.first._id == request2._id)
       match.should be_true
+    end
+
+    it "should be possible to add extra query parts to the url_parts query" do
+       options = {
+        :url => '/week/2011-9/staffing_agencies/1234/customers/12/arrangements/123',
+        :method => 'get',
+        :params => {:test_param1 => '1', :test_param2 => '2'},
+        :user_id => 4,
+        :real_user_id => 5,
+        :at => Time.now
+      }
+      request = Auditing::Request.new(options)
+      request.save.should be_true
+
+      options2 = {
+        :url => '/week/2011-9/staffing_agencies/13/customers/124/arrangements/123',
+        :method => 'get',
+        :params => {:test_param1 => '1', :test_param2 => '2'},
+        :user_id => 3,
+        :real_user_id => 5,
+        :at => Time.now
+      }
+      request2 = Auditing::Request.new(options2)
+      request2.save.should be_true
 
+      search_options = {
+        :week => "2011-9"
+      }
+      results = Auditing::Request.find_by_url_parts(search_options)
+      results.size.should == 2
+
+      results = Auditing::Request.find_by_url_parts({:value => search_options, :user_id => 4})
+      results.size.should == 1
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor-auditing
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn