random_jpg 0.1.0 → 0.2.0

data/README.md

@@ -1,7 +1,7 @@
 # random_jpg
 
 random_jpg is a tool for easy downloading **random images from the web** for use in scripts, application test data etc.
-It runs silently in the background feeding random [Flickr](http://www.flickr.com) images to a [named pipe](http://en.wikipedia.org/wiki/Named_pipe) at a specified location, by default `/tmp/random.jpg`. By using a constant location, this simplifies a number of tasks related to downloading images.
+It runs silently in the background feeding random images to a [named pipe](http://en.wikipedia.org/wiki/Named_pipe) at a specified location, by default `/tmp/random.jpg`. By using a constant location, this simplifies a number of tasks related to downloading images.
 
 ## Installation
 
@@ -51,6 +51,13 @@ For full usage info, run:
 
     $ random_jpg -h
 
+## Image sources
+
+Image source can be chosen using `-l LOADER`. Available options:
+
+* `flickr` (default)
+* `imgur` (not recommended for production use ;)
+
 ## Info
 
 random_jpg © 2012 [Łukasz Adamczak](http://czak.pl), read LICENSE file for details.

data/bin/random_jpg

@@ -7,7 +7,7 @@ require "random_jpg"
 begin
   RandomJpg::Runner.new(ARGV).run
   exit 0
-rescue RandomJpg::Error => e
+rescue RandomJpg::Error, OptionParser::InvalidArgument, OptionParser::MissingArgument => e
   STDERR.puts e.message
   exit 1
 end

data/lib/random_jpg/loader/flickr.rb

@@ -0,0 +1,20 @@
+require "net/http"
+require "json"
+
+module RandomJpg
+  module Loader
+    class Flickr
+      API_URL = "http://api.flickr.com/services/rest/?method=flickr.photos.getRecent&api_key=66c61b93c4723c7c3a3c519728eac252&per_page=1&extras=url_m&format=json"
+
+      def feed(path)
+        response = Net::HTTP.get URI(API_URL)
+        hash = JSON.parse response[14..-2]
+        image_data = Net::HTTP.get URI(hash["photos"]["photo"].first["url_m"])
+
+        File.open(path, "w") do |f|
+          f.write image_data
+        end
+      end
+    end
+  end
+end

data/lib/random_jpg/loader/imgur.rb

@@ -0,0 +1,21 @@
+require "net/http"
+require "json"
+
+module RandomJpg
+  module Loader
+    class Imgur
+      API_URL = "http://imgur.com/gallery/random.json"
+
+      def feed(path)
+        response = Net::HTTP.get URI(API_URL)
+        hash = JSON.parse response
+        image = hash["gallery"].select { |i| i["mimetype"] == "image/jpeg"}.first
+        image_data = Net::HTTP.get URI("http://i.imgur.com/#{image["hash"]}.jpg")
+
+        File.open(path, "w") do |f|
+          f.write image_data
+        end
+      end
+    end
+  end
+end

data/lib/random_jpg/runner.rb

@@ -2,12 +2,17 @@ require "optparse"
 
 module RandomJpg
   class Runner
+    attr_reader :path, :daemon, :force, :loader
+
     def initialize(args = [])
       @path   = "/tmp/random.jpg"
       @daemon = false
       @force  = false
-      @loader = Loader.new
+      @loader = Loader::Flickr.new
+      parse_options(args)
+    end
 
+    def parse_options(args)
       OptionParser.new do |opts|
         opts.banner = "Usage: random_jpg [options]"
         opts.separator ""
@@ -21,6 +26,9 @@ module RandomJpg
         opts.on("-f", "--force", "Force overwrite if a file exists at given path") do
           @force = true
         end
+        opts.on("-l LOADER", [:flickr, :imgur], "Image source (flickr [default], imgur)") do |loader|
+          @loader = Loader::Imgur.new if loader == :imgur
+        end
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
@@ -29,10 +37,10 @@ module RandomJpg
     end
 
     def run
-      create_pipe(@path, @force)
-      Process.daemon if @daemon
-      trap("SIGINT") { File.unlink(@path); exit }
-      loop { @loader.feed(@path) }
+      create_pipe(path, force)
+      Process.daemon if daemon
+      trap("SIGINT") { File.unlink(path); exit }
+      loop { loader.feed(path) }
     end
 
     def create_pipe(path, force = false)

data/lib/random_jpg/version.rb

@@ -1,3 +1,3 @@
 module RandomJpg
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/random_jpg.rb

@@ -1,4 +1,7 @@
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+
 require "random_jpg/version"
 require "random_jpg/error"
 require "random_jpg/runner"
-require "random_jpg/loader"
+require "random_jpg/loader/flickr"
+require "random_jpg/loader/imgur"

data/random_jpg.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/random_jpg/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Łukasz Adamczak"]
   gem.email         = ["lukasz@czak.pl"]
-  gem.description   = %q{RandomJpg is a tool for easy downloading random images for use in scripts, application test data etc. It runs silently in the background feeding random Flickr images to a named pipe at a specified location, by default /tmp/random.jpg.}
+  gem.description   = %q{RandomJpg is a tool for easy downloading random images for use in scripts, application test data etc. It runs silently in the background feeding random images to a named pipe at a specified location, by default /tmp/random.jpg.}
   gem.summary       = %q{A command-line tool for easy downloading & reading random images from the web.}
   gem.homepage      = "https://github.com/czak/random_jpg"
 

data/spec/random_jpg/runner_options_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+module RandomJpg
+  describe Runner do
+    describe "#parse_options(args)" do
+      context "-p" do
+        it "requires an argument" do
+          expect {
+            subject.parse_options(["-p"])
+          }.to raise_error(OptionParser::MissingArgument)
+        end
+      end
+
+      context "-p some/path" do
+        it "sets path to 'some/path'" do
+          subject.parse_options(["-p", "some/path"])
+          subject.path.should == "some/path"
+        end
+      end
+
+      context "-d" do
+        it "enables daemon mode" do
+          subject.parse_options(["-d"])
+          subject.daemon.should be_true
+        end
+      end
+
+      context "-f" do
+        it "enables force overwrite" do
+          subject.parse_options(["-f"])
+          subject.force.should be_true
+        end
+      end
+
+      context "-l" do
+        it "requires an argument" do
+          expect {
+            subject.parse_options(["-l"])
+          }.to raise_error(OptionParser::MissingArgument)
+        end
+
+        it "only accepts arguments: flickr, imgur" do
+          expect {
+            subject.parse_options(["-l", "wrong_loader"])
+          }.to raise_error(OptionParser::InvalidArgument)
+        end
+      end
+
+      context "-l flickr" do
+        it "enables the Flickr loader" do
+          subject.parse_options(["-l", "flickr"])
+          subject.loader.should be_an_instance_of Loader::Flickr
+        end
+      end
+
+      context "-l imgur" do
+        it "enables the Imgur loader" do
+          subject.parse_options(["-l", "imgur"])
+          subject.loader.should be_an_instance_of Loader::Imgur
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: random_jpg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies: []
 description: RandomJpg is a tool for easy downloading random images for use in scripts,
-  application test data etc. It runs silently in the background feeding random Flickr
-  images to a named pipe at a specified location, by default /tmp/random.jpg.
+  application test data etc. It runs silently in the background feeding random images
+  to a named pipe at a specified location, by default /tmp/random.jpg.
 email:
 - lukasz@czak.pl
 executables:
@@ -30,10 +30,12 @@ files:
 - bin/random_jpg
 - lib/random_jpg.rb
 - lib/random_jpg/error.rb
-- lib/random_jpg/loader.rb
+- lib/random_jpg/loader/flickr.rb
+- lib/random_jpg/loader/imgur.rb
 - lib/random_jpg/runner.rb
 - lib/random_jpg/version.rb
 - random_jpg.gemspec
+- spec/random_jpg/runner_options_spec.rb
 - spec/random_jpg/runner_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/czak/random_jpg
@@ -62,5 +64,6 @@ specification_version: 3
 summary: A command-line tool for easy downloading & reading random images from the
   web.
 test_files:
+- spec/random_jpg/runner_options_spec.rb
 - spec/random_jpg/runner_spec.rb
 - spec/spec_helper.rb

data/lib/random_jpg/loader.rb

@@ -1,18 +0,0 @@
-require "net/http"
-require "json"
-
-module RandomJpg
-  class Loader
-    API_URL = "http://api.flickr.com/services/rest/?method=flickr.photos.getRecent&api_key=66c61b93c4723c7c3a3c519728eac252&per_page=1&extras=url_m&format=json"
-
-    def feed(path)
-      response = Net::HTTP.get URI(API_URL)
-      hash = JSON.parse response[14..-2]
-      image_data = Net::HTTP.get URI(hash["photos"]["photo"].first["url_m"])
-
-      File.open(path, "w") do |f|
-        f.write image_data
-      end
-    end
-  end
-end