slack-ruby-client 0.7.0 → 0.7.1

data/lib/slack/web/api/templates/command.erb

@@ -1,12 +1,12 @@
 # This file was auto-generated by lib/tasks/web.rake
 
-<% desc = group['desc'] || "#{group['name'].capitalize} methods." %>
+<% desc = group['desc'] || "#{group['name'].gsub(".", "_").camelize} methods." %>
 <% if desc.include?("'")  %>
 desc "<%= desc %>"
 <% else %>
 desc '<%= desc %>'
 <% end %>
-command '<%= group['name'] %>' do |g|
+command '<%= group['name'].gsub(".", "_") %>' do |g|
 <% names.each_with_index do |(name, data), index| %>
 <% if index > 0 %>
 
@@ -27,7 +27,7 @@ command '<%= group['name'] %>' do |g|
     <% end %>
   <% end %>
     c.action do |_global_options, options, _args|
-      puts JSON.dump($client.<%=group['name'] %>_<%= name %>(options))
+      puts JSON.dump($client.<%=group['name'].gsub(".", "_") %>_<%= name %>(options))
     end
   end
 <% end %>

data/lib/slack/web/api/templates/endpoints.erb

@@ -13,7 +13,7 @@ module Slack
         include Slack::Web::Api::Mixins::Groups
 
 <% files.each do |f| %>
-        include <%= f.capitalize %>
+        include <%= f.camelize %>
 <% end %>
       end
     end

data/lib/slack/web/api/templates/method.erb

@@ -4,7 +4,7 @@ module Slack
   module Web
     module Api
       module Endpoints
-        module <%= group.capitalize %>
+        module <%= group.gsub(".", "_").camelize %>
 <% names.each_with_index do |(name, data), index| %>
 <% next if data['mixin'] %>
 <% if index > 0 %>
@@ -27,7 +27,7 @@ module Slack
 <% end %>
           # @see https://api.slack.com/methods/<%= group %>.<%= name %>
           # @see https://github.com/dblock/slack-api-ref/blob/master/methods/<%= group %>/<%= group %>.<%= name %>.json
-          def <%= group %>_<%= name %>(options = {})
+          def <%= group.gsub(".", "_") %>_<%= name %>(options = {})
 <% data['args'].select{ |k, v| v['required'] }.each do |arg_name, arg_v| %>
             throw ArgumentError.new('Required arguments :<%= arg_name %> missing') if options[:<%= arg_name %>].nil?
 <% end %>

data/lib/slack/web/api/templates/method_spec.erb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Slack::Web::Api::Endpoints::<%= group.capitalize %> do
+RSpec.describe Slack::Web::Api::Endpoints::<%= group.gsub(".", "_").camelize %> do
   let(:client) { Slack::Web::Client.new }
 <% names.each_with_index do |(name, data), index| %>
 <% next if data['mixin'] %>
@@ -12,7 +12,7 @@ RSpec.describe Slack::Web::Api::Endpoints::<%= group.capitalize %> do
 <% required_params.each do |arg_name, arg_v| %>
     it 'requires <%= arg_name %>' do
 <% params_except_required = required_params.reject{ |name, _| name == arg_name  }.map{|var, opts| "#{var}: '#{opts['example']}'"}.join(', ') %>
-      expect { client.<%= group %>_<%= name %><%= params_except_required.empty? ? '' : "(#{params_except_required})" %> }.to raise_error ArgumentError, /Required arguments :<%= arg_name %> missing/
+      expect { client.<%= group.gsub(".", "_") %>_<%= name %><%= params_except_required.empty? ? '' : "(#{params_except_required})" %> }.to raise_error ArgumentError, /Required arguments :<%= arg_name %> missing/
     end
 <% end %>
   end

data/lib/slack/web/config.rb

@@ -11,7 +11,7 @@ module Slack
         :logger,
         :endpoint,
         :token
-      ]
+      ].freeze
 
       attr_accessor(*Config::ATTRIBUTES)
 

data/lib/tasks/real_time.rake

@@ -5,7 +5,7 @@ require 'erubis'
 namespace :slack do
   namespace :real_time do
     namespace :api do
-      REAL_TIME_EVENTS_MARKER = '### RealTime Events'
+      REAL_TIME_EVENTS_MARKER = '### RealTime Events'.freeze
 
       desc 'Update API.'
       task update: [:git_update] do

data/lib/tasks/web.rake

