ruboty-discord 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28801d31d859af52cc6cca9b7de93fb302072606
-  data.tar.gz: 0c44d1e9b24f2e946e9db5456a4b39a723057a44
+  metadata.gz: e48c29baaca622d2bafb994194cf7642344a672f
+  data.tar.gz: 8134ad7b258cc5854fedbc5fb33bcb436e5ff8d3
 SHA512:
-  metadata.gz: da4c9752efccab56f85c67e40db9c9091300179722ce00ee78a2d5747c9826f8e53e30021cf6b73debd53ddf33d6bea4a311b3f146919693b6c28a3cdc148b88
-  data.tar.gz: b97d247e2f4c26f054fb79b535053b772e2d58b1f40e37fcaa088e3ec7c38bd0b71bf2358c141bc5aaac88e5e2506d58978c0d7b3b733c4ecd24cfb29619631a
+  metadata.gz: c79047156beaf021ae1b2adb5427d299379ab63e9d1b1f2c22d24dfe152374023fc88cdfe9c8a4181a5148260d2d4139432563023157e216955e1db884af9a0e
+  data.tar.gz: ad4f9bdc2522f85906457ee21c15c917df3d033681f11031b58c0211b0850cf13f35ed8a81edd18a780ff3301558e3f47b391ca6d61761988fc7dba29c9339aa

