ramesh 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c9be78a66d6d02b4a882874ff795aaa5fd13d0
-  data.tar.gz: b057347aca5b9b104358c8e810d08e70cbdd08cd
+  metadata.gz: e5fa370a619fa4dbf3f126a9f13cbc8c062fe3ef
+  data.tar.gz: 8a6916677ea79e183a31e5068407b84364eb358d
 SHA512:
-  metadata.gz: bfcd3e5df4f56bc52571c983bf2c296dbee2896eb33089a852353aa77161420ee3a57a17b2707323533976e8e86d71a1d204bb221cfc774dae229e9222899851
-  data.tar.gz: fde72af13834220b9ad77f62486fed6d8d6a9fbf9733545e37707825dea0bcb6bab8f266f6ab62b81cd7bb4b4bbc0c1abfa5226fcd89f50abe8e58be68a34889
+  metadata.gz: 26720dcf58e153f7875c73a03e009fee628637f82d5870c30efff8f7115c9d4db1913accc6eb272e697a53444cf890c6e93ce2a12545291930ebdfa0a63583f0
+  data.tar.gz: 92ddd4a170341d856df17dba06998d342279765775640dc51b4ee5c9639d9b43baa120d8133675a157201fa37c40eb73f542caad0caae63dd171c60762b2f1a6

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
+addons:
+  code_climate:
+    repo_token: oshGwJLUmoVW4rxGVlfgutKzrSW3arKW6xxqEH99r74Tva6VlxTmjmL/H9z2Erf4POMi0kqRh1b8brGGb48oVFRc3xOCX8EM/4rchgdSK38/Ue+MOffsYTyqXFY0fYF8rwbsYssAPsFd+3BsdmJ2uOBWtHil4nRxxm2ixxNAZgU=
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1
+  - 2.1.5
+  - 2.2

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/bin/ramesh

@@ -13,23 +13,33 @@ EOS
 
 save_dir = Dir.pwd
 filename = nil
+large_image = false
 
 parser = OptionParser.new(USAGE) do |opt|
   opt.on("-d", "--dir=VAL", "Save directory (default: current directory)") { |val| save_dir = val }
   opt.on("-f", "--filename=VAL", "Save file name (default: timestamp index of downloaded image)") { |val| filename = val }
+  opt.on("-l", "--large", "Download large image") { |large| large_image = large }
 end
 
 argv = parser.parse(ARGV)
 
-client = Ramesh::Client.new(Ramesh::Logger.new(STDOUT))
+client = Ramesh::Client.new
 
 case argv.length
 when 0
-  client.download_image(0, save_dir, filename)
+  if large_image
+    puts client.download_large_image(0, save_dir, filename)
+  else
+    puts client.download_image(0, save_dir, filename)
+  end
 when 1
-  client.download_image(argv[0].to_i, save_dir, filename)
+  if large_image
+    puts client.download_large_image(argv[0].to_i, save_dir, filename)
+  else
+    puts client.download_image(argv[0].to_i, save_dir, filename)
+  end
 when 2
-  client.download_sequential_images(argv[0].to_i, argv[1].to_i, save_dir)
+  puts client.download_sequential_images(argv[0].to_i, argv[1].to_i, save_dir).join(", ")
 else
   $stderr.puts USAGE
   exit 1

data/lib/ramesh.rb

@@ -1,4 +1,3 @@
 require "ramesh/client"
 require "ramesh/image"
-require "ramesh/logger"
 require "ramesh/version"

data/lib/ramesh/client.rb

@@ -2,35 +2,35 @@ module Ramesh
   class Client
     MESHES_INDEX_URL = "http://tokyo-ame.jwa.or.jp/scripts/mesh_index.js"
 
-    def initialize(logger)
-      @logger = logger
-    end
-
     def download_image(minute, save_dir, filename = nil)
-      unless valid_minutes?(minute)
-        raise ArgumentError, "minutes must be a number; 0, 5, 10, ... 120"
-      end
-
-      image_name = name_from_minute(minute)
-      filename ||= "#{image_name}.jpg"
-      image = Image.new(image_name, background_image, mask_image)
-      image.save(save_dir, filename)
+      _download_image(minute, save_dir, filename, :small)
+    end
 
-      @logger.info("Downloaded: #{filename}")
+    def download_large_image(minute, save_dir, filename = nil)
+      _download_image(minute, save_dir, filename, :large)
     end
 
     def download_sequential_images(from, to, save_dir)
