lita-amesh 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17fbccb3ed3945b0ab77db117cc3f54bffc907d55b11f0a9bc3846af97590088
-  data.tar.gz: 774fd4e4204ebeee8f4113d51d640528cf7082a56820a242deca523001590fab
+  metadata.gz: e5f6ebaaf147fb5ab813fe809b7ccd24a1775c00aeac7c27b76095c0f1aa515a
+  data.tar.gz: 893657fc143c61a696fae224a8f41816a3514bc3e9aede15a9b918a13c3deeb9
 SHA512:
-  metadata.gz: 06b58e6d707da3ad2e1607d4a18c133753cd13ad5d05c0a9621b64a47856fd05a6a4a15af5b1d5bb8a44702f6299266952a27a8bbac5b9af989387c875e3625d
-  data.tar.gz: 35d50a2cdd51e24083c1197a523e4bde0874d623bb0a8eeba1b682be1c3a841c195f42e6889000a06c1b98190721333e7b07fa406b55d83bd2ac038253722a21
+  metadata.gz: df71d27dfa21db94163c81b162ab203b158924f749c3d78d83013a68eea0a21c7d313ad0d3b572ab58a41f016e672e1bc4a108d5f8912512daa091bc83029eba
+  data.tar.gz: 7ff347b1792aa22a096e565bd17cb0c684fa052df67cee1e2543f3ae8a147555cc782ed8785c97d3e3c6be4d7fe6c1517460814b81b3d08934bb1b591fa6821a

data/.circleci/config.yml

@@ -0,0 +1,40 @@
+version: 2
+jobs:
+  build:
+    parallelism: 1
+    docker:
+      - image: circleci/ruby:2.5.1
+        environment:
+          BUNDLE_JOBS: 3
+          BUNDLE_RETRY: 3
+          BUNDLE_PATH: vendor/bundle
+      - image: circleci/redis
+    steps:
+      - checkout
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - restore_cache:
+          keys:
+            - rails-demo-bundle-v2-{{ checksum "Gemfile.lock" }}
+            - rails-demo-bundle-v2-
+      - run:
+          name: Bundle Install
+          command: bundle check || bundle install
+      - save_cache:
+          key: rails-demo-bundle-v2-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Wait for Redis
+          command: dockerize -wait tcp://localhost:6379 -timeout 1m
+      - run:
+          name: Run rspec
+          command: |
+            bundle exec rspec --profile 10 \
+                              --format RspecJunitFormatter \
+                              --out test_results/rspec.xml \
+                              --format progress \
+                              $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+      - store_test_results:
+          path: test_results

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lita-amesh (0.0.1)
+    lita-amesh (0.1.0)
       lita (>= 4.7)
       mini_magick
       slack-ruby-client
@@ -75,6 +75,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
     slack-ruby-client (0.12.0)
       activesupport
       faraday (>= 0.9)
@@ -102,6 +104,7 @@ DEPENDENCIES
   rack-test
   rake
   rspec (>= 3.0.0)
+  rspec_junit_formatter
 
 BUNDLED WITH
    1.16.1

data/README.md

@@ -1,5 +1,7 @@
 # lita-amesh
 
