chatty_crow 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3d0453caad9e953327867ecef479adf92bf72a4
-  data.tar.gz: 6a3de41a1532e54d80ea977e03c66e44c3b7ec9f
+  metadata.gz: 934f0269b67bacd13a7806530f99771ecd2fb8ba
+  data.tar.gz: 7d196a82c2915d95b1c449cba03ae909c672580d
 SHA512:
-  metadata.gz: 91cb3bcfac3dee6a1ccc42f046585b1be7b0be84db6845a73cf20d5e54bbbce95a91636072b3869ec305241030f4b7d72ebc568d95fcfcd3690a34f1b9742506
-  data.tar.gz: cd3406e5a6c162de5d88e3acd5e28b500eb62af93452af3577f14de5468195082d2a31a9b2eda1d66ae9b87e8c42c283376fc3847cdb8f640d1daa443ce1efb0
+  metadata.gz: b0437f430fa57e8a0ec001be87591bb5ba25df06237fdb85081afe7868a7da895a24f928b6db3806c07df2d7e4e84663c9e23cbf07ac5e84fb5c3b75fa2a1b0d
+  data.tar.gz: 6ee8ed7c1d545790152af84ad81de1fecb04bb46ffaec019e1bcfd254a9ba7d86d8d3855f260f65980652979769e677cc7e7a7b0c2d1463fd22f18890929c638

data/README.textile

@@ -102,7 +102,7 @@ h3. IOS Push notification
 
 <pre>
 # Send request
-response = ChattyCrow.send_ios(payload: { 'hello' }, channel: 'other_than_default', token: 'other', contacts: [ 'new_ios_id1', 'new_ios_id2' ])
+response = ChattyCrow.send_ios(payload: { 'hello' }, channel: 'other_than_default', token: 'other', contacts: [ 'new_ios_id1', 'new_ios_id2' ], time: { start: DateTime.now.to_i, end: DateTime.now.advance(days: 7) }, location: { latitude: 14.302022, longitude: 43.20923, range: 1000 })
 
 # Or simple message
 response = ChattyCrow.send_ios('Dear users')