@@ -1,6 +1,8 @@
 # largely from https://github.com/aki017/slack-ruby-gem
 require 'json-schema'
 require 'erubis'
+require 'active_support'
+require 'active_support/core_ext'
 
 namespace :slack do
   namespace :web do
@@ -20,8 +22,9 @@ namespace :slack do
           Dir.glob('lib/slack/web/api/slack-api-ref/methods/**/*.json'),
           Dir.glob('lib/slack/web/api/mixins/**/*.json')
         ].flatten.each_with_object({}) do |path, result|
-          name = File.basename(path, '.json')
-          prefix, name = name.split('.')
+          file_name = File.basename(path, '.json')
+          prefix = file_name.split('.')[0..-2].join('.')
+          name = file_name.split('.')[-1]
           result[prefix] ||= {}
           parsed = JSON.parse(File.read(path))
           JSON::Validator.validate(method_schema, parsed, insert_defaults: true)
@@ -34,12 +37,13 @@ namespace :slack do
         data.each_with_index do |(group, names), index|
           printf "%2d/%2d %10s %s\n", index, data.size, group, names.keys
           # method
+          snaked_group = group.tr('.', '_')
           rendered_method = method_template.result(group: group, names: names)
-          File.write "lib/slack/web/api/endpoints/#{group}.rb", rendered_method
+          File.write "lib/slack/web/api/endpoints/#{snaked_group}.rb", rendered_method
           custom_spec_exists = File.exist?("spec/slack/web/api/endpoints/custom_specs/#{group}_spec.rb")
           unless custom_spec_exists
             rendered_method_spec = method_spec_template.result(group: group, names: names)
-            File.write "spec/slack/web/api/endpoints/#{group}_spec.rb", rendered_method_spec
+            File.write "spec/slack/web/api/endpoints/#{snaked_group}_spec.rb", rendered_method_spec
           end
           Dir.glob("lib/slack/web/api/patches/#{group}*.patch").sort.each do |patch|
             puts "- patching #{patch}"
@@ -47,14 +51,14 @@ namespace :slack do
           end
           # command
           rendered_command = command_template.result(group: groups[group], names: names)
-          File.write "bin/commands/#{group}.rb", rendered_command
+          File.write "bin/commands/#{snaked_group}.rb", rendered_command
         end
 
         endpoints_template = Erubis::Eruby.new(File.read('lib/slack/web/api/templates/endpoints.erb'))
-        File.write 'lib/slack/web/api/endpoints.rb', endpoints_template.result(files: data.keys)
+        File.write 'lib/slack/web/api/endpoints.rb', endpoints_template.result(files: data.keys.map { |key| key.tr('.', '_') })
 
         commands_template = Erubis::Eruby.new(File.read('lib/slack/web/api/templates/commands.erb'))
-        File.write 'bin/commands.rb', commands_template.result(files: data.keys)
+        File.write 'bin/commands.rb', commands_template.result(files: data.keys.map { |key| key.tr('.', '_') })
       end
     end
   end

data/slack-ruby-client.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'hashie'
   s.add_development_dependency 'erubis'
   s.add_development_dependency 'json-schema'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 10'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'

data/spec/integration/integration_spec.rb

@@ -116,4 +116,24 @@ RSpec.describe 'integration test', skip: !ENV['SLACK_API_TOKEN'] && 'missing SLA
 
     start_server
   end
+
+  it 'gets close, followed by closed' do
+    client.on :hello do
+      expect(client.started?).to be true
+      client.stop!
+    end
+
+    client.on :close do |data|
+      logger.debug "client.on :close, data=#{data}"
+      expect(client.started?).to be true
+      @close_called = true
+    end
+
+    client.on :closed do |data|
+      logger.debug "client.on :closed, data=#{data}"
+      expect(@close_called).to be true
+    end
+
+    start_server
+  end
 end

data/spec/slack/web/api/endpoints/custom_specs/chat_spec.rb

@@ -30,4 +30,40 @@ RSpec.describe Slack::Web::Api::Endpoints::Chat do
       end
     end
   end
