slackr 0.0.1 → 0.0.2

data/README.md

@@ -24,7 +24,7 @@ Send a message to slack:
 
 ```
 require 'slackr'
-slack = Slackr::Client.new("my_team_name","my_api_key")
+slack = Slackr::Webhook.new("my_team_name","my_api_key")
 slack.say "this is a test"
 ```
 
@@ -32,7 +32,7 @@ Say a message to slack using some customization:
 
 ```
 require 'slackr'
-slack = Slackr::Client.new("my_team_name","my_api_key",{:icon_emoji => ":ghost:"})
+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"}
 ```

data/lib/slackr.rb

@@ -1,64 +1,3 @@
 require "slackr/version"
 require "slackr/errors"
-
-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 Client
-    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
+require "slackr/webhook"

data/lib/slackr/version.rb

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

data/lib/slackr/webhook.rb

@@ -0,0 +1,62 @@
+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/{client_spec.rb → webhook_spec.rb}

@@ -1,34 +1,25 @@
 require 'spec_helper'
 
-describe Slackr::Client do
-  let(:client) { Slackr::Client.new("team","token") }
+describe Slackr::Webhook do
+  let(:client) { Slackr::Webhook.new("team","token") }
   subject { client }
 
-  describe "#initialize" do
-
-  end
-  
   describe "#say" do
-    it "should call Client#send_request with proper options" do
-      msg = "This is a test message"
+    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 "#setup_connection" do
-
-  end
-
   describe "#service_url" do
     it "should generate the right url" do
-      team = "my-team"
-      token = "my-token"
-      subject = Slackr::Client.new(team,token)
-      
+      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
@@ -39,20 +30,23 @@ describe Slackr::Client do
 
       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"
+      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"
+      msg  = "this is my awesome message"
       opts = {"channel" => "#awesometown"}
 
       subject.stub(:default_options).and_return({"icon_emoji" => "ghost"})
@@ -60,8 +54,4 @@ describe Slackr::Client do
     end
   end
 
-  describe "#send_request" do
-
-  end
-  
 end

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: slackr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
   prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Jason Rohwedder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: bundler
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: webmock
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Talk to slack.com chat platform from ruby
 email:
 - jro@risk.io
@@ -90,9 +90,10 @@ files:
 - lib/slackr.rb
 - lib/slackr/errors.rb
 - lib/slackr/version.rb
+- lib/slackr/webhook.rb
 - slackr.gemspec
-- spec/client_spec.rb
 - spec/spec_helper.rb
+- spec/webhook_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -101,29 +102,29 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 3415245645866188118
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 4548143177958109987
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 3415245645866188118
+      hash: 4548143177958109987
+      version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
 summary: Send data into Slack in real-time, via the Incoming Webhooks API
 test_files:
-- spec/client_spec.rb
 - spec/spec_helper.rb
+- spec/webhook_spec.rb