data/.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+indent_style = 4
+trim_trailing_whitespace = false

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,30 @@
+<!-- Choose Issue type -->
+
+This issue is a **Feature request** or **Bug Report**.
+
+### Summary
+
+<!-- Please edit -->
+
+<!-- only bug report -->
+<!--
+### Check list
+
+- [ ] Do you reproduce the bug on the [master](https://github.com/ykzts/ruboty-discord/tree/master) branch?
+- [ ] Did you check whether the bug is duplicated? ([Issues](https://github.com/ykzts/ruboty-discord/issues))
+
+### Step to reproduce
+
+1. ...
+2. ...
+3. ...
+
+### Your Environment
+
+| sofware         | version                    |
+|-----------------|----------------------------|
+| Ruby            | 2.4.2?                     |
+| Ruboty          | 1.3.0?                     |
+| Ruboty::Discord | 1.0.0?                     |
+| OS              | GNU/Linux? macOS? Windows? |
+-->

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  Exclude:
+    - 'spec/**/*'

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+
+rvm:
+  - 2.3
+  - 2.4

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at ykzts@desire.sh. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -0,0 +1,13 @@
+# How to contribute
+
+## Tests
+
+```console
+$ bundle exec rspec
+```
+
+or
+
+```console
+$ bundle exec rake
+```

data/README.md

@@ -1,16 +1,22 @@
-# Ruboty::Discord
+# Ruboty::Discord [![build status](https://travis-ci.org/ykzts/ruboty-discord.svg?branch=master)](https://travis-ci.org/ykzts/ruboty-discord)
 
-Discord adapter for [Ruboty](https://github.com/r7kamura/ruboty)
+Discord adapter for [Ruboty](https://github.com/r7kamura/ruboty).
 
-## Usage
+## Install
 
 ```ruby
 # Gemfile
-gem "ruboty-discord"
+gem 'ruboty-discord'
 ```
 
+## Usage
+
+1. Create new App ([https://discordapp.com/developers/applications/me/create](https://discordapp.com/developers/applications/me/create))
+2. Get Client ID & bot user token
+3. Open `https://discordapp.com/oauth2/authorize?scope=bot&client_id=xxxxxxxxx` (Replace `xxxxxxxxx` with client ID)
+
 ## ENV
 
 ```plain
-DISCORD_TOKEN - Account\'s token. get one on https://discordapp.com/developers/applications/me
+DISCORD_TOKEN - Account's token
 ```

data/Rakefile

@@ -1 +1,5 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/ruboty/adapters/discord.rb

@@ -4,8 +4,8 @@ require 'discordrb'
 require 'ruboty/adapters/base'
 
 module Ruboty
-  module Adapters
-    class Discord < Base
+  module Adapters # :nodoc:
+    class Discord < Base # :nodoc:
       env :DISCORD_TOKEN, 'Account\'s token. get one on https://discordapp.com/developers/applications/me'
 
       def run
@@ -16,7 +16,8 @@ module Ruboty
 
       def say(message)
         channel_id = message[:to]
-        content    = message[:code] ? "```\n#{message[:body]}\n```" : message[:body]
+        body       = message[:body]
+        content    = message[:code] ? "```\n#{body}\n```" : body
 
         bot.send_message(channel_id, content)
       end
@@ -44,20 +45,22 @@ module Ruboty
       end
 
       def on_message(message)
-        body = message.content.gsub(/<@([^>]+?)>/) do |matched|
-          user_id = $1.to_i
-          user = message.mentions.find { |user| user.id == user_id }
-          user.nil? ? matched : "@#{user.username}"
-        end
-
         robot.receive(
-          body: body,
+          body: parse_content(message),
           from: message.channel.id,
           from_name: message.author.name,
           to: message.channel.id,
           time: message.timestamp
         )
       end
+
+      def parse_content(message)
+        message.content.gsub(/<@([^>]+?)>/) do |matched|
+          user_id = Regexp.last_match[1].to_i
+          user = message.mentions.find { |mention| mention.id == user_id }
+          user.nil? ? matched : "@#{user.username}"
+        end
+      end
     end
   end
 end

data/lib/ruboty/discord/version.rb

@@ -2,6 +2,6 @@
 
 module Ruboty
   module Discord
-    VERSION = '1.0.0.beta1'
+    VERSION = '1.0.0'.freeze
   end
 end

data/ruboty-discord.gemspec

@@ -13,8 +13,10 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ['lib']
-  spec.add_dependency 'ruboty', '>= 1.0.4'
   spec.add_dependency 'discordrb', '~> 3.2'
-  spec.add_development_dependency 'rake'
+  spec.add_dependency 'ruboty', '>= 1.0.4'
   spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rubocop', '~> 0.51'
 end

data/spec/ruboty/adapters/discord_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+require 'ostruct'
+require 'discordrb'
+require 'ruboty'
+require 'ruboty/adapters/discord'
+
+RSpec.describe Ruboty::Adapters::Discord do
+  around do |example|
+    original_discord_token = ENV['DISCORD_TOKEN']
+    ENV['DISCORD_TOKEN'] = 'xxxxxxxxxxxxxxxxxxxx'
+    example.run
+    ENV['DISCORD_TOKEN'] = original_discord_token
+  end
+
+  let(:robot) do
+    Ruboty::Robot.new
+  end
+
+  let(:adapter) do
+    described_class.new(robot)
+  end
+
+  describe '#run' do
+    # todo
+  end
+
+  describe '#say' do
+    before do
+      allow_any_instance_of(Discordrb::Bot).to receive(:send_message) do |_, channel_id, content|
+        channel = OpenStruct.new(id: channel_id)
+        OpenStruct.new(content: content, channel: channel)
+      end
+    end
+
+    let(:body) { 'content body' }
+
+    let(:code) { false }
+
+    let(:message) do
+      { body: body, to: 0, code: code }
+    end
+
+    subject do
+      adapter.say(message)
+    end
+
+    context 'when code false' do
+      it do
+        expect(subject.content).to eq('content body')
+      end
+    end
+
+    context 'when code true' do
+      let(:code) { true }
+
+      it do
+        expect(subject.content).to eq("```\ncontent body\n```")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+RSpec.configure do |config|
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-discord
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - Yamagishi Kazutoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: discordrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ruboty
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: discordrb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
+        version: '1.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.51'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.51'
 description: 
 email:
 - ykzts@desire.sh
@@ -73,7 +101,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -82,6 +116,8 @@ files:
 - lib/ruboty/discord.rb
 - lib/ruboty/discord/version.rb
 - ruboty-discord.gemspec
+- spec/ruboty/adapters/discord_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/ykzts/ruboty-discord
 licenses:
 - MIT
@@ -97,9 +133,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8