+
+  context 'chat_update' do
+    let(:ts) { '1405894322.002768' }
+    it 'automatically converts attachments into JSON' do
+      expect(client).to receive(:post).with(
+        'chat.update',
+        attachments: '[]',
+        channel: 'channel',
+        text: 'text',
+        ts: ts
+      )
+      client.chat_update(attachments: [], channel: 'channel', text: 'text', ts: ts)
+    end
+    context 'ts arguments' do
+      it 'requires ts' do
+        expect { client.chat_update(channel: 'channel') }.to raise_error ArgumentError, /Required arguments :ts missing>/
+      end
+    end
+    context 'text and attachment arguments' do
+      it 'requires text or attachments' do
+        expect { client.chat_update(channel: 'channel', ts: ts) }.to raise_error ArgumentError, /Required arguments :text or :attachments missing/
+      end
+      it 'only text' do
+        expect(client).to receive(:post).with('chat.update', hash_including(text: 'text'))
+        expect { client.chat_update(channel: 'channel', text: 'text', ts: ts) }.to_not raise_error
+      end
+      it 'only attachments' do
+        expect(client).to receive(:post).with('chat.update', hash_including(attachments: '[]'))
+        expect { client.chat_update(attachments: [], channel: 'channel', ts: ts) }.to_not raise_error
+      end
+      it 'both text and attachments' do
+        expect(client).to receive(:post).with('chat.update', hash_including(text: 'text', attachments: '[]'))
+        expect { client.chat_update(attachments: [], channel: 'channel', text: 'text', ts: ts) }.to_not raise_error
+      end
+    end
+  end
 end

data/spec/slack/web/api/endpoints/files_comments_spec.rb

@@ -0,0 +1,34 @@
+# This file was auto-generated by lib/tasks/web.rake
+
+require 'spec_helper'
+
+RSpec.describe Slack::Web::Api::Endpoints::FilesComments do
+  let(:client) { Slack::Web::Client.new }
+  context 'files.comments_add' do
+    it 'requires file' do
+      expect { client.files_comments_add(comment: 'Everyone should take a moment to read this file.') }.to raise_error ArgumentError, /Required arguments :file missing/
+    end
+    it 'requires comment' do
+      expect { client.files_comments_add(file: 'F1234567890') }.to raise_error ArgumentError, /Required arguments :comment missing/
+    end
+  end
+  context 'files.comments_delete' do
+    it 'requires file' do
+      expect { client.files_comments_delete(id: 'Fc1234567890') }.to raise_error ArgumentError, /Required arguments :file missing/
+    end
+    it 'requires id' do
+      expect { client.files_comments_delete(file: 'F1234567890') }.to raise_error ArgumentError, /Required arguments :id missing/
+    end
+  end
+  context 'files.comments_edit' do
+    it 'requires file' do
+      expect { client.files_comments_edit(id: 'Fc1234567890', comment: 'Everyone should take a moment to read this file, seriously.') }.to raise_error ArgumentError, /Required arguments :file missing/
+    end
+    it 'requires id' do
+      expect { client.files_comments_edit(file: 'F1234567890', comment: 'Everyone should take a moment to read this file, seriously.') }.to raise_error ArgumentError, /Required arguments :id missing/
+    end
+    it 'requires comment' do
+      expect { client.files_comments_edit(file: 'F1234567890', id: 'Fc1234567890') }.to raise_error ArgumentError, /Required arguments :comment missing/
+    end
+  end
+end

data/spec/slack/web/api/endpoints/files_spec.rb

@@ -4,17 +4,6 @@ require 'spec_helper'
 
 RSpec.describe Slack::Web::Api::Endpoints::Files do
   let(:client) { Slack::Web::Client.new }
-  context 'files_comments' do
-    it 'requires file' do
-      expect { client.files_comments(id: 'Fc1234567890', comment: 'Everyone should take a moment to read this file, seriously.') }.to raise_error ArgumentError, /Required arguments :file missing/
-    end
-    it 'requires id' do
-      expect { client.files_comments(file: 'F1234567890', comment: 'Everyone should take a moment to read this file, seriously.') }.to raise_error ArgumentError, /Required arguments :id missing/
-    end
-    it 'requires comment' do
-      expect { client.files_comments(file: 'F1234567890', id: 'Fc1234567890') }.to raise_error ArgumentError, /Required arguments :comment missing/
-    end
-  end
   context 'files_delete' do
     it 'requires file' do
       expect { client.files_delete }.to raise_error ArgumentError, /Required arguments :file missing/
@@ -36,11 +25,8 @@ RSpec.describe Slack::Web::Api::Endpoints::Files do
     end
   end
   context 'files_upload' do
