Skip to content

Commit 0a0af85

Browse files
committed
refactor app structure and feed contracts
1 parent da8025c commit 0a0af85

70 files changed

Lines changed: 503 additions & 495 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/api/v1/contract.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require_relative '../../exceptions'
3+
require_relative '../../errors/exceptions'
44

55
module Html2rss
66
module Web

app/api/v1/feeds/create_feed.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
require 'time'
44
require 'json'
55

6-
require_relative '../../../auth'
7-
require_relative '../../../auto_source'
8-
require_relative '../../../boundary_models'
9-
require_relative '../../../exceptions'
10-
require_relative '../../../url_validator'
11-
require_relative '../../../observability'
6+
require_relative '../../../security/auth'
7+
require_relative '../../../domain/auto_source'
8+
require_relative '../../../domain/feed_contracts'
9+
require_relative '../../../errors/exceptions'
10+
require_relative '../../../security/url_validator'
11+
require_relative '../../../telemetry/observability'
1212
require_relative '../response'
1313

1414
module Html2rss
@@ -58,7 +58,7 @@ def build_create_params(params, account)
5858
raise BadRequestError, 'Invalid URL format' unless UrlValidator.valid_url?(url)
5959
raise ForbiddenError, 'URL not allowed for this account' unless UrlValidator.url_allowed?(account, url)
6060

61-
BoundaryModels::FeedCreateParams.new(
61+
FeedContracts::CreateParams.new(
6262
url: url,
6363
name: V1::Feeds.extract_site_title(url),
6464
strategy: normalize_strategy(params['strategy'])
@@ -141,9 +141,9 @@ def emit_create_failure(error)
141141
end
142142

143143
def feed_metadata(feed_data)
144-
return feed_data if feed_data.is_a?(BoundaryModels::FeedMetadata)
144+
return feed_data if feed_data.is_a?(FeedContracts::Metadata)
145145

146-
BoundaryModels::FeedMetadata.new(**feed_data)
146+
FeedContracts::Metadata.new(**feed_data)
147147
end
148148

149149
def typed_feed_attributes(typed_feed, timestamp)

app/api/v1/feeds/show_feed.rb

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# frozen_string_literal: true
22

3-
require_relative '../../../account_manager'
4-
require_relative '../../../auth'
5-
require_relative '../../../exceptions'
6-
require_relative '../../../feed_response_format'
3+
require_relative '../../../security/account_manager'
4+
require_relative '../../../security/auth'
5+
require_relative '../../../errors/exceptions'
6+
require_relative '../../../domain/feed_contracts'
7+
require_relative '../../../rendering/feed_response_format'
78
require_relative '../../../feeds/json_renderer'
89
require_relative '../../../feeds/request_parser'
910
require_relative '../../../feeds/resolver'
1011
require_relative '../../../feeds/rss_renderer'
1112
require_relative '../../../feeds/service'
1213
require_relative '../../../http/feed_response'
13-
require_relative '../../../observability'
14+
require_relative '../../../telemetry/observability'
1415

1516
module Html2rss
1617
module Web
@@ -46,7 +47,7 @@ def call(request, token)
4647

4748
# @param request [Rack::Request]
4849
# @param token [String]
49-
# @return [Array<(Html2rss::Web::Feeds::Request, Html2rss::Web::Feeds::ResolvedSource, Html2rss::Web::Feeds::Result)>]
50+
# @return [Array<(Html2rss::Web::FeedContracts::Request, Html2rss::Web::FeedContracts::ResolvedSource, Html2rss::Web::FeedContracts::RenderResult)>]
5051
def feed_pipeline(request, token)
5152
feed_request = ::Html2rss::Web::Feeds::RequestParser.call(
5253
request: request,
@@ -59,8 +60,8 @@ def feed_pipeline(request, token)
5960
[feed_request, resolved_source, result]
6061
end
6162

62-
# @param resolved_source [Html2rss::Web::Feeds::ResolvedSource]
63-
# @param result [Html2rss::Web::Feeds::Result]
63+
# @param resolved_source [Html2rss::Web::FeedContracts::ResolvedSource]
64+
# @param result [Html2rss::Web::FeedContracts::RenderResult]
6465
# @return [void]
6566
def emit_result(resolved_source, result)
6667
return emit_success_from(resolved_source) unless result.status == :error
@@ -70,7 +71,7 @@ def emit_result(resolved_source, result)
7071
)
7172
end
7273

73-
# @param resolved_source [Html2rss::Web::Feeds::ResolvedSource]
74+
# @param resolved_source [Html2rss::Web::FeedContracts::ResolvedSource]
7475
# @return [void]
7576
def emit_success_from(resolved_source)
7677
emit_render_success(

app/api/v1/health.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
require 'time'
44

5-
require_relative '../../auth'
6-
require_relative '../../exceptions'
7-
require_relative '../../local_config'
5+
require_relative '../../security/auth'
6+
require_relative '../../errors/exceptions'
7+
require_relative '../../config/local_config'
88
require_relative 'contract'
99
require_relative 'response'
1010

app/api/v1/root_metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require_relative '../../auto_source'
3+
require_relative '../../domain/auto_source'
44

55
module Html2rss
66
module Web

app/api/v1/strategies.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require_relative '../../exceptions'
3+
require_relative '../../errors/exceptions'
44
require_relative 'response'
55

66
module Html2rss

app/auto_source.rb

Lines changed: 0 additions & 118 deletions
This file was deleted.

app/boundary_models.rb

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)