Jelajahi Sumber

Removed unused code

Dominik Sander 11 tahun lalu
induk
melakukan
095c34c696

+ 0 - 39
app/concerns/json_path_options_overwritable.rb

@@ -1,39 +0,0 @@
-module JsonPathOptionsOverwritable
-  extend ActiveSupport::Concern
-  # Using this concern allows providing optional `<attribute>_path` options hash
-  # attributes which will then (if not blank) be interpolated using the provided JSONPath.
-  #
-  # Example options Hash:
-  # {
-  #   name: 'Huginn',
-  #   name_path: '$.name',
-  #   title: 'Hello from Huginn'
-  #   title_path: ''
-  # }
-  # Example event payload:
-  # {
-  #   name: 'dynamic huginn'
-  # }
-  # calling agent.merge_json_path_options(event) returns the following hash:
-  # {
-  #   name: 'dynamic huginn'
-  #   title: 'Hello from Huginn'
-  # }
-
-  private
-  def merge_json_path_options(event)
-    options.select { |k, v| options_with_path.include? k}.tap do |merged_options|
-      options_with_path.each do |a|
-        merged_options[a] = select_option(event, a)
-      end
-    end
-  end
-
-  def select_option(event, a)
-    if options[a.to_s + '_path'].present?
-      Utils.value_at(event.payload, options[a.to_s + '_path'])
-    else
-      options[a]
-    end
-  end
-end

+ 0 - 4
app/models/agent.rb

@@ -121,10 +121,6 @@ class Agent < ActiveRecord::Base
     end
   end
 
-  def make_message(payload, message = options[:message])
-    message.gsub(/<([^>]+)>/) { Utils.value_at(payload, $1) || "??" }
-  end
-
   def trigger_web_request(params, method, format)
     if respond_to?(:receive_webhook)
       Rails.logger.warn "DEPRECATED: The .receive_webhook method is deprecated, please switch your Agent to use .receive_web_request."

+ 0 - 31
spec/models/concerns/json_path_options_overwritable.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-shared_examples_for JsonPathOptionsOverwritable do
-  before(:each) do
-    @valid_params = described_class.new.default_options
-
-    @checker = described_class.new(:name => "somename", :options => @valid_params)
-    @checker.user = users(:jane)
-
-    @event = Event.new
-    @event.agent = agents(:bob_weather_agent)
-    @event.payload = { :room_name => 'test room', :message => 'Looks like its going to rain', username: "Huggin user"}
-    @event.save!
-  end
-
-  describe "select_option" do
-    it "should use the room_name_path if specified" do
-      @checker.options['room_name_path'] = "$.room_name"
-      @checker.send(:select_option, @event, :room_name).should == "test room"
-    end
-
-    it "should use the normal option when the path option is blank" do
-      @checker.options['room_name'] = 'test'
-      @checker.send(:select_option, @event, :room_name).should == "test"
-    end
-  end
-
-  it "should merge all options" do
-    @checker.send(:merge_json_path_options, @event).symbolize_keys.keys.should == @checker.send(:options_with_path)
-  end
-end