-    it 'requires file' do
-      expect { client.files_upload(filename: 'foo.txt') }.to raise_error ArgumentError, /Required arguments :file missing/
-    end
     it 'requires filename' do
-      expect { client.files_upload(file: '...') }.to raise_error ArgumentError, /Required arguments :filename missing/
+      expect { client.files_upload }.to raise_error ArgumentError, /Required arguments :filename missing/
     end
   end
 end

data/spec/slack/web/api/endpoints/reminders_spec.rb

@@ -0,0 +1,30 @@
+# This file was auto-generated by lib/tasks/web.rake
+
+require 'spec_helper'
+
+RSpec.describe Slack::Web::Api::Endpoints::Reminders do
+  let(:client) { Slack::Web::Client.new }
+  context 'reminders_add' do
+    it 'requires text' do
+      expect { client.reminders_add(time: '1602288000') }.to raise_error ArgumentError, /Required arguments :text missing/
+    end
+    it 'requires time' do
+      expect { client.reminders_add(text: 'eat a banana') }.to raise_error ArgumentError, /Required arguments :time missing/
+    end
+  end
+  context 'reminders_complete' do
+    it 'requires reminder' do
+      expect { client.reminders_complete }.to raise_error ArgumentError, /Required arguments :reminder missing/
+    end
+  end
+  context 'reminders_delete' do
+    it 'requires reminder' do
+      expect { client.reminders_delete }.to raise_error ArgumentError, /Required arguments :reminder missing/
+    end
+  end
+  context 'reminders_info' do
+    it 'requires reminder' do
+      expect { client.reminders_info }.to raise_error ArgumentError, /Required arguments :reminder missing/
+    end
+  end
+end

data/spec/slack/web/api/endpoints/usergroups_spec.rb

@@ -24,12 +24,4 @@ RSpec.describe Slack::Web::Api::Endpoints::Usergroups do
       expect { client.usergroups_update }.to raise_error ArgumentError, /Required arguments :usergroup missing/
     end
   end
-  context 'usergroups_users' do
-    it 'requires usergroup' do
-      expect { client.usergroups_users(users: 'U060R4BJ4,U060RNRCZ') }.to raise_error ArgumentError, /Required arguments :usergroup missing/
-    end
-    it 'requires users' do
-      expect { client.usergroups_users(usergroup: 'S0604QSJC') }.to raise_error ArgumentError, /Required arguments :users missing/
-    end
-  end
 end

data/spec/slack/web/api/endpoints/usergroups_users_spec.rb

@@ -0,0 +1,20 @@
+# This file was auto-generated by lib/tasks/web.rake
+
+require 'spec_helper'
+
+RSpec.describe Slack::Web::Api::Endpoints::UsergroupsUsers do
+  let(:client) { Slack::Web::Client.new }
+  context 'usergroups.users_list' do
+    it 'requires usergroup' do
+      expect { client.usergroups_users_list }.to raise_error ArgumentError, /Required arguments :usergroup missing/
+    end
+  end
+  context 'usergroups.users_update' do
+    it 'requires usergroup' do
+      expect { client.usergroups_users_update(users: 'U060R4BJ4,U060RNRCZ') }.to raise_error ArgumentError, /Required arguments :usergroup missing/
+    end
+    it 'requires users' do
+      expect { client.usergroups_users_update(usergroup: 'S0604QSJC') }.to raise_error ArgumentError, /Required arguments :users missing/
+    end
+  end
+end

data/spec/support/vcr.rb

@@ -1,4 +1,5 @@
 require 'vcr'
+require 'webmock/rspec'
 
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/fixtures/slack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,16 +140,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -235,17 +235,20 @@ files:
 - bin/commands/dnd.rb
 - bin/commands/emoji.rb
 - bin/commands/files.rb
+- bin/commands/files_comments.rb
 - bin/commands/groups.rb
 - bin/commands/im.rb
 - bin/commands/mpim.rb
 - bin/commands/oauth.rb
 - bin/commands/pins.rb
 - bin/commands/reactions.rb
+- bin/commands/reminders.rb
 - bin/commands/rtm.rb
 - bin/commands/search.rb
 - bin/commands/stars.rb
 - bin/commands/team.rb
 - bin/commands/usergroups.rb
+- bin/commands/usergroups_users.rb
 - bin/commands/users.rb
 - bin/slack
 - examples/hi_real_time/Gemfile