+[![CircleCI Status](https://circleci.com/gh/tatsuyafw/lita-amesh/tree/master.svg?style=svg)](https://circleci.com/gh/tatsuyafw/lita-amesh/tree/master)
+
 lita-amesh is a handler for Lita that displays a Tokyo amesh image in a chart room.
 
 ## Installation
@@ -19,7 +21,7 @@ $ convert -version
 
 ### Required attributes
 
-NOTE: So far this gem only supports Slack adapter.
+NOTE: As of now, this gem only supports the Slack adapter.
 
 - `config.adapters.slack.token` (String)
 

data/lib/lita/handlers/amesh/downloader.rb

@@ -8,31 +8,22 @@ module Lita
     module Amesh
       class Downloader
         BASE_URL = 'http://tokyo-ame.jwa.or.jp/'.freeze
+        TIME_FORMAT = '%Y%m%d%H%M'
 
         def self.fetch_amesh_image
           new.fetch_amesh_image
         end
 
         def fetch_amesh_image
-          paths = [
-            'map/map000.jpg',
-            'map/msk000.png',
-            rain_gif_path
-          ]
-
-          # TODO: Deal with an error when an amesh image is not found.
-          begin
-            result = MiniMagick::Image.open("#{BASE_URL}/#{paths[0]}")
-          rescue => e
-            Lita.logger.error(e.message)
+          result = MiniMagick::Image.open("#{BASE_URL}/map/map000.jpg")
+          image = MiniMagick::Image.open("#{BASE_URL}/map/msk000.png")
+          result = result.composite(image) do |c|
+            c.compose 'Over'
           end
 
-          paths[1..-1].each do |path|
-            url = "#{BASE_URL}/#{path}"
-            image = MiniMagick::Image.open(url)
-            result = result.composite(image) do |c|
-              c.compose 'Over'
-            end
+          rain_gif = fetch_rain_gif
+          result = result.composite(rain_gif) do |c|
+            c.compose 'Over'
           end
 
           result
@@ -40,16 +31,39 @@ module Lita
 
         private
 
-        def rain_gif_path
-          current_time_str = Time.now.strftime("%Y%m%d%H%M")
+        def fetch_rain_gif
+          image = nil
+          time = target_time
+          begin
+            image = MiniMagick::Image.open("#{BASE_URL}/#{rain_gif_path(time)}")
+          rescue OpenURI::HTTPError => e
+            Lita.logger.error(e.message)
+            # Fetch 5 minutes ago image as a fallback image
+            time = five_minutes_ago(time)
+            image = MiniMagick::Image.open("#{BASE_URL}/#{rain_gif_path(time)}")
+          end
+
+          image
+        end
+
+        def rain_gif_path(time)
+          t = time.strftime(TIME_FORMAT)
+          "mesh/000/#{t}.gif"
+        end
+
+        def target_time
+          current_time = Time.now
+          current_time_str = current_time.strftime(TIME_FORMAT)
           current_time_i = current_time_str.to_i
 
-          if (current_time_i % 5).zero?
-            return "mesh/000/#{current_time_str}.gif"
-          end
+          return current_time if (current_time_i % 5).zero?
+
+          t = current_time_i - (current_time_i % 5)
+          Time.parse(t.to_s)
+        end
 
-          current_time_i -= current_time_i % 5
-          "mesh/000/#{current_time_i}.gif"
+        def five_minutes_ago(time)
+          time - 5 * 60
         end
       end
     end

data/lita-amesh.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "lita-amesh"
-  spec.version       = "0.0.1"
+  spec.version       = "0.1.0"
   spec.authors       = ["Tatsuya Hoshino"]
   spec.email         = ["tatsuya7.hoshino7@gmail.com"]
   spec.description   = %q{A Lita handler for displaying an image of Tokyo amesh.}
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rspec", ">= 3.0.0"
+  spec.add_development_dependency "rspec_junit_formatter"
 end

data/spec/lita/handlers/amesh/downloader_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Lita::Handlers::Amesh::Downloader do
+  describe '#target_time' do
+    let(:downloader) { described_class.new }
+    subject { downloader.send(:target_time) }
+
+    before do
+      allow(Time).to receive(:now).and_return(current_time)
+    end
+
+    context 'when a current time is divisible by 5' do
+      let(:current_time) { Time.new(2018, 1, 1, 0, 0) }
+
+      it 'returns an url path based on a current time' do
+        expect(subject).to eq(current_time)
+      end
+    end
+
+    context 'when a current time is not divisible by 5' do
+      let(:current_time) { Time.new(2018, 1, 1, 0, 1) }
+
+      it 'returns an url path based on the time that is divisible by 5 before a current time' do
+        expect(subject).to eq(Time.new(2018, 1, 1, 0, 0))
+      end
+    end
+  end
+
+  describe '#five_minutes_ago' do
+    let(:downloader) { described_class.new }
+
+    it 'returns a 5 minutes ago image of given time' do
+      time = Time.new(2018, 1, 1, 0, 0)
+      actual = downloader.send(:five_minutes_ago, time)
+      expect(actual).to eq(Time.new(2017, 12, 31, 23, 55))
+    end
+  end
+end

data/spec/lita/handlers/amesh/handler_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Lita::Handlers::Amesh::Handler, lita_handler: true do
+  it { is_expected.to route_command('amesh').to(:amesh) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-amesh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Tatsuya Hoshino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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: A Lita handler for displaying an image of Tokyo amesh.
 email:
 - tatsuya7.hoshino7@gmail.com
@@ -129,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -142,7 +157,8 @@ files:
 - lib/lita/handlers/amesh/uploaders/slack_uploader.rb
 - lita-amesh.gemspec
 - locales/en.yml
-- spec/lita/handlers/amesh_spec.rb
+- spec/lita/handlers/amesh/downloader_spec.rb
+- spec/lita/handlers/amesh/handler_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/tatsuyafw/lita-amesh
 licenses:
@@ -170,5 +186,6 @@ signing_key:
 specification_version: 4
 summary: A Lita handler for displaying an image of Tokyo amesh.
 test_files:
-- spec/lita/handlers/amesh_spec.rb
+- spec/lita/handlers/amesh/downloader_spec.rb
+- spec/lita/handlers/amesh/handler_spec.rb
 - spec/spec_helper.rb

data/spec/lita/handlers/amesh_spec.rb

@@ -1,4 +0,0 @@
-require "spec_helper"
-
-describe Lita::Handlers::Amesh, lita_handler: true do
-end