Merge pull request #7 from y2k2mt/feature/allow-index-file-on-subdire…

…ctory

Search index file in sub directory

.gitignore

@@ -5,3 +5,4 @@
 *.dwarf
 shard.lock
 /dev/
+.tool-versions

shard.yml

@@ -15,9 +15,6 @@ development_dependencies:
   ameba:
     github: crystal-ameba/ameba
     version: ~> 1.3
-  webmock:
-    github: manastech/webmock.cr
-    version: 0.14.0
 
 crystal: ~> 1.6
 

spec/replay/datasource/filesystem_spec.cr

@@ -31,6 +31,20 @@ describe FileSystemDatasource do
     datasource = FileSystemDatasource.new(test_file_dir, records, requests)
     actual = datasource.get(request)
     actual.should eq(record)
+    actual.as(Record).entity.should eq("baz=qux")
+  end
+
+  it "can retrive resources on sub dir" do
+    test_file_dir = "#{FileUtils.pwd}/spec/replay/datasource/filesystem_spec"
+    request = MockRequest.new("db0da", "db0da_1920c", {"baz" => "qux"})
+    requests = MockRequests.new(request)
+    record = MockRecord.new({"foo" => "bar"}, "quux=corge")
+    records = MockRecords.new(record)
+
+    datasource = FileSystemDatasource.new(test_file_dir, records, requests)
+    actual = datasource.get(request)
+    actual.should eq(record)
+    actual.as(Record).entity.should eq("quux=corge")
   end
 
   it "can not retrive resources not avairable" do

spec/replay/datasource/filesystem_spec/indexes/another_case/db0da_1920c

@@ -0,0 +1,29 @@
+{
+  "id": "1770a0838932637cb823570c908552e4",
+  "host": "hello.replay.org",
+  "method": "GET",
+  "path": "/another",
+  "indexed": {
+    "headers": {},
+    "params": {},
+    "body": ""
+  },
+  "not_indexed": {
+    "headers": {
+      "Host": [
+        "hello.replay.org"
+      ],
+      "User-Agent": [
+        "baz/1"
+      ],
+      "Accept": [
+        "*/*"
+      ]
+    },
+    "params": {
+      "q": "a",
+      "b": "c"
+    },
+    "body": ""
+  }
+}

spec/replay/datasource/filesystem_spec/replies/db0da_1920c

@@ -0,0 +1 @@
+Hello!

spec/replay/datasource/filesystem_spec/replies/db0da_1920c_headers

@@ -0,0 +1 @@
+{"headers":{"Content-Type":"text/plain","Date":"Fri, 09 Sep 2022 15:16:10 GMT","Server":"test_server","Cache-Control":"private","Set-Cookie":"baz=qux"},"status":200}

spec/support/mocks.cr

@@ -19,8 +19,8 @@ struct MockRequests
     @expected_request || RequestError.new
   end
 
-  def from(request_json : JSON::Any)
-    @expected_request.not_nil!
+  def from(request_json : JSON::Any) : Request
+    @expected_request || raise "Expecred request is not set."
   end
 end
 

src/replay/datasource/filesystem.cr

@@ -27,7 +27,7 @@ class FileSystemDatasource
 
   def get(request : Request) : Record | NoIndexFound | CorruptedReplayResource | NoResourceFound
     meta_index = request.base_index
-    index_files = Dir["#{@index_file_dir}/#{meta_index}_*"]
+    index_files = Dir["#{@index_file_dir}/**/#{meta_index}_*"]
     if index_files.empty?
       Replay::Log.debug { "No index_file avairable." }
       NoIndexFound.new(meta_index)
@@ -37,6 +37,7 @@ class FileSystemDatasource
         candidate == request
       end
       found_index_file.try do |found|
+        Replay::Log.debug { "Found index_file path: #{found}" }
         found_index = @requests.from(JSON.parse(File.read(found)))
         body_file = Dir["#{@reply_file_dir}/#{found_index.id_index}"].first?
         header_file = Dir["#{@reply_file_dir}/#{found_index.id_index}_headers"].first?