Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 91 additions & 93 deletions app/models/source_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,100 +18,98 @@ def self.array_string_match(content_value, filter_value)
end
end


FILTER_DEFINITIONS = {
'target_audience' => {
comparison: FilterComparisons.method(:array_string_match)
},

'keyword' => {
comparison: FilterComparisons.method(:array_string_match),
filter_property: 'keywords'
},

'title' => {
comparison: FilterComparisons.method(:string_match)
},

'title_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'title'
},

'description' => {
comparison: FilterComparisons.method(:string_match)
},

'description_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'description'
},

'url' => {
comparison: FilterComparisons.method(:string_match)
},

'url_prefix' => {
comparison: FilterComparisons.method(:prefix_string_match),
filter_property: 'url'
},

'doi' => {
comparison: FilterComparisons.method(:string_match)
},

'license' => {
comparison: FilterComparisons.method(:string_match),
filter_property: 'licence'
},

'difficulty_level' => {
comparison: FilterComparisons.method(:string_match)
},

'resource_type' => {
comparison: FilterComparisons.method(:array_string_match)
},

'prerequisites_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'prerequisites'
},

'learning_objectives_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'learning_objectives'
},

'subtitle' => {
comparison: FilterComparisons.method(:string_match)
},

'subtitle_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'subtitle'
},

'city' => {
comparison: FilterComparisons.method(:string_match)
},

'country' => {
comparison: FilterComparisons.method(:string_match)
},

'event_type' => {
comparison: FilterComparisons.method(:array_string_match),
filter_property: 'event_types'
},

'timezone' => {
comparison: FilterComparisons.method(:string_match)
}
}.freeze


class SourceFilter < ApplicationRecord
FILTER_DEFINITIONS = {
'target_audience' => {
comparison: FilterComparisons.method(:array_string_match)
},

'keyword' => {
comparison: FilterComparisons.method(:array_string_match),
filter_property: 'keywords'
},

'title' => {
comparison: FilterComparisons.method(:string_match)
},

'title_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'title'
},

'description' => {
comparison: FilterComparisons.method(:string_match)
},

'description_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'description'
},

'url' => {
comparison: FilterComparisons.method(:string_match)
},

'url_prefix' => {
comparison: FilterComparisons.method(:prefix_string_match),
filter_property: 'url'
},

'doi' => {
comparison: FilterComparisons.method(:string_match)
},

'license' => {
comparison: FilterComparisons.method(:string_match),
filter_property: 'licence'
},

'difficulty_level' => {
comparison: FilterComparisons.method(:string_match)
},

'resource_type' => {
comparison: FilterComparisons.method(:array_string_match)
},

'prerequisites_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'prerequisites'
},

'learning_objectives_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'learning_objectives'
},

'subtitle' => {
comparison: FilterComparisons.method(:string_match)
},

'subtitle_contains' => {
comparison: FilterComparisons.method(:contains_string_match),
filter_property: 'subtitle'
},

'city' => {
comparison: FilterComparisons.method(:string_match)
},

'country' => {
comparison: FilterComparisons.method(:string_match)
},

'event_type' => {
comparison: FilterComparisons.method(:array_string_match),
filter_property: 'event_types'
},

'timezone' => {
comparison: FilterComparisons.method(:string_match)
}
}.freeze

belongs_to :source

auto_strip_attributes :value
Expand Down
142 changes: 0 additions & 142 deletions lib/ingestors/cds_videos_ingestor.rb

This file was deleted.

5 changes: 4 additions & 1 deletion lib/ingestors/github_ingestor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ def github_api_from_io(uri, parts)
# ttl: time-to-live in seconds (default 7 days)
def cache_fetch(key, url)
Rails.cache.fetch(key, expires_in: TTL, skip_nil: true) do
JSON.parse(open_url(url).read)
response = open_url(url)
next nil unless response

JSON.parse(response.read)
end
end

Expand Down
Loading
Loading