slackr 0.0.2 → 0.0.5

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "2.0.0"
+  - "1.9.3"
+script: bundle exec rspec spec

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in slackr.gemspec
 gemspec
+
+group :test do
+  gem 'pry'
+end

data/README.md

@@ -1,12 +1,18 @@
 # Slackr
 
-A simple gem for sending messages to the Slack.com communications platform.
+A simple wrapper for the http://slack.com API.
+
+## Build Status
+
+[![Build Status](https://travis-ci.org/risk-io/slackr.svg?branch=master)](https://travis-ci.org/risk-io/slackr)
 
 ## Installation
 
+NOTE: the most recent version of the gem has not been published to rubygems.org, so specify the path as shown.
+
 Add this line to your application's Gemfile:
 
-    gem 'slackr'
+    gem 'slackr', :git => 'git://github.com/risk-io/slackr.git'
 
 And then execute:
 
@@ -18,23 +24,18 @@ Or install it yourself as:
 
 ## Usage
 
-
-
 Send a message to slack:
 
 ```
 require 'slackr'
-slack = Slackr::Webhook.new("my_team_name","my_api_key")
-slack.say "this is a test"
+slack = Slackr.connect("teamX", "token124", {"channel" => "#myroom", "username" => "systems_bot"})
+slack.say "hello world" # posts 'hello world' to the myroom channel as the systems_bot user
+slack.say "hello", {"channel" => "#room2", "username" => "joke_bot"} # posts 'hello' to the room2 channel as the joke_but user
 ```
 
-Say a message to slack using some customization:
-
+Retrieve the channel list:
 ```
-require 'slackr'
-slack = Slackr::Webhook.new("my_team_name","my_api_key",{:icon_emoji => ":ghost:"})
-slack.say("this is a test as a ghost")
-slack.say("this is a test as a ghost with a custom name",{:username => "casper"}
+slack.channels.list # returns a hash of channel objects
 ```
 
 Available customizations include:
@@ -49,11 +50,17 @@ Available customizations include:
 # }
 ```
 
+## General Notes
+- Slackr::Connection stores the connection information
+- Slackr::Errors stores the various custom errors thrown
+- Slackr::Version stores the gem version
+- Slackr::IncomingWebhook stores the logic for the various incoming webhook API endpoints
+
 ## TODO
 
-1. More/better tests
-2. Link parsing and attachments
-3. CLI
+- [ ] Support formats for incoming webhook messages
+- [ ] Link parsing and attachments
+- [ ] CLI
 
 ## Contributing
 

data/lib/slackr.rb

@@ -1,3 +1,39 @@
 require "slackr/version"
 require "slackr/errors"
-require "slackr/webhook"
+require "slackr/connection"
+require "slackr/webhooks/incoming"
+require "slackr/channel"
+
+# slack = Slackr.connect("teamX", "token124", {"channel" => "#myroom", "username" => "systems_bot"})
+# slack.say "hello world" => posts 'hello world' to the myroom channel as the systems_bot user
+# slack.say "hello", {"channel" => "#room2", "username" => "joke_bot"} => posts 'hello' to the room2 channel as the joke_but user
+# slack.channels.list => returns a hash of channel objects
+module Slackr
+  extend self
+
+  attr_accessor :connection
+
+  def connect(team, token, options = {})
+    raise Slackr::ArgumentError, "Team required"  if team.nil?
+    raise Slackr::ArgumentError, "Token required" if token.nil?
+    #TODO: raise error if options doesn't contain channel and username values
+    @connection = Slackr::Connection.new(team, token, options).init
+    return self
+  end
+
+  def say(text, options = {})
+    Slackr::IncomingWebhook.say(connection, text, options)
+  end
+
+  def channels
+    Slackr::Channel.init(connection)
+  end
+
+  # support for backwards compatibility
+  class Webhook
+    def initialize(team, token, options = {})
+      warn "[DEPRECATION] `Slackr::Webhook.new` is deprecated.  Please use `Slackr.connect` instead."
+    end
+  end
+end
+

data/lib/slackr/channel.rb

@@ -0,0 +1,61 @@
+require "json"
+
+module Slackr
+  module Channel
+    extend self
+
+    attr_accessor :connection
+
+    def init(connection)
+      @connection = connection
+      return self
+    end
+
+    def list
+      request = request_for(url_for('list'))
+      make_request(request)
+    end
+
+    def history(channel)
+      request  = request_for(history_url(channel))
+      response = make_request(request)
+      messages = response["messages"]
+      while response["has_more"] do
+        oldest_timestamp = oldest_message(response["messages"])["ts"]
+        request  = request_for(history_url(channel, oldest_timestamp))
+        response = make_request(request)
+        messages += response["messages"]
+      end
+      response.merge("messages" => messages)
+    end
+
+  private
+
+    def url_for(action)
+      "#{connection.base_url}/api/channels.#{action}?token=#{connection.token}"
+    end
+
+    def request_for(url)
+      Net::HTTP::Get.new(url)
+    end
+
+    def history_url(channel, timestamp=nil)
+      base = "#{url_for('history')}&channel=#{channel}&count=1000"
+      return base unless timestamp
+      "#{base}&latest=#{timestamp}"
+    end
+
+    def make_request(request)
+      response = connection.http_request(request)
+      if response.code != "200"
+        raise Slackr::ServiceError, "Slack.com - #{response.code} - #{response.body}"
+      end
+      JSON.parse(response.body)
+    end
+
+    def oldest_message(messages)
+      messages.min_by { |message| message["ts"]}
+    end
+  end
+end
+

data/lib/slackr/connection.rb

@@ -0,0 +1,51 @@
+require "net/http"
+require "net/https" # Obsolete as of what ruby version?
+require "uri"
+
+# slack_options
+# {
+#   "channel"    => "#myroom",
+#   "username"   => "my_bot_name",
+#   "icon_url"   => "https://slack.com/img/icons/app-57.png",
+#   "icon_emoji" => ":ghost:"
+# }
+module Slackr
+  class Connection
+    attr_accessor :http, :uri, :options, :team, :token
+
+    def initialize(team, token, options={})
+      @team, @token, @options = team, token, options
+    end
+
+    def init
+      validate_options
+      setup_connection
+      return self
+    end
+
+    def base_url
+      "https://#{@team}.slack.com"
+    end
+
+    def uri_request_uri
+      uri.request_uri
+    end
+
+    def http_request(request)
+      http.request(request)
+    end
+
+  private
+
+    def validate_options
+      (options.has_key?("channel") && options.has_key?("username")) && !options["channel"].match(/^#/).nil?
+    end
+
+    def setup_connection
+      @uri  = URI.parse(base_url)
+      @http = Net::HTTP.new(@uri.host, @uri.port)
+      @http.use_ssl = true
+      @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
+  end
+end

data/lib/slackr/version.rb

@@ -1,3 +1,3 @@
 module Slackr
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

data/lib/slackr/webhooks/incoming.rb

@@ -0,0 +1,42 @@
+require "net/http"
+require "net/https" # Obsolete as of what ruby version?
+require "uri"
+require "json"
+
+module Slackr
+  module IncomingWebhook
+    extend self
+
+    attr_accessor :connection
+
+    # {
+    #   :formatter => [BasicFormatter, LinkFormatter, AttachmentFormatter]
+    # }
+    def say(connection, text="", options={})
+      @connection = connection
+      #formatter = options[:formatter] || BasicFormatter
+      #text      = format_text(formatter, text)
+      #TODO: fix law of demeter violations
+      request      = Net::HTTP::Post.new(service_url)
+      request.body = encode_message(text, options)
+      response     = connection.http_request(request)
+      if response.code != "200"
+        raise Slackr::ServiceError, "Slack.com - #{response.code} - #{response.body}"
+      end
+    end
+
+  private
+
+    def service_url
+      "#{connection.base_url}/services/hooks/incoming-webhook?token=#{connection.token}"
+    end
+
+    def encode_message(text, options)
+      #TODO: extract OptionValidator
+      #TODO: add guard against invalid options
+      #TODO: add guard against nil text
+      connection.options.merge(options).merge({"text" => text}).to_json.to_s
+    end
+  end
+end
+

data/slackr.gemspec

@@ -6,11 +6,11 @@ require 'slackr/version'
 Gem::Specification.new do |spec|
   spec.name          = "slackr"
   spec.version       = Slackr::VERSION
-  spec.authors       = ["Jason Rohwedder"]
-  spec.email         = ["jro@risk.io"]
+  spec.authors       = ["Jason Rohwedder", "Mike Krisher"]
+  spec.email         = ["jro@risk.io", "mike@mikekrisher.com"]
   spec.description   = %q{Talk to slack.com chat platform from ruby}
   spec.summary       = %q{Send data into Slack in real-time, via the Incoming Webhooks API}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/risk-io/slackr"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rake", "~> 10.1.1", ">= 10.1.1"
+  spec.add_development_dependency "rspec", "~> 2.14.1", ">= 2.14.1"
+  spec.add_development_dependency "webmock", "~> 1.17.4", ">= 1.17.4"
 end

data/spec/slackr/channel_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+describe Slackr::Channel do
+  let(:connection) { Slackr::Connection.new('team', 'fakeToken').init }
+  subject { Slackr::Channel.init(connection) }
+
+
+  describe "#list" do
+    let(:list_body) do
+      {
+        :ok       => true,
+        :channels => [
+          {
+            :id          => "C024BE91L",
+            :name        => "fun",
+            :created     => "1360782804",
+            :creator     => "U024BE7LH",
+            :is_archived => false,
+            :is_member   => false,
+            :num_members => 6,
+            :topic       => {
+              :value     => "Fun times",
+              :creator   => "U024BE7LV",
+              :last_set  => "1369677212"
+            },
+            :purpose => {
+              :value    => "This channel is for fun",
+              :creator  => "U024BE7LH",
+              :last_set => "1360782804"
+            }
+          }
+        ]
+      }
+    end
+    before do
+      stub_request(:get, "https://team.slack.com/api/channels.list?token=fakeToken").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => list_body.to_json, :headers => {})
+
+      stub_request(:get, "https://team.slack.com/api/channels.foo?token=fakeToken").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 404, :body => "", :headers => {})
+
+      stub_request(:get, "https://team.slack.com/api/channels.list?token=fakeToken").
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => list_body.to_json, :headers => {})
+    end
+    it "requests the channel list" do
+      expect(subject.list).to eq(JSON.parse(list_body.to_json))
+    end
+
+    context "with a bad request" do
+      it "raises an error" do
+        bad_url = "#{subject.connection.base_url}/api/channel.foo?token=#{subject.connection.token}"
+        expect(subject).to receive(:url_for).and_return(bad_url)
+        expect {
+          subject.list
+        }.to raise_error
+      end
+    end
+  end
+
+  describe "#history" do
+    let(:timestamp_1) { "1407368222.000037" }
+    def message(timestamp=timestamp_1)
+      {
+        "user"       => "U02FBRY5Z",
+        "type"       => "message",
+        "subtype"    => "channel_join",
+        "text"       => "<@U02FBRY5Z|USER> has joined the channel",
+        "ts"         => timestamp
+      }
+    end
+    let(:message_1) { message }
+    let(:message_2) { message("1307368222.000037")}
+
+    def history_body(options={})
+      options = {messages:[message_1], has_more: false}.merge(options)
+      {
+        "ok"       => true,
+        "messages" => options[:messages],
+        "has_more" => options[:has_more]
+      }
+    end
+    let(:long_history_body_1) { history_body(has_more: true) }
+    let(:long_history_body_2) { history_body(messages: [message_2]) }
+    let(:headers) { {:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}} }
+
+    let(:good_channel) { "goodChannel" }
+    let(:bad_channel)  { "badChannel" }
+    let(:long_channel) { "longChannel" }
+    let(:base_history_url) {"https://team.slack.com/api/channels.history?token=fakeToken&count=1000&channel="}
+    let(:bad_history_url) { "#{base_history_url}#{bad_channel}" }
+    let(:good_history_url) { "#{base_history_url}#{good_channel}" }
+    let(:long_history_url_1) { "#{base_history_url}#{long_channel}" }
+    let(:long_history_url_2) { "#{long_history_url_1}&latest=#{timestamp_1}" }
+
+    before do
+      stub_request(:get, bad_history_url).with(headers).
+        to_return(:status => 404, :body => "", :headers => {})
+
+      stub_request(:get, good_history_url).with(headers).
+        to_return(:status => 200, :body => history_body.to_json, :headers => {})
+
+      stub_request(:get, long_history_url_1).with(headers).
+        to_return(:status => 200, :body => long_history_body_1.to_json, :headers => {})
+      stub_request(:get, long_history_url_2).with(headers).
+        to_return(:status => 200, :body => long_history_body_2.to_json, :headers => {})
+    end
+    it "requests the history of a channel" do
+      expect(subject.history(good_channel)).to eq(history_body) #TODO: Should this be JSON.parse(history_body.to_json)? why?
+    end
+    context "with lots of history" do
+      it "makes enough requests to get everything" do
+        expect(subject.history(long_channel)).to eql(history_body(messages: [message_1, message_2]))
+        expect(WebMock).to have_requested(:get, long_history_url_1).once
+        expect(WebMock).to have_requested(:get, long_history_url_2)
+      end
+    end
+    context "with a bad request" do
+      it "raises an error" do
+        expect{subject.history(bad_channel)}.to raise_error
+      end
+    end
+  end
+end
+

data/spec/slackr/connection_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe Slackr::Connection do
+  describe "#init" do
+    before do
+      @subject = Slackr::Connection.new('team', 'fakeToken')
+    end
+
+    it "should validate the options" do
+      expect(@subject).to receive(:validate_options)
+      @subject.init
+    end
+
+    it "should setup the connection" do
+      expect(@subject).to receive(:setup_connection)
+      @subject.init
+    end
+  end
+
+  describe "#base_url" do
+    it "should return the complete url with subdomain" do
+      subject = Slackr::Connection.new("foo", "bar")
+      expect(subject.send(:base_url)).to eq("https://foo.slack.com")
+    end
+  end
+
+  describe "#uri_request_uri" do
+    it "should return the request_url of the uri" do
+      subject = Slackr::Connection.new("team", "token", {"channel" => "#foo", "username" => "baz"})
+      subject.send(:setup_connection)
+      expect(subject.uri_request_uri).to eq("/")
+    end
+  end
+
+  describe "#http_request" do
+    before do
+      stub_request(:post, "https://team.slack.com/").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
+      stub_request(:post, "https://team.slack.com/").
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    it "should return the request_url of the http" do
+      subject = Slackr::Connection.new("team", "token", {"channel" => "#foo", "username" => "baz"})
+      subject.send(:setup_connection)
+      request  = Net::HTTP::Post.new(subject.uri_request_uri)
+      response = subject.http_request(request)
+      expect(response.code).to eq("200")
+    end
+  end
+
+
+  describe "#validate_options" do
+    before do
+      @subject = Slackr::Connection.new('team', 'fakeToken')
+    end
+
+    context 'with valid options' do
+      it "should return true" do
+        options = {
+          "channel"  => "#myroom",
+          "username" => "my_bot_name"
+        }
+        @subject.instance_variable_set(:@options, options)
+        expect(@subject.send(:validate_options)).to eq(true)
+      end
+    end
+
+    context 'with invalid options' do
+      context 'with improper channel name' do
+        it "should return false" do
+          options = {
+            "channel"  => "foo",
+            "username" => "my_bot_name"
+          }
+          @subject.instance_variable_set(:@options, options)
+          expect(@subject.send(:validate_options)).to eq(false)
+        end
+      end
+
+      context 'with missing username' do
+        it "should return false" do
+          options = {
+            "channel"  => "foo"
+          }
+          @subject.instance_variable_set(:@options, options)
+          expect(@subject.send(:validate_options)).to eq(false)
+        end
+      end
+    end
+  end
+
+  describe "#setup_connection" do
+    before do
+      @subject = Slackr::Connection.new("team", "token", {"channel" => "#foo", "username" => "bot"})
+    end
+
+    it "should define the uri instance variable" do
+      expect(@subject.uri).to be_nil
+      @subject.send(:setup_connection)
+      expect(@subject.uri).to_not be_nil
+    end
+
+    it "should define the http isntance variable" do
+      expect(@subject.http).to be_nil
+      @subject.send(:setup_connection)
+      expect(@subject.http).to_not be_nil
+    end
+  end
+end
+

data/spec/slackr/webhooks/incoming_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Slackr::IncomingWebhook do
+  before do
+    @connection = Slackr::Connection.new("team", "token", {})
+    @connection.send(:setup_connection)
+
+    stub_request(:post, "https://team.slack.com/services/hooks/incoming-webhook?token=token").
+      with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+      to_return(:status => 200, :body => "", :headers => {})
+
+    stub_request(:post, "https://team.slack.com/services/hooks/incoming-webhook?token=token").
+      with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+      to_return(:status => 200, :body => "", :headers => {})
+  end
+
+  context "Public API" do
+    describe "#say" do
+      it "should send the request, posting the message in the channel" do
+        text       = "This is a test message"
+        options    = {"channel" => "#somewhere"}
+        expect(Slackr::IncomingWebhook).to receive(:encode_message)
+        Slackr::IncomingWebhook.say(@connection, text, options)
+      end
+    end
+  end
+
+  context "Private API" do
+    describe "#service_url" do
+      it "should generate the right url" do
+        subject.instance_variable_set(:@connection, @connection)
+        result = subject.send(:service_url)
+        expect(result).to eq "https://team.slack.com/services/hooks/incoming-webhook?token=token"
+      end
+    end
+
+    describe "#encode_message" do
+      it "should encode a basic message" do
+        text = "this is my awesome message"
+
+        result = subject.send(:encode_message, text, {})
+        expect(result).to eq "{\"text\":\"#{text}\"}"
+      end
+
+      it "should encode a message with options" do
+        text    = "this is my awesome message"
+        options = {"channel" => "#awesometown"}
+
+        result = subject.send(:encode_message, text, options)
+        expect(result).to eq "{\"channel\":\"#awesometown\",\"text\":\"#{text}\"}"
+      end
+
+      it "should encode a basic message when there are default options" do
+        text = "this is my awesome message"
+
+        subject.connection.stub(:options).and_return({"icon_emoji" => "ghost"})
+        result = subject.send(:encode_message, text, {})
+        expect(result).to eq("{\"icon_emoji\":\"ghost\",\"text\":\"#{text}\"}")
+      end
+
+      it "should encode a message with option when there are default options present" do
+        text    = "this is my awesome message"
+        options = {"channel" => "#awesometown"}
+
+        subject.connection.stub(:options).and_return({"icon_emoji" => "ghost"})
+        result = subject.send(:encode_message, text, options)
+        expect(result).to eq("{\"icon_emoji\":\"ghost\",\"channel\":\"#awesometown\",\"text\":\"#{text}\"}")
+      end
+    end
+  end
+end

data/spec/slackr_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Slackr do
+  describe "#say" do
+    it "should delegate to the IncomingWebhook" do
+      subject = Slackr.connect("foo", "bar", {"channel" => "#general", "username" => "baz"})
+      expect(Slackr::IncomingWebhook).to receive(:say)
+      subject.say("hello world", {})
+    end
+  end
+
+  describe "Webook.new" do
+    before do
+      @orig_stderr = $stderr
+      $stderr = StringIO.new
+    end
+
+    it "should raise a deprecation warning" do
+      Slackr::Webhook.new("team", "token")
+      $stderr.rewind
+      $stderr.string.chomp.should match(/^\[DEPRECATION\]/)
+    end
+
+    after do
+      $stderr = @orig_stderr
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+Dir.glob('../lib/**/*.rb', &method(:require))
 
 require 'slackr'
 require 'webmock/rspec'
+require 'pry'
 
 RSpec.configure do |config|
   # Use color in STDOUT

metadata

@@ -2,99 +2,125 @@
 name: slackr
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Jason Rohwedder
+- Mike Krisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   name: bundler
-  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
 - !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 10.1.1
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   name: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 2.14.1
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   name: webmock
-  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.17.4
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.17.4
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.17.4
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.17.4
 description: Talk to slack.com chat platform from ruby
 email:
 - jro@risk.io
+- mike@mikekrisher.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/slackr.rb
+- lib/slackr/channel.rb
+- lib/slackr/connection.rb
 - lib/slackr/errors.rb
 - lib/slackr/version.rb
-- lib/slackr/webhook.rb
+- lib/slackr/webhooks/incoming.rb
 - slackr.gemspec
+- spec/slackr/channel_spec.rb
+- spec/slackr/connection_spec.rb
+- spec/slackr/webhooks/incoming_spec.rb
+- spec/slackr_spec.rb
 - spec/spec_helper.rb
-- spec/webhook_spec.rb
-homepage: ''
+homepage: https://github.com/risk-io/slackr
 licenses:
 - MIT
 post_install_message: 
@@ -102,29 +128,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4548143177958109987
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4548143177958109987
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Send data into Slack in real-time, via the Incoming Webhooks API
 test_files:
+- spec/slackr/channel_spec.rb
+- spec/slackr/connection_spec.rb
+- spec/slackr/webhooks/incoming_spec.rb
+- spec/slackr_spec.rb
 - spec/spec_helper.rb
-- spec/webhook_spec.rb

data/lib/slackr/webhook.rb

@@ -1,62 +0,0 @@
-require "net/http"
-require "net/https" # Obsolete as of what ruby version?
-require "uri"
-require "json"
-
-# slack_options
-# {
-#   "channel"    => "#myroom",
-#   "username"   => "my_bot_name",
-#   "icon_url"   => "https://slack.com/img/icons/app-57.png",
-#   "icon_emoji" => ":ghost:"
-# }
-
-module Slackr
-
-  class Webhook
-    attr_reader :http, :uri, :default_options
-
-    def initialize(team,token,options={})
-      raise Slackr::ArgumentError, "Team required" if team.nil?
-      raise Slackr::ArgumentError, "Token required" if token.nil?
-
-      @team            = team
-      @token           = token
-      @default_options = options
-
-      setup_connection
-    end
-
-    def say(text="",options={})
-      # reformat links, etc here
-      send_request(text,options)
-    end
-
-    private
-
-    def setup_connection
-      @uri  = URI.parse(service_url)
-      @http = Net::HTTP.new(@uri.host, @uri.port)
-      @http.use_ssl = true
-      @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    end
-
-    def service_url
-      "https://#{@team}.slack.com/services/hooks/incoming-webhook?token=#{@token}"
-    end
-
-    def encode_message(text,options)
-      "payload=#{default_options.merge(options).merge({"text" => text}).to_json.to_s}"
-    end
-
-    def send_request(text,options)
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.body = encode_message(text,options)
-      response = http.request(request)
-      unless response.code == "200"
-        raise Slackr::ServiceError, "Slack.com - #{response.code} - #{response.body}"
-      end
-    end
-
-  end
-end

data/spec/webhook_spec.rb

@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-describe Slackr::Webhook do
-  let(:client) { Slackr::Webhook.new("team","token") }
-  subject { client }
-
-  describe "#say" do
-    it "should call Webhook#send_request with proper options" do
-      msg  = "This is a test message"
-      opts = {"channel" => "#somewhere"}
-
-      subject.should_receive(:send_request).with(msg,opts)
-      subject.say msg,opts
-    end
-  end
-
-  describe "#service_url" do
-    it "should generate the right url" do
-      team    = "my-team"
-      token   = "my-token"
-      subject = Slackr::Webhook.new(team,token)
-
-      subject.send(:service_url).should eq "https://#{team}.slack.com/services/hooks/incoming-webhook?token=#{token}"
-    end
-  end
-
-  describe "#encode_message" do
-    it "should encode a basic message" do
-      msg = "this is my awesome message"
-
-      subject.send(:encode_message,msg,{}).should eq "payload={\"text\":\"#{msg}\"}"
-    end
-
-    it "should encode a message with options" do
-      msg  = "this is my awesome message"
-      opts = {"channel" => "#awesometown"}
-
-      subject.send(:encode_message,msg,opts).should eq "payload={\"channel\":\"#awesometown\",\"text\":\"#{msg}\"}"
-    end
-
-    it "should encode a basic message when there are default options" do
-      msg = "this is my awesome message"
-
-      subject.stub(:default_options).and_return({"icon_emoji" => "ghost"})
-      subject.send(:encode_message,msg,{}).should eq "payload={\"icon_emoji\":\"ghost\",\"text\":\"#{msg}\"}"
-    end
-
-    it "should encode a message with option when there are default options present" do
-      msg  = "this is my awesome message"
-      opts = {"channel" => "#awesometown"}
-
-      subject.stub(:default_options).and_return({"icon_emoji" => "ghost"})
-      subject.send(:encode_message,msg,opts).should eq "payload={\"icon_emoji\":\"ghost\",\"channel\":\"#awesometown\",\"text\":\"#{msg}\"}"
-    end
-  end
-
-end