- {% for event in events %}
-
- | {{ event.title }} |
- Click here to see |
-
- {% endfor %}
-
-EOF
+ content = <<~EOF
+ When you use the "Last event in" or "Merge events" option, you can use variables from the last event received, like this:
+
+ Name: {{name}}
+ Url: {{url}}
+
+ If you use the "Last X Events" mode, a set of events will be passed to your Liquid template. You can use them like this:
+
+
+ {% for event in events %}
+
+ | {{ event.title }} |
+ Click here to see |
+
+ {% endfor %}
+
+ EOF
{
"secret" => "a-secret-key",
"expected_receive_period_in_days" => 2,
@@ -104,7 +99,7 @@ def default_options
form_configurable :expected_receive_period_in_days
form_configurable :content, type: :text
form_configurable :mime_type
- form_configurable :mode, type: :array, values: [ 'Last event in', 'Merge events', 'Last X events']
+ form_configurable :mode, type: :array, values: ['Last event in', 'Merge events', 'Last X events']
form_configurable :event_limit
def working?
@@ -125,35 +120,49 @@ def validate_options
end
unless options['expected_receive_period_in_days'].present? && options['expected_receive_period_in_days'].to_i > 0
- errors.add(:base, "Please provide 'expected_receive_period_in_days' to indicate how many days can pass before this Agent is considered to be not working")
+ errors.add(
+ :base,
+ "Please provide 'expected_receive_period_in_days' to indicate how many days can pass before this Agent is considered to be not working"
+ )
end
- if options['event_limit'].present?
- if (Integer(options['event_limit']) rescue false) == false && date_limit.blank?
- errors.add(:base, "Event limit must be an integer that is less than 1001 or an integer plus a valid unit.")
- elsif (options['event_limit'].to_i > 1000)
- errors.add(:base, "For performance reasons, you cannot have an event limit greater than 1000.")
+ event_limit =
+ if value = options['event_limit'].presence
+ begin
+ Integer(value)
+ rescue StandardError
+ false
+ end
end
- else
+
+ if event_limit == false && date_limit.blank?
+ errors.add(:base, "Event limit must be an integer that is less than 1001 or an integer plus a valid unit.")
+ elsif event_limit && event_limit > 1000
+ errors.add(:base, "For performance reasons, you cannot have an event limit greater than 1000.")
end
end
def receive(incoming_events)
return unless ['merge events', 'last event in'].include?(mode)
+
memory['last_event'] ||= {}
incoming_events.each do |event|
- case mode
- when 'merge events'
- memory['last_event'] = memory['last_event'].merge(event.payload)
- else
- memory['last_event'] = event.payload
- end
+ memory['last_event'] =
+ case mode
+ when 'merge events'
+ memory['last_event'].merge(event.payload)
+ else
+ event.payload
+ end
end
end
def receive_web_request(params, method, format)
- valid_authentication?(params) ? [liquified_content, 200, mime_type, interpolated['response_headers'].presence]
- : [unauthorized_content(format), 401]
+ if valid_authentication?(params)
+ [liquified_content, 200, mime_type, interpolated['response_headers'].presence]
+ else
+ [unauthorized_content(format), 401]
+ end
end
private
@@ -163,8 +172,11 @@ def mode
end
def unauthorized_content(format)
- format =~ /json/ ? { error: "Not Authorized" }
- : "Not Authorized"
+ if format =~ /json/
+ { error: "Not Authorized" }
+ else
+ "Not Authorized"
+ end
end
def valid_authentication?(params)
@@ -193,19 +205,29 @@ def data_for_liquid_template
end
def count_limit
- limit = Integer(options['event_limit']) rescue 1000
+ limit = begin
+ Integer(options['event_limit'])
+ rescue StandardError
+ 1000
+ end
limit <= 1000 ? limit : 1000
end
def date_limit
return nil unless options['event_limit'].to_s.include?(' ')
+
value, unit = options['event_limit'].split(' ')
- value = Integer(value) rescue nil
+ value = begin
+ Integer(value)
+ rescue StandardError
+ nil
+ end
return nil unless value
+
unit = unit.to_s.downcase
return nil unless DATE_UNITS.include?(unit)
+
value.send(unit.to_sym).ago
end
-
end
end
diff --git a/app/models/agents/local_file_agent.rb b/app/models/agents/local_file_agent.rb
index 4bf5f32498..63a7548431 100644
--- a/app/models/agents/local_file_agent.rb
+++ b/app/models/agents/local_file_agent.rb
@@ -13,7 +13,7 @@ def self.should_run?
end
description do
- <<-MD
+ <<~MD
The LocalFileAgent can watch a file/directory for changes or emit an event for every file in that directory. When receiving an event it writes the received data into a file.
`mode` determines if the agent is emitting events for (changed) files or writing received event data to disk.
@@ -41,22 +41,23 @@ def self.should_run?
end
event_description do
- "Events will looks like this:\n\n %s" % if boolify(interpolated['watch'])
- Utils.pretty_print(
- "file_pointer" => {
- "file" => "/tmp/test/filename",
- "agent_id" => id
- },
- "event_type" => "modified/added/removed"
- )
- else
- Utils.pretty_print(
- "file_pointer" => {
- "file" => "/tmp/test/filename",
- "agent_id" => id
- }
- )
- end
+ "Events will looks like this:\n\n " +
+ if boolify(interpolated['watch'])
+ Utils.pretty_print(
+ "file_pointer" => {
+ "file" => "/tmp/test/filename",
+ "agent_id" => id
+ },
+ "event_type" => "modified/added/removed"
+ )
+ else
+ Utils.pretty_print(
+ "file_pointer" => {
+ "file" => "/tmp/test/filename",
+ "agent_id" => id
+ }
+ )
+ end
end
def default_options
@@ -69,8 +70,8 @@ def default_options
}
end
- form_configurable :mode, type: :array, values: %w(read write)
- form_configurable :watch, type: :array, values: %w(true false)
+ form_configurable :mode, type: :array, values: %w[read write]
+ form_configurable :watch, type: :array, values: %w[true false]
form_configurable :path, type: :string
form_configurable :append, type: :boolean
form_configurable :data, type: :string
@@ -98,6 +99,7 @@ def working?
def check
return if interpolated['mode'] != 'read' || boolify(interpolated['watch']) || !should_run?
return unless check_path_existance(true)
+
if File.directory?(expanded_path)
Dir.glob(File.join(expanded_path, '*')).select { |f| File.file?(f) }
else
@@ -109,6 +111,7 @@ def check
def receive(incoming_events)
return if interpolated['mode'] != 'write' || !should_run?
+
incoming_events.each do |event|
mo = interpolated(event)
expanded_path = File.expand_path(mo['path'])
@@ -153,7 +156,8 @@ def should_run?(log = true)
class Worker < LongRunnable::Worker
def setup
require 'listen'
- @listener = Listen.to(*listen_options, &method(:callback))
+ path, options = listen_options
+ @listener = Listen.to(path, **options, &method(:callback))
end
def run
@@ -173,7 +177,7 @@ def callback(*changes)
AgentRunner.with_connection do
changes.zip([:modified, :added, :removed]).each do |files, event_type|
files.each do |file|
- agent.create_event payload: agent.get_file_pointer(file).merge(event_type: event_type)
+ agent.create_event payload: agent.get_file_pointer(file).merge(event_type:)
end
end
agent.touch(:last_check_at)
@@ -182,9 +186,15 @@ def callback(*changes)
def listen_options
if File.directory?(agent.expanded_path)
- [agent.expanded_path, ignore!: [] ]
+ [
+ agent.expanded_path,
+ ignore!: []
+ ]
else
- [File.dirname(agent.expanded_path), { ignore!: [], only: /\A#{Regexp.escape(File.basename(agent.expanded_path))}\z/ } ]
+ [
+ File.dirname(agent.expanded_path),
+ ignore!: [], only: /\A#{Regexp.escape(File.basename(agent.expanded_path))}\z/
+ ]
end
end
end
diff --git a/app/models/agents/manual_event_agent.rb b/app/models/agents/manual_event_agent.rb
index 0d7a67629a..6704ffb6cf 100644
--- a/app/models/agents/manual_event_agent.rb
+++ b/app/models/agents/manual_event_agent.rb
@@ -3,7 +3,7 @@ class ManualEventAgent < Agent
cannot_be_scheduled!
cannot_receive_events!
- description <<-MD
+ description <<~MD
The Manual Event Agent is used to manually create Events for testing or other purposes.
Connect this Agent to other Agents and create Events using the UI provided on this Agent's Summary page.
@@ -24,15 +24,16 @@ def handle_details_post(params)
if params['payload']
json = interpolate_options(JSON.parse(params['payload']))
if json['payloads'] && (json.keys - ['payloads']).length > 0
- { :success => false, :error => "If you provide the 'payloads' key, please do not provide any other keys at the top level." }
+ { success: false,
+ error: "If you provide the 'payloads' key, please do not provide any other keys at the top level." }
else
[json['payloads'] || json].flatten.each do |payload|
- create_event(:payload => payload)
+ create_event(payload:)
end
- { :success => true }
+ { success: true }
end
else
- { :success => false, :error => "You must provide a JSON payload" }
+ { success: false, error: "You must provide a JSON payload" }
end
end
diff --git a/app/models/agents/mqtt_agent.rb b/app/models/agents/mqtt_agent.rb
index 67aa5f1666..cc74b2e341 100644
--- a/app/models/agents/mqtt_agent.rb
+++ b/app/models/agents/mqtt_agent.rb
@@ -1,11 +1,10 @@
-# encoding: utf-8
require "json"
module Agents
class MqttAgent < Agent
gem_dependency_check { defined?(MQTT) }
- description <<-MD
+ description <<~MD
The MQTT Agent allows both publication and subscription to an MQTT topic.
#{'## Include `mqtt` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -59,19 +58,19 @@ class MqttAgent < Agent
Find out more detail on [subscription wildcards](http://www.eclipse.org/paho/files/mqttdoc/Cclient/wildcard.html)
MD
- event_description <<-MD
+ event_description <<~MD
Events are simply nested MQTT payloads. For example, an MQTT payload for Owntracks
- {
- "topic": "owntracks/kcqlmkgx/Dan",
- "message": {"_type": "location", "lat": "-34.8493644", "lon": "138.5218119", "tst": "1401771049", "acc": "50.0", "batt": "31", "desc": "Home", "event": "enter"},
- "time": 1401771051
- }
+ {
+ "topic": "owntracks/kcqlmkgx/Dan",
+ "message": {"_type": "location", "lat": "-34.8493644", "lon": "138.5218119", "tst": "1401771049", "acc": "50.0", "batt": "31", "desc": "Home", "event": "enter"},
+ "time": 1401771051
+ }
MD
def validate_options
unless options['uri'].present? &&
- options['topic'].present?
+ options['topic'].present?
errors.add(:base, "topic and uri are required")
end
end
@@ -84,7 +83,7 @@ def default_options
{
'uri' => 'mqtts://user:pass@localhost:8883',
'ssl' => :TLSv1,
- 'ca_file' => './ca.pem',
+ 'ca_file' => './ca.pem',
'cert_file' => './client.crt',
'key_file' => './client.key',
'topic' => 'huginn',
@@ -94,16 +93,14 @@ def default_options
end
def mqtt_client
- @client ||= begin
- MQTT::Client.new(interpolated['uri']).tap do |c|
- if interpolated['ssl']
- c.ssl = interpolated['ssl'].to_sym
- c.ca_file = interpolated['ca_file']
- c.cert_file = interpolated['cert_file']
- c.key_file = interpolated['key_file']
- end
+ @client ||= MQTT::Client.new(interpolated['uri']).tap { |c|
+ if interpolated['ssl']
+ c.ssl = interpolated['ssl'].to_sym
+ c.ca_file = interpolated['ca_file']
+ c.cert_file = interpolated['cert_file']
+ c.key_file = interpolated['key_file']
end
- end
+ }
end
def receive(incoming_events)
@@ -114,7 +111,6 @@ def receive(incoming_events)
end
end
-
def check
last_message = memory['last_message']
mqtt_client.connect
@@ -131,7 +127,7 @@ def check
# A lot of services generate JSON, so try that.
begin
payload = JSON.parse(payload)
- rescue
+ rescue StandardError
end
create_event payload: {
@@ -151,6 +147,5 @@ def check
self.memory['last_message'] = last_message
save!
end
-
end
end
diff --git a/app/models/agents/pdf_info_agent.rb b/app/models/agents/pdf_info_agent.rb
index 6738bf4fa7..2129133bf9 100644
--- a/app/models/agents/pdf_info_agent.rb
+++ b/app/models/agents/pdf_info_agent.rb
@@ -3,13 +3,12 @@
module Agents
class PdfInfoAgent < Agent
-
gem_dependency_check { defined?(HyPDF) }
cannot_be_scheduled!
no_bulk_receive!
- description <<-MD
+ description <<~MD
The PDF Info Agent returns the metadata contained within a given PDF file, using HyPDF.
#{'## Include the `hypdf` gem in your `Gemfile` to use PDFInfo Agents.' if dependencies_missing?}
@@ -19,24 +18,24 @@ class PdfInfoAgent < Agent
It works by acting on events that contain a key `url` in their payload, and runs the [pdfinfo](https://devcenter.heroku.com/articles/hypdf#pdfinfo) command on them.
MD
- event_description <<-MD
- This will change based on the metadata in the pdf.
-
- { "Title"=>"Everyday Rails Testing with RSpec",
- "Author"=>"Aaron Sumner",
- "Creator"=>"LaTeX with hyperref package",
- "Producer"=>"xdvipdfmx (0.7.8)",
- "CreationDate"=>"Fri Aug 2 05",
- "32"=>"50 2013",
- "Tagged"=>"no",
- "Pages"=>"150",
- "Encrypted"=>"no",
- "Page size"=>"612 x 792 pts (letter)",
- "Optimized"=>"no",
- "PDF version"=>"1.5",
- "url": "your url"
- }
- MD
+ event_description do
+ "This will change based on the metadata in the pdf.\n\n " +
+ Utils.pretty_print({
+ "Title" => "Everyday Rails Testing with RSpec",
+ "Author" => "Aaron Sumner",
+ "Creator" => "LaTeX with hyperref package",
+ "Producer" => "xdvipdfmx (0.7.8)",
+ "CreationDate" => "Fri Aug 2 05",
+ "32" => "50 2013",
+ "Tagged" => "no",
+ "Pages" => "150",
+ "Encrypted" => "no",
+ "Page size" => "612 x 792 pts (letter)",
+ "Optimized" => "no",
+ "PDF version" => "1.5",
+ "url": "your url"
+ })
+ end
def working?
!recent_error_logs?
@@ -57,12 +56,12 @@ def receive(incoming_events)
def check_url(in_url, payload)
return unless in_url.present?
+
Array(in_url).each do |url|
log "Fetching #{url}"
info = HyPDF.pdfinfo(open(url))
- create_event :payload => info.merge(payload)
+ create_event payload: info.merge(payload)
end
end
-
end
end
diff --git a/app/models/agents/peak_detector_agent.rb b/app/models/agents/peak_detector_agent.rb
index fff1ca8af7..ba8bbadfe0 100644
--- a/app/models/agents/peak_detector_agent.rb
+++ b/app/models/agents/peak_detector_agent.rb
@@ -1,12 +1,10 @@
-require 'pp'
-
module Agents
class PeakDetectorAgent < Agent
cannot_be_scheduled!
DEFAULT_SEARCH_URL = 'https://twitter.com/search?q={q}'
- description <<-MD
+ description <<~MD
The Peak Detector Agent will watch for peaks in an event stream. When a peak is detected, the resulting Event will have a payload message of `message`. You can include extractions in the message, for example: `I saw a bar of: {{foo.bar}}`, have a look at the [Wiki](https://github.com/huginn/huginn/wiki/Formatting-Events-using-Liquid) for details.
The `value_path` value is a [JSONPath](http://goessner.net/articles/JsonPath/) to the value of interest. `group_by_path` is a JSONPath that will be used to group values, if present.
@@ -20,7 +18,7 @@ class PeakDetectorAgent < Agent
You may set `search_url` to point to something else than Twitter search, using the URI Template syntax defined in [RFC 6570](https://tools.ietf.org/html/rfc6570). Default value is `#{DEFAULT_SEARCH_URL}` where `{q}` will be replaced with group name.
MD
- event_description <<-MD
+ event_description <<~MD
Events look like:
{
@@ -37,7 +35,7 @@ def validate_options
end
begin
tmpl = search_url
- rescue => e
+ rescue StandardError => e
errors.add(:base, "search_url must be a valid URI template: #{e.message}")
else
unless tmpl.keys.include?('q')
@@ -81,13 +79,18 @@ def check_for_peak(group, event)
return if memory['data'][group].length <= options['min_events'].to_i
if memory['peaks'][group].empty? || memory['peaks'][group].last < event.created_at.to_i - peak_spacing
- average_value, standard_deviation = stats_for(group, :skip_last => 1)
+ average_value, standard_deviation = stats_for(group, skip_last: 1)
newest_value, newest_time = memory['data'][group][-1].map(&:to_f)
if newest_value > average_value + std_multiple * standard_deviation
memory['peaks'][group] << newest_time
memory['peaks'][group].reject! { |p| p <= newest_time - window_duration }
- create_event :payload => { 'message' => interpolated(event)['message'], 'peak' => newest_value, 'peak_time' => newest_time, 'grouped_by' => group.to_s }
+ create_event payload: {
+ 'message' => interpolated(event)['message'],
+ 'peak' => newest_value,
+ 'peak_time' => newest_time,
+ 'grouped_by' => group.to_s
+ }
end
end
end
@@ -132,19 +135,20 @@ def peak_spacing
end
def group_for(event)
- ((interpolated['group_by_path'].present? && Utils.value_at(event.payload, interpolated['group_by_path'])) || 'no_group')
+ group_by_path = interpolated['group_by_path'].presence
+ (group_by_path && Utils.value_at(event.payload, group_by_path)) || 'no_group'
end
def remember(group, event)
memory['data'] ||= {}
memory['data'][group] ||= []
- memory['data'][group] << [ Utils.value_at(event.payload, interpolated['value_path']).to_f, event.created_at.to_i ]
+ memory['data'][group] << [Utils.value_at(event.payload, interpolated['value_path']).to_f, event.created_at.to_i]
cleanup group
end
def cleanup(group)
newest_time = memory['data'][group].last.last
- memory['data'][group].reject! { |value, time| time <= newest_time - window_duration }
+ memory['data'][group].reject! { |_value, time| time <= newest_time - window_duration }
end
end
end
diff --git a/app/models/agents/phantom_js_cloud_agent.rb b/app/models/agents/phantom_js_cloud_agent.rb
index 1f1903bebc..10005feece 100644
--- a/app/models/agents/phantom_js_cloud_agent.rb
+++ b/app/models/agents/phantom_js_cloud_agent.rb
@@ -11,7 +11,7 @@ class PhantomJsCloudAgent < Agent
default_schedule 'every_12h'
- description <<-MD
+ description <<~MD
This Agent generates [PhantomJs Cloud](https://phantomjscloud.com/) URLs that can be used to render JavaScript-heavy webpages for content extraction.
URLs generated by this Agent are formulated in accordance with the [PhantomJs Cloud API](https://phantomjscloud.com/docs/index.html).
@@ -37,8 +37,9 @@ class PhantomJsCloudAgent < Agent
As this agent only provides a limited subset of the most commonly used options, you can follow [this guide](https://github.com/huginn/huginn/wiki/Browser-Emulation-Using-PhantomJS-Cloud) to make full use of additional options PhantomJsCloud provides.
MD
- event_description <<-MD
+ event_description <<~MD
Events look like this:
+
{
"url": "..."
}
diff --git a/app/models/agents/post_agent.rb b/app/models/agents/post_agent.rb
index 662b24a915..06b4d646d7 100644
--- a/app/models/agents/post_agent.rb
+++ b/app/models/agents/post_agent.rb
@@ -13,7 +13,7 @@ class PostAgent < Agent
default_schedule "never"
description do
- <<-MD
+ <<~MD
A Post Agent receives events from other agents (or runs periodically), merges those events with the [Liquid-interpolated](https://github.com/huginn/huginn/wiki/Formatting-Events-using-Liquid) contents of `payload`, and sends the results as POST (or GET) requests to a specified url. To skip merging in the incoming event, but still send the interpolated payload, set `no_merge` to `true`.
The `post_url` field must specify where you would like to send requests. Please include the URI scheme (`http` or `https`).
@@ -56,16 +56,17 @@ class PostAgent < Agent
MD
end
- event_description <<-MD
+ event_description <<~MD
Events look like this:
- {
- "status": 200,
- "headers": {
- "Content-Type": "text/html",
- ...
- },
- "body": "Some data..."
- }
+
+ {
+ "status": 200,
+ "headers": {
+ "Content-Type": "text/html",
+ ...
+ },
+ "body": "Some data..."
+ }
Original event contents will be merged when `output_mode` is set to `merge`.
MD
@@ -89,7 +90,7 @@ def default_options
def working?
return false if recent_error_logs?
-
+
if interpolated['expected_receive_period_in_days'].present?
return false unless last_receive_at && last_receive_at > interpolated['expected_receive_period_in_days'].to_i.days.ago
end
@@ -106,7 +107,8 @@ def validate_options
errors.add(:base, "post_url is a required field")
end
- if options['payload'].present? && %w[get delete].include?(method) && !(options['payload'].is_a?(Hash) || options['payload'].is_a?(Array))
+ if options['payload'].present? && %w[get
+ delete].include?(method) && !(options['payload'].is_a?(Hash) || options['payload'].is_a?(Array))
errors.add(:base, "if provided, payload must be a hash or an array")
end
@@ -134,11 +136,11 @@ def validate_options
errors.add(:base, "method must be 'post', 'get', 'put', 'delete', or 'patch'")
end
- if options['no_merge'].present? && !%[true false].include?(options['no_merge'].to_s)
+ if options['no_merge'].present? && !%(true false).include?(options['no_merge'].to_s)
errors.add(:base, "if provided, no_merge must be 'true' or 'false'")
end
- if options['output_mode'].present? && !options['output_mode'].to_s.include?('{') && !%[clean merge].include?(options['output_mode'].to_s)
+ if options['output_mode'].present? && !options['output_mode'].to_s.include?('{') && !%(clean merge).include?(options['output_mode'].to_s)
errors.add(:base, "if provided, output_mode must be 'clean' or 'merge'")
end
@@ -173,7 +175,8 @@ def handle(data, event = Event.new, headers)
case method
when 'get', 'delete'
- params, body = data, nil
+ params = data
+ body = nil
when 'post', 'put', 'patch'
params = nil
diff --git a/app/models/agents/public_transport_agent.rb b/app/models/agents/public_transport_agent.rb
index b4f69a7238..4ebbb85da9 100644
--- a/app/models/agents/public_transport_agent.rb
+++ b/app/models/agents/public_transport_agent.rb
@@ -6,7 +6,7 @@ class PublicTransportAgent < Agent
default_schedule "every_2m"
- description <<-MD
+ description <<~MD
The Public Transport Request Agent generates Events based on NextBus GPS transit predictions.
Specify the following user settings:
@@ -17,7 +17,7 @@ class PublicTransportAgent < Agent
First, select an agency by visiting [http://www.nextbus.com/predictor/adaAgency.jsp](http://www.nextbus.com/predictor/adaAgency.jsp) and finding your transit system. Once you find it, copy the part of the URL after `?a=`. For example, for the San Francisco MUNI system, you would end up on [http://www.nextbus.com/predictor/adaDirection.jsp?a=**sf-muni**](http://www.nextbus.com/predictor/adaDirection.jsp?a=sf-muni) and copy "sf-muni". Put that into this Agent's agency setting.
- Next, find the stop tags that you care about.
+ Next, find the stop tags that you care about.
Select your destination and lets use the n-judah route. The link should be [http://www.nextbus.com/predictor/adaStop.jsp?a=sf-muni&r=N](http://www.nextbus.com/predictor/adaStop.jsp?a=sf-muni&r=N) Once you find it, copy the part of the URL after `r=`.
@@ -42,18 +42,22 @@ class PublicTransportAgent < Agent
alert_window_in_minutes: 5
MD
- event_description <<-MD
- Events look like this:
- { "routeTitle":"N-Judah",
- "stopTag":"5215",
- "prediction":
- {"epochTime":"1389622846689",
- "seconds":"3454","minutes":"57","isDeparture":"false",
- "affectedByLayover":"true","dirTag":"N__OB4KJU","vehicle":"1489",
- "block":"9709","tripTag":"5840086"
- }
- }
- MD
+ event_description "Events look like this:\n\n " +
+ Utils.pretty_print({
+ "routeTitle": "N-Judah",
+ "stopTag": "5215",
+ "prediction": {
+ "epochTime": "1389622846689",
+ "seconds": "3454",
+ "minutes": "57",
+ "isDeparture": "false",
+ "affectedByLayover": "true",
+ "dirTag": "N__OB4KJU",
+ "vehicle": "1489",
+ "block": "9709",
+ "tripTag": "5840086"
+ }
+ })
def check_url
query = URI.encode_www_form([
@@ -65,27 +69,27 @@ def check_url
end
def stops
- interpolated["stops"].collect{|a| a.split("|").last}
+ interpolated["stops"].collect { |a| a.split("|").last }
end
def check
hydra = Typhoeus::Hydra.new
- request = Typhoeus::Request.new(check_url, :followlocation => true)
+ request = Typhoeus::Request.new(check_url, followlocation: true)
request.on_success do |response|
page = Nokogiri::XML response.body
predictions = page.css("//prediction")
predictions.each do |pr|
parent = pr.parent.parent
- vals = {"routeTitle" => parent["routeTitle"], "stopTag" => parent["stopTag"]}
- if pr["minutes"] && pr["minutes"].to_i < interpolated["alert_window_in_minutes"].to_i
- vals = vals.merge Hash.from_xml(pr.to_xml)
- if not_already_in_memory?(vals)
- create_event(:payload => vals)
- log "creating event..."
- update_memory(vals)
- else
- log "not creating event since already in memory"
- end
+ vals = { "routeTitle" => parent["routeTitle"], "stopTag" => parent["stopTag"] }
+ next unless pr["minutes"] && pr["minutes"].to_i < interpolated["alert_window_in_minutes"].to_i
+
+ vals = vals.merge Hash.from_xml(pr.to_xml)
+ if not_already_in_memory?(vals)
+ create_event(payload: vals)
+ log "creating event..."
+ update_memory(vals)
+ else
+ log "not creating event since already in memory"
end
end
end
@@ -100,20 +104,26 @@ def update_memory(vals)
def cleanup_old_memory
self.memory["existing_routes"] ||= []
- self.memory["existing_routes"].reject!{|h| h["currentTime"].to_time <= (Time.now - 2.hours)}
+ time = 2.hours.ago
+ self.memory["existing_routes"].reject! { |h| h["currentTime"].to_time <= time }
end
def add_to_memory(vals)
- self.memory["existing_routes"] ||= []
- self.memory["existing_routes"] << {"stopTag" => vals["stopTag"], "tripTag" => vals["prediction"]["tripTag"], "epochTime" => vals["prediction"]["epochTime"], "currentTime" => Time.now}
+ (self.memory["existing_routes"] ||= []) << {
+ "stopTag" => vals["stopTag"],
+ "tripTag" => vals["prediction"]["tripTag"],
+ "epochTime" => vals["prediction"]["epochTime"],
+ "currentTime" => Time.now
+ }
end
def not_already_in_memory?(vals)
m = self.memory["existing_routes"] || []
- m.select{|h| h['stopTag'] == vals["stopTag"] &&
- h['tripTag'] == vals["prediction"]["tripTag"] &&
- h['epochTime'] == vals["prediction"]["epochTime"]
- }.count == 0
+ m.select { |h|
+ h['stopTag'] == vals["stopTag"] &&
+ h['tripTag'] == vals["prediction"]["tripTag"] &&
+ h['epochTime'] == vals["prediction"]["epochTime"]
+ }.count == 0
end
def default_options
diff --git a/app/models/agents/pushbullet_agent.rb b/app/models/agents/pushbullet_agent.rb
index 07b2460615..f30f5e239e 100644
--- a/app/models/agents/pushbullet_agent.rb
+++ b/app/models/agents/pushbullet_agent.rb
@@ -10,13 +10,13 @@ class PushbulletAgent < Agent
API_BASE = 'https://api.pushbullet.com/v2/'
TYPE_TO_ATTRIBUTES = {
- 'note' => [:title, :body],
- 'link' => [:title, :body, :url],
- 'address' => [:name, :address]
+ 'note' => [:title, :body],
+ 'link' => [:title, :body, :url],
+ 'address' => [:name, :address]
}
class Unauthorized < StandardError; end
- description <<-MD
+ description <<~MD
The Pushbullet agent sends pushes to a pushbullet device
To authenticate you need to either the `api_key` or create a `pushbullet_api_key` credential, you can find yours at your account page:
@@ -60,9 +60,11 @@ def default_options
def validate_options
errors.add(:base, "you need to specify a pushbullet api_key") if options['api_key'].blank?
errors.add(:base, "you need to specify a device_id") if options['device_id'].blank?
- errors.add(:base, "you need to specify a valid message type") if options['type'].blank? or not ['note', 'link', 'address'].include?(options['type'])
+ errors.add(:base, "you need to specify a valid message type") if options['type'].blank? ||
+ !['note', 'link', 'address'].include?(options['type'])
TYPE_TO_ATTRIBUTES[options['type']].each do |attr|
- errors.add(:base, "you need to specify '#{attr.to_s}' for the type '#{options['type']}'") if options[attr].blank?
+ errors.add(:base,
+ "you need to specify '#{attr}' for the type '#{options['type']}'") if options[attr].blank?
end
end
@@ -75,7 +77,7 @@ def validate_api_key
def complete_device_id
devices
- .map { |d| {text: d['nickname'], id: d['iden']} }
+ .map { |d| { text: d['nickname'], id: d['iden'] } }
.unshift(text: 'All Devices', id: '__ALL__')
end
@@ -92,6 +94,7 @@ def receive(incoming_events)
end
private
+
def safely
yield
rescue Unauthorized => e
@@ -101,6 +104,7 @@ def safely
def request(http_method, method, options)
response = JSON.parse(HTTParty.send(http_method, API_BASE + method, options).body)
raise Unauthorized, response['error']['message'] if response['error'].present?
+
response
end
@@ -113,20 +117,21 @@ def devices
def create_device
return if options['device_id'].present?
+
safely do
- response = request(:post, 'devices', basic_auth.merge(body: {nickname: 'Huginn', type: 'stream'}))
+ response = request(:post, 'devices', basic_auth.merge(body: { nickname: 'Huginn', type: 'stream' }))
self.options[:device_id] = response['iden']
end
end
def basic_auth
- {basic_auth: {username: interpolated[:api_key].presence || credential('pushbullet_api_key'), password: ''}}
+ { basic_auth: { username: interpolated[:api_key].presence || credential('pushbullet_api_key'), password: '' } }
end
def query_options(event)
mo = interpolated(event)
dev_ident = mo[:device_id] == "__ALL__" ? '' : mo[:device_id]
- basic_auth.merge(body: {device_iden: dev_ident, type: mo[:type]}.merge(payload(mo)))
+ basic_auth.merge(body: { device_iden: dev_ident, type: mo[:type] }.merge(payload(mo)))
end
def payload(mo)
diff --git a/app/models/agents/pushover_agent.rb b/app/models/agents/pushover_agent.rb
index acffcb5ff6..6d85f7f600 100644
--- a/app/models/agents/pushover_agent.rb
+++ b/app/models/agents/pushover_agent.rb
@@ -5,10 +5,9 @@ class PushoverAgent < Agent
cannot_create_events!
no_bulk_receive!
-
API_URL = 'https://api.pushover.net/1/messages.json'
- description <<-MD
+ description <<~MD
The Pushover Agent receives and collects events and sends them via push notification to a user/group.
**You need a Pushover API Token:** [https://pushover.net/apps/build](https://pushover.net/apps/build)
@@ -88,15 +87,15 @@ def receive(incoming_events)
retry
expire
].each do |key|
- if value = String.try_convert(interpolated[key].presence)
- case key
- when 'url'
- value.slice!(512..-1)
- when 'url_title'
- value.slice!(100..-1)
- end
- post_params[key] = value
+ value = String.try_convert(interpolated[key].presence) or next
+
+ case key
+ when 'url'
+ value.slice!(512..-1)
+ when 'url_title'
+ value.slice!(100..-1)
end
+ post_params[key] = value
end
# html is special because String.try_convert(true) gives nil (not even "nil", just nil)
if value = interpolated['html'].presence
diff --git a/app/models/agents/read_file_agent.rb b/app/models/agents/read_file_agent.rb
index a7903408c7..ec87c50f83 100644
--- a/app/models/agents/read_file_agent.rb
+++ b/app/models/agents/read_file_agent.rb
@@ -13,7 +13,7 @@ def default_options
end
description do
- <<-MD
+ <<~MD
The ReadFileAgent takes events from `FileHandling` agents, reads the file, and emits the contents as a string.
`data_key` specifies the key of the emitted event which contains the file contents.
@@ -22,10 +22,12 @@ def default_options
MD
end
- event_description <<-MD
- {
- "data" => '...'
- }
+ event_description <<~MD
+ Events look like:
+
+ {
+ "data" => '...'
+ }
MD
form_configurable :data_key, type: :string
@@ -43,6 +45,7 @@ def working?
def receive(incoming_events)
incoming_events.each do |event|
next unless io = get_io(event)
+
create_event payload: { interpolated['data_key'] => io.read }
end
end
diff --git a/app/models/agents/rss_agent.rb b/app/models/agents/rss_agent.rb
index 9a3ac794ee..1bb7174b14 100644
--- a/app/models/agents/rss_agent.rb
+++ b/app/models/agents/rss_agent.rb
@@ -11,7 +11,7 @@ class RssAgent < Agent
DEFAULT_EVENTS_ORDER = [['{{date_published}}', 'time'], ['{{last_updated}}', 'time']]
description do
- <<-MD
+ <<~MD
The RSS Agent consumes RSS feeds and emits events when they change.
This agent, using [Feedjira](https://github.com/feedjira/feedjira) as a base, can parse various types of RSS and Atom feeds and has some special handlers for FeedBurner, iTunes RSS, and so on. However, supported fields are limited by its general and abstract nature. For complex feeds with additional field types, we recommend using a WebsiteAgent. See [this example](https://github.com/huginn/huginn/wiki/Agent-configuration-examples#itunes-trailers).
@@ -49,7 +49,7 @@ def default_options
}
end
- event_description <<-MD
+ event_description <<~MD
Events look like:
{
@@ -131,11 +131,13 @@ def validate_options
errors.add(:base, "url is required") unless options['url'].present?
unless options['expected_update_period_in_days'].present? && options['expected_update_period_in_days'].to_i > 0
- errors.add(:base, "Please provide 'expected_update_period_in_days' to indicate how many days can pass without an update before this Agent is considered to not be working")
+ errors.add(:base,
+ "Please provide 'expected_update_period_in_days' to indicate how many days can pass without an update before this Agent is considered to not be working")
end
if options['remembered_id_count'].present? && options['remembered_id_count'].to_i < 1
- errors.add(:base, "Please provide 'remembered_id_count' as a number bigger than 0 indicating how many IDs should be saved to distinguish between new and old IDs in RSS feeds. Delete option to use default (500).")
+ errors.add(:base,
+ "Please provide 'remembered_id_count' as a number bigger than 0 indicating how many IDs should be saved to distinguish between new and old IDs in RSS feeds. Delete option to use default (500).")
end
validate_web_request_options!
@@ -161,17 +163,15 @@ def check_urls(urls)
max_events = (interpolated['max_events_per_run'].presence || 0).to_i
urls.each do |url|
- begin
- response = faraday.get(url)
- if response.success?
- feed = Feedjira.parse(preprocessed_body(response))
- new_events.concat feed_to_events(feed)
- else
- error "Failed to fetch #{url}: #{response.inspect}"
- end
- rescue => e
- error "Failed to fetch #{url} with message '#{e.message}': #{e.backtrace}"
+ response = faraday.get(url)
+ if response.success?
+ feed = Feedjira.parse(preprocessed_body(response))
+ new_events.concat feed_to_events(feed)
+ else
+ error "Failed to fetch #{url}: #{response.inspect}"
end
+ rescue StandardError => e
+ error "Failed to fetch #{url} with message '#{e.message}': #{e.backtrace}"
end
events = sort_events(new_events).select.with_index { |event, index|
@@ -210,7 +210,8 @@ def preprocessed_body(response)
else
# Encoding is already known, so do not let the parser detect
# it from the XML declaration in the content.
- body.sub!(/(?\A\u{FEFF}?\s*<\?xml(?:\s+\w+(?\s*=\s*(?:'[^']*'|"[^"]*")))*?)\s+encoding\g/, '\\k')
+ body.sub!(/(?\A\u{FEFF}?\s*<\?xml(?:\s+\w+(?\s*=\s*(?:'[^']*'|"[^"]*")))*?)\s+encoding\g/,
+ '\\k')
end
body
end
@@ -226,7 +227,7 @@ def feed_data(feed)
{
id: feed.feed_id,
- type: type,
+ type:,
url: feed.url,
links: feed.links,
title: feed.title,
@@ -257,15 +258,15 @@ def itunes_feed_data(feed)
itunes_summary
language
].each { |attr|
- if value = feed.try(attr).presence
- data[attr] =
- case attr
- when :itunes_summary
- clean_fragment(value)
- else
- value
- end
- end
+ next unless value = feed.try(attr).presence
+
+ data[attr] =
+ case attr
+ when :itunes_summary
+ clean_fragment(value)
+ else
+ value
+ end
}
end
data
diff --git a/app/models/agents/s3_agent.rb b/app/models/agents/s3_agent.rb
index bf3291ba61..34db21cd06 100644
--- a/app/models/agents/s3_agent.rb
+++ b/app/models/agents/s3_agent.rb
@@ -11,7 +11,7 @@ class S3Agent < Agent
gem_dependency_check { defined?(Aws::S3) }
description do
- <<-MD
+ <<~MD
The S3Agent can watch a bucket for changes or emit an event for every file in that bucket. When receiving events, it writes the data into a file on S3.
#{'## Include `aws-sdk-core` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -41,22 +41,23 @@ class S3Agent < Agent
end
event_description do
- "Events will looks like this:\n\n %s" % if boolify(interpolated['watch'])
- Utils.pretty_print({
- "file_pointer" => {
- "file" => "filename",
- "agent_id" => id
- },
- "event_type" => "modified/added/removed"
- })
- else
- Utils.pretty_print({
- "file_pointer" => {
- "file" => "filename",
- "agent_id" => id
- }
- })
- end
+ "Events will looks like this:\n\n " +
+ if boolify(interpolated['watch'])
+ Utils.pretty_print({
+ "file_pointer" => {
+ "file" => "filename",
+ "agent_id" => id
+ },
+ "event_type" => "modified/added/removed"
+ })
+ else
+ Utils.pretty_print({
+ "file_pointer" => {
+ "file" => "filename",
+ "agent_id" => id
+ }
+ })
+ end
end
def default_options
@@ -70,11 +71,12 @@ def default_options
}
end
- form_configurable :mode, type: :array, values: %w(read write)
+ form_configurable :mode, type: :array, values: %w[read write]
form_configurable :access_key_id, roles: :validatable
form_configurable :access_key_secret, roles: :validatable
- form_configurable :region, type: :array, values: %w(us-east-1 us-west-1 us-west-2 eu-west-1 eu-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1)
- form_configurable :watch, type: :array, values: %w(true false)
+ form_configurable :region, type: :array,
+ values: %w[us-east-1 us-west-1 us-west-2 eu-west-1 eu-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1]
+ form_configurable :watch, type: :array, values: %w[true false]
form_configurable :bucket, roles: :completable
form_configurable :filename
form_configurable :data
@@ -114,7 +116,7 @@ def validate_access_key_secret
end
def complete_bucket
- (buckets || []).collect { |room| {text: room.name, id: room.name} }
+ (buckets || []).collect { |room| { text: room.name, id: room.name } }
end
def working?
@@ -123,9 +125,10 @@ def working?
def check
return if interpolated['mode'] != 'read'
+
contents = safely do
- get_bucket_contents
- end
+ get_bucket_contents
+ end
if boolify(interpolated['watch'])
watch(contents)
else
@@ -141,6 +144,7 @@ def get_io(file)
def receive(incoming_events)
return if interpolated['mode'] != 'write'
+
incoming_events.each do |event|
safely do
mo = interpolated(event)
@@ -155,7 +159,7 @@ def safely
yield
rescue Aws::S3::Errors::AccessDenied => e
error("Could not access '#{interpolated['bucket']}' #{e.class} #{e.message}")
- rescue Aws::S3::Errors::ServiceError =>e
+ rescue Aws::S3::Errors::ServiceError => e
error("#{e.class}: #{e.message}")
end
@@ -175,7 +179,7 @@ def watch(contents)
end
contents.delete(key)
end
- contents.each do |key, etag|
+ contents.each do |key, _etag|
create_event payload: get_file_pointer(key).merge(event_type: :added)
end
diff --git a/app/models/agents/scheduler_agent.rb b/app/models/agents/scheduler_agent.rb
index 3d06ae1bea..3d1e824d4a 100644
--- a/app/models/agents/scheduler_agent.rb
+++ b/app/models/agents/scheduler_agent.rb
@@ -12,7 +12,7 @@ class SchedulerAgent < Agent
cattr_reader :second_precision_enabled
- description <<-MD
+ description <<~MD
The Scheduler Agent periodically takes an action on target Agents according to a user-defined schedule.
# Action types
diff --git a/app/models/agents/sentiment_agent.rb b/app/models/agents/sentiment_agent.rb
index ad48dd0c17..78fe12e897 100644
--- a/app/models/agents/sentiment_agent.rb
+++ b/app/models/agents/sentiment_agent.rb
@@ -6,7 +6,7 @@ class SentimentAgent < Agent
cannot_be_scheduled!
- description <<-MD
+ description <<~MD
The Sentiment Agent generates `good-bad` (psychological valence or happiness index), `active-passive` (arousal), and `strong-weak` (dominance) score. It will output a value between 1 and 9. It will only work on English content.
Make sure the content this agent is analyzing is of sufficient length to get respectable results.
@@ -14,7 +14,7 @@ class SentimentAgent < Agent
Provide a JSONPath in `content` field where content is residing and set `expected_receive_period_in_days` to the maximum number of days you would allow to be passed between events being received by this agent.
MD
- event_description <<-MD
+ event_description <<~MD
Events look like:
{
@@ -41,17 +41,22 @@ def receive(incoming_events)
incoming_events.each do |event|
Utils.values_at(event.payload, interpolated['content']).each do |content|
sent_values = sentiment_values anew, content
- create_event :payload => { 'content' => content,
- 'valence' => sent_values[0],
- 'arousal' => sent_values[1],
- 'dominance' => sent_values[2],
- 'original_event' => event.payload }
+ create_event payload: {
+ 'content' => content,
+ 'valence' => sent_values[0],
+ 'arousal' => sent_values[1],
+ 'dominance' => sent_values[2],
+ 'original_event' => event.payload
+ }
end
end
end
def validate_options
- errors.add(:base, "content and expected_receive_period_in_days must be present") unless options['content'].present? && options['expected_receive_period_in_days'].present?
+ errors.add(
+ :base,
+ "content and expected_receive_period_in_days must be present"
+ ) unless options['content'].present? && options['expected_receive_period_in_days'].present?
end
def self.sentiment_hash
@@ -67,18 +72,18 @@ def self.sentiment_hash
def sentiment_values(anew, text)
valence, arousal, dominance, freq = [0] * 4
text.downcase.strip.gsub(/[^a-z ]/, "").split.each do |word|
- if anew.has_key? word
- valence += anew[word][0]
- arousal += anew[word][1]
- dominance += anew[word][2]
- freq += 1
- end
+ next unless anew.has_key? word
+
+ valence += anew[word][0]
+ arousal += anew[word][1]
+ dominance += anew[word][2]
+ freq += 1
end
if valence != 0
- [valence/freq, arousal/freq, dominance/freq]
+ [valence / freq, arousal / freq, dominance / freq]
else
["Insufficient data for meaningful answer"] * 3
end
end
end
-end
\ No newline at end of file
+end
diff --git a/app/models/agents/shell_command_agent.rb b/app/models/agents/shell_command_agent.rb
index 672dd9b48a..7e827cb3d4 100644
--- a/app/models/agents/shell_command_agent.rb
+++ b/app/models/agents/shell_command_agent.rb
@@ -5,12 +5,11 @@ class ShellCommandAgent < Agent
can_dry_run!
no_bulk_receive!
-
def self.should_run?
ENV['ENABLE_INSECURE_AGENTS'] == "true"
end
- description <<-MD
+ description <<~MD
The Shell Command Agent will execute commands on your local system, returning the output.
`command` specifies the command (either a shell command line string or an array of command line arguments) to be executed, and `path` will tell ShellCommandAgent in what directory to run this command. The content of `stdin` will be fed to the command via the standard input.
@@ -33,26 +32,26 @@ def self.should_run?
You can enable this Agent in your .env file by setting `ENABLE_INSECURE_AGENTS` to `true`.
MD
- event_description <<-MD
- Events look like this:
+ event_description <<~MD
+ Events look like this:
- {
- "command": "pwd",
- "path": "/home/Huginn",
- "exit_status": 0,
- "errors": "",
- "output": "/home/Huginn"
- }
+ {
+ "command": "pwd",
+ "path": "/home/Huginn",
+ "exit_status": 0,
+ "errors": "",
+ "output": "/home/Huginn"
+ }
MD
def default_options
{
- 'path' => "/",
- 'command' => "pwd",
- 'unbundle' => false,
- 'suppress_on_failure' => false,
- 'suppress_on_empty_output' => false,
- 'expected_update_period_in_days' => 1
+ 'path' => "/",
+ 'command' => "pwd",
+ 'unbundle' => false,
+ 'suppress_on_failure' => false,
+ 'suppress_on_empty_output' => false,
+ 'expected_update_period_in_days' => 1
}
end
@@ -98,7 +97,7 @@ def handle(opts, event = nil)
path = opts['path']
stdin = opts['stdin']
- result, errors, exit_status = run_command(path, command, stdin, interpolated.slice(:unbundle).symbolize_keys)
+ result, errors, exit_status = run_command(path, command, stdin, **interpolated.slice(:unbundle).symbolize_keys)
payload = {
'command' => command,
@@ -109,7 +108,7 @@ def handle(opts, event = nil)
}
unless suppress_event?(payload)
- created_event = create_event payload: payload
+ created_event = create_event(payload:)
end
log("Ran '#{command}' under '#{path}'", outbound_event: created_event, inbound_event: event)
@@ -146,7 +145,7 @@ def run_command(path, command, stdin, unbundle: false)
_, status = Process.wait2(pid)
exit_status = status.exitstatus
- rescue => e
+ rescue StandardError => e
errors = e.to_s
result = ''.freeze
exit_status = nil
diff --git a/app/models/agents/slack_agent.rb b/app/models/agents/slack_agent.rb
index 7c6b18505d..04ad3b573d 100644
--- a/app/models/agents/slack_agent.rb
+++ b/app/models/agents/slack_agent.rb
@@ -10,7 +10,7 @@ class SlackAgent < Agent
gem_dependency_check { defined?(Slack) }
- description <<-MD
+ description <<~MD
The Slack Agent lets you receive events and send notifications to [Slack](https://slack.com/).
#{'## Include `slack-notifier` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -38,7 +38,7 @@ def default_options
def validate_options
unless options['webhook_url'].present? ||
- (options['auth_token'].present? && options['team_name'].present?) # compatibility
+ (options['auth_token'].present? && options['team_name'].present?) # compatibility
errors.add(:base, "webhook_url is required")
end
@@ -65,11 +65,11 @@ def username
end
def slack_notifier
- @slack_notifier ||= Slack::Notifier.new(webhook_url, username: username)
+ @slack_notifier ||= Slack::Notifier.new(webhook_url, username:)
end
def filter_options(opts)
- opts.select { |key, value| ALLOWED_PARAMS.include? key }.symbolize_keys
+ opts.select { |key, _value| ALLOWED_PARAMS.include? key }.symbolize_keys
end
def receive(incoming_events)
diff --git a/app/models/agents/stubhub_agent.rb b/app/models/agents/stubhub_agent.rb
index f0ba562be3..c4693541a5 100644
--- a/app/models/agents/stubhub_agent.rb
+++ b/app/models/agents/stubhub_agent.rb
@@ -2,24 +2,25 @@ module Agents
class StubhubAgent < Agent
cannot_receive_events!
- description <<-MD
+ description <<~MD
The StubHub Agent creates an event for a given StubHub Event.
It can be used to track how many tickets are available for the event and the minimum and maximum price. All that is required is that you paste in the url from the actual event, e.g. https://www.stubhub.com/outside-lands-music-festival-tickets/outside-lands-music-festival-3-day-pass-san-francisco-golden-gate-park-polo-fields-8-8-2014-9020701/
MD
- event_description <<-MD
+ event_description <<~MD
Events looks like this:
- {
- "url": "https://stubhub.com/valid-event-url"
- "name": "Event Name"
- "date": "2014-08-01"
- "max_price": "999.99"
- "min_price": "100.99"
- "total_postings": "50"
- "total_tickets": "150"
- "venue_name": "Venue Name"
- }
+
+ {
+ "url": "https://stubhub.com/valid-event-url"
+ "name": "Event Name"
+ "date": "2014-08-01"
+ "max_price": "999.99"
+ "min_price": "100.99"
+ "total_postings": "50"
+ "total_tickets": "150"
+ "venue_name": "Venue Name"
+ }
MD
default_schedule "every_1d"
@@ -29,7 +30,7 @@ def working?
end
def default_options
- { 'url' => 'https://stubhub.com/enter-your-event-here' }
+ { 'url' => 'https://stubhub.com/enter-your-event-here' }
end
def validate_options
@@ -41,7 +42,7 @@ def url
end
def check
- create_event :payload => fetch_stubhub_data(url)
+ create_event payload: fetch_stubhub_data(url)
end
def fetch_stubhub_data(url)
@@ -49,7 +50,6 @@ def fetch_stubhub_data(url)
end
class StubhubFetcher
-
def self.call(url)
new(url).fields
end
@@ -63,7 +63,7 @@ def event_id
end
def base_url
- 'https://www.stubhub.com/listingCatalog/select/?q='
+ 'https://www.stubhub.com/listingCatalog/select/?q='
end
def build_url
@@ -96,7 +96,6 @@ def fields
private
attr_reader :url
-
end
end
end
diff --git a/app/models/agents/telegram_agent.rb b/app/models/agents/telegram_agent.rb
index d1a12ecfa8..da65d7d3d4 100644
--- a/app/models/agents/telegram_agent.rb
+++ b/app/models/agents/telegram_agent.rb
@@ -9,14 +9,14 @@ class TelegramAgent < Agent
no_bulk_receive!
can_dry_run!
- description <<-MD
+ description <<~MD
The Telegram Agent receives and collects events and sends them via [Telegram](https://telegram.org/).
It is assumed that events have either a `text`, `photo`, `audio`, `document`, `video` or `group` key. You can use the EventFormattingAgent if your event does not provide these keys.
The value of `text` key is sent as a plain text message. You can also tell Telegram how to parse the message with `parse_mode`, set to either `html`, `markdown` or `markdownv2`.
The value of `photo`, `audio`, `document` and `video` keys should be a url whose contents will be sent to you.
- The value of `group` key should be a list and must consist of 2-10 objects representing an [InputMedia](https://core.telegram.org/bots/api#inputmedia) from the [Telegram Bot API](https://core.telegram.org/bots/api#inputmedia). Be careful: the `caption` field is not covered by the "long message" setting.
+ The value of `group` key should be a list and must consist of 2-10 objects representing an [InputMedia](https://core.telegram.org/bots/api#inputmedia) from the [Telegram Bot API](https://core.telegram.org/bots/api#inputmedia). Be careful: the `caption` field is not covered by the "long message" setting.#{' '}
**Setup**
@@ -63,17 +63,31 @@ def validate_auth_token
def complete_chat_id
response = HTTMultiParty.post(telegram_bot_uri('getUpdates'))
return [] unless response['ok']
+
response['result'].map { |update| update_to_complete(update) }.uniq
end
def validate_options
errors.add(:base, 'auth_token is required') unless options['auth_token'].present?
errors.add(:base, 'chat_id is required') unless options['chat_id'].present?
- errors.add(:base, 'caption should be 1024 characters or less') if interpolated['caption'].present? && interpolated['caption'].length > 1024 && (!interpolated['long_message'].present? || interpolated['long_message'] != 'split')
- errors.add(:base, "disable_notification has invalid value: should be 'true' or 'false'") if interpolated['disable_notification'].present? && !%w(true false).include?(interpolated['disable_notification'])
- errors.add(:base, "disable_web_page_preview has invalid value: should be 'true' or 'false'") if interpolated['disable_web_page_preview'].present? && !%w(true false).include?(interpolated['disable_web_page_preview'])
- errors.add(:base, "long_message has invalid value: should be 'split' or 'truncate'") if interpolated['long_message'].present? && !%w(split truncate).include?(interpolated['long_message'])
- errors.add(:base, "parse_mode has invalid value: should be 'html', 'markdown' or 'markdownv2'") if interpolated['parse_mode'].present? && !%w(html markdown markdownv2).include?(interpolated['parse_mode'])
+ errors.add(:base,
+ 'caption should be 1024 characters or less') if interpolated['caption'].present? && interpolated['caption'].length > 1024 && (!interpolated['long_message'].present? || interpolated['long_message'] != 'split')
+ errors.add(:base,
+ "disable_notification has invalid value: should be 'true' or 'false'") if interpolated['disable_notification'].present? && !%w[
+ true false
+ ].include?(interpolated['disable_notification'])
+ errors.add(:base,
+ "disable_web_page_preview has invalid value: should be 'true' or 'false'") if interpolated['disable_web_page_preview'].present? && !%w[
+ true false
+ ].include?(interpolated['disable_web_page_preview'])
+ errors.add(:base,
+ "long_message has invalid value: should be 'split' or 'truncate'") if interpolated['long_message'].present? && !%w[
+ split truncate
+ ].include?(interpolated['long_message'])
+ errors.add(:base,
+ "parse_mode has invalid value: should be 'html', 'markdown' or 'markdownv2'") if interpolated['parse_mode'].present? && !%w[
+ html markdown markdownv2
+ ].include?(interpolated['parse_mode'])
end
def working?
@@ -99,11 +113,13 @@ def receive(incoming_events)
def configure_params(params)
params[:chat_id] = interpolated['chat_id']
- params[:disable_notification] = interpolated['disable_notification'] if interpolated['disable_notification'].present?
+ params[:disable_notification] =
+ interpolated['disable_notification'] if interpolated['disable_notification'].present?
if params.has_key?(:text)
- params[:disable_web_page_preview] = interpolated['disable_web_page_preview'] if interpolated['disable_web_page_preview'].present?
+ params[:disable_web_page_preview] =
+ interpolated['disable_web_page_preview'] if interpolated['disable_web_page_preview'].present?
params[:parse_mode] = interpolated['parse_mode'] if interpolated['parse_mode'].present?
- elsif not params.has_key?(:media)
+ elsif !params.has_key?(:media)
params[:caption] = interpolated['caption'] if interpolated['caption'].present?
end
@@ -115,8 +131,9 @@ def receive_event(event)
messages_send = TELEGRAM_ACTIONS.count do |field, _method|
payload = event.payload[field]
next unless payload.present?
+
if field == :group
- send_telegram_messages field, configure_params(:media => payload)
+ send_telegram_messages field, configure_params(media: payload)
else
send_telegram_messages field, configure_params(field => payload)
end
@@ -163,7 +180,7 @@ def telegram_bot_uri(method)
def update_to_complete(update)
chat = (update['message'] || update.fetch('channel_post', {})).fetch('chat', {})
- {id: chat['id'], text: chat['title'] || "#{chat['first_name']} #{chat['last_name']}"}
+ { id: chat['id'], text: chat['title'] || "#{chat['first_name']} #{chat['last_name']}" }
end
end
end
diff --git a/app/models/agents/trigger_agent.rb b/app/models/agents/trigger_agent.rb
index 9757beceb0..bf6ee7796d 100644
--- a/app/models/agents/trigger_agent.rb
+++ b/app/models/agents/trigger_agent.rb
@@ -3,9 +3,19 @@ class TriggerAgent < Agent
cannot_be_scheduled!
can_dry_run!
- VALID_COMPARISON_TYPES = %w[regex !regex field=value field>value not\ in]
-
- description <<-MD
+ VALID_COMPARISON_TYPES = %w[
+ regex
+ !regex
+ field=value
+ field>value
+ not\ in
+ ]
+
+ description <<~MD
The Trigger Agent will watch for a specific value in an Event payload.
The `rules` array contains a mixture of strings and hashes.
@@ -32,7 +42,7 @@ class TriggerAgent < Agent
Set `expected_receive_period_in_days` to the maximum amount of time that you'd expect to pass between Events being received by this Agent.
MD
- event_description <<-MD
+ event_description <<~MD
Events look like this:
{ "message": "Your message" }
@@ -52,14 +62,19 @@ class TriggerAgent < Agent
def validate_options
unless options['expected_receive_period_in_days'].present? &&
- options['rules'].present? &&
- options['rules'].all? { |rule| valid_rule?(rule) }
- errors.add(:base, "expected_receive_period_in_days, message, and rules, with a type, value, and path for every rule, are required")
+ options['rules'].present? &&
+ options['rules'].all? { |rule| valid_rule?(rule) }
+ errors.add(:base,
+ "expected_receive_period_in_days, message, and rules, with a type, value, and path for every rule, are required")
end
- errors.add(:base, "message is required unless 'keep_event' is 'true'") unless options['message'].present? || keep_event?
+ errors.add(:base,
+ "message is required unless 'keep_event' is 'true'") unless options['message'].present? || keep_event?
- errors.add(:base, "keep_event, when present, must be 'true' or 'false'") unless options['keep_event'].blank? || %w[true false].include?(options['keep_event'])
+ errors.add(:base,
+ "keep_event, when present, must be 'true' or 'false'") unless options['keep_event'].blank? || %w[
+ true false
+ ].include?(options['keep_event'])
if options['must_match'].present?
if options['must_match'].to_i < 1
@@ -75,10 +90,10 @@ def default_options
'expected_receive_period_in_days' => "2",
'keep_event' => 'false',
'rules' => [{
- 'type' => "regex",
- 'value' => "foo\\d+bar",
- 'path' => "topkey.subkey.subkey.goal",
- }],
+ 'type' => "regex",
+ 'value' => "foo\\d+bar",
+ 'path' => "topkey.subkey.subkey.goal",
+ }],
'message' => "Looks like your pattern matched in '{{value}}'!"
}
end
@@ -89,7 +104,6 @@ def working?
def receive(incoming_events)
incoming_events.each do |event|
-
opts = interpolated(event)
match_results = opts['rules'].map do |rule|
@@ -129,16 +143,16 @@ def receive(incoming_events)
end
end
- if matches?(match_results)
- if keep_event?
- payload = event.payload.dup
- payload['message'] = opts['message'] if opts['message'].present?
- else
- payload = { 'message' => opts['message'] }
- end
+ next unless matches?(match_results)
- create_event :payload => payload
+ if keep_event?
+ payload = event.payload.dup
+ payload['message'] = opts['message'] if opts['message'].present?
+ else
+ payload = { 'message' => opts['message'] }
end
+
+ create_event(payload:)
end
end
diff --git a/app/models/agents/tumblr_likes_agent.rb b/app/models/agents/tumblr_likes_agent.rb
index 317d31e8d0..e3b96cd650 100644
--- a/app/models/agents/tumblr_likes_agent.rb
+++ b/app/models/agents/tumblr_likes_agent.rb
@@ -4,7 +4,7 @@ class TumblrLikesAgent < Agent
gem_dependency_check { defined?(Tumblr::Client) }
- description <<-MD
+ description <<~MD
The Tumblr Likes Agent checks for liked Tumblr posts from a specific blog.
#{'## Include `tumblr_client` and `omniauth-tumblr` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -23,7 +23,8 @@ class TumblrLikesAgent < Agent
def validate_options
errors.add(:base, 'blog_name is required') unless options['blog_name'].present?
- errors.add(:base, 'expected_update_period_in_days is required') unless options['expected_update_period_in_days'].present?
+ errors.add(:base,
+ 'expected_update_period_in_days is required') unless options['expected_update_period_in_days'].present?
end
def working?
@@ -47,11 +48,11 @@ def check
if liked['liked_posts']
# Loop over all liked posts which came back from Tumblr, add to memory, and create events.
liked['liked_posts'].each do |post|
- unless memory[:ids].include?(post['id'])
- memory[:ids].push(post['id'])
- memory[:last_liked] = post['liked_timestamp'] if post['liked_timestamp'] > memory[:last_liked]
- create_event(payload: post)
- end
+ next if memory[:ids].include?(post['id'])
+
+ memory[:ids].push(post['id'])
+ memory[:last_liked] = post['liked_timestamp'] if post['liked_timestamp'] > memory[:last_liked]
+ create_event(payload: post)
end
elsif liked['status'] && liked['msg']
# If there was a problem fetching likes (like 403 Forbidden or 404 Not Found) create an error message.
diff --git a/app/models/agents/tumblr_publish_agent.rb b/app/models/agents/tumblr_publish_agent.rb
index c72f879aa4..1dfdb21438 100644
--- a/app/models/agents/tumblr_publish_agent.rb
+++ b/app/models/agents/tumblr_publish_agent.rb
@@ -6,7 +6,7 @@ class TumblrPublishAgent < Agent
gem_dependency_check { defined?(Tumblr::Client) }
- description <<-MD
+ description <<~MD
The Tumblr Publish Agent publishes Tumblr posts from the events it receives.
#{'## Include `tumblr_client` and `omniauth-tumblr` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -59,7 +59,8 @@ class TumblrPublishAgent < Agent
MD
def validate_options
- errors.add(:base, "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present?
+ errors.add(:base,
+ "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present?
end
def working?
@@ -112,9 +113,9 @@ def receive(incoming_events)
return
end
expanded_post = get_post(blog_name, post["id"])
- create_event :payload => {
+ create_event payload: {
'success' => true,
- 'published_post' => "["+blog_name+"] "+post_type,
+ 'published_post' => "[" + blog_name + "] " + post_type,
'post_id' => post["id"],
'agent_id' => event.agent_id,
'event_id' => event.id,
@@ -126,13 +127,13 @@ def receive(incoming_events)
def publish_post(blog_name, post_type, options)
options_obj = {
- :state => options['state'],
- :tags => options['tags'],
- :tweet => options['tweet'],
- :date => options['date'],
- :format => options['format'],
- :slug => options['slug'],
- }
+ state: options['state'],
+ tags: options['tags'],
+ tweet: options['tweet'],
+ date: options['date'],
+ format: options['format'],
+ slug: options['slug'],
+ }
case post_type
when "text"
@@ -174,9 +175,7 @@ def publish_post(blog_name, post_type, options)
end
def get_post(blog_name, id)
- obj = tumblr.posts(blog_name, {
- :id => id
- })
+ obj = tumblr.posts(blog_name, { id: })
obj["posts"].first
end
end
diff --git a/app/models/agents/twilio_agent.rb b/app/models/agents/twilio_agent.rb
index ad444228a0..f55d9c41c9 100644
--- a/app/models/agents/twilio_agent.rb
+++ b/app/models/agents/twilio_agent.rb
@@ -8,7 +8,7 @@ class TwilioAgent < Agent
gem_dependency_check { defined?(Twilio) }
- description <<-MD
+ description <<~MD
The Twilio Agent receives and collects events and sends them via text message (up to 160 characters) or gives you a call when scheduled.
#{'## Include `twilio-ruby` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -29,16 +29,17 @@ def default_options
'auth_token' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
'sender_cell' => 'xxxxxxxxxx',
'receiver_cell' => 'xxxxxxxxxx',
- 'server_url' => 'http://somename.com:3000',
- 'receive_text' => 'true',
- 'receive_call' => 'false',
+ 'server_url' => 'http://somename.com:3000',
+ 'receive_text' => 'true',
+ 'receive_call' => 'false',
'expected_receive_period_in_days' => '1'
}
end
def validate_options
unless options['account_sid'].present? && options['auth_token'].present? && options['sender_cell'].present? && options['receiver_cell'].present? && options['expected_receive_period_in_days'].present? && options['receive_call'].present? && options['receive_text'].present?
- errors.add(:base, 'account_sid, auth_token, sender_cell, receiver_cell, receive_text, receive_call and expected_receive_period_in_days are all required')
+ errors.add(:base,
+ 'account_sid, auth_token, sender_cell, receiver_cell, receive_text, receive_call and expected_receive_period_in_days are all required')
end
end
@@ -66,15 +67,15 @@ def working?
end
def send_message(message)
- client.messages.create :from => interpolated['sender_cell'],
- :to => interpolated['receiver_cell'],
- :body => message
+ client.messages.create from: interpolated['sender_cell'],
+ to: interpolated['receiver_cell'],
+ body: message
end
def make_call(secret)
- client.calls.create :from => interpolated['sender_cell'],
- :to => interpolated['receiver_cell'],
- :url => post_url(interpolated['server_url'], secret)
+ client.calls.create from: interpolated['sender_cell'],
+ to: interpolated['receiver_cell'],
+ url: post_url(interpolated['server_url'], secret)
end
def post_url(server_url, secret)
@@ -83,7 +84,9 @@ def post_url(server_url, secret)
def receive_web_request(params, method, format)
if memory['pending_calls'].has_key? params['secret']
- response = Twilio::TwiML::VoiceResponse.new {|r| r.say( message: memory['pending_calls'][params['secret']], voice: 'woman')}
+ response = Twilio::TwiML::VoiceResponse.new { |r|
+ r.say(message: memory['pending_calls'][params['secret']], voice: 'woman')
+ }
memory['pending_calls'].delete params['secret']
[response.to_s, 200]
end
diff --git a/app/models/agents/twilio_receive_text_agent.rb b/app/models/agents/twilio_receive_text_agent.rb
index f22e980a10..5eb16b7694 100644
--- a/app/models/agents/twilio_receive_text_agent.rb
+++ b/app/models/agents/twilio_receive_text_agent.rb
@@ -5,20 +5,21 @@ class TwilioReceiveTextAgent < Agent
gem_dependency_check { defined?(Twilio) }
- description do <<-MD
- The Twilio Receive Text Agent receives text messages from Twilio and emits them as events.
+ description do
+ <<~MD
+ The Twilio Receive Text Agent receives text messages from Twilio and emits them as events.
- #{'## Include `twilio-ruby` in your Gemfile to use this Agent!' if dependencies_missing?}
+ #{'## Include `twilio-ruby` in your Gemfile to use this Agent!' if dependencies_missing?}
- In order to create events with this agent, configure Twilio to send POST requests to:
+ In order to create events with this agent, configure Twilio to send POST requests to:
- ```
- #{post_url}
- ```
+ ```
+ #{post_url}
+ ```
- #{'The placeholder symbols above will be replaced by their values once the agent is saved.' unless id}
+ #{'The placeholder symbols above will be replaced by their values once the agent is saved.' unless id}
- Options:
+ Options:
* `server_url` must be set to the URL of your
Huginn installation (probably "https://#{ENV['DOMAIN']}"), which must be web-accessible. Be sure to set http/https correctly.
@@ -35,8 +36,8 @@ def default_options
{
'account_sid' => 'ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
'auth_token' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
- 'server_url' => "https://#{ENV['DOMAIN'].presence || 'example.com'}",
- 'reply_text' => '',
+ 'server_url' => "https://#{ENV['DOMAIN'].presence || 'example.com'}",
+ 'reply_text' => '',
"expected_receive_period_in_days" => 1
}
end
@@ -73,11 +74,10 @@ def receive_web_request(request)
# validate from twilio
@validator ||= Twilio::Security::RequestValidator.new interpolated['auth_token']
if !@validator.validate(post_url, params, signature)
- error("Twilio Signature Failed to Validate\n\n"+
- "URL: #{post_url}\n\n"+
- "POST params: #{params.inspect}\n\n"+
- "Signature: #{signature}"
- )
+ error("Twilio Signature Failed to Validate\n\n" +
+ "URL: #{post_url}\n\n" +
+ "POST params: #{params.inspect}\n\n" +
+ "Signature: #{signature}")
return ["Not authorized", 401]
end
@@ -87,9 +87,9 @@ def receive_web_request(request)
r.message(body: interpolated['reply_text'])
end
end
- return [response.to_s, 200, "text/xml"]
+ [response.to_s, 200, "text/xml"]
else
- return ["Bad request", 400]
+ ["Bad request", 400]
end
end
end
diff --git a/app/models/agents/twitter_action_agent.rb b/app/models/agents/twitter_action_agent.rb
index 176a80563e..a5f958cd59 100644
--- a/app/models/agents/twitter_action_agent.rb
+++ b/app/models/agents/twitter_action_agent.rb
@@ -4,7 +4,7 @@ class TwitterActionAgent < Agent
cannot_be_scheduled!
- description <<-MD
+ description <<~MD
The Twitter Action Agent is able to retweet or favorite tweets from the events it receives.
#{twitter_dependencies_missing if dependencies_missing?}
diff --git a/app/models/agents/twitter_favorites.rb b/app/models/agents/twitter_favorites.rb
index 1dae8a8dbb..ac7f797445 100644
--- a/app/models/agents/twitter_favorites.rb
+++ b/app/models/agents/twitter_favorites.rb
@@ -5,7 +5,7 @@ class TwitterFavorites < Agent
can_dry_run!
cannot_receive_events!
- description <<-MD
+ description <<~MD
The Twitter Favorites List Agent follows the favorites list of a specified Twitter user.
#{twitter_dependencies_missing if dependencies_missing?}
diff --git a/app/models/agents/twitter_publish_agent.rb b/app/models/agents/twitter_publish_agent.rb
index 566f2c3575..2f6ddfe6c9 100644
--- a/app/models/agents/twitter_publish_agent.rb
+++ b/app/models/agents/twitter_publish_agent.rb
@@ -4,7 +4,7 @@ class TwitterPublishAgent < Agent
cannot_be_scheduled!
- description <<-MD
+ description <<~MD
The Twitter Publish Agent publishes tweets from the events it receives.
#{twitter_dependencies_missing if dependencies_missing?}
@@ -19,32 +19,34 @@ class TwitterPublishAgent < Agent
If `output_mode` is set to `merge`, the emitted Event will be merged into the original contents of the received Event.
MD
- event_description <<-MD
+ event_description <<~MD
Events look like this:
- {
- "success": true,
- "published_tweet": "...",
- "tweet_id": ...,
- "tweet_url": "...",
- "agent_id": ...,
- "event_id": ...
- }
-
- {
- "success": false,
- "error": "...",
- "failed_tweet": "...",
- "agent_id": ...,
- "event_id": ...
- }
+
+ {
+ "success": true,
+ "published_tweet": "...",
+ "tweet_id": ...,
+ "tweet_url": "...",
+ "agent_id": ...,
+ "event_id": ...
+ }
+
+ {
+ "success": false,
+ "error": "...",
+ "failed_tweet": "...",
+ "agent_id": ...,
+ "event_id": ...
+ }
Original event contents will be merged when `output_mode` is set to `merge`.
MD
def validate_options
- errors.add(:base, "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present?
+ errors.add(:base,
+ "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present?
- if options['output_mode'].present? && !options['output_mode'].to_s.include?('{') && !%[clean merge].include?(options['output_mode'].to_s)
+ if options['output_mode'].present? && !options['output_mode'].to_s.include?('{') && !%(clean merge).include?(options['output_mode'].to_s)
errors.add(:base, "if provided, output_mode must be 'clean' or 'merge'")
end
end
diff --git a/app/models/agents/twitter_search_agent.rb b/app/models/agents/twitter_search_agent.rb
index 4c95629eed..60ed9b9581 100644
--- a/app/models/agents/twitter_search_agent.rb
+++ b/app/models/agents/twitter_search_agent.rb
@@ -5,7 +5,7 @@ class TwitterSearchAgent < Agent
can_dry_run!
cannot_receive_events!
- description <<-MD
+ description <<~MD
The Twitter Search Agent performs and emits the results of a specified Twitter search.
#{twitter_dependencies_missing if dependencies_missing?}
diff --git a/app/models/agents/twitter_stream_agent.rb b/app/models/agents/twitter_stream_agent.rb
index b496adad80..3722accdca 100644
--- a/app/models/agents/twitter_stream_agent.rb
+++ b/app/models/agents/twitter_stream_agent.rb
@@ -5,7 +5,7 @@ class TwitterStreamAgent < Agent
cannot_receive_events!
- description <<-MD
+ description <<~MD
The Twitter Stream Agent follows the Twitter stream in real time, watching for certain keywords, or filters, that you provide.
#{twitter_dependencies_missing if dependencies_missing?}
@@ -147,7 +147,7 @@ def self.setup_worker
config_hash.push(oauth_token)
Worker.new(id: agents.first.worker_id(config_hash),
- config: { filter_to_agent_map: filter_to_agent_map },
+ config: { filter_to_agent_map: },
agent: agents.first)
end
end
@@ -155,7 +155,7 @@ def self.setup_worker
class Worker < LongRunnable::Worker
RELOAD_TIMEOUT = 60.minutes
DUPLICATE_DETECTION_LENGTH = 1000
- SEPARATOR = /[^\w_-]+/
+ SEPARATOR = /[^\w-]+/
def setup
require 'twitter/json_stream'
@@ -187,13 +187,13 @@ def stream!(filters, agent, &block)
path =
if track.present?
- "/1.1/statuses/filter.json?#{{ track: track }.to_param}"
+ "/1.1/statuses/filter.json?#{{ track: }.to_param}"
else
"/1.1/statuses/sample.json"
end
stream = Twitter::JSONStream.connect(
- path: path,
+ path:,
ssl: true,
oauth: {
consumer_key: agent.twitter_consumer_key,
diff --git a/app/models/agents/twitter_user_agent.rb b/app/models/agents/twitter_user_agent.rb
index bd2cb74689..b350bbdc9a 100644
--- a/app/models/agents/twitter_user_agent.rb
+++ b/app/models/agents/twitter_user_agent.rb
@@ -5,7 +5,7 @@ class TwitterUserAgent < Agent
can_dry_run!
cannot_receive_events!
- description <<-MD
+ description <<~MD
The Twitter User Agent either follows the timeline of a specific Twitter user or follows your own home timeline including both your tweets and tweets from people whom you are following.
#{twitter_dependencies_missing if dependencies_missing?}
diff --git a/app/models/agents/user_location_agent.rb b/app/models/agents/user_location_agent.rb
index 753c3a9b7b..5152fba76b 100644
--- a/app/models/agents/user_location_agent.rb
+++ b/app/models/agents/user_location_agent.rb
@@ -6,20 +6,21 @@ class UserLocationAgent < Agent
gem_dependency_check { defined?(Haversine) }
- description do <<-MD
- The User Location Agent creates events based on WebHook POSTS that contain a `latitude` and `longitude`. You can use the [POSTLocation](https://github.com/cantino/post_location) or [PostGPS](https://github.com/chriseidhof/PostGPS) iOS app to post your location to `https://#{ENV['DOMAIN']}/users/#{user.id}/update_location/:secret` where `:secret` is specified in your options.
+ description do
+ <<~MD
+ The User Location Agent creates events based on WebHook POSTS that contain a `latitude` and `longitude`. You can use the [POSTLocation](https://github.com/cantino/post_location) or [PostGPS](https://github.com/chriseidhof/PostGPS) iOS app to post your location to `https://#{ENV['DOMAIN']}/users/#{user.id}/update_location/:secret` where `:secret` is specified in your options.
- #{'## Include `haversine` in your Gemfile to use this Agent!' if dependencies_missing?}
+ #{'## Include `haversine` in your Gemfile to use this Agent!' if dependencies_missing?}
- If you want to only keep more precise locations, set `max_accuracy` to the upper bound, in meters. The default name for this field is `accuracy`, but you can change this by setting a value for `accuracy_field`.
+ If you want to only keep more precise locations, set `max_accuracy` to the upper bound, in meters. The default name for this field is `accuracy`, but you can change this by setting a value for `accuracy_field`.
- If you want to require a certain distance traveled, set `min_distance` to the minimum distance, in meters. Note that GPS readings and the measurement itself aren't exact, so don't rely on this for precision filtering.
+ If you want to require a certain distance traveled, set `min_distance` to the minimum distance, in meters. Note that GPS readings and the measurement itself aren't exact, so don't rely on this for precision filtering.
- To view the locations on a map, set `api_key` to your [Google Maps JavaScript API key](https://developers.google.com/maps/documentation/javascript/get-api-key#key).
- MD
+ To view the locations on a map, set `api_key` to your [Google Maps JavaScript API key](https://developers.google.com/maps/documentation/javascript/get-api-key#key).
+ MD
end
- event_description <<-MD
+ event_description <<~MD
Assuming you're using the iOS application, events look like this:
{
@@ -49,7 +50,8 @@ def default_options
end
def validate_options
- errors.add(:base, "secret is required and must be longer than 4 characters") unless options['secret'].present? && options['secret'].length > 4
+ errors.add(:base,
+ "secret is required and must be longer than 4 characters") unless options['secret'].present? && options['secret'].length > 4
end
def receive(incoming_events)
@@ -71,7 +73,7 @@ def receive_web_request(params, method, format)
handle_payload params.except(:secret)
- return ['ok', 200]
+ ['ok', 200]
end
private
@@ -87,7 +89,12 @@ def accurate_enough?(payload, accuracy_field)
def far_enough?(payload)
if memory['last_location'].present?
- travel = Haversine.distance(memory['last_location']['latitude'].to_i, memory['last_location']['longitude'].to_i, payload['latitude'].to_i, payload['longitude'].to_i).to_meters
+ travel = Haversine.distance(
+ memory['last_location']['latitude'].to_i,
+ memory['last_location']['longitude'].to_i,
+ payload['latitude'].to_i,
+ payload['longitude'].to_i
+ ).to_meters
!interpolated[:min_distance].present? || travel > interpolated[:min_distance].to_i
else # for the first run, before "last_location" exists
true
@@ -98,7 +105,7 @@ def far_enough?(payload)
if interpolated[:max_accuracy].present? && !payload[accuracy_field].present?
log "Accuracy field missing; all locations will be kept"
end
- create_event payload: payload, location: location
+ create_event(payload:, location:)
memory["last_location"] = payload
end
end
diff --git a/app/models/agents/weather_agent.rb b/app/models/agents/weather_agent.rb
index 177f5174ea..e68fd62b26 100644
--- a/app/models/agents/weather_agent.rb
+++ b/app/models/agents/weather_agent.rb
@@ -7,24 +7,23 @@ class WeatherAgent < Agent
gem_dependency_check { defined?(ForecastIO) }
- description <<-MD
+ description <<~MD
The Weather Agent creates an event for the day's weather at a given `location`.
#{'## Include `forecast_io` in your Gemfile to use this Agent!' if dependencies_missing?}
You also must select when you would like to get the weather forecast for using the `which_day` option, where the number 1 represents today, 2 represents tomorrow and so on. Weather forecast inforation is only returned for at most one week at a time.
- The weather forecast information is provided by Dark Sky.
+ The weather forecast information is provided by Dark Sky.
The `location` must be a comma-separated string of map co-ordinates (longitude, latitude). For example, San Francisco would be `37.7771,-122.4196`.
You must set up an [API key for Dark Sky](https://darksky.net/dev/) in order to use this Agent.
Set `expected_update_period_in_days` to the maximum amount of time that you'd expect to pass between Events being created by this Agent.
-
MD
- event_description <<-MD
+ event_description <<~MD
Events look like this:
{
@@ -71,7 +70,7 @@ def default_options
def check
if key_setup?
- create_event :payload => model(which_day).merge('location' => location)
+ create_event payload: model(which_day).merge('location' => location)
end
end
@@ -93,7 +92,7 @@ def language
interpolated["language"].presence || "en"
end
- def wunderground?
+ def wunderground?
interpolated["service"].presence && interpolated["service"].presence.downcase == "wunderground"
end
@@ -112,12 +111,14 @@ def validate_location
:base,
"Location #{location} is malformed. Location for " +
'Dark Sky must be in the format "-00.000,-00.00000". The ' +
- "number of decimal places does not matter.")
+ "number of decimal places does not matter."
+ )
end
end
def validate_options
- errors.add(:base, "The Weather Underground API has been disabled since Jan 1st 2018, please switch to DarkSky") if wunderground?
+ errors.add(:base,
+ "The Weather Underground API has been disabled since Jan 1st 2018, please switch to DarkSky") if wunderground?
validate_location
errors.add(:base, "api_key is required") unless interpolated['api_key'].present?
errors.add(:base, "which_day selection is required") unless which_day.present?
@@ -127,7 +128,7 @@ def dark_sky
if key_setup?
ForecastIO.api_key = interpolated['api_key']
lat, lng = coordinates
- ForecastIO.forecast(lat, lng, params: {lang: language.downcase})['daily']['data']
+ ForecastIO.forecast(lat, lng, params: { lang: language.downcase })['daily']['data']
end
end
@@ -135,7 +136,7 @@ def model(which_day)
value = dark_sky[which_day - 1]
if value
timestamp = Time.at(value.time)
- day = {
+ {
'date' => {
'epoch' => value.time.to_s,
'pretty' => timestamp.strftime("%l:%M %p %Z on %B %d, %Y"),
@@ -146,7 +147,7 @@ def model(which_day)
'hour' => timestamp.hour,
'min' => timestamp.strftime("%M"),
'sec' => timestamp.sec,
- 'isdst' => timestamp.isdst ? 1 : 0 ,
+ 'isdst' => timestamp.isdst ? 1 : 0,
'monthname' => timestamp.strftime("%B"),
'monthname_short' => timestamp.strftime("%b"),
'weekday_short' => timestamp.strftime("%a"),
@@ -156,18 +157,18 @@ def model(which_day)
},
'period' => which_day.to_i,
'high' => {
- 'fahrenheit' => value.temperatureMax.round().to_s,
+ 'fahrenheit' => value.temperatureMax.round.to_s,
'epoch' => value.temperatureMaxTime.to_s,
- 'fahrenheit_apparent' => value.apparentTemperatureMax.round().to_s,
+ 'fahrenheit_apparent' => value.apparentTemperatureMax.round.to_s,
'epoch_apparent' => value.apparentTemperatureMaxTime.to_s,
- 'celsius' => ((5*(Float(value.temperatureMax) - 32))/9).round().to_s
+ 'celsius' => ((5 * (Float(value.temperatureMax) - 32)) / 9).round.to_s
},
'low' => {
- 'fahrenheit' => value.temperatureMin.round().to_s,
+ 'fahrenheit' => value.temperatureMin.round.to_s,
'epoch' => value.temperatureMinTime.to_s,
- 'fahrenheit_apparent' => value.apparentTemperatureMin.round().to_s,
+ 'fahrenheit_apparent' => value.apparentTemperatureMin.round.to_s,
'epoch_apparent' => value.apparentTemperatureMinTime.to_s,
- 'celsius' => ((5*(Float(value.temperatureMin) - 32))/9).round().to_s
+ 'celsius' => ((5 * (Float(value.temperatureMin) - 32)) / 9).round.to_s
},
'conditions' => value.summary,
'icon' => value.icon,
@@ -184,8 +185,8 @@ def model(which_day)
},
'dewPoint' => value.dewPoint.to_s,
'avewind' => {
- 'mph' => value.windSpeed.round().to_s,
- 'kph' => (Float(value.windSpeed) * 1.609344).round().to_s,
+ 'mph' => value.windSpeed.round.to_s,
+ 'kph' => (Float(value.windSpeed) * 1.609344).round.to_s,
'degrees' => value.windBearing.to_s
},
'visibility' => value.visibility.to_s,
@@ -193,7 +194,6 @@ def model(which_day)
'pressure' => value.pressure.to_s,
'ozone' => value.ozone.to_s
}
- return day
end
end
end
diff --git a/app/models/agents/webhook_agent.rb b/app/models/agents/webhook_agent.rb
index 325ecb86cb..e4ad8b0ccc 100644
--- a/app/models/agents/webhook_agent.rb
+++ b/app/models/agents/webhook_agent.rb
@@ -6,16 +6,17 @@ class WebhookAgent < Agent
cannot_be_scheduled!
cannot_receive_events!
- description do <<-MD
- The Webhook Agent will create events by receiving webhooks from any source. In order to create events with this agent, make a POST request to:
+ description do
+ <<~MD
+ The Webhook Agent will create events by receiving webhooks from any source. In order to create events with this agent, make a POST request to:
- ```
- https://#{ENV['DOMAIN']}/users/#{user.id}/web_requests/#{id || ':id'}/#{options['secret'] || ':secret'}
- ```
+ ```
+ https://#{ENV['DOMAIN']}/users/#{user.id}/web_requests/#{id || ':id'}/#{options['secret'] || ':secret'}
+ ```
- #{'The placeholder symbols above will be replaced by their values once the agent is saved.' unless id}
+ #{'The placeholder symbols above will be replaced by their values once the agent is saved.' unless id}
- Options:
+ Options:
* `secret` - A token that the host will provide for authentication.
* `expected_receive_period_in_days` - How often you expect to receive
@@ -38,14 +39,15 @@ class WebhookAgent < Agent
end
event_description do
- <<-MD
+ <<~MD
The event payload is based on the value of the `payload_path` option,
which is set to `#{interpolated['payload_path']}`.
MD
end
def default_options
- { "secret" => "supersecretstring",
+ {
+ "secret" => "supersecretstring",
"expected_receive_period_in_days" => 1,
"payload_path" => "some_key",
"event_headers" => "",
@@ -97,7 +99,7 @@ def receive_web_request(request)
begin
response = faraday.post('https://www.google.com/recaptcha/api/siteverify',
parameters)
- rescue => e
+ rescue StandardError => e
error "Verification failed: #{e.message}"
return ["Not Authorized", 401]
end
@@ -117,9 +119,17 @@ def receive_web_request(request)
end
if interpolated['response_headers'].presence
- [interpolated(params)['response'] || 'Event Created', code, "text/plain", interpolated['response_headers'].presence]
+ [
+ interpolated(params)['response'] || 'Event Created',
+ code,
+ "text/plain",
+ interpolated['response_headers'].presence
+ ]
else
- [interpolated(params)['response'] || 'Event Created', code]
+ [
+ interpolated(params)['response'] || 'Event Created',
+ code
+ ]
end
end
diff --git a/app/models/agents/website_agent.rb b/app/models/agents/website_agent.rb
index fe057b47de..3784975456 100644
--- a/app/models/agents/website_agent.rb
+++ b/app/models/agents/website_agent.rb
@@ -14,7 +14,7 @@ class WebsiteAgent < Agent
UNIQUENESS_LOOK_BACK = 200
UNIQUENESS_FACTOR = 3
- description <<-MD
+ description <<~MD
The Website Agent scrapes a website, XML document, or JSON feed and creates Events based on the results.
Specify a `url` and select a `mode` for when to create Events based on the scraped data, either `all`, `on_change`, or `merge` (if fetching based on an Event, see below).
@@ -224,37 +224,42 @@ def working?
def default_options
{
- 'expected_update_period_in_days' => "2",
- 'url' => "https://xkcd.com",
- 'type' => "html",
- 'mode' => "on_change",
- 'extract' => {
- 'url' => { 'css' => "#comic img", 'value' => "@src" },
- 'title' => { 'css' => "#comic img", 'value' => "@alt" },
- 'hovertext' => { 'css' => "#comic img", 'value' => "@title" }
- }
+ 'expected_update_period_in_days' => "2",
+ 'url' => "https://xkcd.com",
+ 'type' => "html",
+ 'mode' => "on_change",
+ 'extract' => {
+ 'url' => { 'css' => "#comic img", 'value' => "@src" },
+ 'title' => { 'css' => "#comic img", 'value' => "@alt" },
+ 'hovertext' => { 'css' => "#comic img", 'value' => "@title" }
+ }
}
end
def validate_options
# Check for required fields
- errors.add(:base, "either url, url_from_event, or data_from_event are required") unless options['url'].present? || options['url_from_event'].present? || options['data_from_event'].present?
- errors.add(:base, "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present?
+ errors.add(:base,
+ "either url, url_from_event, or data_from_event are required") unless options['url'].present? || options['url_from_event'].present? || options['data_from_event'].present?
+ errors.add(:base,
+ "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present?
validate_extract_options!
validate_template_options!
validate_http_success_codes!
# Check for optional fields
if options['mode'].present?
- errors.add(:base, "mode must be set to on_change, all or merge") unless %w[on_change all merge].include?(options['mode'])
+ errors.add(:base, "mode must be set to on_change, all or merge") unless %w[on_change all
+ merge].include?(options['mode'])
end
if options['expected_update_period_in_days'].present?
- errors.add(:base, "Invalid expected_update_period_in_days format") unless is_positive_integer?(options['expected_update_period_in_days'])
+ errors.add(:base,
+ "Invalid expected_update_period_in_days format") unless is_positive_integer?(options['expected_update_period_in_days'])
end
if options['uniqueness_look_back'].present?
- errors.add(:base, "Invalid uniqueness_look_back format") unless is_positive_integer?(options['uniqueness_look_back'])
+ errors.add(:base,
+ "Invalid uniqueness_look_back format") unless is_positive_integer?(options['uniqueness_look_back'])
end
validate_web_request_options!
@@ -264,23 +269,24 @@ def validate_http_success_codes!
consider_success = options["http_success_codes"]
if consider_success.present?
- if (consider_success.class != Array)
+ if consider_success.class != Array
errors.add(:http_success_codes, "must be an array and specify at least one status code")
- else
- if consider_success.uniq.count != consider_success.count
- errors.add(:http_success_codes, "duplicate http code found")
- else
- if consider_success.any?{|e| e.to_s !~ /^\d+$/ }
- errors.add(:http_success_codes, "please make sure to use only numeric values for code, ex 404, or \"404\"")
- end
- end
+ elsif consider_success.uniq.count != consider_success.count
+ errors.add(:http_success_codes, "duplicate http code found")
+ elsif consider_success.any? { |e| e.to_s !~ /^\d+$/ }
+ errors.add(:http_success_codes,
+ "please make sure to use only numeric values for code, ex 404, or \"404\"")
end
end
end
def validate_extract_options!
- extraction_type = (extraction_type() rescue extraction_type(options))
+ extraction_type = begin
+ extraction_type()
+ rescue StandardError
+ extraction_type(options)
+ end
case extract = options['extract']
when Hash
if extract.each_value.any? { |value| !value.is_a?(Hash) }
@@ -297,7 +303,8 @@ def validate_extract_options!
when String
# ok
when nil
- errors.add(:base, "When type is html or xml, all extractions must have a css or xpath attribute (bad extraction details for #{name.inspect})")
+ errors.add(:base,
+ "When type is html or xml, all extractions must have a css or xpath attribute (bad extraction details for #{name.inspect})")
else
errors.add(:base, "Wrong type of \"xpath\" value in extraction details for #{name.inspect}")
end
@@ -318,7 +325,8 @@ def validate_extract_options!
when String
# ok
when nil
- errors.add(:base, "When type is json, all extractions must have a path attribute (bad extraction details for #{name.inspect})")
+ errors.add(:base,
+ "When type is json, all extractions must have a path attribute (bad extraction details for #{name.inspect})")
else
errors.add(:base, "Wrong type of \"path\" value in extraction details for #{name.inspect}")
end
@@ -329,11 +337,12 @@ def validate_extract_options!
when String
begin
re = Regexp.new(regexp)
- rescue => e
+ rescue StandardError => e
errors.add(:base, "invalid regexp for #{name.inspect}: #{e.message}")
end
when nil
- errors.add(:base, "When type is text, all extractions must have a regexp attribute (bad extraction details for #{name.inspect})")
+ errors.add(:base,
+ "When type is text, all extractions must have a regexp attribute (bad extraction details for #{name.inspect})")
else
errors.add(:base, "Wrong type of \"regexp\" value in extraction details for #{name.inspect}")
end
@@ -346,7 +355,8 @@ def validate_extract_options!
errors.add(:base, "no named capture #{index.inspect} found in regexp for #{name.inspect})")
end
when nil
- errors.add(:base, "When type is text, all extractions must have an index attribute (bad extraction details for #{name.inspect})")
+ errors.add(:base,
+ "When type is text, all extractions must have an index attribute (bad extraction details for #{name.inspect})")
else
errors.add(:base, "Wrong type of \"index\" value in extraction details for #{name.inspect}")
end
@@ -369,8 +379,7 @@ def validate_extract_options!
def validate_template_options!
template = options['template'].presence or return
- unless Hash === template &&
- template.each_pair.all? { |key, value| String === value }
+ unless Hash === template && template.each_key.all?(String)
errors.add(:base, 'template must be a hash of strings.')
end
end
@@ -403,7 +412,7 @@ def check_url(url, existing_payload = {})
interpolation_context['_response_'] = ResponseDrop.new(response)
handle_data(response.body, response.env[:url], existing_payload)
}
- rescue => e
+ rescue StandardError => e
error "Error when fetching url: #{e.message}\n#{e.backtrace.join("\n")}"
end
@@ -432,12 +441,12 @@ def handle_data(body, url, existing_payload)
output =
case extraction_type
- when 'json'
- extract_json(doc)
- when 'text'
- extract_text(doc)
- else
- extract_xml(doc)
+ when 'json'
+ extract_json(doc)
+ when 'text'
+ extract_text(doc)
+ else
+ extract_xml(doc)
end
num_tuples = output.size or
@@ -485,6 +494,7 @@ def receive(incoming_events)
end
private
+
def consider_response_successful?(response)
response.success? || begin
consider_success = options["http_success_codes"]
@@ -497,7 +507,7 @@ def handle_event_data(data, event, existing_payload)
interpolation_context['_response_'] = ResponseFromEventDrop.new(event)
handle_data(data, event.payload['url'].presence, existing_payload)
}
- rescue => e
+ rescue StandardError => e
error "Error when handling event data: #{e.message}\n#{e.backtrace.join("\n")}"
end
@@ -557,7 +567,7 @@ def use_namespaces?
if interpolated.key?('use_namespaces')
boolify(interpolated['use_namespaces'])
else
- interpolated['extract'].none? { |name, extraction_details|
+ interpolated['extract'].none? { |_name, extraction_details|
extraction_details.key?('xpath')
}
end
@@ -620,7 +630,7 @@ def extract_xml(doc)
log "Extracting #{extraction_type} at #{xpath || css}"
case nodes
when Nokogiri::XML::NodeSet
- stringified_nodes = nodes.map do |node|
+ stringified_nodes = nodes.map do |node|
case value = node.xpath(extraction_details['value'] || '.')
when Float
# Node#xpath() returns any numeric value as float;
@@ -677,6 +687,7 @@ def []=(key, value)
if @size && @size != size
raise UnevenSizeError, 'got an uneven size'
end
+
@size = size
end
@@ -684,7 +695,7 @@ def []=(key, value)
end
def each
- @size.times.zip(*@hash.values) do |index, *values|
+ @size.times.zip(*@hash.values) do |_index, *values|
yield @hash.each_key.lazy.zip(values).to_h
end
end
@@ -734,14 +745,20 @@ def url
class ResponseFromEventDrop < LiquidDroppable::Drop
def headers
- headers = Faraday::Utils::Headers.from(@object.payload[:headers]) rescue {}
+ headers = begin
+ Faraday::Utils::Headers.from(@object.payload[:headers])
+ rescue StandardError
+ {}
+ end
HeaderDrop.new(headers)
end
# Integer value of HTTP status
def status
- Integer(@object.payload[:status]) rescue nil
+ Integer(@object.payload[:status])
+ rescue StandardError
+ nil
end
# The URL
diff --git a/app/models/agents/weibo_publish_agent.rb b/app/models/agents/weibo_publish_agent.rb
index 073a511fdc..f0320d0006 100644
--- a/app/models/agents/weibo_publish_agent.rb
+++ b/app/models/agents/weibo_publish_agent.rb
@@ -1,12 +1,10 @@
-# encoding: utf-8
-
module Agents
class WeiboPublishAgent < Agent
include WeiboConcern
cannot_be_scheduled!
- description <<-MD
+ description <<~MD
The Weibo Publish Agent publishes tweets from the events it receives.
#{'## Include `weibo_2` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -24,7 +22,7 @@ class WeiboPublishAgent < Agent
def validate_options
unless options['uid'].present? &&
- options['expected_update_period_in_days'].present?
+ options['expected_update_period_in_days'].present?
errors.add(:base, "expected_update_period_in_days and uid are required")
end
end
@@ -62,7 +60,7 @@ def receive(incoming_events)
else
publish_tweet tweet_text
end
- create_event :payload => {
+ create_event payload: {
'success' => true,
'published_tweet' => tweet_text,
'published_pic' => pic_url,
@@ -70,7 +68,7 @@ def receive(incoming_events)
'event_id' => event.id
}
rescue OAuth2::Error => e
- create_event :payload => {
+ create_event payload: {
'success' => false,
'error' => e.message,
'failed_tweet' => tweet_text,
@@ -84,29 +82,27 @@ def receive(incoming_events)
end
end
- def publish_tweet text
+ def publish_tweet(text)
weibo_client.statuses.update text
end
- def publish_tweet_with_pic text, pic
+ def publish_tweet_with_pic(text, pic)
weibo_client.statuses.upload text, open(pic)
end
def valid_image?(url)
- begin
- url = URI.parse(url)
- http = Net::HTTP.new(url.host, url.port)
- http.use_ssl = (url.scheme == "https")
- http.start do |http|
- # images supported #http://open.weibo.com/wiki/2/statuses/upload
- return ['image/gif', 'image/jpeg', 'image/png'].include? http.head(url.request_uri)['Content-Type']
- end
- rescue => e
- return false
+ url = URI.parse(url)
+ http = Net::HTTP.new(url.host, url.port)
+ http.use_ssl = (url.scheme == "https")
+ http.start do |http|
+ # images supported #http://open.weibo.com/wiki/2/statuses/upload
+ return ['image/gif', 'image/jpeg', 'image/png'].include? http.head(url.request_uri)['Content-Type']
end
+ rescue StandardError => e
+ false
end
- def unwrap_tco_urls text, tweet_json
+ def unwrap_tco_urls(text, tweet_json)
tweet_json[:entities][:urls].each do |url|
text.gsub! url[:url], url[:expanded_url]
end
diff --git a/app/models/agents/weibo_user_agent.rb b/app/models/agents/weibo_user_agent.rb
index 295dd14a71..0b1756b4bd 100644
--- a/app/models/agents/weibo_user_agent.rb
+++ b/app/models/agents/weibo_user_agent.rb
@@ -1,12 +1,10 @@
-# encoding: utf-8
-
module Agents
class WeiboUserAgent < Agent
include WeiboConcern
cannot_receive_events!
- description <<-MD
+ description <<~MD
The Weibo User Agent follows the timeline of a specified Weibo user. It uses this endpoint: http://open.weibo.com/wiki/2/statuses/user_timeline/en
#{'## Include `weibo_2` in your Gemfile to use this Agent!' if dependencies_missing?}
@@ -18,7 +16,7 @@ class WeiboUserAgent < Agent
Set `expected_update_period_in_days` to the maximum amount of time that you'd expect to pass between Events being created by this Agent.
MD
- event_description <<-MD
+ event_description <<~MD
Events are the raw JSON provided by the Weibo API. Should look something like:
{
@@ -72,7 +70,7 @@ class WeiboUserAgent < Agent
def validate_options
unless options['uid'].present? &&
- options['expected_update_period_in_days'].present?
+ options['expected_update_period_in_days'].present?
errors.add(:base, "expected_update_period_in_days and uid are required")
end
end
@@ -93,22 +91,21 @@ def default_options
def check
since_id = memory['since_id'] || nil
- opts = {:uid => interpolated['uid'].to_i}
- opts.merge! :since_id => since_id unless since_id.nil?
+ opts = { uid: interpolated['uid'].to_i }
+ opts.merge! since_id: since_id unless since_id.nil?
# http://open.weibo.com/wiki/2/statuses/user_timeline/en
resp = weibo_client.statuses.user_timeline opts
if resp[:statuses]
-
resp[:statuses].each do |status|
memory['since_id'] = status.id if !memory['since_id'] || (status.id > memory['since_id'])
- create_event :payload => status.as_json
+ create_event payload: status.as_json
end
end
save!
end
end
-end
\ No newline at end of file
+end
diff --git a/app/models/agents/witai_agent.rb b/app/models/agents/witai_agent.rb
index bff5b8b0db..b5da15c350 100644
--- a/app/models/agents/witai_agent.rb
+++ b/app/models/agents/witai_agent.rb
@@ -3,43 +3,42 @@ class WitaiAgent < Agent
cannot_be_scheduled!
no_bulk_receive!
- description <<-MD
+ description <<~MD
The `wit.ai` agent receives events, sends a text query to your `wit.ai` instance and generates outcome events.
Fill in `Server Access Token` of your `wit.ai` instance. Use [Liquid](https://github.com/huginn/huginn/wiki/Formatting-Events-using-Liquid) to fill query field.
-
+
`expected_receive_period_in_days` is the expected number of days by which agent should receive events. It helps in determining if the agent is working.
MD
- event_description <<-MD
-
- Every event have `outcomes` key with your payload as value. Sample event:
+ event_description <<~MD
+ Every event have `outcomes` key with your payload as value. Sample event:
- {"outcome" : [
- {"_text" : "set temperature to 34 degrees at 11 PM",
- "intent" : "get_temperature",
- "entities" : {
- "temperature" : [
- {
- "type" : "value",
- "value" : 34,
- "unit" : "degree"
- }],
- "datetime" : [
- {
- "grain" : "hour",
- "type" : "value",
- "value" : "2015-03-26T21:00:00.000-07:00"
- }]},
- "confidence" : 0.556
- }]}
+ {"outcome" : [
+ {"_text" : "set temperature to 34 degrees at 11 PM",
+ "intent" : "get_temperature",
+ "entities" : {
+ "temperature" : [
+ {
+ "type" : "value",
+ "value" : 34,
+ "unit" : "degree"
+ }],
+ "datetime" : [
+ {
+ "grain" : "hour",
+ "type" : "value",
+ "value" : "2015-03-26T21:00:00.000-07:00"
+ }]},
+ "confidence" : 0.556
+ }]}
MD
def default_options
{
- 'server_access_token' => 'xxxxx',
- 'expected_receive_period_in_days' => 2,
- 'query' => '{{xxxx}}'
+ 'server_access_token' => 'xxxxx',
+ 'expected_receive_period_in_days' => 2,
+ 'query' => '{{xxxx}}'
}
end
@@ -64,17 +63,18 @@ def receive(incoming_events)
end
private
- def api_endpoint
- 'https://api.wit.ai/message?v=20141022'
- end
- def query_url(query)
- api_endpoint + { q: query }.to_query
- end
+ def api_endpoint
+ 'https://api.wit.ai/message?v=20141022'
+ end
- def headers
- #oauth
- {:headers => {'Authorization' => 'Bearer ' + interpolated[:server_access_token]}}
- end
+ def query_url(query)
+ api_endpoint + { q: query }.to_query
+ end
+
+ def headers
+ # oauth
+ { headers: { 'Authorization' => 'Bearer ' + interpolated[:server_access_token] } }
+ end
end
end
diff --git a/app/models/event.rb b/app/models/event.rb
index 1b9735ef12..0148ad9908 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -12,10 +12,12 @@ class Event < ActiveRecord::Base
json_serialize :payload
belongs_to :user, optional: true
- belongs_to :agent, :counter_cache => true
+ belongs_to :agent, counter_cache: true
- has_many :agent_logs_as_inbound_event, :class_name => "AgentLog", :foreign_key => :inbound_event_id, :dependent => :nullify
- has_many :agent_logs_as_outbound_event, :class_name => "AgentLog", :foreign_key => :outbound_event_id, :dependent => :nullify
+ has_many :agent_logs_as_inbound_event, class_name: "AgentLog", foreign_key: :inbound_event_id,
+ dependent: :nullify
+ has_many :agent_logs_as_outbound_event, class_name: "AgentLog", foreign_key: :outbound_event_id,
+ dependent: :nullify
scope :recent, lambda { |timespan = 12.hours.ago|
where("events.created_at > ?", timespan)
@@ -44,20 +46,18 @@ class Event < ActiveRecord::Base
def location
@location ||= Location.new(
# lat and lng are BigDecimal, but converted to Float by the Location class
- lat: lat,
- lng: lng,
+ lat:,
+ lng:,
radius:
- begin
- h = payload[:horizontal_accuracy].presence
- v = payload[:vertical_accuracy].presence
- if h && v
- (h.to_f + v.to_f) / 2
- else
- (h || v || payload[:accuracy]).to_f
- end
+ if (h = payload[:horizontal_accuracy].presence) &&
+ (v = payload[:vertical_accuracy].presence)
+ (h.to_f + v.to_f) / 2
+ else
+ (h || v || payload[:accuracy]).to_f
end,
course: payload[:course],
- speed: payload[:speed].presence)
+ speed: payload[:speed].presence
+ )
end
def location=(location)
@@ -69,13 +69,14 @@ def location=(location)
else
location = Location.new(location)
end
- self.lat, self.lng = location.lat, location.lng
+ self.lat = location.lat
+ self.lng = location.lng
location
end
# Emit this event again, as a new Event.
def reemit!
- agent.create_event :payload => payload, :lat => lat, :lng => lng
+ agent.create_event(payload:, lat:, lng:)
end
# Look for Events whose `expires_at` is present and in the past. Remove those events and then update affected Agents'
@@ -95,43 +96,52 @@ def update_agent_last_event_at
end
def possibly_propagate
- #immediately schedule agents that want immediate updates
- propagate_ids = agent.receivers.where(:propagate_immediately => true).pluck(:id)
- Agent.receive!(:only_receivers => propagate_ids) unless propagate_ids.empty?
+ # immediately schedule agents that want immediate updates
+ propagate_ids = agent.receivers.where(propagate_immediately: true).pluck(:id)
+ Agent.receive!(only_receivers: propagate_ids) unless propagate_ids.empty?
end
-end
-class EventDrop
- def initialize(object)
- @payload = object.payload
- super
+ public def to_liquid
+ Drop.new(self)
end
- def liquid_method_missing(key)
- @payload[key]
- end
+ class Drop < LiquidDroppable::Drop
+ def initialize(object)
+ @payload = object.payload
+ super
+ end
- def each(&block)
- @payload.each(&block)
- end
+ def liquid_method_missing(key)
+ @payload[key]
+ end
- def agent
- @payload.fetch(__method__) {
- @object.agent
- }
- end
+ def each(&block)
+ @payload.each(&block)
+ end
- def created_at
- @payload.fetch(__method__) {
- @object.created_at
- }
- end
+ def agent
+ @payload.fetch(__method__) {
+ @object.agent
+ }
+ end
- def _location_
- @object.location
- end
+ def created_at
+ @payload.fetch(__method__) {
+ @object.created_at
+ }
+ end
- def as_json
- {location: _location_.as_json, agent: @object.agent.to_liquid.as_json, payload: @payload.as_json, created_at: created_at.as_json}
+ def _location_
+ @object.location
+ end
+
+ def as_json
+ {
+ location: _location_.as_json,
+ agent: @object.agent.to_liquid.as_json,
+ payload: @payload.as_json,
+ created_at: created_at.as_json
+ }
+ end
end
end
diff --git a/app/models/link.rb b/app/models/link.rb
index 0cda8cb1c4..d202b0c403 100644
--- a/app/models/link.rb
+++ b/app/models/link.rb
@@ -1,7 +1,7 @@
# A Link connects Agents in a directed Event flow from the `source` to the `receiver`.
class Link < ActiveRecord::Base
- belongs_to :source, :class_name => "Agent", :inverse_of => :links_as_source
- belongs_to :receiver, :class_name => "Agent", :inverse_of => :links_as_receiver
+ belongs_to :source, class_name: "Agent", inverse_of: :links_as_source
+ belongs_to :receiver, class_name: "Agent", inverse_of: :links_as_receiver
before_create :store_event_id_at_creation
diff --git a/app/models/scenario.rb b/app/models/scenario.rb
index c6a053870d..2da90f2003 100644
--- a/app/models/scenario.rb
+++ b/app/models/scenario.rb
@@ -1,16 +1,16 @@
class Scenario < ActiveRecord::Base
include HasGuid
- belongs_to :user, :counter_cache => :scenario_count, :inverse_of => :scenarios
- has_many :scenario_memberships, :dependent => :destroy, :inverse_of => :scenario
- has_many :agents, :through => :scenario_memberships, :inverse_of => :scenarios
+ belongs_to :user, counter_cache: :scenario_count, inverse_of: :scenarios
+ has_many :scenario_memberships, dependent: :destroy, inverse_of: :scenario
+ has_many :agents, through: :scenario_memberships, inverse_of: :scenarios
validates_presence_of :name, :user
validates_format_of :tag_fg_color, :tag_bg_color,
- # Regex adapted from: http://stackoverflow.com/a/1636354/3130625
- :with => /\A#(?:[0-9a-fA-F]{3}){1,2}\z/, :allow_nil => true,
- :message => "must be a valid hex color."
+ # Regex adapted from: http://stackoverflow.com/a/1636354/3130625
+ with: /\A#(?:[0-9a-fA-F]{3}){1,2}\z/, allow_nil: true,
+ message: "must be a valid hex color."
validate :agents_are_owned
@@ -26,18 +26,16 @@ def destroy_with_mode(mode)
end
def self.icons
- @icons ||= begin
- YAML.load_file(Rails.root.join('config/icons.yml'))
- end
+ @icons ||= YAML.load_file(Rails.root.join('config/icons.yml'))
end
private
def unique_agent_ids
agents.joins(:scenario_memberships)
- .group('scenario_memberships.agent_id')
- .having('count(scenario_memberships.agent_id) = 1')
- .pluck('scenario_memberships.agent_id')
+ .group('scenario_memberships.agent_id')
+ .having('count(scenario_memberships.agent_id) = 1')
+ .pluck('scenario_memberships.agent_id')
end
def agents_are_owned
diff --git a/app/models/scenario_membership.rb b/app/models/scenario_membership.rb
index a9ea3048fb..03019caa12 100644
--- a/app/models/scenario_membership.rb
+++ b/app/models/scenario_membership.rb
@@ -1,4 +1,4 @@
class ScenarioMembership < ActiveRecord::Base
- belongs_to :agent, :inverse_of => :scenario_memberships
- belongs_to :scenario, :inverse_of => :scenario_memberships
+ belongs_to :agent, inverse_of: :scenario_memberships
+ belongs_to :scenario, inverse_of: :scenario_memberships
end
diff --git a/app/models/service.rb b/app/models/service.rb
index 84df77ffa0..48bfb8b83a 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -1,8 +1,8 @@
class Service < ActiveRecord::Base
serialize :options, Hash
- belongs_to :user, :inverse_of => :services
- has_many :agents, :inverse_of => :service
+ belongs_to :user, inverse_of: :services
+ has_many :agents, inverse_of: :service
validates_presence_of :user_id, :provider, :name, :token
@@ -20,7 +20,7 @@ def disable_agents(conditions = {})
end
def toggle_availability!
- disable_agents(where_not: {user_id: self.user_id}) if global
+ disable_agents(where_not: { user_id: self.user_id }) if global
self.global = !self.global
self.save!
end
@@ -34,20 +34,21 @@ def prepare_request
def refresh_token_parameters
{
grant_type: 'refresh_token',
- client_id: oauth_key,
+ client_id: oauth_key,
client_secret: oauth_secret,
- refresh_token: refresh_token
+ refresh_token:
}
end
def refresh_token!
response = HTTParty.post(endpoint, query: refresh_token_parameters)
data = JSON.parse(response.body)
- update(expires_at: Time.now + data['expires_in'], token: data['access_token'], refresh_token: data['refresh_token'].presence || refresh_token)
+ update(expires_at: Time.now + data['expires_in'], token: data['access_token'],
+ refresh_token: data['refresh_token'].presence || refresh_token)
end
def endpoint
- client_options = Devise.omniauth_configs[provider.to_sym].strategy_class.default_options['client_options']
+ client_options = Devise.omniauth_configs[provider.to_sym].strategy_class.default_options['client_options']
URI.join(client_options['site'], client_options['token_url'])
end
@@ -63,12 +64,14 @@ def self.initialize_or_update_via_omniauth(omniauth)
options = get_options(omniauth)
find_or_initialize_by(provider: omniauth['provider'], uid: omniauth['uid'].to_s).tap do |service|
- service.assign_attributes token: omniauth['credentials']['token'],
- secret: omniauth['credentials']['secret'],
- name: options[:name],
- refresh_token: omniauth['credentials']['refresh_token'],
- expires_at: omniauth['credentials']['expires_at'] && Time.at(omniauth['credentials']['expires_at']),
- options: options
+ service.attributes = {
+ token: omniauth['credentials']['token'],
+ secret: omniauth['credentials']['secret'],
+ name: options[:name],
+ refresh_token: omniauth['credentials']['refresh_token'],
+ expires_at: omniauth['credentials']['expires_at'] && Time.at(omniauth['credentials']['expires_at']),
+ options:
+ }
end
end
@@ -80,12 +83,11 @@ def self.get_options(omniauth)
option_providers.fetch(omniauth['provider'], option_providers['default']).call(omniauth)
end
- private
@@option_providers = HashWithIndifferentAccess.new
cattr_reader :option_providers
register_options_provider('default') do |omniauth|
- {name: omniauth['info']['nickname'] || omniauth['info']['name']}
+ { name: omniauth['info']['nickname'] || omniauth['info']['name'] }
end
register_options_provider('google') do |omniauth|
diff --git a/app/models/user.rb b/app/models/user.rb
index 256b689736..f83924ee93 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,10 +1,9 @@
# Huginn is designed to be a multi-User system. Users have many Agents (and Events created by those Agents).
class User < ActiveRecord::Base
- DEVISE_MODULES = [:database_authenticatable, :registerable,
- :recoverable, :rememberable, :trackable,
- :validatable, :lockable, :omniauthable,
- (ENV['REQUIRE_CONFIRMED_EMAIL'] == 'true' ? :confirmable : nil)].compact
- devise *DEVISE_MODULES
+ devise :database_authenticatable, :registerable,
+ :recoverable, :rememberable, :trackable,
+ :validatable, :lockable, :omniauthable,
+ *(:confirmable if ENV['REQUIRE_CONFIRMED_EMAIL'] == 'true')
INVITATION_CODES = [ENV['INVITATION_CODE'] || 'try-huginn']
@@ -12,17 +11,29 @@ class User < ActiveRecord::Base
# This is in addition to a real persisted field like 'username'
attr_accessor :login
- validates_presence_of :username
- validates :username, uniqueness: { case_sensitive: false }
- validates_format_of :username, :with => /\A[a-zA-Z0-9_-]{3,190}\Z/, :message => "can only contain letters, numbers, underscores, and dashes, and must be between 3 and 190 characters in length."
- validates_inclusion_of :invitation_code, :on => :create, :in => INVITATION_CODES, :message => "is not valid", if: -> { !requires_no_invitation_code? && User.using_invitation_code? }
-
- has_many :user_credentials, :dependent => :destroy, :inverse_of => :user
- has_many :events, -> { order("events.created_at desc") }, :dependent => :delete_all, :inverse_of => :user
- has_many :agents, -> { order("agents.created_at desc") }, :dependent => :destroy, :inverse_of => :user
- has_many :logs, :through => :agents, :class_name => "AgentLog"
- has_many :scenarios, :inverse_of => :user, :dependent => :destroy
- has_many :services, -> { by_name('asc') }, :dependent => :destroy
+ validates :username,
+ presence: true,
+ uniqueness: { case_sensitive: false },
+ format: {
+ with: /\A[a-zA-Z0-9_-]{3,190}\Z/,
+ message: "can only contain letters, numbers, underscores, and dashes, and must be between 3 and 190 characters in length."
+ }
+ validates :invitation_code,
+ inclusion: {
+ in: INVITATION_CODES,
+ message: "is not valid",
+ },
+ if: -> {
+ !requires_no_invitation_code? && User.using_invitation_code?
+ },
+ on: :create
+
+ has_many :user_credentials, dependent: :destroy, inverse_of: :user
+ has_many :events, -> { order("events.created_at desc") }, dependent: :delete_all, inverse_of: :user
+ has_many :agents, -> { order("agents.created_at desc") }, dependent: :destroy, inverse_of: :user
+ has_many :logs, through: :agents, class_name: "AgentLog"
+ has_many :scenarios, inverse_of: :user, dependent: :destroy
+ has_many :services, -> { by_name('asc') }, dependent: :destroy
def available_services
Service.available_to_user(self).by_name
@@ -32,7 +43,7 @@ def available_services
def self.find_first_by_auth_conditions(warden_conditions)
conditions = warden_conditions.dup
if login = conditions.delete(:login)
- where(conditions).where(["lower(username) = :value OR lower(email) = :value", { :value => login.downcase }]).first
+ where(conditions).where(["lower(username) = :value OR lower(email) = :value", { value: login.downcase }]).first
else
where(conditions).first
end
@@ -78,12 +89,10 @@ def requires_no_invitation_code?
def undefined_agent_types
agents.reorder('').group(:type).pluck(:type).select do |type|
- begin
- type.constantize
- false
- rescue NameError
- true
- end
+ type.constantize
+ false
+ rescue NameError
+ true
end
end
diff --git a/app/models/user_credential.rb b/app/models/user_credential.rb
index ffa3c38729..a507b992cf 100644
--- a/app/models/user_credential.rb
+++ b/app/models/user_credential.rb
@@ -3,7 +3,7 @@ class UserCredential < ActiveRecord::Base
belongs_to :user
- validates :credential_name, presence: true, uniqueness: { case_sensitive: true, scope: :user_id}
+ validates :credential_name, presence: true, uniqueness: { case_sensitive: true, scope: :user_id }
validates :credential_value, presence: true
validates :mode, inclusion: { in: MODES }
validates :user_id, presence: true
diff --git a/app/presenters/form_configurable_agent_presenter.rb b/app/presenters/form_configurable_agent_presenter.rb
index 4e8f983004..6d40d63fe1 100644
--- a/app/presenters/form_configurable_agent_presenter.rb
+++ b/app/presenters/form_configurable_agent_presenter.rb
@@ -16,14 +16,15 @@ def initialize(agent, view)
def option_field_for(attribute)
data = @agent.form_configurable_fields[attribute]
value = @agent.options[attribute.to_s] || @agent.default_options[attribute.to_s]
- html_options = {role: (data[:roles] + ['form-configurable']).join(' '), data: {attribute: attribute}}
+ html_options = { role: (data[:roles] + ['form-configurable']).join(' '), data: { attribute: } }
case data[:type]
when :text
@view.content_tag 'div' do
- @view.concat @view.text_area_tag("agent[options][#{attribute}]", value, html_options.merge(class: 'form-control', rows: 3))
+ @view.concat @view.text_area_tag("agent[options][#{attribute}]", value,
+ html_options.merge(class: 'form-control', rows: 3))
if data[:ace].present?
- ace_options = { source: "[name='agent[options][#{attribute}]']", mode: '', theme: ''}.deep_symbolize_keys!
+ ace_options = { source: "[name='agent[options][#{attribute}]']", mode: '', theme: '' }.deep_symbolize_keys!
ace_options.deep_merge!(data[:ace].deep_symbolize_keys) if data[:ace].is_a?(Hash)
@view.concat @view.content_tag('div', '', class: 'ace-editor', data: ace_options)
end
@@ -31,21 +32,30 @@ def option_field_for(attribute)
when :boolean
@view.content_tag 'div' do
@view.concat(@view.content_tag('label', class: 'radio-inline') do
- @view.concat @view.radio_button_tag "agent[options][#{attribute}_radio]", 'true', @agent.send(:boolify, value) == true, html_options
+ @view.concat @view.radio_button_tag "agent[options][#{attribute}_radio]", 'true',
+ @agent.send(:boolify, value) == true, html_options
@view.concat "True"
end)
@view.concat(@view.content_tag('label', class: 'radio-inline') do
- @view.concat @view.radio_button_tag "agent[options][#{attribute}_radio]", 'false', @agent.send(:boolify, value) == false, html_options
+ @view.concat @view.radio_button_tag "agent[options][#{attribute}_radio]", 'false',
+ @agent.send(:boolify, value) == false, html_options
@view.concat "False"
end)
@view.concat(@view.content_tag('label', class: 'radio-inline') do
- @view.concat @view.radio_button_tag "agent[options][#{attribute}_radio]", 'manual', @agent.send(:boolify, value) == nil, html_options
+ @view.concat @view.radio_button_tag "agent[options][#{attribute}_radio]", 'manual',
+ @agent.send(:boolify, value).nil?, html_options
@view.concat "Manual Input"
end)
- @view.concat(@view.text_field_tag "agent[options][#{attribute}]", value, html_options.merge(:class => "form-control #{@agent.send(:boolify, value) != nil ? 'hidden' : ''}"))
+ @view.concat(@view.text_field_tag("agent[options][#{attribute}]", value,
+ html_options.merge(class: "form-control #{@agent.send(:boolify, value) != nil ? 'hidden' : ''}")))
end
- when :array, :string
- @view.text_field_tag "agent[options][#{attribute}]", value, html_options.deep_merge(:class => 'form-control', data: {cache_response: data[:cache_response] != false})
+ when :array
+ @view.select_tag "agent[options][#{attribute}]", nil,
+ html_options.deep_merge(class: 'form-control',
+ data: { value:, cache_response: data[:cache_response] != false })
+ when :string
+ @view.text_field_tag "agent[options][#{attribute}]", value,
+ html_options.deep_merge(class: 'form-control', data: { cache_response: data[:cache_response] != false })
end
end
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f2475bb530..290d52f824 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -30,18 +30,18 @@
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
if ENV["RAILS_LOG_TO_STDOUT"].present? ||
- ENV['ON_HEROKU'] ||
- ENV['HEROKU_POSTGRESQL_ROSE_URL'] ||
- ENV['HEROKU_POSTGRESQL_GOLD_URL'] ||
- File.read(File.join(File.dirname(__FILE__), '../../Procfile')) =~ /intended for Heroku/
+ ENV['ON_HEROKU'] ||
+ ENV['HEROKU_POSTGRESQL_ROSE_URL'] ||
+ ENV['HEROKU_POSTGRESQL_GOLD_URL'] ||
+ File.read(File.join(File.dirname(__FILE__), '../../Procfile')) =~ /intended for Heroku/
logger = ActiveSupport::Logger.new(STDOUT)
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
end
# Compress JavaScripts and CSS
- config.assets.js_compressor = :uglifier
- config.assets.css_compressor = :sass
+ config.assets.js_compressor = :terser
+ config.assets.css_compressor = :scss
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
@@ -69,7 +69,7 @@
config.log_level = :info
# Prepend all log lines with the following tags.
- config.log_tags = [ :request_id ]
+ config.log_tags = [:request_id]
# Use a different cache store in production.
config.cache_store = :memory_store
@@ -86,7 +86,7 @@
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
- config.action_mailer.default_url_options = { :host => ENV['DOMAIN'] }
+ config.action_mailer.default_url_options = { host: ENV['DOMAIN'] }
config.action_mailer.asset_host = ENV['DOMAIN']
if ENV['ASSET_HOST'].present?
config.action_mailer.asset_host = ENV['ASSET_HOST']
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index a8ed9e5f0e..62da61a9a0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -8,11 +8,3 @@
# Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-Rails.application.config.assets.precompile += %w( diagram.js graphing.js map_marker.js ace.js tweets.js )
-
-Rails.application.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
-Rails.application.config.assets.precompile += %w(*.woff *.eot *.svg *.ttf) # Bootstrap fonts
diff --git a/db/migrate/20140813110107_set_charset_for_mysql.rb b/db/migrate/20140813110107_set_charset_for_mysql.rb
index 35feda3ea6..6c1fb33568 100644
--- a/db/migrate/20140813110107_set_charset_for_mysql.rb
+++ b/db/migrate/20140813110107_set_charset_for_mysql.rb
@@ -29,7 +29,7 @@ def change
type = column.type
limit = column.limit
options = {
- limit: limit,
+ limit:,
null: column.null,
default: column.default,
}
@@ -53,7 +53,7 @@ def change
next
end
- change_column table_name, name, type, options
+ change_column table_name, name, type, **options
}
execute 'ALTER TABLE %s CHARACTER SET utf8 COLLATE utf8_unicode_ci' % table_name
diff --git a/db/migrate/20170731191002_migrate_growl_agent_to_liquid.rb b/db/migrate/20170731191002_migrate_growl_agent_to_liquid.rb
index 2a75e0ba16..87df9c91cf 100644
--- a/db/migrate/20170731191002_migrate_growl_agent_to_liquid.rb
+++ b/db/migrate/20170731191002_migrate_growl_agent_to_liquid.rb
@@ -1,18 +1,5 @@
class MigrateGrowlAgentToLiquid < ActiveRecord::Migration[5.1]
- def up
- Agents::GrowlAgent.find_each do |agent|
- agent.options['subject'] = '{{subject}}' if agent.options['subject'].blank?
- agent.options['message'] = '{{ message | default: text }}' if agent.options['message'].blank?
- agent.save(validate: false)
- end
- end
-
- def down
- Agents::GrowlAgent.find_each do |agent|
- %w(subject message sticky priority).each do |key|
- agent.options.delete(key)
- end
- agent.save(validate: false)
- end
+ def change
+ # Agents::GrowlAgent is no more
end
end
diff --git a/doc/manual/installation.md b/doc/manual/installation.md
index a55fba05f8..a392d46e9e 100644
--- a/doc/manual/installation.md
+++ b/doc/manual/installation.md
@@ -46,7 +46,7 @@ up-to-date and install it.
Install the required packages (needed to compile Ruby and native extensions to Ruby gems):
- sudo apt-get install -y runit build-essential git zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake nodejs graphviz jq shared-mime-info
+ sudo apt-get install -y runit build-essential git zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate pkg-config cmake nodejs graphviz jq shared-mime-info
### Debian Stretch
diff --git a/docker/multi-process/Dockerfile b/docker/multi-process/Dockerfile
index baa71c80e6..55993b734d 100644
--- a/docker/multi-process/Dockerfile
+++ b/docker/multi-process/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM rubylang/ruby:3.2-jammy
COPY docker/scripts/prepare /scripts/
RUN /scripts/prepare
diff --git a/docker/multi-process/scripts/standalone-packages b/docker/multi-process/scripts/standalone-packages
index cb9dc1f542..120397c024 100755
--- a/docker/multi-process/scripts/standalone-packages
+++ b/docker/multi-process/scripts/standalone-packages
@@ -1,9 +1,18 @@
+set -e
+
export DEBIAN_FRONTEND=noninteractive
+
apt-get update
-apt-get install -y python2.7 python-docutils mysql-server \
- supervisor python-pip && \
+apt-get install -y gnupg
+
+echo "deb http://repo.mysql.com/apt/ubuntu/ bionic mysql-5.7" > /etc/apt/sources.list.d/mysql.list
+apt-key adv --keyserver pgp.mit.edu --recv-keys 3A79BD29
+apt-get update
+
+apt-get install -y --allow-downgrades python3-pip mysql-server supervisor \
+ mysql-server=5.7.42-1ubuntu18.04 mysql-client=5.7.42-1ubuntu18.04 libmysqlclient-dev=5.7.42-1ubuntu18.04 && \
apt-get -y clean
-pip install supervisor-stdout
+pip install git+https://github.com/coderanger/supervisor-stdout
rm -rf /var/lib/apt/lists/*
rm -rf /usr/share/doc/
rm -rf /usr/share/man/
@@ -14,10 +23,13 @@ mkdir -p /var/log/supervisor /var/log/mysql
chgrp -R 0 /etc/supervisor /var/lib/mysql /var/log/supervisor /var/log/mysql
chmod -R g=u /etc/supervisor /var/lib/mysql /var/log/supervisor /var/log/mysql
sed -r -i /etc/mysql/mysql.conf.d/mysqld.cnf \
- -e 's/^ *user *.+/user=1001/' \
-e 's#/var/run/mysqld/mysqld.sock#/app/tmp/sockets/mysqld.sock#' \
-e 's#/var/run/mysqld/mysqld.pid#/app/tmp/pids/mysqld.pid#'
-sed -r -i /etc/mysql/debian.cnf \
- -e 's#/var/run/mysqld/mysqld.sock#/app/tmp/sockets/mysqld.sock#'
-cp /etc/mysql/debian.cnf /etc/mysql/mysql.conf.d/client.cnf
-chmod 644 /etc/mysql/mysql.conf.d/client.cnf
+echo "user=1001" >> /etc/mysql/mysql.conf.d/mysqld.cnf
+cat >> /etc/mysql/conf.d/mysql.cnf << EOF
+[client]
+socket = /app/tmp/sockets/mysqld.sock
+[mysql_upgrade]
+socket = /app/tmp/sockets/mysqld.sock
+find /etc/mysql/
+EOF
diff --git a/docker/scripts/prepare b/docker/scripts/prepare
index 23257202f3..ce1712085e 100755
--- a/docker/scripts/prepare
+++ b/docker/scripts/prepare
@@ -23,13 +23,11 @@ minimal_apt_get_install='apt-get install -y --no-install-recommends'
apt-get update
apt-get dist-upgrade -y --no-install-recommends
$minimal_apt_get_install software-properties-common
-add-apt-repository -y ppa:brightbox/ruby-ng-experimental
-apt-get update
$minimal_apt_get_install build-essential checkinstall git-core \
zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev \
libncurses5-dev libffi-dev libxml2-dev libxslt-dev curl libcurl4-openssl-dev libicu-dev \
graphviz libmysqlclient-dev libpq-dev libsqlite3-dev \
- ruby2.7 ruby2.7-dev locales tzdata shared-mime-info iputils-ping
+ locales tzdata shared-mime-info iputils-ping
locale-gen en_US.UTF-8
update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
# Specific version 3.3.20: 3.3.21 changes platform support, breaks our build
diff --git a/docker/single-process/Dockerfile b/docker/single-process/Dockerfile
index d040de283f..efe4cf2037 100644
--- a/docker/single-process/Dockerfile
+++ b/docker/single-process/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM rubylang/ruby:3.2-jammy
COPY docker/scripts/prepare /scripts/
RUN /scripts/prepare
diff --git a/lib/location.rb b/lib/location.rb
index e6db847659..7eb45b4f2c 100644
--- a/lib/location.rb
+++ b/lib/location.rb
@@ -13,6 +13,7 @@ def initialize(data = {})
case data
when Array
raise ArgumentError, 'unsupported location data' unless data.size == 2
+
self.lat, self.lng = data
when Hash, Location
data.each { |key, value|
@@ -91,7 +92,7 @@ def latlng
def floatify(value)
case value
when nil, ''
- return nil
+ nil
else
float = Float(value)
if block_given?
@@ -101,14 +102,18 @@ def floatify(value)
end
end
end
-end
-class LocationDrop
- KEYS = Location.members.map(&:to_s).concat(%w[latitude longitude latlng])
+ public def to_liquid
+ Drop.new(self)
+ end
- def liquid_method_missing(key)
- if KEYS.include?(key)
- @object.__send__(key)
+ class Drop < LiquidDroppable::Drop
+ KEYS = Location.members.map(&:to_s).concat(%w[latitude longitude latlng])
+
+ def liquid_method_missing(key)
+ if KEYS.include?(key)
+ @object.__send__(key)
+ end
end
end
end
diff --git a/spec/capybara_helper.rb b/spec/capybara_helper.rb
index 3551f4c91f..81aeb085d8 100644
--- a/spec/capybara_helper.rb
+++ b/spec/capybara_helper.rb
@@ -1,20 +1,12 @@
require 'rails_helper'
require 'capybara/rails'
-require 'capybara/poltergeist'
-require 'capybara-screenshot/rspec'
require 'capybara-select-2'
CAPYBARA_TIMEOUT = ENV['CI'] == 'true' ? 60 : 5
-Capybara.register_driver :poltergeist do |app|
- Capybara::Poltergeist::Driver.new(app, timeout: CAPYBARA_TIMEOUT)
-end
-
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = ENV['USE_HEADED_CHROME'] ? :selenium_chrome : :selenium_chrome_headless
Capybara.default_max_wait_time = CAPYBARA_TIMEOUT
-Capybara::Screenshot.prune_strategy = { keep: 3 }
-
RSpec.configure do |config|
config.include Warden::Test::Helpers
config.include AlertConfirmer, type: :feature
diff --git a/spec/concerns/liquid_droppable_spec.rb b/spec/concerns/liquid_droppable_spec.rb
deleted file mode 100644
index 64dc384876..0000000000
--- a/spec/concerns/liquid_droppable_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'rails_helper'
-
-describe LiquidDroppable do
- before do
- class DroppableTest
- include LiquidDroppable
-
- def initialize(value)
- @value = value
- end
-
- attr_reader :value
-
- def to_s
- "[value:#{value}]"
- end
- end
-
- class DroppableTestDrop
- def value
- @object.value
- end
- end
- end
-
- describe 'test class' do
- it 'should be droppable' do
- five = DroppableTest.new(5)
- expect(five.to_liquid.class).to eq(DroppableTestDrop)
- expect(Liquid::Template.parse('{{ x.value | plus:3 }}').render('x' => five)).to eq('8')
- expect(Liquid::Template.parse('{{ x }}').render('x' => five)).to eq('[value:5]')
- end
- end
-end
diff --git a/spec/concerns/liquid_interpolatable_spec.rb b/spec/concerns/liquid_interpolatable_spec.rb
index 127a43f0ed..084e17b471 100644
--- a/spec/concerns/liquid_interpolatable_spec.rb
+++ b/spec/concerns/liquid_interpolatable_spec.rb
@@ -23,7 +23,7 @@ class Agents::InterpolatableAgent < Agent
include LiquidInterpolatable
def check
- create_event :payload => {}
+ create_event payload: {}
end
def validate_options
@@ -52,7 +52,7 @@ def validate_options
let(:agent) { Agents::InterpolatableAgent.new(name: "test") }
it 'serializes data to json' do
- agent.interpolation_context['something'] = {foo: 'bar'}
+ agent.interpolation_context['something'] = { foo: 'bar' }
agent.options['cleaned'] = '{{ something | json }}'
expect(agent.interpolated['cleaned']).to eq('{"foo":"bar"}')
end
@@ -67,8 +67,8 @@ def @filter.to_xpath_roundtrip(string)
it 'should escape a string for use in XPath expression' do
[
- %q{abc}.freeze,
- %q{'a"bc'dfa""fds''fa}.freeze,
+ 'abc'.freeze,
+ %q('a"bc'dfa""fds''fa).freeze,
].each { |string|
expect(@filter.to_xpath_roundtrip(string)).to eq(string)
}
@@ -82,7 +82,8 @@ def @filter.to_xpath_roundtrip(string)
describe 'to_uri' do
before do
- @agent = Agents::InterpolatableAgent.new(name: "test", options: { 'foo' => '{% assign u = s | to_uri %}{{ u.path }}' })
+ @agent = Agents::InterpolatableAgent.new(name: "test",
+ options: { 'foo' => '{% assign u = s | to_uri %}{{ u.path }}' })
@agent.interpolation_context['s'] = 'http://example.com/dir/1?q=test'
end
@@ -132,21 +133,21 @@ def @filter.to_xpath_roundtrip(string)
describe 'uri_expand' do
before do
- stub_request(:head, 'https://t.co.x/aaaa').
- to_return(status: 301, headers: { Location: 'https://bit.ly.x/bbbb' })
- stub_request(:head, 'https://bit.ly.x/bbbb').
- to_return(status: 301, headers: { Location: 'http://tinyurl.com.x/cccc' })
- stub_request(:head, 'http://tinyurl.com.x/cccc').
- to_return(status: 301, headers: { Location: 'http://www.example.com/welcome' })
- stub_request(:head, 'http://www.example.com/welcome').
- to_return(status: 200)
+ stub_request(:head, 'https://t.co.x/aaaa')
+ .to_return(status: 301, headers: { Location: 'https://bit.ly.x/bbbb' })
+ stub_request(:head, 'https://bit.ly.x/bbbb')
+ .to_return(status: 301, headers: { Location: 'http://tinyurl.com.x/cccc' })
+ stub_request(:head, 'http://tinyurl.com.x/cccc')
+ .to_return(status: 301, headers: { Location: 'http://www.example.com/welcome' })
+ stub_request(:head, 'http://www.example.com/welcome')
+ .to_return(status: 200)
(1..5).each do |i|
- stub_request(:head, "http://2many.x/#{i}").
- to_return(status: 301, headers: { Location: "http://2many.x/#{i+1}" })
+ stub_request(:head, "http://2many.x/#{i}")
+ .to_return(status: 301, headers: { Location: "http://2many.x/#{i + 1}" })
end
- stub_request(:head, 'http://2many.x/6').
- to_return(status: 301, headers: { 'Content-Length' => '5' })
+ stub_request(:head, 'http://2many.x/6')
+ .to_return(status: 301, headers: { 'Content-Length' => '5' })
end
it 'should handle inaccessible URIs' do
@@ -171,20 +172,20 @@ def @filter.to_xpath_roundtrip(string)
end
it 'should detect a redirect loop' do
- stub_request(:head, 'http://bad.x/aaaa').
- to_return(status: 301, headers: { Location: 'http://bad.x/bbbb' })
- stub_request(:head, 'http://bad.x/bbbb').
- to_return(status: 301, headers: { Location: 'http://bad.x/aaaa' })
+ stub_request(:head, 'http://bad.x/aaaa')
+ .to_return(status: 301, headers: { Location: 'http://bad.x/bbbb' })
+ stub_request(:head, 'http://bad.x/bbbb')
+ .to_return(status: 301, headers: { Location: 'http://bad.x/aaaa' })
expect(@filter.uri_expand('http://bad.x/aaaa')).to eq('http://bad.x/aaaa')
end
it 'should be able to handle an FTP URL' do
- stub_request(:head, 'http://downloads.x/aaaa').
- to_return(status: 301, headers: { Location: 'http://downloads.x/download?file=aaaa.zip' })
- stub_request(:head, 'http://downloads.x/download').
- with(query: { file: 'aaaa.zip' }).
- to_return(status: 301, headers: { Location: 'ftp://downloads.x/pub/aaaa.zip' })
+ stub_request(:head, 'http://downloads.x/aaaa')
+ .to_return(status: 301, headers: { Location: 'http://downloads.x/download?file=aaaa.zip' })
+ stub_request(:head, 'http://downloads.x/download')
+ .with(query: { file: 'aaaa.zip' })
+ .to_return(status: 301, headers: { Location: 'ftp://downloads.x/pub/aaaa.zip' })
expect(@filter.uri_expand('http://downloads.x/aaaa')).to eq('ftp://downloads.x/pub/aaaa.zip')
end
@@ -223,7 +224,8 @@ def @filter.to_xpath_roundtrip(string)
it 'should support escaped characters' do
agent.interpolation_context['something'] = "foo\\1\n\nfoo\\bar\n\nfoo\\baz"
- agent.options['test'] = "{{ something | regex_replace_first: '\\\\(\\w{2,})', '\\1\\\\' | regex_replace_first: '\\n+', '\\n' }}"
+ agent.options['test'] =
+ "{{ something | regex_replace_first: '\\\\(\\w{2,})', '\\1\\\\' | regex_replace_first: '\\n+', '\\n' }}"
expect(agent.interpolated['test']).to eq("foo\\1\nfoobar\\\n\nfoo\\baz")
end
end
@@ -233,13 +235,15 @@ def @filter.to_xpath_roundtrip(string)
it 'should extract the matched part' do
agent.interpolation_context['something'] = "foo BAR BAZ"
- agent.options['test'] = "{{ something | regex_extract: '[A-Z]+' }} / {{ something | regex_extract: '[A-Z]([A-Z]+)', 1 }} / {{ something | regex_extract: '(?.)AZ', 'x' }}"
+ agent.options['test'] =
+ "{{ something | regex_extract: '[A-Z]+' }} / {{ something | regex_extract: '[A-Z]([A-Z]+)', 1 }} / {{ something | regex_extract: '(?.)AZ', 'x' }}"
expect(agent.interpolated['test']).to eq("BAR / AR / B")
end
it 'should return nil if not matched' do
agent.interpolation_context['something'] = "foo BAR BAZ"
- agent.options['test'] = "{% assign var = something | regex_extract: '[A-Z][a-z]+' %}{% if var == nil %}nil{% else %}non-nil{% endif %}"
+ agent.options['test'] =
+ "{% assign var = something | regex_extract: '[A-Z][a-z]+' %}{% if var == nil %}nil{% else %}non-nil{% endif %}"
expect(agent.interpolated['test']).to eq("nil")
end
end
@@ -255,7 +259,8 @@ def @filter.to_xpath_roundtrip(string)
it 'should support escaped characters' do
agent.interpolation_context['something'] = "foo\\1\n\nfoo\\bar\n\nfoo\\baz"
- agent.options['test'] = "{{ something | regex_replace: '\\\\(\\w{2,})', '\\1\\\\' | regex_replace: '\\n+', '\\n' }}"
+ agent.options['test'] =
+ "{{ something | regex_replace: '\\\\(\\w{2,})', '\\1\\\\' | regex_replace: '\\n+', '\\n' }}"
expect(agent.interpolated['test']).to eq("foo\\1\nfoobar\\\nfoobaz\\")
end
end
@@ -265,21 +270,24 @@ def @filter.to_xpath_roundtrip(string)
it 'should replace the first occurrence of a string using regex' do
agent.interpolation_context['something'] = 'foobar zoobar'
- agent.options['cleaned'] = '{% regex_replace_first "(?\S+)(?bar)" in %}{{ something }}{% with %}{{ word | upcase }}{{ suffix }}{% endregex_replace_first %}'
+ agent.options['cleaned'] =
+ '{% regex_replace_first "(?\S+)(?bar)" in %}{{ something }}{% with %}{{ word | upcase }}{{ suffix }}{% endregex_replace_first %}'
expect(agent.interpolated['cleaned']).to eq('FOObar zoobar')
end
it 'should be able to take a pattern in a variable' do
agent.interpolation_context['something'] = 'foobar zoobar'
agent.interpolation_context['pattern'] = "(?\\S+)(?bar)"
- agent.options['cleaned'] = '{% regex_replace_first pattern in %}{{ something }}{% with %}{{ word | upcase }}{{ suffix }}{% endregex_replace_first %}'
+ agent.options['cleaned'] =
+ '{% regex_replace_first pattern in %}{{ something }}{% with %}{{ word | upcase }}{{ suffix }}{% endregex_replace_first %}'
expect(agent.interpolated['cleaned']).to eq('FOObar zoobar')
end
it 'should define a variable named "match" in a "with" block' do
agent.interpolation_context['something'] = 'foobar zoobar'
agent.interpolation_context['pattern'] = "(?\\S+)(?bar)"
- agent.options['cleaned'] = '{% regex_replace_first pattern in %}{{ something }}{% with %}{{ match.word | upcase }}{{ match["suffix"] }}{% endregex_replace_first %}'
+ agent.options['cleaned'] =
+ '{% regex_replace_first pattern in %}{{ something }}{% with %}{{ match.word | upcase }}{{ match["suffix"] }}{% endregex_replace_first %}'
expect(agent.interpolated['cleaned']).to eq('FOObar zoobar')
end
end
@@ -289,7 +297,8 @@ def @filter.to_xpath_roundtrip(string)
it 'should replace the all occurrences of a string using regex' do
agent.interpolation_context['something'] = 'foobar zoobar'
- agent.options['cleaned'] = '{% regex_replace "(?\S+)(?bar)" in %}{{ something }}{% with %}{{ word | upcase }}{{ suffix }}{% endregex_replace %}'
+ agent.options['cleaned'] =
+ '{% regex_replace "(?\S+)(?bar)" in %}{{ something }}{% with %}{{ word | upcase }}{{ suffix }}{% endregex_replace %}'
expect(agent.interpolated['cleaned']).to eq('FOObar ZOObar')
end
end
@@ -304,9 +313,9 @@ def @filter.to_xpath_roundtrip(string)
end
it 'returns an object that was not modified in liquid' do
- agent.interpolation_context['something'] = {'nested' => {'abc' => 'test'}}
+ agent.interpolation_context['something'] = { 'nested' => { 'abc' => 'test' } }
agent.options['object'] = "{{something.nested | as_object}}"
- expect(agent.interpolated['object']).to eq({"abc" => 'test'})
+ expect(agent.interpolated['object']).to eq({ "abc" => 'test' })
end
context 'as_json' do
@@ -315,19 +324,19 @@ def ensure_safety(obj)
end
it 'it converts "complex" objects' do
- agent.interpolation_context['something'] = {'nested' => Service.new}
+ agent.interpolation_context['something'] = { 'nested' => Service.new }
agent.options['object'] = "{{something | as_object}}"
- expect(agent.interpolated['object']).to eq({'nested'=> ensure_safety(Service.new.as_json)})
+ expect(agent.interpolated['object']).to eq({ 'nested' => ensure_safety(Service.new.as_json) })
end
- it 'works with AgentDrops' do
+ it 'works with Agent::Drops' do
agent.interpolation_context['something'] = agent
agent.options['object'] = "{{something | as_object}}"
expect(agent.interpolated['object']).to eq(ensure_safety(agent.to_liquid.as_json.stringify_keys))
end
- it 'works with EventDrops' do
- event = Event.new(payload: {some: 'payload'}, agent: agent, created_at: Time.now)
+ it 'works with Event::Drops' do
+ event = Event.new(payload: { some: 'payload' }, agent:, created_at: Time.now)
agent.interpolation_context['something'] = event
agent.options['object'] = "{{something | as_object}}"
expect(agent.interpolated['object']).to eq(ensure_safety(event.to_liquid.as_json.stringify_keys))
@@ -352,33 +361,33 @@ def ensure_safety(obj)
describe 'rebase_hrefs' do
let(:agent) { Agents::InterpolatableAgent.new(name: "test") }
- let(:fragment) { <
-
- 
file1
-
-
- file2
-
-
- 
file3
-
-
-HTML
-
- let(:replaced_fragment) { <
-
- 
file1
-
-
- file2
-
-
- 
file3
-
-
-HTML
+ let(:fragment) { <<~HTML }
+
+ HTML
+
+ let(:replaced_fragment) { <<~HTML }
+
+ HTML
it 'rebases relative URLs in a fragment' do
agent.interpolation_context['content'] = fragment
diff --git a/spec/concerns/twitter_concern_spec.rb b/spec/concerns/twitter_concern_spec.rb
index d6eb98c8ec..fe705177f3 100644
--- a/spec/concerns/twitter_concern_spec.rb
+++ b/spec/concerns/twitter_concern_spec.rb
@@ -107,6 +107,7 @@ class TestTwitterAgent < Agent
context "when a Twitter::Tweet object is given" do
let(:input) { Twitter::Tweet.new(tweet_hash) }
+ let(:expected) { super().then { |attrs| attrs.update(text: attrs[:full_text]) } }
it "formats a tweet" do
expect(subject).to eq(expected)
end
diff --git a/spec/controllers/agents/dry_runs_controller_spec.rb b/spec/controllers/agents/dry_runs_controller_spec.rb
index 77550b775b..6e6aa28cc4 100644
--- a/spec/controllers/agents/dry_runs_controller_spec.rb
+++ b/spec/controllers/agents/dry_runs_controller_spec.rb
@@ -16,7 +16,7 @@ def valid_attributes(options = {})
describe "GET index" do
it "does not load any events without specifing sources" do
- get :index, params: {type: 'Agents::WebsiteAgent', source_ids: []}
+ get :index, params: { type: 'Agents::WebsiteAgent', source_ids: [] }
expect(assigns(:events)).to eq([])
end
@@ -29,13 +29,13 @@ def valid_attributes(options = {})
end
it "for new agents" do
- get :index, params: {type: 'Agents::WebsiteAgent', source_ids: [@agent.id]}
+ get :index, params: { type: 'Agents::WebsiteAgent', source_ids: [@agent.id] }
expect(assigns(:events)).to eq([])
end
it "for existing agents" do
expect(@agent.events.count).not_to be(0)
- expect { get :index, params: {agent_id: @agent} }.to raise_error(NoMethodError)
+ expect { get :index, params: { agent_id: @agent } }.to raise_error(NoMethodError)
end
end
@@ -47,12 +47,12 @@ def valid_attributes(options = {})
end
it "load the most recent events when providing source ids" do
- get :index, params: {type: 'Agents::WebsiteAgent', source_ids: [@agent.id]}
+ get :index, params: { type: 'Agents::WebsiteAgent', source_ids: [@agent.id] }
expect(assigns(:events)).to eq([@agent.events.first])
end
it "loads the most recent events for a saved agent" do
- get :index, params: {agent_id: @agent}
+ get :index, params: { agent_id: @agent }
expect(assigns(:events)).to eq([@agent.events.first])
end
end
@@ -60,12 +60,13 @@ def valid_attributes(options = {})
describe "POST create" do
before do
- stub_request(:any, /xkcd/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/xkcd.html")), status: 200)
+ stub_request(:any, /xkcd/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/xkcd.html")),
+ status: 200)
end
it "does not actually create any agent, event or log" do
expect {
- post :create, params: {agent: valid_attributes}
+ post :create, params: { agent: valid_attributes }
}.not_to change {
[users(:bob).agents.count, users(:bob).events.count, users(:bob).logs.count]
}
@@ -81,7 +82,7 @@ def valid_attributes(options = {})
it "does not actually update an agent" do
agent = agents(:bob_weather_agent)
expect {
- post :create, params: {agent_id: agent, agent: valid_attributes(name: 'New Name')}
+ post :create, params: { agent_id: agent, agent: valid_attributes(name: 'New Name') }
}.not_to change {
[users(:bob).agents.count, users(:bob).events.count, users(:bob).logs.count, agent.name, agent.updated_at]
}
@@ -93,7 +94,7 @@ def valid_attributes(options = {})
agent.save!
url_from_event = "http://xkcd.com/?from_event=1".freeze
expect {
- post :create, params: {agent_id: agent, event: { url: url_from_event }.to_json}
+ post :create, params: { agent_id: agent.id, event: { url: url_from_event }.to_json }
}.not_to change {
[users(:bob).agents.count, users(:bob).events.count, users(:bob).logs.count, agent.name, agent.updated_at]
}
@@ -103,25 +104,25 @@ def valid_attributes(options = {})
it "uses the memory of an existing Agent" do
valid_params = {
- :name => "somename",
- :options => {
- :code => "Agent.check = function() { this.createEvent({ 'message': this.memory('fu') }); };",
+ name: "somename",
+ options: {
+ code: "Agent.check = function() { this.createEvent({ 'message': this.memory('fu') }); };",
}
}
agent = Agents::JavaScriptAgent.new(valid_params)
- agent.memory = {fu: "bar"}
+ agent.memory = { fu: "bar" }
agent.user = users(:bob)
agent.save!
- post :create, params: {agent_id: agent, agent: valid_params}
+ post :create, params: { agent_id: agent, agent: valid_params }
results = assigns(:results)
- expect(results[:events][0]).to eql({"message" => "bar"})
+ expect(results[:events][0]).to eql({ "message" => "bar" })
end
it 'sets created_at of the dry-runned event' do
agent = agents(:bob_formatting_agent)
- agent.options['instructions'] = {'created_at' => '{{created_at | date: "%a, %b %d, %y"}}'}
+ agent.options['instructions'] = { 'created_at' => '{{created_at | date: "%a, %b %d, %y"}}' }
agent.save
- post :create, params: {agent_id: agent, event: {test: 1}.to_json}
+ post :create, params: { agent_id: agent, event: { test: 1 }.to_json }
results = assigns(:results)
expect(results[:events]).to be_a(Array)
expect(results[:events].length).to eq(1)
diff --git a/spec/features/create_an_agent_spec.rb b/spec/features/create_an_agent_spec.rb
index 04eb297877..4196755d07 100644
--- a/spec/features/create_an_agent_spec.rb
+++ b/spec/features/create_an_agent_spec.rb
@@ -7,7 +7,7 @@
it "creates an agent" do
visit "/"
- page.find("a", text: "Agents").trigger(:mouseover)
+ page.find("a", text: "Agents").hover
click_on("New Agent")
select_agent_type("Trigger Agent")
@@ -43,7 +43,7 @@
it "creates an agent with a source and a receiver" do
visit "/"
- page.find("a", text: "Agents").trigger(:mouseover)
+ page.find("a", text: "Agents").hover
click_on("New Agent")
select_agent_type("Trigger Agent")
@@ -64,7 +64,7 @@
it "creates an agent with a control target" do
visit "/"
- page.find("a", text: "Agents").trigger(:mouseover)
+ page.find("a", text: "Agents").hover
click_on("New Agent")
select_agent_type("Scheduler Agent")
@@ -83,7 +83,7 @@
it "creates an agent with a controller" do
visit "/"
- page.find("a", text: "Agents").trigger(:mouseover)
+ page.find("a", text: "Agents").hover
click_on("New Agent")
select_agent_type("Weather Agent")
@@ -103,7 +103,7 @@
it "creates an alert if a new agent with invalid json is submitted" do
visit "/"
- page.find("a", text: "Agents").trigger(:mouseover)
+ page.find("a", text: "Agents").hover
click_on("New Agent")
select_agent_type("Trigger Agent")
@@ -114,7 +114,9 @@
"expected_receive_period_in_days": "2"
"keep_event": "false"
}')
- expect(get_alert_text_from { click_on "Save" }).to have_text("Sorry, there appears to be an error in your JSON input. Please fix it before continuing.")
+ expect(get_alert_text_from {
+ click_on "Save"
+ }).to have_text("Sorry, there appears to be an error in your JSON input. Please fix it before continuing.")
end
context "displaying the correct information" do
diff --git a/spec/models/agent_spec.rb b/spec/models/agent_spec.rb
index 2737f0df34..de8756769b 100644
--- a/spec/models/agent_spec.rb
+++ b/spec/models/agent_spec.rb
@@ -33,7 +33,7 @@
describe ".bulk_check" do
before do
- @weather_agent_count = Agents::WeatherAgent.where(:schedule => "midnight", :disabled => false).count
+ @weather_agent_count = Agents::WeatherAgent.where(schedule: "midnight", disabled: false).count
end
it "should run all Agents with the given schedule" do
@@ -142,7 +142,7 @@ class Agents::SomethingSource < Agent
default_schedule "2pm"
def check
- create_event :payload => {}
+ create_event payload: {}
end
def validate_options
@@ -154,8 +154,8 @@ class Agents::CannotBeScheduled < Agent
cannot_be_scheduled!
def receive(events)
- events.each do |event|
- create_event :payload => { :events_received => 1 }
+ events.each do |_event|
+ create_event payload: { events_received: 1 }
end
end
end
@@ -167,7 +167,7 @@ def receive(events)
describe Agents::SomethingSource do
let(:new_instance) do
- agent = Agents::SomethingSource.new(:name => "some agent")
+ agent = Agents::SomethingSource.new(name: "some agent")
agent.user = users(:bob)
agent
end
@@ -190,7 +190,7 @@ def receive(events)
end
it "sets the default on new instances, allows setting new schedules, and prevents invalid schedules" do
- @checker = Agents::SomethingSource.new(:name => "something")
+ @checker = Agents::SomethingSource.new(name: "something")
@checker.user = users(:bob)
expect(@checker.schedule).to eq("2pm")
@checker.save!
@@ -205,7 +205,7 @@ def receive(events)
end
it "should have an empty schedule if it cannot_be_scheduled" do
- @checker = Agents::CannotBeScheduled.new(:name => "something")
+ @checker = Agents::CannotBeScheduled.new(name: "something")
@checker.user = users(:bob)
expect(@checker.schedule).to be_nil
expect(@checker).to be_valid
@@ -221,7 +221,7 @@ def receive(events)
describe "#create_event" do
before do
- @checker = Agents::SomethingSource.new(:name => "something")
+ @checker = Agents::SomethingSource.new(name: "something")
@checker.user = users(:bob)
@checker.save!
end
@@ -242,7 +242,7 @@ def receive(events)
describe ".async_check" do
before do
- @checker = Agents::SomethingSource.new(:name => "something")
+ @checker = Agents::SomethingSource.new(name: "something")
@checker.user = users(:bob)
@checker.save!
end
@@ -283,7 +283,8 @@ def receive(events)
describe ".receive!" do
before do
- stub_request(:any, /darksky/).to_return(:body => File.read(Rails.root.join("spec/data_fixtures/weather.json")), :status => 200)
+ stub_request(:any, /darksky/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/weather.json")),
+ status: 200)
end
it "should use available events" do
@@ -360,7 +361,7 @@ def receive(events)
it "should group events" do
count = 0
- allow_any_instance_of(Agents::TriggerAgent).to receive(:receive) { |agent, events|
+ allow_any_instance_of(Agents::TriggerAgent).to receive(:receive) { |_agent, events|
count += 1
expect(events.map(&:user).map(&:username).uniq.length).to eq(1)
}
@@ -381,7 +382,7 @@ def receive(events)
end
it "should ignore events that were created before a particular Link" do
- agent2 = Agents::SomethingSource.new(:name => "something")
+ agent2 = Agents::SomethingSource.new(name: "something")
agent2.user = users(:bob)
agent2.save!
agent2.check
@@ -436,14 +437,14 @@ def receive(events)
describe "creating a new agent and then calling .receive!" do
it "should not backfill events for a newly created agent" do
Event.delete_all
- sender = Agents::SomethingSource.new(:name => "Sending Agent")
+ sender = Agents::SomethingSource.new(name: "Sending Agent")
sender.user = users(:bob)
sender.save!
- sender.create_event :payload => {}
- sender.create_event :payload => {}
+ sender.create_event payload: {}
+ sender.create_event payload: {}
expect(sender.events.count).to eq(2)
- receiver = Agents::CannotBeScheduled.new(:name => "Receiving Agent")
+ receiver = Agents::CannotBeScheduled.new(name: "Receiving Agent")
receiver.user = users(:bob)
receiver.sources << sender
receiver.save!
@@ -451,7 +452,7 @@ def receive(events)
expect(receiver.events.count).to eq(0)
Agent.receive!
expect(receiver.events.count).to eq(0)
- sender.create_event :payload => {}
+ sender.create_event payload: {}
Agent.receive!
expect(receiver.events.count).to eq(1)
end
@@ -460,32 +461,32 @@ def receive(events)
describe "creating agents with propagate_immediately = true" do
it "should schedule subagent events immediately" do
Event.delete_all
- sender = Agents::SomethingSource.new(:name => "Sending Agent")
+ sender = Agents::SomethingSource.new(name: "Sending Agent")
sender.user = users(:bob)
sender.save!
receiver = Agents::CannotBeScheduled.new(
- :name => "Receiving Agent",
+ name: "Receiving Agent",
)
receiver.propagate_immediately = true
receiver.user = users(:bob)
receiver.sources << sender
receiver.save!
- sender.create_event :payload => {"message" => "new payload"}
+ sender.create_event payload: { "message" => "new payload" }
expect(sender.events.count).to eq(1)
expect(receiver.events.count).to eq(1)
- #should be true without calling Agent.receive!
+ # should be true without calling Agent.receive!
end
it "should only schedule receiving agents that are set to propagate_immediately" do
Event.delete_all
- sender = Agents::SomethingSource.new(:name => "Sending Agent")
+ sender = Agents::SomethingSource.new(name: "Sending Agent")
sender.user = users(:bob)
sender.save!
im_receiver = Agents::CannotBeScheduled.new(
- :name => "Immediate Receiving Agent",
+ name: "Immediate Receiving Agent",
)
im_receiver.propagate_immediately = true
im_receiver.user = users(:bob)
@@ -493,20 +494,20 @@ def receive(events)
im_receiver.save!
slow_receiver = Agents::CannotBeScheduled.new(
- :name => "Slow Receiving Agent",
+ name: "Slow Receiving Agent",
)
slow_receiver.user = users(:bob)
slow_receiver.sources << sender
slow_receiver.save!
- sender.create_event :payload => {"message" => "new payload"}
+ sender.create_event payload: { "message" => "new payload" }
expect(sender.events.count).to eq(1)
expect(im_receiver.events.count).to eq(1)
- #we should get the quick one
- #but not the slow one
+ # we should get the quick one
+ # but not the slow one
expect(slow_receiver.events.count).to eq(0)
Agent.receive!
- #now we should have one in both
+ # now we should have one in both
expect(im_receiver.events.count).to eq(1)
expect(slow_receiver.events.count).to eq(1)
end
@@ -514,7 +515,7 @@ def receive(events)
describe "validations" do
it "calls validate_options" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.options[:bad] = true
expect(agent).to have(1).error_on(:base)
@@ -523,7 +524,7 @@ def receive(events)
end
it "makes options symbol-indifferent before validating" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.options["bad"] = true
expect(agent).to have(1).error_on(:base)
@@ -532,7 +533,7 @@ def receive(events)
end
it "makes memory symbol-indifferent before validating" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.memory["bad"] = 2
agent.save
@@ -540,7 +541,7 @@ def receive(events)
end
it "should work when assigned a hash or JSON string" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.memory = {}
expect(agent.memory).to eq({})
expect(agent.memory["foo"]).to be_nil
@@ -578,11 +579,11 @@ def receive(events)
agent.options = 5
expect(agent.options["hi"]).to eq(2)
expect(agent).to have(1).errors_on(:options)
- expect(agent.errors_on(:options)).to include("cannot be set to an instance of #{2.class}") # Integer (ruby >=2.4) or Fixnum (ruby <2.4)
+ expect(agent.errors_on(:options)).to include("cannot be set to an instance of #{2.class}") # Integer (ruby >=2.4) or Fixnum (ruby <2.4)
end
it "should not allow source agents owned by other people" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.source_ids = [agents(:bob_weather_agent).id]
expect(agent).to have(0).errors_on(:sources)
@@ -593,7 +594,7 @@ def receive(events)
end
it "should not allow target agents owned by other people" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.receiver_ids = [agents(:bob_weather_agent).id]
expect(agent).to have(0).errors_on(:receivers)
@@ -604,7 +605,7 @@ def receive(events)
end
it "should not allow controller agents owned by other people" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.controller_ids = [agents(:bob_weather_agent).id]
expect(agent).to have(0).errors_on(:controllers)
@@ -615,7 +616,7 @@ def receive(events)
end
it "should not allow control target agents owned by other people" do
- agent = Agents::CannotBeScheduled.new(:name => "something")
+ agent = Agents::CannotBeScheduled.new(name: "something")
agent.user = users(:bob)
agent.control_target_ids = [agents(:bob_weather_agent).id]
expect(agent).to have(0).errors_on(:control_targets)
@@ -626,7 +627,7 @@ def receive(events)
end
it "should not allow scenarios owned by other people" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
agent.scenario_ids = [scenarios(:bob_weather).id]
@@ -643,7 +644,7 @@ def receive(events)
end
it "validates keep_events_for" do
- agent = Agents::SomethingSource.new(:name => "something")
+ agent = Agents::SomethingSource.new(name: "something")
agent.user = users(:bob)
expect(agent).to be_valid
agent.keep_events_for = nil
@@ -669,11 +670,11 @@ def receive(events)
before do
@time = "2014-01-01 01:00:00 +00:00"
travel_to @time do
- @agent = Agents::SomethingSource.new(:name => "something")
+ @agent = Agents::SomethingSource.new(name: "something")
@agent.keep_events_for = 5.days
@agent.user = users(:bob)
@agent.save!
- @event = @agent.create_event :payload => { "hello" => "world" }
+ @event = @agent.create_event payload: { "hello" => "world" }
expect(@event.expires_at.to_i).to be_within(2).of(5.days.from_now.to_i)
end
end
@@ -695,9 +696,9 @@ def receive(events)
it "updates events' expires_at" do
travel_to @time do
expect {
- @agent.options[:foo] = "bar1"
- @agent.keep_events_for = 3.days
- @agent.save!
+ @agent.options[:foo] = "bar1"
+ @agent.keep_events_for = 3.days
+ @agent.save!
}.to change { @event.reload.expires_at }
expect(@event.expires_at.to_i).to be_within(2).of(3.days.from_now.to_i)
end
@@ -731,18 +732,20 @@ def receive(events)
@sender = Agents::SomethingSource.new(
name: 'Agent (2)',
options: { foo: 'bar2' },
- schedule: '5pm')
+ schedule: '5pm'
+ )
@sender.user = users(:bob)
@sender.save!
- @sender.create_event :payload => {}
- @sender.create_event :payload => {}
+ @sender.create_event payload: {}
+ @sender.create_event payload: {}
expect(@sender.events.count).to eq(2)
@receiver = Agents::CannotBeScheduled.new(
name: 'Agent',
options: { foo: 'bar3' },
keep_events_for: 3.days,
- propagate_immediately: true)
+ propagate_immediately: true
+ )
@receiver.user = users(:bob)
@receiver.sources << @sender
@receiver.memory[:test] = 1
@@ -752,19 +755,19 @@ def receive(events)
it "should create a clone of a given agent for editing" do
sender_clone = users(:bob).agents.build_clone(@sender)
- expect(sender_clone.attributes).to eq(Agent.new.attributes.
- update(@sender.slice(:user_id, :type,
- :options, :schedule, :keep_events_for, :propagate_immediately)).
- update('name' => 'Agent (2) (2)', 'options' => { 'foo' => 'bar2' }))
+ expect(sender_clone.attributes).to eq(Agent.new.attributes
+ .update(@sender.slice(:user_id, :type,
+ :options, :schedule, :keep_events_for, :propagate_immediately))
+ .update('name' => 'Agent (2) (2)', 'options' => { 'foo' => 'bar2' }))
expect(sender_clone.source_ids).to eq([])
receiver_clone = users(:bob).agents.build_clone(@receiver)
- expect(receiver_clone.attributes).to eq(Agent.new.attributes.
- update(@receiver.slice(:user_id, :type,
- :options, :schedule, :keep_events_for, :propagate_immediately)).
- update('name' => 'Agent (3)', 'options' => { 'foo' => 'bar3' }))
+ expect(receiver_clone.attributes).to eq(Agent.new.attributes
+ .update(@receiver.slice(:user_id, :type,
+ :options, :schedule, :keep_events_for, :propagate_immediately))
+ .update('name' => 'Agent (3)', 'options' => { 'foo' => 'bar3' }))
expect(receiver_clone.source_ids).to eq([@sender.id])
end
@@ -782,7 +785,7 @@ class Agents::WebRequestReceiver < Agent
context "when .receive_web_request is defined" do
before do
- @agent = Agents::WebRequestReceiver.new(:name => "something")
+ @agent = Agents::WebRequestReceiver.new(name: "something")
@agent.user = users(:bob)
@agent.save!
@@ -794,46 +797,49 @@ def @agent.receive_web_request(params, method, format)
it "calls the .receive_web_request hook, updates last_web_request_at, and saves" do
request = ActionDispatch::Request.new({
- 'action_dispatch.request.request_parameters' => { :some_param => "some_value" },
+ 'action_dispatch.request.request_parameters' => { some_param: "some_value" },
'REQUEST_METHOD' => "POST",
'HTTP_ACCEPT' => 'text/html'
})
@agent.trigger_web_request(request)
- expect(@agent.reload.memory['last_request']).to eq([ { "some_param" => "some_value" }, "post", "text/html" ])
+ expect(@agent.reload.memory['last_request']).to eq([{ "some_param" => "some_value" }, "post", "text/html"])
expect(@agent.last_web_request_at.to_i).to be_within(1).of(Time.now.to_i)
end
end
context "when .receive_web_request is defined with just request" do
before do
- @agent = Agents::WebRequestReceiver.new(:name => "something")
+ @agent = Agents::WebRequestReceiver.new(name: "something")
@agent.user = users(:bob)
@agent.save!
def @agent.receive_web_request(request)
- memory['last_request'] = [request.params, request.method_symbol.to_s, request.format, {'HTTP_X_CUSTOM_HEADER' => request.headers['HTTP_X_CUSTOM_HEADER']}]
+ memory['last_request'] =
+ [request.params, request.method_symbol.to_s, request.format,
+ { 'HTTP_X_CUSTOM_HEADER' => request.headers['HTTP_X_CUSTOM_HEADER'] }]
['Ok!', 200]
end
end
it "calls the .trigger_web_request with headers, and they get passed to .receive_web_request" do
request = ActionDispatch::Request.new({
- 'action_dispatch.request.request_parameters' => { :some_param => "some_value" },
+ 'action_dispatch.request.request_parameters' => { some_param: "some_value" },
'REQUEST_METHOD' => "POST",
'HTTP_ACCEPT' => 'text/html',
'HTTP_X_CUSTOM_HEADER' => "foo"
})
@agent.trigger_web_request(request)
- expect(@agent.reload.memory['last_request']).to eq([ { "some_param" => "some_value" }, "post", "text/html", {'HTTP_X_CUSTOM_HEADER' => "foo"} ])
+ expect(@agent.reload.memory['last_request']).to eq([{ "some_param" => "some_value" }, "post", "text/html",
+ { 'HTTP_X_CUSTOM_HEADER' => "foo" }])
expect(@agent.last_web_request_at.to_i).to be_within(1).of(Time.now.to_i)
end
end
context "when .receive_webhook is defined" do
before do
- @agent = Agents::WebRequestReceiver.new(:name => "something")
+ @agent = Agents::WebRequestReceiver.new(name: "something")
@agent.user = users(:bob)
@agent.save!
@@ -845,7 +851,7 @@ def @agent.receive_webhook(params)
it "outputs a deprecation warning and calls .receive_webhook with the params" do
request = ActionDispatch::Request.new({
- 'action_dispatch.request.request_parameters' => { :some_param => "some_value" },
+ 'action_dispatch.request.request_parameters' => { some_param: "some_value" },
'REQUEST_METHOD' => "POST",
'HTTP_ACCEPT' => 'text/html'
})
@@ -890,7 +896,7 @@ def @agent.receive_webhook(params)
end
it "sets expires_at on created events" do
- event = agents(:jane_weather_agent).create_event :payload => { 'hi' => 'there' }
+ event = agents(:jane_weather_agent).create_event payload: { 'hi' => 'there' }
expect(event.expires_at.to_i).to be_within(5).of(agents(:jane_weather_agent).keep_events_for.seconds.from_now.to_i)
end
end
@@ -901,7 +907,7 @@ def @agent.receive_webhook(params)
end
it "does not set expires_at on created events" do
- event = agents(:jane_website_agent).create_event :payload => { 'hi' => 'there' }
+ event = agents(:jane_website_agent).create_event payload: { 'hi' => 'there' }
expect(event.expires_at).to be_nil
end
end
@@ -925,7 +931,8 @@ def @agent.receive_webhook(params)
describe ".drop_pending_events" do
before do
- stub_request(:any, /darksky/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/weather.json")), status: 200)
+ stub_request(:any, /darksky/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/weather.json")),
+ status: 200)
end
it "should drop pending events while the agent was disabled when set to true" do
@@ -960,7 +967,7 @@ def @agent.receive_webhook(params)
end
end
-describe AgentDrop do
+describe Agent::Drop do
def interpolate(string, agent)
agent.interpolate_string(string, "agent" => agent)
end
@@ -979,7 +986,8 @@ def interpolate(string, agent)
},
},
schedule: 'every_1h',
- keep_events_for: 2.days)
+ keep_events_for: 2.days
+ )
@wsa1.user = users(:bob)
@wsa1.save!
@@ -996,7 +1004,8 @@ def interpolate(string, agent)
},
},
schedule: 'every_12h',
- keep_events_for: 2.days)
+ keep_events_for: 2.days
+ )
@wsa2.user = users(:bob)
@wsa2.save!
@@ -1012,7 +1021,8 @@ def interpolate(string, agent)
skip_created_at: 'false',
},
keep_events_for: 2.days,
- propagate_immediately: true)
+ propagate_immediately: true
+ )
@efa.user = users(:bob)
@efa.sources << @wsa1 << @wsa2
@efa.memory[:test] = 1
@@ -1022,9 +1032,9 @@ def interpolate(string, agent)
end
it 'should be created via Agent#to_liquid' do
- expect(@wsa1.to_liquid.class).to be(AgentDrop)
- expect(@wsa2.to_liquid.class).to be(AgentDrop)
- expect(@efa.to_liquid.class).to be(AgentDrop)
+ expect(@wsa1.to_liquid.class).to be(Agent::Drop)
+ expect(@wsa2.to_liquid.class).to be(Agent::Drop)
+ expect(@efa.to_liquid.class).to be(Agent::Drop)
end
it 'should have .id, .type and .name' do
@@ -1039,7 +1049,7 @@ def interpolate(string, agent)
expect(interpolate(t, @wsa1)).to eq('http://xkcd.com/')
expect(interpolate(t, @wsa2)).to eq('http://dilbert.com/')
expect(interpolate('{{agent.options.instructions.message}}',
- @efa)).to eq('{{agent.name}}: {{title}} {{url}}')
+ @efa)).to eq('{{agent.name}}: {{title}} {{url}}')
end
it 'should have .sources' do
diff --git a/spec/models/agents/growl_agent_spec.rb b/spec/models/agents/growl_agent_spec.rb
deleted file mode 100644
index c8487243a5..0000000000
--- a/spec/models/agents/growl_agent_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'rails_helper'
-
-describe Agents::GrowlAgent do
- before do
- @checker = Agents::GrowlAgent.new(:name => 'a growl agent',
- :options => { :growl_server => 'localhost',
- :growl_app_name => 'HuginnGrowlApp',
- :growl_password => 'mypassword',
- :growl_notification_name => 'Notification',
- expected_receive_period_in_days: '1' ,
- message: '{{message}}',
- subject: '{{subject}}'})
- @checker.user = users(:bob)
- @checker.save!
-
- allow_any_instance_of(Growl::GNTP).to receive(:notify)
-
- @event = Event.new
- @event.agent = agents(:bob_weather_agent)
- @event.payload = { :subject => 'Weather Alert!', :message => 'Looks like its going to rain' }
- @event.save!
- end
-
- describe "#working?" do
- it "checks if events have been received within the expected receive period" do
- expect(@checker).not_to be_working # No events received
- Agents::GrowlAgent.async_receive @checker.id, [@event.id]
- expect(@checker.reload).to be_working # Just received events
- two_days_from_now = 2.days.from_now
- allow(Time).to receive(:now) { two_days_from_now }
- expect(@checker.reload).not_to be_working # More time has passed than the expected receive period without any new events
- end
- end
-
- describe "validation" do
- before do
- expect(@checker).to be_valid
- end
-
- it "should validate presence of of growl_server" do
- @checker.options[:growl_server] = ""
- expect(@checker).not_to be_valid
- end
-
- it "should validate presence of expected_receive_period_in_days" do
- @checker.options[:expected_receive_period_in_days] = ""
- expect(@checker).not_to be_valid
- end
- end
-
- describe "register_growl" do
- it "should set the password for the Growl connection from the agent options" do
- @checker.register_growl
- expect(@checker.growler.password).to eql(@checker.options[:growl_password])
- end
-
- it "should add a notification to the Growl connection" do
- expect(Growl::GNTP).to receive(:new).and_wrap_original do |orig, *args|
- orig.call(*args).tap { |obj|
- expect(obj).to receive(:add_notification).with(@checker.options[:growl_notification_name])
- }
- end
- @checker.register_growl
- end
- end
-
- describe "notify_growl" do
- it "should call Growl.notify with the correct notification name, subject, and message" do
- message = "message"
- subject = "subject"
- expect(Growl::GNTP).to receive(:new).and_wrap_original do |orig, *args|
- orig.call(*args).tap { |obj|
- expect(obj).to receive(:notify).with(@checker.options[:growl_notification_name], subject, message, 0, false, nil, '')
- }
- end
- @checker.register_growl
- @checker.notify_growl(subject: subject, message: message, sticky: false, priority: 0, callback_url: '')
- end
- end
-
- describe "receive" do
- def generate_events_array
- events = []
- (2..rand(7)).each do
- events << @event
- end
- return events
- end
-
- it "should call register_growl once per received event" do
- events = generate_events_array
- expect(@checker).to receive(:register_growl).exactly(events.length).times.and_call_original
- @checker.receive(events)
- end
-
- it "should call notify_growl one time for each event received" do
- events = generate_events_array
- events.each do |event|
- expect(@checker).to receive(:notify_growl).with(subject: event.payload['subject'], message: event.payload['message'], priority: 0, sticky: false, callback_url: nil)
- end
- @checker.receive(events)
- end
-
- it "should not call notify_growl if message or subject are missing" do
- event_without_a_subject = Event.new
- event_without_a_subject.agent = agents(:bob_weather_agent)
- event_without_a_subject.payload = { :message => 'Looks like its going to rain' }
- event_without_a_subject.save!
-
- event_without_a_message = Event.new
- event_without_a_message.agent = agents(:bob_weather_agent)
- event_without_a_message.payload = { :subject => 'Weather Alert YO!' }
- event_without_a_message.save!
-
- expect(@checker).not_to receive(:notify_growl)
- @checker.receive([event_without_a_subject,event_without_a_message])
- end
- end
-end
diff --git a/spec/models/agents/shell_command_agent_spec.rb b/spec/models/agents/shell_command_agent_spec.rb
index 0b82a44fb8..800f2ad314 100644
--- a/spec/models/agents/shell_command_agent_spec.rb
+++ b/spec/models/agents/shell_command_agent_spec.rb
@@ -12,7 +12,8 @@
@valid_params2 = {
path: @valid_path,
- command: [RbConfig.ruby, '-e', 'puts "hello, #{STDIN.eof? ? "world" : STDIN.read.strip}."; STDERR.puts "warning!"'],
+ command: [RbConfig.ruby, '-e',
+ 'puts "hello, #{STDIN.eof? ? "world" : STDIN.read.strip}."; STDERR.puts "warning!"'],
stdin: "{{name}}",
expected_update_period_in_days: '1',
}
@@ -60,7 +61,7 @@
describe "#working?" do
it "generating events as scheduled" do
- allow(@checker).to receive(:run_command).with(@valid_path, 'pwd', nil, {}) { ["fake pwd output", "", 0] }
+ allow(@checker).to receive(:run_command).with(@valid_path, 'pwd', nil) { ["fake pwd output", "", 0] }
expect(@checker).not_to be_working
@checker.check
@@ -74,13 +75,18 @@
describe "#check" do
before do
orig_run_command = @checker.method(:run_command)
- allow(@checker).to receive(:run_command).with(@valid_path, 'pwd', nil, {}) { ["fake pwd output", "", 0] }
- allow(@checker).to receive(:run_command).with(@valid_path, 'empty_output', nil, {}) { ["", "", 0] }
- allow(@checker).to receive(:run_command).with(@valid_path, 'failure', nil, {}) { ["failed", "error message", 1] }
- allow(@checker).to receive(:run_command).with(@valid_path, 'echo $BUNDLE_GEMFILE', nil, unbundle: true) { orig_run_command.(@valid_path, 'echo $BUNDLE_GEMFILE', nil, unbundle: true) }
- [[], [{}], [{ unbundle: false }]].each do |rest|
- allow(@checker).to receive(:run_command).with(@valid_path, 'echo $BUNDLE_GEMFILE', nil, *rest) { [ENV['BUNDLE_GEMFILE'].to_s, "", 0] }
- end
+ allow(@checker).to receive(:run_command).with(@valid_path, 'pwd', nil) { ["fake pwd output", "", 0] }
+ allow(@checker).to receive(:run_command).with(@valid_path, 'empty_output', nil) { ["", "", 0] }
+ allow(@checker).to receive(:run_command).with(@valid_path, 'failure', nil) { ["failed", "error message", 1] }
+ allow(@checker).to receive(:run_command).with(@valid_path, 'echo $BUNDLE_GEMFILE', nil, unbundle: true) {
+ orig_run_command.call(@valid_path, 'echo $BUNDLE_GEMFILE', nil, unbundle: true)
+ }
+ allow(@checker).to receive(:run_command).with(@valid_path, 'echo $BUNDLE_GEMFILE', nil) {
+ [ENV['BUNDLE_GEMFILE'].to_s, "", 0]
+ }
+ allow(@checker).to receive(:run_command).with(@valid_path, 'echo $BUNDLE_GEMFILE', nil, unbundle: false) {
+ [ENV['BUNDLE_GEMFILE'].to_s, "", 0]
+ }
end
it "should create an event when checking" do
@@ -93,7 +99,10 @@
it "should create an event when checking (unstubbed)" do
expect { @checker2.check }.to change { Event.count }.by(1)
expect(Event.last.payload[:path]).to eq(@valid_path)
- expect(Event.last.payload[:command]).to eq([RbConfig.ruby, '-e', 'puts "hello, #{STDIN.eof? ? "world" : STDIN.read.strip}."; STDERR.puts "warning!"'])
+ expect(Event.last.payload[:command]).to eq [
+ RbConfig.ruby, '-e',
+ 'puts "hello, #{STDIN.eof? ? "world" : STDIN.read.strip}."; STDERR.puts "warning!"'
+ ]
expect(Event.last.payload[:output]).to eq('hello, world.')
expect(Event.last.payload[:errors]).to eq('warning!')
end
@@ -169,7 +178,9 @@
describe "#receive" do
before do
- allow(@checker).to receive(:run_command).with(@valid_path, @event.payload[:cmd], nil, {}) { ["fake ls output", "", 0] }
+ allow(@checker).to receive(:run_command).with(@valid_path, @event.payload[:cmd], nil) {
+ ["fake ls output", "", 0]
+ }
end
it "creates events" do
diff --git a/spec/models/agents/twitter_stream_agent_spec.rb b/spec/models/agents/twitter_stream_agent_spec.rb
index 8073629ac6..b614bb8487 100644
--- a/spec/models/agents/twitter_stream_agent_spec.rb
+++ b/spec/models/agents/twitter_stream_agent_spec.rb
@@ -189,7 +189,7 @@
it "yields received tweets" do
expect(@worker).to receive(:stream!).with(['agent'], @agent).and_yield('status' => 'hello')
- expect(@worker).to receive(:handle_status).with('status' => 'hello')
+ expect(@worker).to receive(:handle_status).with({ 'status' => 'hello' })
expect(Thread).to receive(:stop)
@worker.run
end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index fea103371c..7287fce8a5 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -23,7 +23,8 @@
lng: nil,
radius: 0.0,
speed: nil,
- course: nil))
+ course: nil
+ ))
end
it "returns a hash containing location information" do
@@ -41,7 +42,8 @@
lng: 3.0,
radius: 0.0,
speed: 0.5,
- course: 90.0))
+ course: 90.0
+ ))
end
end
@@ -63,10 +65,10 @@
describe ".cleanup_expired!" do
it "removes any Events whose expired_at date is non-null and in the past, updating Agent counter caches" do
- half_hour_event = agents(:jane_weather_agent).create_event :expires_at => 20.minutes.from_now
- one_hour_event = agents(:bob_weather_agent).create_event :expires_at => 1.hours.from_now
- two_hour_event = agents(:jane_weather_agent).create_event :expires_at => 2.hours.from_now
- three_hour_event = agents(:jane_weather_agent).create_event :expires_at => 3.hours.from_now
+ half_hour_event = agents(:jane_weather_agent).create_event expires_at: 20.minutes.from_now
+ one_hour_event = agents(:bob_weather_agent).create_event expires_at: 1.hours.from_now
+ two_hour_event = agents(:jane_weather_agent).create_event expires_at: 2.hours.from_now
+ three_hour_event = agents(:jane_weather_agent).create_event expires_at: 3.hours.from_now
non_expiring_event = agents(:bob_weather_agent).create_event({})
initial_bob_count = agents(:bob_weather_agent).reload.events_count
@@ -150,20 +152,20 @@
describe "when an event is created" do
it "updates a counter cache on agent" do
expect {
- agents(:jane_weather_agent).events.create!(:user => users(:jane))
+ agents(:jane_weather_agent).events.create!(user: users(:jane))
}.to change { agents(:jane_weather_agent).reload.events_count }.by(1)
end
it "updates last_event_at on agent" do
expect {
- agents(:jane_weather_agent).events.create!(:user => users(:jane))
+ agents(:jane_weather_agent).events.create!(user: users(:jane))
}.to change { agents(:jane_weather_agent).reload.last_event_at }
end
end
describe "when an event is updated" do
it "does not touch the last_event_at on the agent" do
- event = agents(:jane_weather_agent).events.create!(:user => users(:jane))
+ event = agents(:jane_weather_agent).events.create!(user: users(:jane))
agents(:jane_weather_agent).update_attribute :last_event_at, 2.days.ago
@@ -175,7 +177,7 @@
end
end
-describe EventDrop do
+describe Event::Drop do
def interpolate(string, event)
event.agent.interpolate_string(string, event.to_liquid)
end
@@ -194,7 +196,7 @@ def interpolate(string, event)
end
it 'should be created via Agent#to_liquid' do
- expect(@event.to_liquid.class).to be(EventDrop)
+ expect(@event.to_liquid.class).to be(Event::Drop)
end
it 'should have attributes of its payload' do
diff --git a/spec/presenters/form_configurable_agent_presenter_spec.rb b/spec/presenters/form_configurable_agent_presenter_spec.rb
index 6f7e39a584..64ece21ed3 100644
--- a/spec/presenters/form_configurable_agent_presenter_spec.rb
+++ b/spec/presenters/form_configurable_agent_presenter_spec.rb
@@ -12,30 +12,61 @@ class FormConfigurableAgentPresenterAgent < Agent
end
before(:all) do
- @presenter = FormConfigurableAgentPresenter.new(FormConfigurableAgentPresenterAgent.new, ActionController::Base.new.view_context)
+ @presenter = FormConfigurableAgentPresenter.new(FormConfigurableAgentPresenterAgent.new,
+ ActionController::Base.new.view_context)
end
it "works for the type :string" do
expect(@presenter.option_field_for(:string)).to(
- have_tag('input', with: {:'data-attribute' => 'string', role: 'validatable form-configurable', type: 'text', name: 'agent[options][string]'})
+ have_tag(
+ 'input',
+ with: {
+ 'data-attribute': 'string',
+ role: 'validatable form-configurable',
+ type: 'text',
+ name: 'agent[options][string]'
+ }
+ )
)
end
it "works for the type :text" do
expect(@presenter.option_field_for(:text)).to(
- have_tag('textarea', with: {:'data-attribute' => 'text', role: 'completable form-configurable', name: 'agent[options][text]'})
+ have_tag(
+ 'textarea',
+ with: {
+ 'data-attribute': 'text',
+ role: 'completable form-configurable',
+ name: 'agent[options][text]'
+ }
+ )
)
end
it "works for the type :boolean" do
expect(@presenter.option_field_for(:boolean)).to(
- have_tag('input', with: {:'data-attribute' => 'boolean', role: 'form-configurable', name: 'agent[options][boolean_radio]', type: 'radio'})
+ have_tag(
+ 'input',
+ with: {
+ 'data-attribute': 'boolean',
+ role: 'form-configurable',
+ name: 'agent[options][boolean_radio]',
+ type: 'radio'
+ }
+ )
)
end
it "works for the type :array" do
expect(@presenter.option_field_for(:array)).to(
- have_tag('input', with: {:'data-attribute' => 'array', role: 'completable form-configurable', type: 'text', name: 'agent[options][array]'})
+ have_tag(
+ 'select',
+ with: {
+ 'data-attribute': 'array',
+ role: 'completable form-configurable',
+ name: 'agent[options][array]'
+ }
+ )
)
end
-end
\ No newline at end of file
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 22c342a8ad..f821104eb2 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -4,11 +4,19 @@
require 'simplecov'
SimpleCov.start 'rails'
elsif ENV['CI'] == 'true'
- require 'coveralls'
- Coveralls.wear!('rails')
+ require 'simplecov'
+ SimpleCov.start 'rails' do
+ require 'simplecov-lcov'
+ SimpleCov::Formatter::LcovFormatter.config do |c|
+ c.report_with_single_file = true
+ c.single_report_path = 'coverage/lcov.info'
+ end
+ formatter SimpleCov::Formatter::LcovFormatter
+ add_filter %w[version.rb initializer.rb]
+ end
end
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path('../config/environment', __dir__)
require 'rspec/rails'
require 'webmock/rspec'
diff --git a/spec/support/feature_helpers.rb b/spec/support/feature_helpers.rb
index 836586dfa9..f8a649c9d8 100644
--- a/spec/support/feature_helpers.rb
+++ b/spec/support/feature_helpers.rb
@@ -1,6 +1,7 @@
module FeatureHelpers
- def select_agent_type(type)
- select2(type, from: "Type")
+ def select_agent_type(search)
+ agent_name = search[/\A.*?Agent\b/] || search
+ select2(agent_name, search:, from: "Type")
# Wait for all parts of the Agent form to load:
expect(page).to have_css("div.function_buttons") # Options editor