@@ -300,6 +303,7 @@ files:
 - lib/slack/web/api/endpoints/dnd.rb
 - lib/slack/web/api/endpoints/emoji.rb
 - lib/slack/web/api/endpoints/files.rb
+- lib/slack/web/api/endpoints/files_comments.rb
 - lib/slack/web/api/endpoints/groups.rb
 - lib/slack/web/api/endpoints/im.rb
 - lib/slack/web/api/endpoints/mpim.rb
@@ -307,11 +311,13 @@ files:
 - lib/slack/web/api/endpoints/pins.rb
 - lib/slack/web/api/endpoints/presence.rb
 - lib/slack/web/api/endpoints/reactions.rb
+- lib/slack/web/api/endpoints/reminders.rb
 - lib/slack/web/api/endpoints/rtm.rb
 - lib/slack/web/api/endpoints/search.rb
 - lib/slack/web/api/endpoints/stars.rb
 - lib/slack/web/api/endpoints/team.rb
 - lib/slack/web/api/endpoints/usergroups.rb
+- lib/slack/web/api/endpoints/usergroups_users.rb
 - lib/slack/web/api/endpoints/users.rb
 - lib/slack/web/api/error.rb
 - lib/slack/web/api/mixins.rb
@@ -325,6 +331,7 @@ files:
 - lib/slack/web/api/mixins/users.search.rb
 - lib/slack/web/api/patches/chat.1.text-attachments-required.patch
 - lib/slack/web/api/patches/chat.2.attachments-json.patch
+- lib/slack/web/api/patches/chat.3.update-attachments-support.patch
 - lib/slack/web/api/schema/group.json
 - lib/slack/web/api/schema/method.json
 - lib/slack/web/api/templates/command.erb
@@ -381,17 +388,20 @@ files:
 - spec/slack/web/api/endpoints/custom_specs/users_spec.rb
 - spec/slack/web/api/endpoints/dnd_spec.rb
 - spec/slack/web/api/endpoints/emoji_spec.rb
+- spec/slack/web/api/endpoints/files_comments_spec.rb
 - spec/slack/web/api/endpoints/files_spec.rb
 - spec/slack/web/api/endpoints/im_spec.rb
 - spec/slack/web/api/endpoints/mpim_spec.rb
 - spec/slack/web/api/endpoints/oauth_spec.rb
 - spec/slack/web/api/endpoints/pins_spec.rb
 - spec/slack/web/api/endpoints/reactions_spec.rb
+- spec/slack/web/api/endpoints/reminders_spec.rb
 - spec/slack/web/api/endpoints/rtm_spec.rb
 - spec/slack/web/api/endpoints/search_spec.rb
 - spec/slack/web/api/endpoints/stars_spec.rb
 - spec/slack/web/api/endpoints/team_spec.rb
 - spec/slack/web/api/endpoints/usergroups_spec.rb
+- spec/slack/web/api/endpoints/usergroups_users_spec.rb
 - spec/slack/web/api/error_spec.rb
 - spec/slack/web/api/mixins/channels_spec.rb
 - spec/slack/web/api/mixins/groups_spec.rb
@@ -465,17 +475,20 @@ test_files:
 - spec/slack/web/api/endpoints/custom_specs/users_spec.rb
 - spec/slack/web/api/endpoints/dnd_spec.rb
 - spec/slack/web/api/endpoints/emoji_spec.rb
+- spec/slack/web/api/endpoints/files_comments_spec.rb
 - spec/slack/web/api/endpoints/files_spec.rb
 - spec/slack/web/api/endpoints/im_spec.rb
 - spec/slack/web/api/endpoints/mpim_spec.rb
 - spec/slack/web/api/endpoints/oauth_spec.rb
 - spec/slack/web/api/endpoints/pins_spec.rb
 - spec/slack/web/api/endpoints/reactions_spec.rb
+- spec/slack/web/api/endpoints/reminders_spec.rb
 - spec/slack/web/api/endpoints/rtm_spec.rb
 - spec/slack/web/api/endpoints/search_spec.rb
 - spec/slack/web/api/endpoints/stars_spec.rb
 - spec/slack/web/api/endpoints/team_spec.rb
 - spec/slack/web/api/endpoints/usergroups_spec.rb
+- spec/slack/web/api/endpoints/usergroups_users_spec.rb
 - spec/slack/web/api/error_spec.rb
 - spec/slack/web/api/mixins/channels_spec.rb
 - spec/slack/web/api/mixins/groups_spec.rb