ruboty-ragoon 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20d4b68a5e247bc9c10e729cdbabca486e71803
-  data.tar.gz: 2a8399ac7603ea269171ad5be7b925bb350924d9
+  metadata.gz: b533e41028a40a84be238a9e7afc689f68fabc5c
+  data.tar.gz: aa714ff277ee2c8ab6440dfcac6876b7928625c7
 SHA512:
-  metadata.gz: 584f736b7169fb1f3a78ee22379dc0ce3b7cee5a2b5a6463c7d1dd9828ac28f3aab90259e236e73cd2989997e4f77cea8e6b45203a52b4e94cce7b804ab324d2
-  data.tar.gz: 63295f8b0aa264d242a8ba8729e9b5cfd933f1991db56398c1a5fbe14adbcf9ddc13f6048aef3ffa03af7353ef913e285155c2bd7b2be521ed45f3c62ffdcf2f
+  metadata.gz: 81d9eb366380ebe52f289cbae5f3465554ab9941d3c9a0d1ac35a99969aff592ad97594581f9aba69a5975288ccac764aaa95bc05bb3cb4a5ed63a5feada28ed
+  data.tar.gz: fdc12b1edf2ff7a373e2e622ec0a16b0b8bc9f3cb7d2f2bcc2ed0d862afd647f4ca46f906ded8494f2f0fc42ca5cda63ae5e3bd8519142c59036dd4a0a1de951

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.3.0
+  - 2.2.3

data/README.md

@@ -1,5 +1,7 @@
 # Ruboty::Ragoon
 