-      unless valid_minutes?(from) && valid_minutes?(to)
-        raise ArgumentError, "minutes must be a number; 0, 5, 10, ... 120"
-      end
+      raise ArgumentError, "minutes must be a number; 0, 5, 10, ... 120" unless valid_minutes?(from) && valid_minutes?(to)
 
-      (from..to).step(5) do |minute|
-        download_image(save_dir, minute)
+      [].tap do |image_names|
+        (from..to).step(5) { |minute| image_names << download_image(minute, save_dir) }
       end
     end
 
     private
 
+    def _download_image(minute, save_dir, filename, image_size)
+      raise ArgumentError, "minutes must be a number; 0, 5, 10, ... 120" unless valid_minutes?(minute)
+
+      image_name = name_from_minute(minute)
+      filename ||= "#{image_name}.jpg"
+      image = Image.new(image_name, image_size)
+      image.save(save_dir, filename)
+
+      filename
+    end
+
     def background_image
       @background_image ||= Image.background_image
     end

data/lib/ramesh/image.rb

@@ -3,25 +3,14 @@ require "open-uri"
 
 module Ramesh
   class Image
-    MESH_URL_BASE = "http://tokyo-ame.jwa.or.jp/mesh/000/"
-    BACKGROUND_IMAGE_URL = "http://tokyo-ame.jwa.or.jp/map/map000.jpg"
-    MASK_IMAGE_URL = "http://tokyo-ame.jwa.or.jp/map/msk000.png"
+    MESH_URL_BASE = "http://tokyo-ame.jwa.or.jp/mesh"
+    MAP_URL_BASE = "http://tokyo-ame.jwa.or.jp/map"
 
-    def self.background_image
-      download_image(BACKGROUND_IMAGE_URL)
-    end
-
-    def self.mask_image
-      download_image(MASK_IMAGE_URL)
-    end
-
-    def initialize(image_name,
-                   background_image = self.class.background_image,
-                   mask_image = self.class.mask_image)
+    def initialize(image_name, image_size = :small)
       image_list = [
-                    background_image,
-                    self.class.download_image(moment_image_url(image_name)),
-                    mask_image
+                    background_image(image_size),
+                    moment_image(image_name, image_size),
+                    mask_image(image_size)
                    ]
       @image = composite_images(image_list)
     end
@@ -33,12 +22,43 @@ module Ramesh
 
     private
 
-    def self.download_image(url)
+    def background_image(image_size)
+      download_image(background_image_url(image_size))
+    end
+
+    def moment_image(image_name, image_size)
+      download_image(moment_image_url(image_name, image_size))
+    end
+
+    def mask_image(image_size)
+      download_image(mask_image_url(image_size))
+    end
+
+    def download_image(url)
       MiniMagick::Image.read(open(url).read)
     end
 
-    def moment_image_url(image_name)
-      "#{MESH_URL_BASE}#{image_name}.gif"
+    def size_number(image_size)
+      case image_size
+      when :small
+        "000"
+      when :large
+        "100"
+      else
+        raise ArgumentError, "Invalid size is given"
+      end
+    end
+
+    def background_image_url(image_size)
+      "#{MAP_URL_BASE}/map#{size_number(image_size)}.jpg"
+    end
+
+    def moment_image_url(image_name, image_size)
+      "#{MESH_URL_BASE}/#{size_number(image_size)}/#{image_name}.gif"
+    end
+
+    def mask_image_url(image_size)
+      "#{MAP_URL_BASE}/msk#{size_number(image_size)}.png"
     end
 
     def composite_images(image_list)

data/lib/ramesh/version.rb

@@ -1,3 +1,3 @@
 module Ramesh
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/ramesh.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "fakefs"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake"

data/spec/ramesh/client_spec.rb

@@ -3,21 +3,9 @@ require "fileutils"
 
 module Ramesh
   describe Client do
-    let(:logger) do
-      double("logger", info: true)
-    end
-
-    let(:client) do
-      Ramesh::Client.new(logger)
-    end
-
-    let(:tmpdir) do
-      File.expand_path(File.join("..", "..", "tmp"), __FILE__)
-    end
-
-    let(:meshes_index_url) do
-      "http://tokyo-ame.jwa.or.jp/scripts/mesh_index.js"
-    end
+    let(:client) { Ramesh::Client.new }
+    let(:tmpdir) { File.expand_path(File.join("..", "..", "tmp"), __FILE__) }
+    let(:meshes_index_url) { "http://tokyo-ame.jwa.or.jp/scripts/mesh_index.js" }
 
     before do
       stub_request(:get, meshes_index_url)
