flico 0.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d21b66c84738f5f1ef760829af88cf4f40d7c8fb
-  data.tar.gz: b27c22ad9028030c2be42e66b9d00a7f42534811
+SHA256:
+  metadata.gz: 473a26ece9ff8cf869ea977bdc1a96a5b800848ce82f4ee0282dad74bda96bdc
+  data.tar.gz: b4e83f8d45ea19e79e4d5884603f3941af769e279d8267dff9379f662f3acbbf
 SHA512:
-  metadata.gz: affd36e436da1a851f4e3d43382b8530d17c8db550d220bf89063567076cbb61d87c69e4068ce5bd4dc4b0492abd29fe0a570c50a85c8935844d911d66ce7a3c
-  data.tar.gz: 9186a05a4a81b5f15eea86c955eb8e92b1e6061bf7ae84fa401393e07c12a26b30df7c8a2133cdbab9264d8ff22b3375c3987f41109025f7ddb8c72565a7f928
+  metadata.gz: 55a33bfccc1180547b859c572ef4802f4bd6b6299298319e0b21519ae381b4f040b0620ffbde06e002c9d9216d6f00b559af148aa38b93d9968b10464351c918
+  data.tar.gz: c96edd9e612f9cb0dbc1711c0d0dedf5ade8be1b1e685316055cd4d48b3bbda9bbdc6c2b8aa8eea6073a9da88f10d8589b9f1c4bfad9db033d7d20664ec3ab7a

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+3.2.2

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    flico (0.0.1)
+    flico (1.0.0)
       flickraw
       mini_magick
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    flickraw (0.9.9)
-    mini_magick (4.7.1)
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    diff-lcs (1.5.0)
+    flickraw (0.9.10)
+    mini_magick (4.12.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
 
 DEPENDENCIES
   bundler
@@ -36,4 +36,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.15.1
+   2.4.13

data/LICENSE.text

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2017 Amandeep Bhamra
+Copyright 2017 Amandeep Singh Bhamra
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/Rakefile

@@ -1,5 +1,7 @@
-require "rspec/core/rake_task"
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "flico"
-require "irb"
+require 'bundler/setup'
+require 'flico'
+require 'irb'
 
 IRB.start

data/bin/flico

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 $LOAD_PATH << './lib'
 require 'flico'
 Flico::CommandLineInterface.start(ARGV)

data/flico.gemspec

@@ -1,26 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-	
-	spec.version       = '0.0.2'
-	spec.name          = 'flico'
-	spec.summary       = %q{CLI tool to create collage using Flickr}
-	spec.homepage      = "https://github.com/amandeepbhamra/flico"
-	spec.license       = 'MIT'
+  spec.name = 'flico'
+  spec.version       = '2.0.0'
+  spec.summary       = 'A CLI tool to create collage from keywords using Flickr'
+  spec.homepage      = 'https://github.com/amandeepbhamra/flico'
+  spec.license       = 'MIT'
+
+  spec.authors       = ['Amandeep Singh Bhamra']
+  spec.email         = ['amandeep.bhamra@gmail.com']
 
-	spec.authors       = ['Amandeep Bhamra']
-	spec.email         = ["amandeep.bhamra@gmail.com"]
-	
-	spec.files         = `git ls-files -z`.split("\x0")
-	spec.bindir        = 'bin'
-	spec.executables   = 'flico'
-	spec.require_paths = ['lib']
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.bindir        = 'bin'
+  spec.executables   = 'flico'
+  spec.require_paths = ['lib']
 
-	spec.add_dependency 'flickraw'
-  	spec.add_dependency 'mini_magick'
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rake"
-	spec.add_development_dependency "rspec"
+  spec.add_dependency 'flickraw', '~> 0.9.10'
+  spec.add_dependency 'mini_magick', '~> 4.12'
+  spec.add_development_dependency 'bundler', '~> 2.4', '>= 2.4.14'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
+  spec.add_development_dependency 'rspec', '~> 3.12'
 end

data/lib/flico/app.rb

@@ -1,45 +1,51 @@
+# frozen_string_literal: true
+
+require 'flico/dictionary'
+require 'flico/collager'
+require 'flico/image_file'
+
 module Flico
+  class ApplicationError < StandardError; end
+
+  class App
+    KEYWORDS_COUNT = 10
+
+    attr_reader :keywords, :options
+
+    def initialize(keywords, options)
+      @keywords = add_missing_keywords(keywords)
+      @options = options
+    end
+
+    def create
+      options[:file_name] = prepare_file_name(options)
+
+      Collager.new(prepare_images, options[:file_name]).save
+
+      puts "Flicollage saved at #{options[:file_name]}"
+    end
+
+    def prepare_images
+      keywords.map { |keyword| ImageFile.new(keyword).fetch_from_flickr }
+    end
+
+    private
+
+    def add_missing_keywords(words)
+      words_count = words.size
+      return words if words_count == KEYWORDS_COUNT
+
+      words += Dictionary.new.words(KEYWORDS_COUNT - words_count)
+      puts "KEYWORDS: #{words}"
+      words
+    end
 
-	class ApplicationError < StandardError; end
-	class KeywordMissing < StandardError; end
-	class NoImage < StandardError; end
-	class FetchingError < StandardError; end
-    	
-  	class App
-    	
-    	attr_reader :resources
-
-    	def initialize(resources)
-      		@resources = resources
-    	end
-
-    	def create_collage
-    		image_urls = []
-      		begin
-        		image_urls.push get_images
-      		end while image_urls.count < 10
-      		collage(image_urls)
-    	end
-
-    	def collage(images)
-      		resources.save_collage.call(resources.collager.call(images))
-    	end
-
-    	def get_images
-      		keywords_count    = 10
-      		keyword           = resources.dictionary.call
-      		image_url         = resources.flickr_api.call(keyword)
-      		downloaded_image  = resources.fetch_image.call(image_url)
-      		rescue NoImage => e
-      		puts "Image not found for keyword '#{keyword}'. Message: #{e.message}. Retrying"
-      		unless (tries -= 1) > 0
-        		raise ApplicationError, "Failed getting image after retrying #{MAX_KEYWORD_RETRIES} times"
-      		else
-        		retry
-      		end
-      		rescue FetchingError => e
-      		raise ApplicationError, e.message
-    	end
-  	end
+    def prepare_file_name(options)
+      return options[:file_name] unless options[:file_name].nil?
 
+      puts 'Enter file name for collage (press ENTER to use default)'
+      file_name = $stdin.gets.strip
+      file_name.empty? ? "flicollage-#{Time.now.strftime('%Y%m%d%H%M%S')}.png" : file_name
+    end
+  end
 end

data/lib/flico/collager.rb

@@ -1,45 +1,25 @@
-require 'flico/grid'
+# frozen_string_literal: true
+
 require 'mini_magick'
 
 module Flico
-	
-	class Collager
-		attr_reader :grid
-
-		def initialize(grid=Grid.new)
-      		@grid = grid
-    	end
-
-		def call(image_urls)
-	      	images = image_urls.map { |p| MiniMagick::Image.open p.path }
-	      	temp_file = Tempfile.new ['collage_maker', '.png']
-	      	canvas = MiniMagick::Tool::Convert.new do |i|
-	        	i.size "#{grid.canv_width}x#{grid.canv_height}"
-	        	i.xc "white"
-	        	i << temp_file.path
-	      	end
-
-	      	resized_images = image_urls.map.with_index do |path, idx|
-		        image = MiniMagick::Image.open path.path
-		        image.crop(grid.crop_rectangle(idx, image.width, image.height).to_mm)
-		        image.resize(grid.resize_rectangle(idx, image.width, image.height).to_mm)
-	        	print_to_canvas(image, grid.cell_rectangle(idx), temp_file)
-	      	end
-	      	temp_file
-	    end
-
-	    private
+  class Collager
+    attr_reader :images_url, :file_name
 
-	    def print_to_canvas(image, rectangle, temp_file)
-	      	canvas = MiniMagick::Image.new temp_file.path
-	      	result = canvas.composite(image) do |c|
-	        	c.compose 'Over'
-	        	c.geometry rectangle.to_mm
-	      	end
-	      	result.write temp_file.path
-	      	temp_file.rewind
-	    end
-	    
-	end
+    def initialize(images_url, file_name)
+      @images_url = images_url
+      @file_name = file_name
+    end
 
+    def save
+      montage = MiniMagick::Tool::Montage.new
+      montage.density '600'
+      montage.tile '5X2'
+      montage.geometry '+10+20'
+      montage.border '5'
+      images_url.each { |image_url| montage << image_url }
+      montage << file_name
+      montage.call
+    end
+  end
 end

data/lib/flico/dictionary.rb

@@ -1,30 +1,35 @@
+# frozen_string_literal: true
+
 module Flico
-  	
-  	class Dictionary
-	
-		def initialize(dictionary_path)
-	  		@dictionary_path = dictionary_path
-	  		@words = []
-		end
+  class Dictionary
+    PATH = '/usr/share/dict/words'
+    ALPHABETS_LOWER_LIMIT = 3
+    ALPHABETS_UPPER_LIMIT = 10
+
+    def initialize
+      @dictionary_path = validate(PATH)
+      @words = []
+    end
 
-		def call
-	  		@words.shift || dictionary_word
-		end
+    def words(count)
+      @words += pick_words(count)
+    end
 
-		def append(keywords)
-	  		@words += keywords
-		end
+    private
 
-		private
+    def pick_words(count)
+      File.readlines(PATH).select do |word|
+        word.size > ALPHABETS_LOWER_LIMIT && word.size < ALPHABETS_UPPER_LIMIT
+      end.sample(count).map(&:strip)
+    end
 
-		def dictionary_word
-	  		selected_line = nil
-	  		File.foreach(@dictionary_path).each_with_index do |line, number|
-				selected_line = line if (rand < 1.0) / (number + 1)
-	  		end
-	  		selected_line.strip
-		end
-  	
-  	end
+    def validate(path)
+      unless File.exist?(path)
+        warn "Exiting due to missing dictionary at path: #{path}"
+        exit 1
+      end
 
+      path
+    end
+  end
 end

data/lib/flico/flickr/base_api.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'flickraw'
+
+module Flico
+  module Flickr
+    class BaseApi
+      attr_reader :key, :secret, :api
+
+      def initialize
+        @key = ENV['FLICKR_KEY']
+        @secret = ENV['FLICKR_SECRET']
+        @api = flickraw_api
+      end
+
+      def get_photo(keyword)
+        valid_keyword?(keyword)
+
+        puts "Searching images for keyword: #{keyword}"
+
+        results = search_api(keyword)
+
+        results.count.zero? ? (warn "No Image for keyword: #{keyword}") : photo_url(results.first.id)
+      end
+
+      private
+
+      def flickraw_api
+        valid_secrets?
+
+        FlickRaw.api_key = key
+        FlickRaw.shared_secret = secret
+        FlickRaw::Flickr.new
+      end
+
+      def valid_secrets?
+        if key.nil? || secret.nil?
+          warn 'Exiting due to missing required environment variables: FLICKR_KEY or FLICKR_SECRET'
+          exit 1
+        end
+
+        true
+      end
+
+      def search_api(keyword)
+        api.photos.search({ text: keyword, per_page: 10, sort: 'interestingness-desc' })
+      end
+
+      def info_api(image)
+        api.photos.getInfo(photo_id: image)
+      end
+
+      def size_api(id)
+        api.photos.getSizes(photo_id: id)
+      end
+
+      def photo_url(id)
+        size_api(id).find { |v| v['label'] == 'Square' }['source']
+      end
+
+      def valid_keyword?(keyword)
+        warn "Missing Keywords (can't be nil)" if keyword.nil?
+      end
+    end
+  end
+end

data/lib/flico/image_file.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'flico/flickr/base_api'
+
+module Flico
+  class NoImage < StandardError; end
+  class FetchingError < StandardError; end
+
+  class ImageFile
+    attr_accessor :keyword
+
+    def initialize(keyword)
+      @keyword = keyword
+    end
+
+    def fetch_from_flickr
+      Flickr::BaseApi.new.get_photo(keyword)
+    rescue NoImage => e
+      puts "Image not found for keyword '#{keyword}'. Message: #{e.message}. Retrying"
+      unless (tries -= 1).positive?
+        raise ApplicationError, "Failed getting image after retrying #{MAX_KEYWORD_RETRIES} times"
+      end
+
+      retry
+    rescue FetchingError => e
+      raise ApplicationError, e.message
+    end
+  end
+end

data/lib/flico.rb

@@ -1,79 +1,25 @@
-require 'flickraw'
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'optparse'
 require 'flico/app'
-require 'flico/flickr_command'
-require 'flico/dictionary'
-require 'flico/saver'
-require 'flico/collager'
 
 module Flico
-
-	class CommandLineInterface
-
-		def self.parse_args(args)
-	      	options = {}
-			OptionParser.new do |opts|
-			  opts.banner = "Usage: flico [options] [10 keywords with space as delimiter]"
-			  opts.on("-f", "--file_name [FileName]", "Collage FileName") do |f|
-			    options[:file_name] = f
-			  end
-			end.parse!(args)	      	
-	      	[args, options]
-	    end
-	    
-	    def self.start(args)
-	      	keywords, options 	= parse_args(args)	      
-	      	puts "Given Keywords: #{keywords.join(' ')} with Options: #{options}"
-	      	resources 			= validate_resources(keywords, options)
-	      	App.new(resources).create_collage
-	    end
-
-	    def self.validate_resources(keywords, options={})
-	      	dictionary = validate_dictionary
-	      	dictionary.append(keywords)
-	      	col = SaveCollage.new
-	      	col.output_file_name = options[:file_name]
-
-			Resource.new(flickr_api: validate_flickr_api, dictionary: dictionary, fetch_image: FetchImage.new, collager: Collager.new, save_collage: col)
-	    end
-
-	    def self.validate_flickr_api
-	    	key, secret = ENV['FLICKR_KEY'], ENV['FLICKR_SECRET']
-	    	unless key == nil && secret == nil
-	    		FlickRaw.api_key 		= key
-	        	FlickRaw.shared_secret 	= secret
-	        	FlickrCommand.setup(FlickRaw::Flickr.new)
-	    	else
-	    		STDERR.puts "Performing AutoExit due to missing required environment variables: FLICKR_KEY and FLICKR_SECRET"
-	        	exit 1
-	    	end
-	    end
-
-	    def self.validate_dictionary
-	    	dictionary_path = '/usr/share/dict/words'
-	      	if File.exist?(dictionary_path)
-	      		dictionary = Dictionary.new(dictionary_path)	        	
-	      	else
-	      		STDERR.puts "Performing AutoExit due to missing required dictionary at path: #{dictionary_path}"
-	        	exit 1
-	      	end
-	    end    
-
-	end
-
-	class Resource
-    
-    	attr_reader :flickr_api, :dictionary, :fetch_image, :collager, :save_collage
-
-    	def initialize(params={})
-    		@flickr_api 	= params.fetch(:flickr_api) 
-    		@dictionary 	= params.fetch(:dictionary) 
-    		@fetch_image 	= params.fetch(:fetch_image) 
-    		@collager 		= params.fetch(:collager) 
-    		@save_collage 	= params.fetch(:save_collage)      		
-    	end
-
-  	end
-
+  class CommandLineInterface
+    def self.parse_args(args)
+      options = {}
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: flico [options] [10 keywords with space as delimiter]'
+        opts.on('-f', '--file_name [FileName]', 'Collage FileName') do |f|
+          options[:file_name] = f
+        end
+      end.parse!(args)
+      [args, options]
+    end
+
+    def self.start(args)
+      keywords, options	= parse_args(args)
+      App.new(keywords, options).create
+    end
+  end
 end

data/spec/base_api_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'flico/flickr/base_api'
+
+describe Flico::Flickr::BaseApi do
+  let(:photo_url) do
+    {
+      'label' => 'Square',
+      'width' => 75,
+      'height' => 75,
+      'source' => 'https://farm3.staticflickr.com/2805/33472607802_42e011bcf5_s.jpg',
+      'url' => 'https://farm3.staticflickr.com/2805/33472607802_42e011bcf5/sizes/sq/',
+      'media' => 'photo'
+    }
+  end
+
+  let(:subject) { described_class.new }
+
+  context 'search success' do
+    before do
+      ENV['FLICKR_KEY'] = 'FOO'
+      ENV['FLICKR_SECRET'] = 'BAR'
+    end
+
+    it 'should return image url for search keyword' do
+      allow_any_instance_of(Flico::Flickr::BaseApi).to receive(:flickraw_api).and_return(double('flickraw_api'))
+      allow_any_instance_of(Flico::Flickr::BaseApi).to receive(:get_photo).and_return(photo_url)
+
+      expect(subject.get_photo('Volkswagen Golf in Luxembourg')['source']).to eq('https://farm3.staticflickr.com/2805/33472607802_42e011bcf5_s.jpg')
+    end
+  end
+end

data/spec/dictionary_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'flico/dictionary'
+
+describe Flico::Dictionary do
+  let(:subject) { described_class.new }
+
+  context '#words' do
+    let(:count) { 3 }
+    let(:words) { subject.words(count) }
+
+    it 'should not be empty' do
+      expect(words).to_not be_empty
+    end
+
+    it 'should return 3 random words' do
+      expect(words.count).to eq count
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
@@ -44,57 +46,55 @@ RSpec.configure do |config|
   # triggering implicit auto-inclusion in groups with matching metadata.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  config.filter_run_when_matching :focus
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = "doc"
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # 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
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # 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
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
 end

metadata

@@ -1,86 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: flico
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 2.0.0
 platform: ruby
 authors:
-- Amandeep Bhamra
-autorequire: 
+- Amandeep Singh Bhamra
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flickraw
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '3.12'
+description:
 email:
 - amandeep.bhamra@gmail.com
 executables:
@@ -102,19 +114,18 @@ files:
 - flico.gemspec
 - lib/flico.rb
 - lib/flico/app.rb
-- lib/flico/cell.rb
 - lib/flico/collager.rb
 - lib/flico/dictionary.rb
-- lib/flico/flickr_command.rb
-- lib/flico/grid.rb
-- lib/flico/saver.rb
-- spec/flickr_command_spec.rb
+- lib/flico/flickr/base_api.rb
+- lib/flico/image_file.rb
+- spec/base_api_spec.rb
+- spec/dictionary_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/amandeepbhamra/flico
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
-summary: CLI tool to create collage using Flickr
+summary: A CLI tool to create collage from keywords using Flickr
 test_files: []

data/lib/flico/cell.rb

@@ -1,30 +0,0 @@
-module Flico
-
-	class Cell
-		attr_reader :x, :y, :width, :height
-
-		def initialize(x=0, y=0, width, height)
-			@x, @y 			= x, y
-			@width, @height = width, height
-		end
-
-		def aspect_ratio
-			width.to_f / height.to_f
-		end
-
-		def to_mm
-			"#{width}x#{height}+#{x}+#{y}"
-		end
-
-		def ==(o)
-			o.class == self.class && o.state == state
-		end
-
-		protected
-
-		def state
-			[@x, @y, @width, @height]
-		end
-	end
-
-end

data/lib/flico/flickr_command.rb

@@ -1,58 +0,0 @@
-module Flico
-
-	class FlickrCommand
-
-		def initialize(search_command:, sizes_command:)
-			@search_command = search_command
-			@sizes_command = sizes_command
-		end
-
-		def self.setup(flickraw)
-			new(search_command: SearchCommand.new(flickraw), sizes_command: SizesCommand.new(flickraw))
-		end
-		
-		def call(keyword)
-			unless keyword.nil?
-				puts "Searching images for keyword: #{keyword}"
-				results = @search_command.call(keyword)
-				unless results.count == 0
-					get_image_url(results.first['id'])
-				else
-					STDERR.puts "No Image for keyword: #{keyword}"
-				end
-			else
-				STDERR.puts "Missing Keywords (can't be nil)"
-			end						
-		end
-
-		private
-
-		def get_image_url(photo_id)
-			sizes 	= @sizes_command.call(photo_id)
-			mid 	= sizes.count / 2
-			sizes[mid]['source']
-		end
-
-	end
-	
-	
-	class FlickrBase		
-		attr_reader :api
-		def initialize(flickraw)
-			@api = flickraw
-		end	
-	end
-
-	class SearchCommand < FlickrBase		
-		def call(keyword)
-			api.photos.search({text: keyword, per_page: 10, sort: 'interestingness-desc'})
-		end	
-	end
-
-	class SizesCommand < FlickrBase
-		def call(photo_id)		
-			api.photos.getSizes(photo_id: photo_id)
-		end
-	end
-
-end

data/lib/flico/grid.rb

@@ -1,81 +0,0 @@
-require 'flico/cell'
-
-module Flico
-	
-	class Grid
-				
-		GRID 		= [[0,1,1,2], [3,4,5,6], [7,8,8,9]]
-		CANV_WIDTH 	= 1750
-		CANV_HEIGHT = 1250
-
-		def canv_width
-			CANV_WIDTH
-		end
-
-		def canv_height
-			CANV_HEIGHT
-		end
-
-		def columns
-			GRID.max_by(&:size).size
-		end
-
-		def column_cells
-			GRID.transpose
-		end
-
-		def rows
-			GRID.size
-		end
-
-		def row_cells
-			GRID
-		end
-		
-		def cell_width(name)
-			cell_size(CANV_WIDTH, columns, size_multiplier(row_cells, name))
-		end
-
-		def cell_height(name)
-			cell_size(CANV_HEIGHT, rows, size_multiplier(column_cells, name))
-		end
-
-		def crop_rectangle(cell_name, image_width, image_height)
-			x, y = 0, 0
-			image = Cell.new(image_width, image_height)
-			cell = cell_rectangle(cell_name)
-
-			unless image.aspect_ratio >= cell.aspect_ratio
-				final_width = image.width
-				final_height = image.height - (image.height - (image.width / cell.aspect_ratio))
-			else
-				final_width = image_width - (image.width - (image.height * cell.aspect_ratio))
-				final_height = image.height
-			end
-
-			crop_rectangle = Cell.new(x, y, final_width, final_height)
-			crop_rectangle
-		end
-
-		def resize_rectangle(cell_name, image_width, image_height)
-			image = Cell.new(image_width, image_height)
-			cell_rectangle(cell_name)
-		end
-
-		def cell_rectangle(name)
-			row, column = row_cells.find_index {|row| row.include? name }, column_cells.find_index {|row| row.include? name }
-			Cell.new(column * (CANV_WIDTH / columns), row * (CANV_HEIGHT / rows), cell_width(name), cell_height(name))
-		end
-
-		private
-
-		def size_multiplier(table, name)
-			table.map {|row| row.count(name)}.max
-		end
-
-		def cell_size(total, divisions, multiplier)
-			(multiplier == 0) ? 0 : ((total / divisions) * multiplier)
-		end
-	end
-
-end

data/lib/flico/saver.rb

@@ -1,44 +0,0 @@
-require 'open-uri'
-require 'tempfile'
-require 'fileutils'
-require 'date'
-
-
-module Flico
-
-	class FetchingError < StandardError; end
-
-	class FetchImage
-
-		def call(url)
-			tempfile = Tempfile.new 'temp_image'
-			IO.copy_stream(open(url, read_timeout: 5), tempfile)
-			tempfile.rewind
-			tempfile
-			rescue OpenURI::HTTPError => e
-			raise FetchingError, "Couldn't download from: #{url} due to #{e.message}"
-		end
-
-	end
-
-	class SaveCollage
-
-		attr_accessor :output_file_name
-
-		def call(file_path)
-	      	file_name = output_file_name || validate_file_name
-	      	FileUtils.mv file_path, file_name
-	      	puts "Flicollage saved at #{file_name}"
-	    end
-
-	    private
-
-	    def validate_file_name
-	      	puts "Enter file name for collage (press ENTER to use '#{default}')"
-	      	file_name = STDIN.gets.strip
-			file_name.empty? ? "flicollage-#{Time.now.strftime('%Y%m%d%H%M%S')}.png" : file_name
-	    end
-
-	end
-
-end

data/spec/flickr_command_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-require 'flico/flickr_command'
-
-describe Flico::FlickrCommand do
-
-	let(:search_results) {[{"id"=>"33472607802", "owner"=>"78759190@N05", "secret"=>"42e011bcf5", "server"=>"2805", "farm"=>3, "title"=>"Volkswagen Golf in Luxembourg", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0}]}
-  	let(:sizes_results) {
-    	[
-      		{"label"=>"Square", "width"=>75, "height"=>75, "source"=>"https://farm3.staticflickr.com/2805/33472607802_42e011bcf5_s.jpg", "url"=>"https://farm3.staticflickr.com/2805/33472607802_42e011bcf5/sizes/sq/", "media"=>"photo"},
-      		{"label"=>"Large Square", "width"=>"150", "height"=>"150", "source"=>"https://farm3.staticflickr.com/2805/33472607802_42e011bcf5_q.jpg", "url"=>"https://farm3.staticflickr.com/2805/33472607802_42e011bcf5/sizes/q/", "media"=>"photo"},
-      		{"label"=>"Thumbnail", "width"=>"100", "height"=>"66", "source"=>"https://farm3.staticflickr.com/2805/33472607802_42e011bcf5_t.jpg", "url"=>"https://farm3.staticflickr.com/2805/33472607802_42e011bcf5/sizes/t/", "media"=>"photo"}
-      	]
-  	}
-  	let(:subject) { described_class.new(search_command: search_command, sizes_command: sizes_command) }
-  	let(:search_command) { double('search', call: search_results ) }
-  	let(:sizes_command) { double('sizes', call: sizes_results)}
-
-	context 'search success' do
-		it 'should return image url for search keyword' do
-			expect(subject.call 'Volkswagen Golf in Luxembourg').to eq('https://farm3.staticflickr.com/2805/33472607802_42e011bcf5_q.jpg')
-		end
-	end
-
-end