+[![Build Status](https://travis-ci.org/kwappa/ruboty-ragoon.svg)](https://travis-ci.org/kwappa/ruboty-ragoon)
+
 [Ragoon](https://github.com/kwappa/ragoon) handler for [Ruboty](https://github.com/r7kamura/ruboty)
 
 ## Installation

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+task default: :test
+
+desc 'Run test_unit based test'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = Dir['test/**/test_*.rb']
+  t.verbose = true
+end

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'ruboty/ragoon'
+
+require 'pry'
+Pry.start

data/lib/ruboty/actions/ragoon/event.rb

@@ -0,0 +1,29 @@
+module Ruboty::Actions::Ragoon
+  class Event < ::Ruboty::Actions::Base
+    include ::Ruboty::Actions::Ragoon
+
+    def call
+      target_date = parse_date(message[:date])
+      events = ::Ruboty::Ragoon::Event.new(target_date)
+      message.reply(events.render(private: private?))
+    end
+
+    private
+
+    def parse_date(date)
+      date = date.strip.downcase
+      case date
+      when 'today'
+        Date.today
+      when 'tomorrow'
+        Date.today + 1
+      when 'yesterday'
+        Date.today - 1
+      else
+        Date.parse(date)
+      end
+    rescue
+      Date.today
+    end
+  end
+end

data/lib/ruboty/actions/ragoon/notification.rb

@@ -0,0 +1,25 @@
+module Ruboty::Actions::Ragoon
+  class Notification < ::Ruboty::Actions::Base
+    include ::Ruboty::Actions::Ragoon
+
+    def call
+      notifications = ::Ruboty::Ragoon::Notification.new(message.robot.brain)
+      notifications.retrieve
+      unless notifications.empty?
+        reply = [":new: #{notifications.unread_count}件の新着通知があります #{notification_url}"]
+
+        if private?
+          reply += notifications.list.find_all(&:unread).map(&:format)
+        end
+
+        message.reply(reply.join("\n"))
+      end
+    end
+
+    private
+
+    def notification_url
+      "#{::Ragoon::garoon_endpoint.gsub(/\?.*\Z/, '')}/notification/index"
+    end
+  end
+end

data/lib/ruboty/actions/{helpers.rb → ragoon.rb}

@@ -1,6 +1,6 @@
 module Ruboty
   module Actions
-    module Helpers
+    module Ragoon
       def private?
         adapter = message.original[:robot].send(:adapter)
         return false unless adapter.private_methods.include?(:user_info)

data/lib/ruboty/handlers/ragoon.rb

@@ -5,11 +5,11 @@ module Ruboty
       on(/grn notice/, name: 'notification',  description: 'show new notification from garoon')
 
       def schedule(message)
-        ::Ruboty::Actions::Event.new(message).call
+        ::Ruboty::Actions::Ragoon::Event.new(message).call
       end
 
       def notification(message)
-        ::Ruboty::Actions::Notification.new(message).call
+        ::Ruboty::Actions::Ragoon::Notification.new(message).call
       end
     end
   end

data/lib/ruboty/ragoon/notification.rb

@@ -1,24 +1,38 @@
 module Ruboty
   module Ragoon
     class Notification
-      attr_reader   :list
+      attr_reader   :list, :brain
 
-      def initialize
-        retrieve
+      def initialize(brain)
+        @brain = brain
       end
 
       def retrieve
-        @list = ::Ragoon::Services::Notification.new.retrieve.map { |data| Item.new(data) }
+        new_notifications = ::Ragoon::Services::Notification.new.retrieve
+                            .map { |data| Item.new(data) }
+                            .find_all { |item| item.unread }
+
+        new_notification_ids = new_notifications.map(&:id)
+        ids_to_notify = not_notified_ids(new_notification_ids)
+
+        @list = new_notifications.find_all { |n| ids_to_notify.include?(n.id) }
       end
 
       def unread_count
-        @list.count { |item| item.unread }
+        @list.count
       end
 
       def empty?
         unread_count == 0
       end
 
+      def not_notified_ids(new_notification_ids)
+        notified_ids = @brain.data['notification_notified_ids'] || []
+        notified_ids &= new_notification_ids
+        @brain.data['notification_notified_ids'] = notified_ids + new_notification_ids
+        new_notification_ids - notified_ids
+      end
+
       class Item
         attr_accessor :id, :module_type, :module_icon, :unread, :recieved_at, :subject, :url
 

data/lib/ruboty/ragoon/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Ragoon
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/lib/ruboty/ragoon.rb

@@ -5,9 +5,9 @@ require 'ruboty/ragoon/template'
 require 'ruboty/ragoon/event'
 require 'ruboty/ragoon/notification'
 require 'ruboty/ragoon/version'
-require 'ruboty/actions/helpers'
-require 'ruboty/actions/event'
-require 'ruboty/actions/notification'
+require 'ruboty/actions/ragoon'
+require 'ruboty/actions/ragoon/event'
+require 'ruboty/actions/ragoon/notification'
 require 'ruboty/handlers/ragoon'
 require 'tilt'
 require 'tilt/erb'

data/ruboty-ragoon.gemspec

@@ -24,4 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'test-unit-rr'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-ragoon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ruboty handlers to use ragoon
 email:
 - kwappa.856@gmail.com
@@ -88,13 +130,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/ruboty/actions/event.rb
-- lib/ruboty/actions/helpers.rb
-- lib/ruboty/actions/notification.rb
+- bin/console
+- lib/ruboty/actions/ragoon.rb
+- lib/ruboty/actions/ragoon/event.rb
+- lib/ruboty/actions/ragoon/notification.rb
 - lib/ruboty/handlers/ragoon.rb
 - lib/ruboty/ragoon.rb
 - lib/ruboty/ragoon/config.rb

data/lib/ruboty/actions/event.rb

@@ -1,31 +0,0 @@
-module Ruboty
-  module Actions
-    class Event < ::Ruboty::Actions::Base
-      include ::Ruboty::Actions::Helpers
-
-      def call
-        target_date = parse_date(message[:date])
-        events = ::Ruboty::Ragoon::Event.new(target_date)
-        message.reply(events.render(private: private?))
-      end
-
-      private
-
-      def parse_date(date)
-        date = date.strip.downcase
-        case date
-        when 'today'
-          Date.today
-        when 'tomorrow'
-          Date.today + 1
-        when 'yesterday'
-          Date.today - 1
-        else
-          Date.parse(date)
-        end
-      rescue
-        Date.today
-      end
-    end
-  end
-end

data/lib/ruboty/actions/notification.rb

@@ -1,26 +0,0 @@
-module Ruboty
-  module Actions
-    class Notification < ::Ruboty::Actions::Base
-      include ::Ruboty::Actions::Helpers
-
-      def call
-        notifications = ::Ruboty::Ragoon::Notification.new
-        unless notifications.empty?
-          reply = [":new: #{notifications.unread_count}件の新着通知があります #{notification_url}"]
-
-          if private?
-            reply += notifications.list.find_all(&:unread).map(&:format)
-          end
-
-          message.reply(reply.join("\n"))
-        end
-      end
-
-      private
-
-      def notification_url
-        "#{::Ragoon::garoon_endpoint.gsub(/\?.*\Z/, '')}/notification/index"
-      end
-    end
-  end
-end