@@ -26,21 +14,13 @@ module Ramesh
     end
 
     describe "#download_image" do
-      let(:download_image) do
-        client.download_image(minute, tmpdir, filename)
-      end
-
-      let(:minute) do
-        0
-      end
-
-      let(:filename) do
-        nil
-      end
+      let(:download_image) { client.download_image(minute, tmpdir, filename) }
+      let(:minute)         { 0 }
+      let(:filename)       { nil }
 
       before do
         image = double(write: true)
-        allow(Image).to receive(:download_image).and_return(image)
+        allow_any_instance_of(Image).to receive(:download_image).and_return(image)
         allow_any_instance_of(Image).to receive(:composite_images).and_return(image)
       end
 
@@ -49,13 +29,12 @@ module Ramesh
           30
         end
 
-        it "should download the image of the specified minutes ago" do
-          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "201405091815.jpg").once
-          download_image
+        it "should return image name" do
+          expect(download_image).to eq "201405091815.jpg"
         end
 
-        it "should log the result" do
-          expect(logger).to receive(:info).with("Downloaded: 201405091815.jpg")
+        it "should download the image of the specified minutes ago" do
+          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "201405091815.jpg").once
           download_image
         end
       end
@@ -77,6 +56,10 @@ module Ramesh
           "out.jpg"
         end
 
+        it "should return image name" do
+          expect(download_image).to eq filename
+        end
+
         it "should download the image with specified name" do
           expect_any_instance_of(Image).to receive(:save).with(tmpdir, "out.jpg").once
           download_image
@@ -84,18 +67,71 @@ module Ramesh
       end
     end
 
+    describe "#download_large_image" do
+      let(:download_large_image) { client.download_large_image(minute, tmpdir, filename) }
+      let(:minute)               { 0 }
+      let(:filename)             { nil }
+
+      before do
+        image = double(write: true)
+        allow_any_instance_of(Image).to receive(:download_image).and_return(image)
+        allow_any_instance_of(Image).to receive(:composite_images).and_return(image)
+      end
+
+      context "when valid minute is specified" do
+        let(:minute) { 30 }
+
+        it "should return image name" do
+          expect(download_large_image).to eq "201405091815.jpg"
+        end
+
+        it "should download the image of the specified minutes ago" do
+          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "201405091815.jpg").once
+          download_large_image
+        end
+      end
+
+      context "when invalid minute is specified" do
+        let(:minute) { 7 }
+
+        it "should raise ArgumentError" do
+          expect do
+            download_large_image
+          end.to raise_error ArgumentError
+        end
+      end
+
+      context "when filename is specified" do
+        let(:filename) { "out.jpg" }
+
+        it "should return image name" do
+          expect(download_large_image).to eq filename
+        end
+
+        it "should download the image with specified name" do
+          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "out.jpg").once
+          download_large_image
+        end
+      end
+    end
+
     describe "#download_sequential_images" do
-      let(:download_sequential_images) do
-        client.download_sequential_images(from, to, tmpdir)
+      let(:download_sequential_images) { client.download_sequential_images(from, to, tmpdir) }
+
+      before do
+        image = double(write: true)
+        allow_any_instance_of(Image).to receive(:download_image).and_return(image)
+        allow_any_instance_of(Image).to receive(:composite_images).and_return(image)
       end
 
       context "when valid section is specified" do
-        let(:from) do
-          0
-        end
+        let(:from) { 0 }
+        let(:to)   { 30 }
 
-        let(:to) do
-          30
+        it "should return the array of image names" do
+          result = download_sequential_images
+          expect(result).to be_a Array
+          expect(result.length).to eq 7
         end
 
         it "should download the images" do
@@ -105,13 +141,8 @@ module Ramesh
       end
 
       context "when invalid section is specified" do
-        let(:from) do
-          1
-        end
-
-        let(:to) do
-          2
-        end
+        let(:from) { 1 }
+        let(:to)   { 2 }
 
         it "should raise ArgumentError" do
           expect do

data/spec/ramesh/image_spec.rb

@@ -3,30 +3,34 @@ require "fileutils"
 
 module Ramesh
   describe Image do
-    let(:image_name) do
-      "201405091845"
-    end
-
-    let(:filename) do
-      "201405091845.jpg"
-    end
-
-    let(:tmpdir) do
-      File.expand_path(File.join("..", "..", "tmp"), __FILE__)
-    end
+    let(:image_name) { "201405091845" }
+    let(:filename)   { "201405091845.jpg" }
+    let(:tmpdir)     { File.expand_path(File.join("..", "..", "tmp"), __FILE__) }
 
     let(:mesh_url) do
       "http://tokyo-ame.jwa.or.jp/mesh/000/#{image_name}.gif"
     end
 
+    let(:mesh_url_large) do
+      "http://tokyo-ame.jwa.or.jp/mesh/100/#{image_name}.gif"
+    end
+
     let(:background_url) do
       "http://tokyo-ame.jwa.or.jp/map/map000.jpg"
     end
 
+    let(:background_url_large) do
+      "http://tokyo-ame.jwa.or.jp/map/map100.jpg"
+    end
+
     let(:mask_url) do
       "http://tokyo-ame.jwa.or.jp/map/msk000.png"
     end
 
+    let(:mask_url_large) do
+      "http://tokyo-ame.jwa.or.jp/map/msk100.png"
+    end
+
     let(:fixture_image) do
       open(fixture_path("lena.png")).read
     end
@@ -34,24 +38,16 @@ module Ramesh
     before do
       stub_request(:get, mesh_url)
         .to_return(status: 200, body: fixture_image)
+      stub_request(:get, mesh_url_large)
+        .to_return(status: 200, body: fixture_image)
       stub_request(:get, background_url)
         .to_return(status: 200, body: fixture_image)
+      stub_request(:get, background_url_large)
+        .to_return(status: 200, body: fixture_image)
       stub_request(:get, mask_url)
         .to_return(status: 200, body: fixture_image)
-    end
-
-    describe "#background_image" do
-      it "should download the background image" do
-        described_class.background_image
-        expect(a_request(:get, background_url)).to have_been_made.once
-      end
-    end
-
-    describe "#mask_image" do
-      it "should download the mask image" do
-        described_class.mask_image
-        expect(a_request(:get, mask_url)).to have_been_made.once
-      end
+      stub_request(:get, mask_url_large)
+        .to_return(status: 200, body: fixture_image)
     end
 
     describe "#initialize" do
@@ -63,19 +59,6 @@ module Ramesh
           expect(a_request(:get, mask_url)).to have_been_made.once
         end
       end
-
-      context "with cached images" do
-        it "should composite the moment image" do
-          image = double(composite: true)
-          background_image = double(composite: image)
-          mask_image = double(composite: image)
-
-          described_class.new(image_name, background_image, mask_image)
-          expect(a_request(:get, mesh_url)).to have_been_made.once
-          expect(a_request(:get, background_url)).not_to have_been_made
-          expect(a_request(:get, mask_url)).not_to have_been_made
-        end
-      end
     end
 
     describe "#save" do

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
-require 'coveralls'
-Coveralls.wear!
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'ramesh'
 require 'webmock/rspec'
 
+WebMock.disable_net_connect!(allow: "codeclimate.com")
+
 def fixture_path(name)
   File.expand_path(File.join("..", "fixtures", name), __FILE__)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramesh
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - dtan4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -156,14 +156,12 @@ files:
 - lib/ramesh.rb
 - lib/ramesh/client.rb
 - lib/ramesh/image.rb
-- lib/ramesh/logger.rb
 - lib/ramesh/version.rb
 - ramesh.gemspec
 - spec/fixtures/index.js
 - spec/fixtures/lena.png
 - spec/ramesh/client_spec.rb
 - spec/ramesh/image_spec.rb
-- spec/ramesh/logger_spec.rb
 - spec/ramesh_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dtan4/ramesh
@@ -195,6 +193,5 @@ test_files:
 - spec/fixtures/lena.png
 - spec/ramesh/client_spec.rb
 - spec/ramesh/image_spec.rb
-- spec/ramesh/logger_spec.rb
 - spec/ramesh_spec.rb
 - spec/spec_helper.rb

data/lib/ramesh/logger.rb

@@ -1,11 +0,0 @@
-module Ramesh
-  class Logger
-    def initialize(output)
-      @output = output
-    end
-
-    def info(msg)
-      @output.puts msg
-    end
-  end
-end

data/spec/ramesh/logger_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-
-module Ramesh
-  describe Logger do
-    let(:output) do
-      double("output", puts: true)
-    end
-
-    let(:logger) do
-      described_class.new(output)
-    end
-
-    describe "#info" do
-      it "should flush message" do
-        logger.info("message")
-        expect(output).to have_received(:puts).with("message")
-      end
-    end
-  end
-end