ramesh 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 864cf2072c0d6e2fadf44f5f5bf45bca20b02ee4
-  data.tar.gz: cebbb43a3842d404dd8a9f86b6e79f7a1aac9414
+  metadata.gz: f095feb67813f3fc287cae0facf015f91cb6a8ed
+  data.tar.gz: 7e375fa8880fa9cf421c74944c6cd8f9c4ec19ff
 SHA512:
-  metadata.gz: f9172e4821c9e2f94fc3738b8905a408dfe11d145a64a01841099bcea2a4cdc82aa9d59aa1c200df347cc0d9428d5a0075232bb9c42f8608994c1fb5e3aa0084
-  data.tar.gz: 8bed25633c866e135e3e26438fa14075c4afcda2fd0530cca94f5e869e53931503a76afcca3c58cefe1cddaa0d75c0d90fcf66fbe0f2db220c999442b9420c4e
+  metadata.gz: 6842b6ad926081e3f31064693b1505bbd26ae5cfbbb96d7136bb2ad4f0441bd94fe988b67db492638f59cf2db4e673fb134ee7644ca2740fca6f4a1b3bb62fe0
+  data.tar.gz: bab705ad4c7ff24a27b47f91efd0c86b6558725cd5fd3d829301da45616fb09ddc5fb8222dcba53b79899286f1431bfa3162265e856ce576d2e91cf592136691

data/README.md

@@ -23,10 +23,10 @@ Or install it yourself as:
 
 ## Usage
 
-    ramesh                  download the latest image
-    ramesh [0-120]          download the image specified minutes before
-    ramesh [0-120]-[0-120]  download images within a specified range
-    ramesh -h               show this usage
+    ramesh [-d save_dir]              download the latest image
+    ramesh [-d save_dir] 0-120        download the image specified minutes before
+    ramesh [-d save_dir] 0-120 0-120  download images within a specified range
+    ramesh -h, --help                 show this usage
 
 ## Contributing
 

data/lib/ramesh/client.rb

@@ -12,7 +12,7 @@ module Ramesh
       end
 
       image_name = name_from_minute(minute)
-      image = Image.new(image_name)
+      image = Image.new(image_name, background_image, mask_image)
       image.save(save_dir, image_name)
 
       @logger.info("Downloaded: #{image_name}.jpg")
@@ -30,6 +30,14 @@ module Ramesh
 
     private
 
+    def background_image
+      @background_image ||= Image.background_image
+    end
+
+    def mask_image
+      @mask_image ||= Image.mask_image
+    end
+
     def meshes_index
       @meshes_index ||= open(MESHES_INDEX_URL).read.gsub(/[^0-9,]/, "").split(",")
     end

data/lib/ramesh/image.rb

@@ -1,4 +1,4 @@
-require "RMagick"
+require "mini_magick"
 require "open-uri"
 
 module Ramesh
@@ -34,7 +34,7 @@ module Ramesh
     private
 
     def self.download_image(url)
-      Magick::Image.from_blob(open(url).read).shift
+      MiniMagick::Image.read(open(url).read)
     end
 
     def moment_image_url(image_name)
@@ -43,7 +43,13 @@ module Ramesh
 
     def composite_images(image_list)
       image = image_list.shift
-      image_list.each { |layer| image = image.composite(layer, 0, 0, Magick::OverCompositeOp) }
+
+      image_list.each do |layer|
+        image = image.composite(layer) do |c|
+          c.compose "Over"
+        end
+      end
+
       image
     end
   end

data/lib/ramesh/version.rb

@@ -1,3 +1,3 @@
 module Ramesh
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/ramesh.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "fakefs"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "rmagick"
+  spec.add_dependency "mini_magick"
 end

data/spec/fixtures/index.js

@@ -1,2 +1,2 @@
-Amesh.setIndexList(["201405091845","201405091840","201405091835","201405091830","201405091825","201405091820","201405091815","201405091810","201405091805","201405091800","201405091755","201405091750","201405091745","201405091740","201405091735","201405091730","201405091725","201405091720","201405091715","201405091710","201405091705","201405091700","201405091655","201405091650","201405091645"]);
-
+Amesh.setIndexList(["201405091845","201405091840","201405091835","201405091830","201405091825","201405091820","201405091815","201405091810","201405091805","201405091800","201405091755","201405091750","201405091745","201405091740","201405091735","201405091730","201405091725","201405091720","201405091715","201405091710","201405091705","201405091700","201405091655","201405091650","201405091645"]);
+

data/spec/ramesh/client_spec.rb

@@ -28,8 +28,8 @@ module Ramesh
     describe "#download_image" do
       before do
         image = double(write: true)
-        Image.stub(download_image: image)
-        Image.any_instance.stub(composite_images: image)
+        allow(Image).to receive(:download_image).and_return(image)
+        allow_any_instance_of(Image).to receive(:composite_images).and_return(image)
       end
 
       context "when minute is not specified" do

data/spec/ramesh/image_spec.rb

@@ -23,13 +23,17 @@ module Ramesh
       "http://tokyo-ame.jwa.or.jp/map/msk000.png"
     end
 
+    let(:fixture_image) do
+      open(fixture_path("lena.png")).read
+    end
+
     before do
       stub_request(:get, mesh_url)
-        .to_return(status: 200, body: open(fixture_path("lena.png")).read)
+        .to_return(status: 200, body: fixture_image)
       stub_request(:get, background_url)
-        .to_return(status: 200, body: open(fixture_path("lena.png")).read)
+        .to_return(status: 200, body: fixture_image)
       stub_request(:get, mask_url)
-        .to_return(status: 200, body: open(fixture_path("lena.png")).read)
+        .to_return(status: 200, body: fixture_image)
     end
 
     describe "#background_image" do
@@ -47,11 +51,26 @@ module Ramesh
     end
 
     describe "#initialize" do
-      it "should composite the moment image" do
-        described_class.new(image_name)
-        expect(a_request(:get, mesh_url)).to have_been_made.once
-        expect(a_request(:get, background_url)).to have_been_made.once
-        expect(a_request(:get, mask_url)).to have_been_made.once
+      context "without cached images" do
+        it "should composite the moment image" do
+          described_class.new(image_name)
+          expect(a_request(:get, mesh_url)).to have_been_made.once
+          expect(a_request(:get, background_url)).to have_been_made.once
+          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
 
@@ -63,7 +82,7 @@ module Ramesh
       it "should save itself to the file" do
         image = described_class.new(image_name)
         image.save(tmpdir, image_name)
-        expect(File.exist?(File.join(tmpdir, "#{image_name}.jpg"))).to be_true
+        expect(File.exist?(File.join(tmpdir, "#{image_name}.jpg"))).to be_truthy
       end
 
       after do

data/spec/spec_helper.rb

@@ -1,21 +1,11 @@
 require 'coveralls'
 Coveralls.wear!
 
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
 require 'ramesh'
 require 'webmock/rspec'
 
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-end
-
 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.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - dtan4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="