@@ -123,6 +123,8 @@ response = ChattyCrow.send_android(payload: { data: { key: 'key1', key2: 'key2'}
 # response.success = 5
 # response.failed  = 1
 # response.failed_contacts = [ 'new_ios_id1' ]
+# response.message_id = your created message ID
+# response.message = Response::Message instance
 </pre>
 
 h3. Skype notification
@@ -145,6 +147,26 @@ response = ChattyCrow.send_jabber('Dear users', channel: 'other_than_default', c
 # response  # ChattyCrow::Response::Notification
 </pre>
 
+h3. HipChat notifications
+
+<pre>
+# Send request
+# Color (red, yellow, purple, random - yellow is default)
+response = ChattyCrow.send_hipchat('Dear users', color: 'red', channel: 'other_than_default', contacts: [ 'new_ios_id1', 'new_ios_id2' ])
+
+# Response
+# response  # ChattyCrow::Response::Notification
+</pre>
+
+h3. Slack notifications
+
+<pre>
+# Send request
+response = ChattyCrow.send_hipchat('Dear users', channel: 'other_than_default', contacts: [ 'new_ios_id1', 'new_ios_id2' ])
+
+# Response
+# response  # ChattyCrow::Response::Notification
+</pre>
 
 h3. SMS notification (only Czech Republic yet)
 
@@ -156,6 +178,16 @@ response = ChattyCrow.send_sms 'Dear Users', contacts: [ '+420111222333', '+4202
 # response  # ChattyCrow::Response::Notification
 </pre>
 
+h2. Message detail and state
+
+We're providing uniq message id to check what's going on with your message. You obtain message instance from successfull response.
+
+<pre>
+message = response.message
+message.refresh_data!
+message.status # OK etc..
+</pre>
+
 h2. Working with contacts via API
 
 It's actually very usable, you can automatically add or remove contacts in your application after user was registered.
@@ -181,3 +213,31 @@ h3. Remove contact
   # response.failed_count  = 1
   # response.failed = [ 'new2failed' ]
 </pre>
+
+h2. Batch notifications
+
+Allows sends multiple notifications with serveral restrictions, notifications are immediatelly aborted when:
+* Token and channels not matched
+* One of channel is suspended
+* Times or locations are invalid in any case
+
+<pre>
+  batch = ChattyCrow.create_batch("different token then default")
+
+  # Its almost the same as send_android, but channel is required!
+  batch.add_jabber 'Dear users', channel: 'channel', contacts: [ 'aa' ]
+  batch.execute # add '!' to raise error, when something is wrong
+</pre>
+
+h2. Changelog
+
+h3. 1.3.0
+
+* Add batch notifications (this is required for Redmine Plugin or Capistrano Plugin)
+
+h3. 1.2.2
+
+* Add messages state API
+* Remove GET contact list methods
+* Add support of change location API
+* Add HipChat, Slack and Telegram

data/Rakefile

@@ -12,3 +12,12 @@ end
 
 # Default task - test
 task default: %w(test coveralls:push)
+
+# Task console
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require './lib/chattycrow'
+  ARGV.clear
+  IRB.start
+end

data/chatty_crow.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
     %w(chatty_crow.gemspec CHANGELOG Gemfile Guardfile INSTALL LICENSE Rakefile README.textile)
   s.test_files    = Dir.glob('{test}/**/*')
 
-  s.required_ruby_version = '>= 2'
+  s.required_ruby_version = '>= 1.9'
 
   s.add_runtime_dependency('multi_json', '~> 1.0')
-  s.add_runtime_dependency('rest_client', '~> 1.7')
+  s.add_runtime_dependency('rest-client', '~> 1.7')
   s.add_runtime_dependency('mime-types', '>= 1')
 
   s.add_development_dependency('fakeweb', '~> 1.3')

data/lib/chatty_crow.rb

@@ -2,6 +2,7 @@ require 'rest-client'
 require 'chatty_crow/config'
 require 'chatty_crow/error'
 require 'chatty_crow/response'
+require 'chatty_crow/message'
 require 'chatty_crow/request'
 require 'chatty_crow/request/android'
 require 'chatty_crow/request/ios'
@@ -9,7 +10,14 @@ require 'chatty_crow/request/jabber'
 require 'chatty_crow/request/mail'
 require 'chatty_crow/request/skype'
 require 'chatty_crow/request/sms'
+require 'chatty_crow/request/hipchat'
+require 'chatty_crow/request/slack'
+require 'chatty_crow/response/notification'
+require 'chatty_crow/response/batch'
+require 'chatty_crow/response/contacts_add'
+require 'chatty_crow/response/contacts_remove'
 require 'chatty_crow/notification_request'
+require 'chatty_crow/batch_notification_request'
 require 'chatty_crow/contacts_request'
 
 # Load Rails Components
@@ -75,6 +83,14 @@ module ChattyCrow
     NotificationRequest.send(Request::Skype, *args)
   end
 
+  def self.send_hipchat(*args)
+    NotificationRequest.send(Request::HipChat, *args)
+  end
+
+  def self.send_slack(*args)
+    NotificationRequest.send(Request::Slack, *args)
+  end
+
   def self.send_jabber(*args)
     NotificationRequest.send(Request::Jabber, *args)
   end
@@ -95,6 +111,11 @@ module ChattyCrow
     ContactsRequest.remove(*args)
   end
 
+  # Create batch request
+  def self.create_batch(token = nil)
+    BatchNotificationRequest.new(token)
+  end
+
   # Helper method for wrapping non-array objects
   # @param object [Object] Something
   # @return [Array] Array
@@ -116,4 +137,19 @@ module ChattyCrow
       {}
     end
   end
+
+  # Symbolize keys
+  def self.symbolize_keys!(hash)
+    hash.keys.each do |key|
+      # Get value
+      value = hash.delete(key)
+
+      # Save as sym
+      hash[(key.to_sym rescue key)] = value
+
+      # Recursive?
+      symbolize_keys!(hash[key.to_sym]) if value.is_a?(Hash)
+    end
+    true
+  end
 end

data/lib/chatty_crow/batch_notification_request.rb

@@ -0,0 +1,126 @@
+require 'rest_client'
+
+module ChattyCrow
+  # Batch notification request
+  # use for send different kind
+  # of notifications
+  class BatchNotificationRequest
+    # Prepare data
+    attr_accessor :requests, :token
+
+    def initialize(token = nil)
+      @token = token
+    end
+
+    def requests
+      @requests ||= []
+    end
+
+    # Add requests by type
+    def add_mail(*args)
+      add_other Request::Mail.new(*args)
+    end
+
+    def add_ios(*args)
+      add_other Request::Ios.new(*args)
+    end
+
+    def add_android(*args)
+      add_other Request::Android.new(*args)
+    end
+
+    def add_skype(*args)
+      add_other Request::Skype.new(*args)
+    end
+
+    def add_hipchat(*args)
+      add_other Request::HipChat.new(*args)
+    end
+
+    def add_slack(*args)
+      add_other Request::Slack.new(*args)
+    end
+
+    def add_jabber(*args)
+      add_other Request::Jabber.new(*args)
+    end
+
+    # Add other with channel name
+    def add_other(instance)
+      # Throw error when instance has empty channel
+      fail ::ArgumentError, 'Channel is required' unless instance.channel
+
+      # Add
+      requests << instance
+    end
+
+    # Send
+    def execute
+      proceed(false)
+    end
+
+    # Send with errors!
+    def execute!
+      proceed(true)
+    end
+
+    # :nodoc:
+    def self.batch_notification_url
+      ChattyCrow.configuration.batch_url
+    end
+
+    # Batch headers
+    def batch_headers
+      ChattyCrow.batch_headers(@token)
+    end
+
+    private
+
+    # Method actually sends created request to server
+    # [Can be refactored, with request class]
+    # @param raise_errors [Boolean] Raise errors if error?
+    # @return [Object] Raise an exception or return Response::Notification
+    def proceed(raise_errors = true)
+      # Empty requests?
+      if requests.empty?
+        if raise_errors
+          fail ::ArgumentError, 'At least one message is required!'
+        else
+          return false
+        end
+      end
+
+      # Headers
+      options = { headers: batch_headers, url: self.class.batch_notification_url, method: :post }
+
+      # Create array!
+      options[:payload] = { channels: requests.map { |i| i.to_json(true)[:payload] } }.to_json
+
+      # Send
+      RestClient::Request.execute(options) do |response, request, result, &block|
+        begin
+          case response.code
+          when 200, 201
+            Response::Batch.new response, options
+          when 301, 302, 307
+            response.follow_redirection(request, result, &block)
+          when 400
+            fail Error::InvalidAttributes, response
+          when 401
+            fail Error::UnauthorizedRequest, response
+          when 404
+            fail Error::ChannelNotFound, response
+          else
+            fail Error::InvalidReturn, response
+          end
+        rescue => e
+          if raise_errors
+            raise e
+          else
+            false
+          end
+        end
+      end # RestClient
+    end # Execute
+  end
+end

data/lib/chatty_crow/config.rb

@@ -24,10 +24,14 @@ module ChattyCrow
   end
 
   def self.default_headers(channel, token)
+    batch_headers(token).merge('Channel' => (channel || configuration.default_channel))
+  end
+
+  def self.batch_headers(token)
     {
       'Token'   => token   || configuration.token,
-      'Channel' => channel || configuration.default_channel,
-      'Accept'  => 'application/json'
+      'Accept'  => 'application/json',
+      'Content-Type' => 'application/json'
     }
   end
 
@@ -45,10 +49,10 @@ module ChattyCrow
     attr_accessor :http_read_timeout
 
     # Call urls
-    attr_reader :notification_url, :contacts_url
+    attr_reader :notification_url, :contacts_url, :messages_url, :batch_url
 
     def initialize
-      self.host          = 'https://chatty-crow.com/api/v1/'
+      self.host          = 'https://chattycrow.com/api/v1/'
       @token             = nil
       @default_channel   = nil
       @http_open_timeout = 2
@@ -59,6 +63,8 @@ module ChattyCrow
       @host             = s
       @notification_url = s + (s[-1] == '/' ? '' : '/') + 'notification'
       @contacts_url     = s + (s[-1] == '/' ? '' : '/') + 'contacts'
+      @messages_url     = s + (s[-1] == '/' ? '' : '/') + 'message'
+      @batch_url        = s + (s[-1] == '/' ? '' : '/') + 'batch'
     end
   end
 end

data/lib/chatty_crow/contacts_request.rb

@@ -28,7 +28,7 @@ module ChattyCrow
     # Method prepare data from add/remove contact
     # @params klass [Class] Initializable class for response
     # @params method [String] HTTP method
-    # @params *ąrgs [Arguments]
+    # @params args [Arguments]
     def self.send_contact_request(klass, method, *args)
       # Parse options
       options = ChattyCrow.extract_options!(args)
@@ -55,6 +55,9 @@ module ChattyCrow
       options[:url]     = contacts_url
       options[:headers] = ChattyCrow.default_headers(options.delete(:channel), options.delete(:token))
 
+      # Convert payload to JSON
+      options[:payload] = options[:payload].to_json
+
       # Send request
       RestClient::Request.execute(options) do |response, request, result, &block|
         case response.code

data/lib/chatty_crow/message.rb

@@ -0,0 +1,82 @@
+require 'rest_client'
+
+module ChattyCrow
+  # Message status
+  # It's bind to /api/message_id call
+  class Message
+    # Attribute
+    attr_accessor :channel, :token, :message_id
+
+    # Actual states
+    attr_accessor :success, :waiting, :error, :last_update, :status
+
+    # Only message_id is required, in case other options
+    # are not different from global configuration
+    def initialize(opts = {})
+      # Set variables
+      @channel    = opts.delete(:channel)
+      @token      = opts.delete(:token)
+      @message_id = opts.delete(:message_id)
+
+      # Refresh
+      refresh
+    end
+
+    # Refresh
+    def refresh!
+      refresh_data
+    end
+
+    def refresh
+      refresh_data(true)
+    end
+
+    private
+
+    def data=(response)
+      # Parse body
+      body = JSON.parse(response.body)
+      @status  = body.delete('status')
+      @success = body['notifications'].delete('success')
+      @waiting = body['notifications'].delete('waiting')
+      @error   = body['notifications'].delete('error')
+
+      # Set last update
+      @last_update = Time.now
+    end
+
+    def call_options
+      {
+        url: "#{ChattyCrow.configuration.messages_url}/#{@message_id}",
+        headers: ChattyCrow.default_headers(@channel, @token),
+        method: :get
+      }
+    end
+
+    def refresh_data(raise_errors = false)
+      # Send request
+      RestClient::Request.execute(call_options) do |response, request, result, &block|
+        begin
+          case response.code
+          when 200
+            self.data = response
+          when 301, 302, 307
+            response.follow_redirection(request, result, &block)
+          when 401
+            fail Error::UnauthorizedRequest, response
+          when 404
+            fail Error::ChannelNotFound, response
+          else
+            fail Error::InvalidReturn, response
+          end
+        rescue => e
+          if raise_errors
+            raise e
+          else
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chatty_crow/notification_request.rb

@@ -23,13 +23,18 @@ module ChattyCrow
     # @param raise_errors [Boolean] Raise errors if error?
     # @return [Object] Raise an exception or return Response::Notification
     def self.execute(instance, raise_errors = true)
+      # Get options
       options = instance.to_json.merge(url: notification_url, method: :post)
 
+      # Set options to JSON string
+      options[:payload] = options[:payload].to_json
+
+      # Send
       RestClient::Request.execute(options) do |response, request, result, &block|
         begin
           case response.code
           when 200, 201
-            Response::Notification.new response
+            Response::Notification.new response, options
           when 301, 302, 307
             response.follow_redirection(request, result, &block)
           when 400

data/lib/chatty_crow/request.rb

@@ -3,7 +3,10 @@ module ChattyCrow
     # Parent of all requests to ChattyCrow API
     class BaseRequest
       # Methods
-      attr_accessor :contacts, :payload, :channel, :token
+      attr_accessor :contacts, :payload, :channel, :token, :time, :location
+
+      # Batch request method
+      attr_accessor :channel
 
       # Intialize options!
       attr_accessor :arguments, :options, :arguments_flatten
@@ -19,12 +22,32 @@ module ChattyCrow
         @options   = ChattyCrow.extract_options!(args)
         @arguments = args
 
+        # Symbolize keys in options for validations
+        ChattyCrow.symbolize_keys!(@options)
+
         # Create flatten arguments for (skype/android/sms.. requests)
         @arguments_flatten = args.join(', ') if args.any?
 
         # Recipients
         @contacts = ChattyCrow.wrap(@options.delete(:contacts)).compact
 
+        # Time and location - validate!
+        if @time = @options.delete(:time)
+          { start: Fixnum, end: Fixnum }.each do |key, klass|
+            unless @time[key].is_a?(klass)
+              fail ::ArgumentError, "#{key} must be instance of #{klass}"
+            end
+          end
+        end
+
+        if @location = @options.delete(:location)
+          { latitude: Float, longitude: Float, range: Fixnum }.each do |key, klass|
+            unless @location[key].is_a?(klass)
+              fail ::ArgumentError, "#{key} must be instance of #{klass}"
+            end
+          end
+        end
+
         # Channel
         @channel = @options.delete(:channel)
 
@@ -39,14 +62,20 @@ module ChattyCrow
 
       # Get request for send
       # @return [Hash] Request
-      def to_json
-        {
+      def to_json(channel = false)
+        ret = {
           payload: {
             payload: payload,
-            contacts: @contacts
+            contacts: @contacts,
+            time: @time,
+            location: @location
           },
           headers: headers
         }
+
+        ret[:payload][:channel] = @channel if channel
+
+        ret
       end
     end
   end

data/lib/chatty_crow/request/hipchat.rb

@@ -0,0 +1,17 @@
+module ChattyCrow
+  module Request
+    # HipChat request
+    class HipChat < BaseRequest
+      def initialize(*args)
+        super(*args)
+
+        # If arguments exists set as body into options!
+        # Its for just easy ChattyCrow.send_hipchat 'Hello'
+        @options[:body] = @arguments_flatten if @arguments_flatten
+
+        # Set payload
+        @payload = @options
+      end
+    end
+  end
+end

data/lib/chatty_crow/request/mail.rb

@@ -189,7 +189,7 @@ module ChattyCrow
           subject: @subject,
           html_body: Base64.encode64(@html_body || ''),
           text_body: Base64.encode64(@text_body || ''),
-          attachments: attachments.map(&:to_json)
+          files: attachments.map(&:to_json)
         }
       end
 

data/lib/chatty_crow/request/slack.rb

@@ -0,0 +1,17 @@
+module ChattyCrow
+  module Request
+    # Slack request
+    class Slack < BaseRequest
+      def initialize(*args)
+        super(*args)
+
+        # If arguments exists set as body into options!
+        # Its for just easy ChattyCrow.send_slack 'Hello'
+        @options[:body] = @arguments_flatten if @arguments_flatten
+
+        # Set payload
+        @payload = @options
+      end
+    end
+  end
+end

data/lib/chatty_crow/response.rb

@@ -7,22 +7,32 @@ module ChattyCrow
       attr_accessor :code, :body, :status, :msg
 
       def initialize(response)
-        @code   = response.code
-        @body   = JSON.parse(response.body)
+        if response.is_a?(String)
+          @code   = response.code
+          @body   = JSON.parse(response.body)
+        else
+          @code = -1
+          @body = response
+        end
+
         @status = @body.delete('status')
         @msg    = @body.delete('msg')
       end
 
+      def status
+        @status.to_s
+      end
+
       def ok?
-        @status.to_s.downcase == 'ok'
+        @status.downcase.downcase == 'ok'
       end
 
       def partial_error?
-        @status.to_s.downcase == 'perror'
+        @status.downcase.downcase == 'perror'
       end
 
       def error?
-        @status.to_s.downcase == 'error'
+        @status.downcase.downcase == 'error'
       end
     end
   end

data/lib/chatty_crow/response/batch.rb

@@ -0,0 +1,66 @@
+module ChattyCrow
+  module Response
+    # Notification response
+    class Batch < Base
+      # Channels
+      attr_accessor :channels
+
+      # Actual channel & token
+      attr_accessor :token
+
+      # Initialize notification response
+      # @param response [RestClient::Response] Response from server
+      # @param options [Hash] Headers
+      def initialize(response, options)
+        super response
+
+        # Get Token
+        @token = options[:headers]['Token']
+
+        # Create an hash for channels
+        @channels ||= {}
+
+        # Parse channels!
+        @body['channels'].each do |channel|
+          @channels[channel['channel']] = BatchNotification.new(channel, @token)
+        end
+      end
+
+      def channels
+        @channels ||= {}
+      end
+    end
+
+    # Batch notification response class
+    # Place for refactoring
+    class BatchNotification < Base
+      # Infos
+      attr_accessor :success, :total, :failed_contacts, :message_id
+
+      # Token & channel
+      attr_accessor :token, :channel
+
+      # Init from response
+      def initialize(body, token)
+        super(body)
+
+        # Set token
+        @token = token
+
+        # Parse response
+        @channel         = @body.delete('channel')
+        @success         = @body.delete('success')
+        @total           = @body.delete('total')
+        @failed_contacts = @body.delete('contacts')
+        @message_id      = @body.delete('message_id')
+      end
+
+      # Get instance of message
+      # @return Message [ChattyCrow::Message]
+      def message
+        @message ||= ::ChattyCrow::Message.new(channel: @channel, token: @token, message_id: @message_id)
+      end
+    end
+  end
+end
+

data/lib/chatty_crow/response/notification.rb

@@ -2,17 +2,32 @@ module ChattyCrow
   module Response
     # Notification response
     class Notification < Base
-      attr_accessor :success, :total, :failed_contacts
+      attr_accessor :success, :total, :failed_contacts, :message_id
+
+      # Actual channel & token
+      attr_accessor :token, :channel
 
       # Initialize notification response
       # @param response [RestClient::Response] Response from server
-      def initialize(response)
+      # @param options [Hash] Headers
+      def initialize(response, options)
         super response
 
         # Parse response
         @success         = @body.delete('success')
         @total           = @body.delete('total')
         @failed_contacts = @body.delete('contacts')
+        @message_id      = @body.delete('message_id')
+
+        # Parse headers for message
+        @channel = options[:headers]['Channel']
+        @token   = options[:headers]['Token']
+      end
+
+      # Get instance of message
+      # @return Message [ChattyCrow::Message]
+      def message
+        @message ||= ::ChattyCrow::Message.new(channel: @channel, token: @token, message_id: @message_id)
       end
     end
   end

data/lib/chatty_crow/version.rb

@@ -1,4 +1,4 @@
 # Version
 module ChattyCrow
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.1'.freeze
 end

data/test/base_request_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path '../helper', __FILE__
+
+# Unit test for contact methods
+class BaseRequestTest < MiniTest::Should::TestCase
+  should 'Raise argument error if location filed has an invalid type' do
+    expect { ChattyCrow.send_skype 'Test', location: { latitude: 'invalid string', longitude: 'invalid string', range: 'invalid string' } }.to_raise ArgumentError
+  end
+
+  should 'Raise argument error if some fields in locations missing' do
+    expect { ChattyCrow.send_skype 'Test', location: { latitude: 30.2010102, range: 200 } }.to_raise ArgumentError
+  end
+
+  should 'Raise argument error if some fields in time missing' do
+    expect { ChattyCrow.send_skype 'Test', time: { start: 4093903 } }.to_raise ArgumentError
+  end
+
+  should 'Raise argument error if some fields in time has an invalid type' do
+    expect { ChattyCrow.send_skype 'Test', time: { start: '40.2030', end: 'abcd' } }.to_raise ArgumentError
+  end
+end

data/test/batch_test.rb

@@ -0,0 +1,112 @@
+require File.expand_path '../helper', __FILE__
+
+# Batch test
+class BatchTest < MiniTest::Should::TestCase
+  should 'use default token' do
+    batch = ChattyCrow.create_batch
+    batch.add_ios payload: 'Dear users', channel: 'test#1'
+
+    # Mock batch
+    body = {
+      channels: [
+        {
+          channel: 'channel#2',
+          status: 'PERROR',
+          msg: '10 of 15 created',
+          success: 10,
+          total: 15,
+          contacts: %w(test1 test2),
+          message_id: 1
+        },
+      ]
+    }
+    mock_batch status: %(200 Ok), body: body.to_json
+
+    # Call
+    batch.execute!
+
+    # Compare last token
+    expect(last_headers['token']).to_equal ChattyCrow.configuration.token
+  end
+
+  should 'raise error when try to add service without channel' do
+    batch = ChattyCrow.create_batch
+    expect { batch.add_ios(payload: 'Dear users') }.to_raise ::ArgumentError
+  end
+
+  should 'return valid notification response' do
+    FIRST_CHANNEL = 'channel#1'
+
+    # Mock notification
+    body = {
+      channels: [
+        {
+          channel: FIRST_CHANNEL,
+          status: 'OK',
+          msg: '15 of 15 created',
+          success: 15,
+          total: 15,
+          contacts: [],
+          message_id: 1
+        },
+        {
+          channel: 'channel#2',
+          status: 'PERROR',
+          msg: '10 of 15 created',
+          success: 10,
+          total: 15,
+          contacts: %w(test1 test2),
+          message_id: 1
+        },
+      ]
+    }
+    mock_batch status: %(200 Ok), body: body.to_json
+
+    # Create batch
+    batch = ChattyCrow.create_batch
+
+    # Add some payloads
+    batch.add_ios(payload: 'Dear IOS users', channel: FIRST_CHANNEL)
+    batch.add_skype(payload: 'Dear SKYPE users', channel: 'channel#2')
+
+    # Response
+    response = batch.execute!
+
+    # Parse response
+    expect(response.channels.count).to_equal 2
+
+    # Get response for first channel
+    channel  = response.channels[FIRST_CHANNEL]
+    template = body[:channels][0]
+    expect(channel).to_be_instance_of ChattyCrow::Response::BatchNotification
+    expect(channel.status).to_equal template[:status]
+    expect(channel.ok?).to_equal true
+    expect(channel.partial_error?).to_equal false
+
+    # Get message
+    message_body = {
+      status: :ok,
+      notifications: {
+        success: 15,
+        waiting: 0,
+        error: 0
+      }
+    }
+    mock_message(id: template[:message_id], body: message_body.to_json)
+    message = channel.message
+
+    expect(last_headers['token']).to_equal ChattyCrow.configuration.token
+    expect(last_headers['channel']).to_equal FIRST_CHANNEL
+
+    expect(message.channel).to_equal FIRST_CHANNEL
+    expect(message.message_id).to_equal template[:message_id]
+    expect(message.token).to_equal ChattyCrow.configuration.token
+    expect(message.success).to_equal message_body[:notifications][:success]
+    expect(message.waiting).to_equal message_body[:notifications][:waiting]
+    expect(message.error).to_equal message_body[:notifications][:error]
+
+    # Clear mocks
+    clear_mock_url
+  end
+end
+

data/test/configuration_test.rb

@@ -3,9 +3,10 @@ require File.expand_path '../helper', __FILE__
 # Test for proper gem configuration
 class ConfigurationTest < MiniTest::Should::TestCase
   should 'provide defaults' do
-    assert_config_default :host, 'https://chatty-crow.com/api/v1/'
-    assert_config_default :notification_url, 'https://chatty-crow.com/api/v1/notification'
-    assert_config_default :contacts_url, 'https://chatty-crow.com/api/v1/contacts'
+    assert_config_default :host, 'https://chattycrow.com/api/v1/'
+    assert_config_default :notification_url, 'https://chattycrow.com/api/v1/notification'
+    assert_config_default :contacts_url, 'https://chattycrow.com/api/v1/contacts'
+    assert_config_default :batch_url, 'https://chattycrow.com/api/v1/batch'
     assert_config_default :token, nil
     assert_config_default :default_channel, nil
     assert_config_default :http_open_timeout, 2
@@ -19,6 +20,7 @@ class ConfigurationTest < MiniTest::Should::TestCase
     assert_equal url, config.host
     assert_equal "#{url}/notification", config.notification_url
     assert_equal "#{url}/contacts", config.contacts_url
+    assert_equal "#{url}/batch", config.batch_url
   end
 
   should 'use correct url with backslash' do
@@ -28,6 +30,7 @@ class ConfigurationTest < MiniTest::Should::TestCase
     assert_equal url, config.host
     assert_equal "#{url}notification", config.notification_url
     assert_equal "#{url}contacts", config.contacts_url
+    assert_equal "#{url}batch", config.batch_url
   end
 
   def assert_config_default(option, default_value, config = nil)

data/test/helper.rb

@@ -35,6 +35,21 @@ module TestHelpers
     FakeWeb.register_uri(method, configuration.notification_url, options)
   end
 
+  # Mock default batch url
+  def mock_batch(options)
+    method = options.delete(:method) || :post
+    options[:status] ||= %w(200 OK)
+
+    FakeWeb.register_uri(method, configuration.batch_url, options)
+  end
+
+  # Mock messages
+  def mock_message(options)
+    method = options.delete(:method) || :get
+    options[:status] ||= %w(200 OK)
+    FakeWeb.register_uri(method, "#{configuration.messages_url}/#{options[:id]}", options)
+  end
+
   # Mock default URL for contacts
   def mock_contacts(options)
     method = options.delete(:method) || :post

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatty_crow
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Netbrick s.r.o.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rest_client
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -184,6 +184,7 @@ files:
 - lib/chatty-crow.rb
 - lib/chatty_crow.rb
 - lib/chatty_crow/action_mailer_extension.rb
+- lib/chatty_crow/batch_notification_request.rb
 - lib/chatty_crow/config.rb
 - lib/chatty_crow/contacts_request.rb
 - lib/chatty_crow/error.rb
@@ -191,16 +192,20 @@ files:
 - lib/chatty_crow/error/invalid_attributes.rb
 - lib/chatty_crow/error/invalid_return.rb
 - lib/chatty_crow/error/unauthorized_request.rb
+- lib/chatty_crow/message.rb
 - lib/chatty_crow/notification_request.rb
 - lib/chatty_crow/railtie.rb
 - lib/chatty_crow/request.rb
 - lib/chatty_crow/request/android.rb
+- lib/chatty_crow/request/hipchat.rb
 - lib/chatty_crow/request/ios.rb
 - lib/chatty_crow/request/jabber.rb
 - lib/chatty_crow/request/mail.rb
 - lib/chatty_crow/request/skype.rb
+- lib/chatty_crow/request/slack.rb
 - lib/chatty_crow/request/sms.rb
 - lib/chatty_crow/response.rb
+- lib/chatty_crow/response/batch.rb
 - lib/chatty_crow/response/contacts_add.rb
 - lib/chatty_crow/response/contacts_remove.rb
 - lib/chatty_crow/response/notification.rb
@@ -209,6 +214,8 @@ files:
 - test/android_test.rb
 - test/attachment_test.rb
 - test/base_parser_test.rb
+- test/base_request_test.rb
+- test/batch_test.rb
 - test/configuration_test.rb
 - test/contacts_test.rb
 - test/factories/stewie.jpeg
@@ -227,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -235,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Send your messages to more than 6 comunnication channels.
@@ -243,9 +250,12 @@ test_files:
 - test/android_test.rb
 - test/attachment_test.rb
 - test/base_parser_test.rb
+- test/base_request_test.rb
+- test/batch_test.rb
 - test/configuration_test.rb
 - test/contacts_test.rb
 - test/factories/stewie.jpeg
 - test/helper.rb
 - test/mail_test.rb
 - test/response_test.rb
+has_rdoc: