event_girl_client 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338c8438e3e0c9128e741b38c68ce235c17cb684
-  data.tar.gz: 063bde9c78788f8c75cda59f2e9174da3a7fd54d
+  metadata.gz: 45d48f71187bb05f54d7234c221a05162e2867c3
+  data.tar.gz: 0e40be2d59046a776e3a9949b5bedef83b21bbe4
 SHA512:
-  metadata.gz: 46fb409415e99b7d8a47dca6c6fffbf0f646717747b04c742742bd5c94455133343a86d09b883229796e7d0594e27e3189253c40925cee3f4b000522cdc9204e
-  data.tar.gz: 8ce5481f54d9d111508ebdc6fe2ce5d10c950ec95443369cdbc67e0ded17022e80e9716e63bb0ed58038999262e223a43bb38e5137a3847fe767fa4333c5d3b2
+  metadata.gz: 986ef878eb244739f99301f321ae95684feae7f9e7a02898c96bdbff271776f5c08d42630e6e50c408b29ca6743831475214e758e8a1545cb6d819df2084163b
+  data.tar.gz: 22bfed4e7ecd0d16f5cc9d404a3be5eb1154963c3c68e7e042542cbd8a1601a9ff3044b458fe9b737c7de9b12e803de6c8ab5c4a44ebd5d6dd2fd11fd689a0c2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.2.0
+- Add support for optional content parameter
+- EventGirl::Client.send_event is deprecated, use #send! instead
+- Allows setting the url to protocol + hostname only, w/o path
+
 ## v1.1.1
 - Adds SSL-support
 

data/bin/event_girl

@@ -15,7 +15,7 @@ Version = EventGirl::Client::VERSION.dup
 
 options = {}
 option_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: event_girl [options] EVENTNAME"
+  opts.banner = "Usage: event_girl [options] EVENTNAME OPTIONAL_DATA"
 
   opts.separator ""
   opts.separator "Options:"
@@ -57,7 +57,7 @@ end
 
 begin
   client = EventGirl::Client.new(options[:url], options[:api_token])
-  client.send_event(ARGV[0])
+  client.send!(ARGV[0], ARGV[1])
 rescue => e
   puts "E: #{e.message}"
   puts e.backtrace if options[:debug]

data/lib/event_girl_client.rb

@@ -6,7 +6,7 @@ require 'rubygems'
 module EventGirl
   class Client
 
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
 
     # Class-wide configuration
     @@api_token = nil
@@ -20,19 +20,27 @@ module EventGirl
       raise ArgumentError.new('No url provided.') unless @url
     end
 
+    # @deprecated Use {#send!} instead.
+    def send_event(*args)
+      send!(*args)
+    end
+
     # POSTs a string to the event_girl server.
-    def send_event(title)
+    def send!(title, content = nil)
       uri = URI.parse(url)
 
+      # Auto-correct missing trailing slash
+      path = uri.path == '' ? '/' : uri.path
+
       # This is all the post request stuff.
-      req = Net::HTTP::Post.new(uri.path)
+      req = Net::HTTP::Post.new(path)
 
       # The request format and content type is json
       req['Accept']       = "application/json"
       req['Content-Type'] = "application/json"
 
       # This takes the entered api token and title. This is what is sent. It is a HASH!
-      req.body = '{"api_token":"' + api_token + '","incoming_event":{"title":"' + title.to_s + '"}}'
+      req.body = '{"api_token":"' + api_token + '","incoming_event":{"title":"' + title.to_s + '","content":"' + content.to_s + '"}}'
 
       # The request is sent via HTTP to the host and port. You also get a response
       # ex: 201 (it worked)

data/spec/client_spec.rb

@@ -43,16 +43,45 @@ describe EventGirl::Client do
   end
 
   describe '#send_event' do
-    it 'requires the event title as argument' do
-      expect(subject.method(:send_event).arity).to eql 1
+    it 'still responds to send_event' do
+      expect(subject).to respond_to :send_event
+    end
+
+    it 'delegates to #send!' do
+      subject.should_receive(:send!).with('foo', 'bar')
+      subject.send_event('foo', 'bar')
+    end
+  end
+
+  describe '#send!' do
+    it 'requires the event title and supports content optionally' do
+      expect(subject.method(:send!).arity).to eql(-2)
+    end
+
+    it 'adds a missing trailing slash' do
+      url = 'http://eg.example.com'
+      stub_request(:post, "#{url}/")
+      subject = described_class.new url
+      expect do
+        subject.send! ''
+      end.not_to raise_error
     end
 
     it 'sends json data' do
       title = 'event girl test'
-      json  = '{"api_token":"' + subject.api_token + '","incoming_event":{"title":"' + title + '"}}'
+      json  = '{"api_token":"' + subject.api_token + '","incoming_event":{"title":"' + title + '","content":""}}'
+      stub_request(:post, subject.url).
+        with(body: json)
+      subject.send! title
+    end
+
+    it 'allows sending of optional content' do
+      title   = 'event girl test'
+      content = 'this is additional payload data'
+      json    = '{"api_token":"' + subject.api_token + '","incoming_event":{"title":"' + title + '","content":"' + content + '"}}'
       stub_request(:post, subject.url).
         with(body: json)
-      subject.send_event title
+      subject.send! title, content
     end
 
     it 'sends json headers' do
@@ -63,7 +92,7 @@ describe EventGirl::Client do
             'Content-Type' => 'application/json'
           }
         )
-      subject.send_event 'event girl test'
+      subject.send! 'event girl test'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_girl_client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Susanne Dewein
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler