photomontage 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d155d29d732c87aec0e051adaeba064defaa79f
-  data.tar.gz: 762d9df517bae4aa4e0847518534154c81b87c2d
+  metadata.gz: 0f116ffe0dc8f7923602ae5adcda3f7bec0fafb2
+  data.tar.gz: 0918142e16589077a75c2ae2c33a8877bb57522a
 SHA512:
-  metadata.gz: 9e9ac51b06e9fe4fd7a2b3ce52e7ad50138464cfec3c912f57c7209ef674fab262271cdf7e20d51194026864943db76fad7b6951090e9ddd7163cb33042645a7
-  data.tar.gz: 91c1c8da76a2fd1c5ae17639f00a25e2556432336c963b203065ef75d5e647914b5a3ac0f86355a6e37a9acecb58343431e6d8f3eee2e5e5fb4dab09f54a1c06
+  metadata.gz: ba80616b815074931a11691a975f5169d053085bdd6b8b8a8286a247ff388a071734ce7b7589dec8bd3228b5180d121119555c6eca05964748ffb0a2361bf418
+  data.tar.gz: 027735a579b80e7793018f0897a9ebf926e5de6acf568dbee38f6cb86a47c66412de040441054a2e9a2e693c2078a4ef8b95e1365c6105090bd108a816f120e7

data/bin/photomontage

@@ -2,4 +2,5 @@
 
 require 'photomontage'
 
-Photomontage.begin
+keywords = Photomontage.begin
+Photomontage.respond(keywords)

data/lib/flickr.rb

@@ -20,7 +20,7 @@ class Flickr
 				}
 			}
 		@index = index
-		@keyword = keyword
+		@url = nil
 	end
 
 	def search	
@@ -34,6 +34,7 @@ class Flickr
 	end
 
 	def fetch
+		return false unless @url
 		File.open("tmp/#{@index}.jpg", "wb") do |f| 
 			image = f.write HTTParty.get(@url).parsed_response
 		end
@@ -42,26 +43,41 @@ class Flickr
 	end
 
 	def self.create_collage(file_name)
-		result = read_bg_image
+		bg_image = read_bg_image
+		result = loop_images(bg_image)
+		
+		write_image_to_file(result, file_name)
+	end
+
+	private
+
+	def self.write_image_to_file(result, file_name)
+		Dir.mkdir 'images' unless File.exists?('images')
+		result.write "images/#{file_name}.jpg"
+	end
+
+	def self.loop_images(bg_image)
 		i,y=0,0
 		(0..1).each do |j|
 			x = -200
 			5.times{
 				img = MiniMagick::Image.new("tmp/#{i}.jpg")
-				result = result.composite(img) do |c|
-				c.compose "Over"
-				x += 200
-				i += 1
-				c.geometry "+#{x}+#{y}"
-				end
+				result = make_composite_image(result, img, x, y, i)
 			}
-		y += 300
+			y += 300
 		end
-		Dir.mkdir 'images' unless File.exists?('images')
-		result.write "images/#{file_name}.jpg"
+		result
 	end
 
-	private
+	def self.make_composite_image(result, img, x, y, i)
+		result.composite(img) do |c|
+			c.compose "Over"
+			x += 200
+			i += 1
+			c.geometry "+#{x}+#{y}"
+		end
+		result
+	end
 
 	def set_image_url(response)
 		photo = response["rsp"]["photos"]["photo"]
@@ -77,6 +93,6 @@ class Flickr
 		File.open("tmp/bg.jpg", "wb") do |f| 
 			f.write HTTParty.get("https://s30.postimg.org/l9fwb3to1/image.jpg").parsed_response
 		end
-		img = MiniMagick::Image.new("tmp/bg.jpg")
+		MiniMagick::Image.new("tmp/bg.jpg")
 	end
 end

data/lib/photomontage/version.rb

@@ -1,3 +1,3 @@
 module Photomontage
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/photomontage.rb

@@ -6,34 +6,34 @@ require "rmagick"
 require 'ruby-progressbar'
 require 'flickr'
 require 'colorize'
+require './config/interaction'
 
 module Photomontage
   def self.begin
-		puts "Hi there! Welcome to".green + " Photomontage!!".bold.green + "\nSimply provide 10 or less words, and get a collage of pictures representing your words, in seconds!\n".green
-		puts "Type".green + " 'exit' ".red + "anytime to stop providing words \n".green
+		puts Interaction::WELCOME
 		keywords = []
 		10.times{
 			word = STDIN.gets.chomp
 			break if word == 'exit'
-			keywords << word
+			keywords << word if !word.empty?
 		}
-		respond(keywords)
+		keywords
 	end
 
 	def self.respond(keywords)
 		Dir.mkdir 'tmp' unless File.exists?('tmp')
 		FileUtils.rm_rf(Dir.glob('tmp/*'))
-		puts "\nHold on...While we make your collage...\n".green
+		puts Interaction::IN_PROGRESS
 
 		keywords.each_with_index do |keyword, index|
 			scrape_flickr(keyword, index)
 		end
 		verify_images_present?
-		puts "\n\nGreat! Your photo collage is ready! What would you like to name it?".yellow
+		puts Interaction::FILE_NAME
 		file_name = STDIN.gets.chomp
 		Flickr.create_collage(file_name)
 		FileUtils.rm_rf(Dir.glob('tmp/*'))
-		puts "\n\nDone! Type".green + " 'open images/#{file_name}.jpg' ".magenta + "to view your image now! \n*If you using ruby interactive shell, exit from the shell.".green
+		puts Interaction::COMPLETE.gsub('FILE_NAME', file_name)
 	end
 
 	private

data/photomontage.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "mini_magick", ['4.6.0']
   spec.add_runtime_dependency "ruby-progressbar", ['1.8.1']
   spec.add_runtime_dependency "colorize", ['0.8.1']
+  spec.add_runtime_dependency "safe_yaml", ['1.0.4']
 end

data/spec/flickr_spec.rb

@@ -0,0 +1,48 @@
+require 'photomontage'
+require 'flickr'
+
+describe Flickr do
+	describe '#search' do
+		context 'when invoked with a valid keyword,' do
+			it "call the Flickr search API, and return a true value" do
+				flickr = Flickr.new("apple", 1)
+				expect(flickr.search).to_not eq(false)
+			end
+		end
+
+		context 'when invoked with an empty string,' do
+			it "call the Flickr search API, and return a false value" do
+				flickr = Flickr.new("", 1)
+				expect(flickr.search).to eq(false)
+			end
+		end
+	end
+
+	describe '#fetch' do
+		context 'when invoked with a valid keyword,' do
+			it "call the Flickr search API, and return an image" do
+				flickr = Flickr.new("apple", 1)
+				flickr.search
+				expect(flickr.fetch).to be_kind_of(Magick::Image) 
+			end
+		end
+		context 'when invoked with an invalid keyword,' do
+			it "return false" do
+				flickr = Flickr.new("", 1)
+				flickr.search
+				expect(flickr.fetch).to eq(false) 
+			end
+		end
+	end
+
+	describe '.create_collage' do
+		context 'create a collage' do
+			it "and return the resultant image" do
+				allow(Flickr).to receive(:read_bg_image)
+				expect(Flickr).to receive(:loop_images)
+				expect(Flickr).to receive(:write_image_to_file)
+				res = Flickr.create_collage("test_file")
+			end
+		end
+	end
+end

data/spec/photomontage_spec.rb

@@ -1,10 +1,28 @@
 require 'photomontage'
 
-describe Picturesque do
-	describe '.respond' do
-		context 'when no keywords are passed' do
-			it "should return No keyword passed message" do
-				expect(Picturesque.respond("")).to eq("No keyword passed")
+describe Photomontage do
+	describe '.begin' do
+		context 'when no keywords are entered' do
+			it "should return empty array" do
+				words = ["exit"]
+				words.each{|word| expect(STDIN).to receive(:gets).and_return(word)}
+				expect(Photomontage.begin).to eq([])
+			end
+		end
+
+		context 'when 3 keywords are entered' do
+			it "should return array of the entered keywords" do
+				words = ["penguin", "banana", "limousine", "exit"]
+				words.each{|word| expect(STDIN).to receive(:gets).and_return(word)}
+				expect(Photomontage.begin).to eq(words - ["exit"])
+			end
+		end
+
+		context 'when 10 keywords are entered' do
+			it "should return array of all entered keywords" do
+				words = ["penguin", "banana", "limousine", "ocean", "game of thrones", "lion", "soccer", "boat", "exit"]
+				words.each{|word| expect(STDIN).to receive(:gets).and_return(word)}
+				expect(Photomontage.begin).to eq(words - ["exit"])
 			end
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photomontage
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Aishwarya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 description: It's beautiful
 email:
 - aishwarya923@gmail.com
@@ -135,12 +149,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bg.jpg
 - bin/photomontage
 - lib/flickr.rb
 - lib/photomontage.rb
 - lib/photomontage/version.rb
 - photomontage.gemspec
+- spec/flickr_spec.rb
 - spec/photomontage_spec.rb
 homepage: ''
 licenses:
@@ -167,4 +181,5 @@ signing_key:
 specification_version: 4
 summary: Photomontage - collage made from user provided keywords
 test_files:
+- spec/flickr_spec.rb
 - spec/photomontage_spec.rb