simple-images-downloader 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaab3c2b2fd909ddb983e0f23b20bb4361c41288ea834ab698b972c42a3b211b
-  data.tar.gz: ea9be3356750b3ec278b01f439eac533c12dc757ab9c0fb26496e7b90a954302
+  metadata.gz: 5d6712c3ea229e3cb09526ef0f0144f79fa9dcf1d7af6f20b23a83502ea34be1
+  data.tar.gz: b1147429efdf91682067decf309aec22050f2ed835b0b0261560f93fd6a63aa6
 SHA512:
-  metadata.gz: a127db82c6529f8c592f1a85f88f8cc7742aa5ea175a18cdca895e7f4e17a08b14213713aa1b5030cdf44fda1ddd785c7b600f7f7ad69854d09dc5179e1ba708
-  data.tar.gz: 32538f8dd10a8d7d3eca94819cac12a2170364b11a612b7a555cb3898eba95e19628ea8726ab95e2cbc86e5cac65dfbbab128461c5e54cae01b37a3354cfcc61
+  metadata.gz: b3cf6db2633b3ebf0e094482079193fa2dbcb75e169c70ea3778e9c46b00abbdae4089378c36d8570630aa0698ca5343ee1a97e67f6e8e193c1d234c240bb35f
+  data.tar.gz: cd9645e49d0a1658c74a6acde0a5608bd5a79fea67acda6235057c018066aaee7b5352ca150a5bf77d926189cd41dfb43950e62f0257edab98f31fc25f7a3f1b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.3 - 2023-09-27
+- Corrected destination validation in SimpleImagesDownloader::Dispenser
+- Corrected source file validation in SimpleImagesDownloader::SourceFiles
+- Refactored
+- Fixed error message when destination is invalid
+
 ## 1.0.2 - 2020-09-25
 - Refactored SimpleImagesDownloader::Dispenser keeping the same behaviour
 - Updated README

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-images-downloader (1.0.2)
+    simple-images-downloader (1.0.3)
       zeitwerk (~> 2.4.0)
 
 GEM
@@ -10,7 +10,6 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
-    byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
     crack (0.4.4)
@@ -29,9 +28,6 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (12.3.3)
@@ -80,7 +76,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -88,7 +84,6 @@ PLATFORMS
 DEPENDENCIES
   faker (~> 2.14)
   pry (~> 0.13.1)
-  pry-byebug (~> 3.9.0)
   rake (~> 12.0)
   rspec (~> 3.0)
   rspec_junit_formatter (~> 0.4.1)
@@ -104,4 +99,4 @@ RUBY VERSION
    ruby 2.7.1p83
 
 BUNDLED WITH
-   2.1.4
+   2.2.19

data/lib/simple_images_downloader/client.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  class Client
+    def initialize(options = Configuration::REQUEST_OPTIONS)
+      @options = options
+    end
+
+    def open(uri)
+      uri.open(@options)
+    rescue OpenURI::HTTPRedirect
+      raise Errors::RedirectError, uri
+    rescue OpenURI::HTTPError
+      raise Errors::ConnectionError, uri
+    end
+  end
+end

data/lib/simple_images_downloader/configuration.rb

@@ -8,6 +8,13 @@ module SimpleImagesDownloader
       destination
     ].freeze
 
+    REQUEST_OPTIONS = {
+      'User-Agent' => "SimpleImagesDownloader/#{SimpleImagesDownloader::VERSION}",
+      redirect: false,
+      open_timeout: 30,
+      read_timeout: 30
+    }.freeze
+
     attr_accessor(*ACCESSORS)
 
     def initialize

data/lib/simple_images_downloader/dispenser.rb

@@ -3,28 +3,30 @@
 module SimpleImagesDownloader
   class Dispenser
     extend Forwardable
+    include Validatable
 
     def_delegator 'SimpleImagesDownloader::Configuration', :destination, :destination_dir
 
-    def initialize(source, remote_path)
+    def initialize(source, remote_path, validators = [DestinationValidator.new])
       @source      = source
       @remote_path = remote_path
+      @validators  = validators
     end
 
     def place
-      raise Errors::DestinationIsNotWritable, destination unless File.writable?(destination_dir)
+      validate!(destination_dir)
 
-      FileUtils.mv @source, destination
+      FileUtils.mv @source, target
     end
 
-    def destination
-      @destination ||= destination_dir + file_name
+    def target
+      @target ||= destination_dir + file_name
     end
 
     def file_name
       @file_name ||= File.basename(@source) + File.extname(@remote_path)
     end
 
-    private :destination_dir, :destination, :file_name
+    private :destination_dir, :target, :file_name
   end
 end

data/lib/simple_images_downloader/downloader.rb

@@ -2,13 +2,6 @@
 
 module SimpleImagesDownloader
   class Downloader
-    REQUEST_OPTIONS = {
-      'User-Agent' => "SimpleImagesDownloader/#{SimpleImagesDownloader::VERSION}",
-      redirect: false,
-      open_timeout: 30,
-      read_timeout: 30
-    }.freeze
-
     def initialize(uri)
       @uri = uri
     end
@@ -16,23 +9,15 @@ module SimpleImagesDownloader
     def download
       puts "Downloading #{@uri}"
 
-      @downloaded_file = StringioToTempfile.convert(downloaded_file) if downloaded_file.is_a?(StringIO)
+      io = Client.new.open(@uri)
+
+      downloaded_file = StringioToTempfile.convert(io) unless io.nil?
 
       Dispenser.new(downloaded_file, @uri.path).place
 
       puts 'Downloading is finished'
     ensure
-      downloaded_file.close
-    end
-
-    private
-
-    def downloaded_file
-      @downloaded_file ||= @uri.open(REQUEST_OPTIONS)
-    rescue OpenURI::HTTPRedirect
-      raise Errors::RedirectError, @uri
-    rescue OpenURI::HTTPError
-      raise Errors::ConnectionError, @uri
+      downloaded_file&.close
     end
   end
 end

data/lib/simple_images_downloader/errors.rb

@@ -52,5 +52,19 @@ module SimpleImagesDownloader
         super(message)
       end
     end
+
+    class DestinationIsNotDirectory < BaseError
+      def initialize(path)
+        message = "The destination - #{path} is not directory"
+        super(message)
+      end
+    end
+
+    class PermissionsError < BaseError
+      def initialize(path)
+        message = "Couldn't read file #{path} due to permissions error"
+        super(message)
+      end
+    end
   end
 end

data/lib/simple_images_downloader/line.rb

@@ -2,14 +2,17 @@
 
 module SimpleImagesDownloader
   class Line
-    def initialize(string)
-      @string = string
+    include Validatable
+
+    def initialize(string, validators = [ImagePathValidator.new])
+      @string     = string
+      @validators = validators
     end
 
     def uri
       parsed_uri = URI.parse(@string)
 
-      ImagePathValidator.new(@string).validate
+      validate!(@string)
 
       parsed_uri
     rescue URI::Error

data/lib/simple_images_downloader/source_file.rb

@@ -2,13 +2,15 @@
 
 module SimpleImagesDownloader
   class SourceFile
-    def initialize(path, validator = nil)
-      @path      = path
-      @validator = validator || SimpleImagesDownloader::FilePersistanceValidator.new(path)
+    include Validatable
+
+    def initialize(path, validators = [FilePersistanceValidator.new, FileAccessibilityValidator.new])
+      @path       = path
+      @validators = validators
     end
 
     def each_line(&block)
-      @validator.validate
+      validate!(@path)
 
       begin
         file.each(chomp: true, &block)

data/lib/simple_images_downloader/validatable/destination_validator.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  module Validatable
+    class DestinationValidator < Validator
+      def validate(destination_dir)
+        raise Errors::DestinationIsNotDirectory, destination_dir unless File.directory?(destination_dir)
+        raise Errors::DestinationIsNotWritable, destination_dir unless File.writable?(destination_dir)
+      end
+    end
+  end
+end

data/lib/simple_images_downloader/validatable/file_accessibility_validator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  module Validatable
+    class FileAccessibilityValidator < Validator
+      def validate(path)
+        return if File.readable?(path)
+
+        raise Errors::PermissionsError, path
+      end
+    end
+  end
+end

data/lib/simple_images_downloader/validatable/file_persistance_validator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  module Validatable
+    class FilePersistanceValidator < Validator
+      def validate(path)
+        return if File.exist?(path)
+
+        raise Errors::MissingFileError, path
+      end
+    end
+  end
+end

data/lib/simple_images_downloader/validatable/image_path_validator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  module Validatable
+    class ImagePathValidator < Validator
+      VALID_EXTENSIONS = %w[.png .jpg .gif .jpeg].freeze
+
+      def validate(path)
+        extension = File.extname(path)
+
+        return if VALID_EXTENSIONS.include?(extension)
+
+        raise Errors::MissingImageInPath, path
+      end
+    end
+  end
+end

data/lib/simple_images_downloader/validatable/validator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  module Validatable
+    class Validator
+      def validate(_value)
+        raise NotImplementedError, 'must be implemented in subclass'
+      end
+    end
+  end
+end

data/lib/simple_images_downloader/validatable.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module SimpleImagesDownloader
+  module Validatable
+    def validate!(value)
+      (@validators ||= []).each { |validator| validator.validate(value) }
+    end
+  end
+end

data/lib/simple_images_downloader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleImagesDownloader
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/rubocop.yml

@@ -33,7 +33,7 @@ Style/Documentation:
   Enabled: false
 
 Style/MethodCalledOnDoEndBlock:
-  Enabled: true
+  Enabled: false
 
 Style/CollectionMethods:
   Enabled: true

data/simple_images_downloader.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'faker', '~> 2.14'
   spec.add_development_dependency 'pry', '~> 0.13.1'
-  spec.add_development_dependency 'pry-byebug', '~> 3.9.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-images-downloader
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - IlkhamGaysin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.1
-description: 
+description:
 email:
 - ilgamgaysin@gmail.com
 executables:
@@ -220,16 +206,21 @@ files:
 - bin/setup
 - exe/simple-images-downloader
 - lib/simple_images_downloader.rb
+- lib/simple_images_downloader/client.rb
 - lib/simple_images_downloader/configuration.rb
 - lib/simple_images_downloader/dispenser.rb
 - lib/simple_images_downloader/downloader.rb
 - lib/simple_images_downloader/errors.rb
-- lib/simple_images_downloader/file_persistance_validator.rb
-- lib/simple_images_downloader/image_path_validator.rb
 - lib/simple_images_downloader/line.rb
 - lib/simple_images_downloader/runner.rb
 - lib/simple_images_downloader/source_file.rb
 - lib/simple_images_downloader/stringio_to_tempfile.rb
+- lib/simple_images_downloader/validatable.rb
+- lib/simple_images_downloader/validatable/destination_validator.rb
+- lib/simple_images_downloader/validatable/file_accessibility_validator.rb
+- lib/simple_images_downloader/validatable/file_persistance_validator.rb
+- lib/simple_images_downloader/validatable/image_path_validator.rb
+- lib/simple_images_downloader/validatable/validator.rb
 - lib/simple_images_downloader/version.rb
 - rubocop.yml
 - simple_images_downloader.gemspec
@@ -240,7 +231,7 @@ metadata:
   homepage_uri: https://github.com/IlkhamGaysin/simple-images-downloader
   source_code_uri: https://github.com/IlkhamGaysin/simple-images-downloader
   changelog_uri: https://github.com/IlkhamGaysin/simple-images-downloader/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: simple-images-downloader allows to download images from a file containing
   list of urls to those images.

data/lib/simple_images_downloader/file_persistance_validator.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleImagesDownloader
-  class FilePersistanceValidator
-    def initialize(path)
-      @path = path
-    end
-
-    def validate
-      raise Errors::MissingFileError, @path unless File.exist?(@path)
-    end
-  end
-end

data/lib/simple_images_downloader/image_path_validator.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleImagesDownloader
-  class ImagePathValidator
-    VALID_EXTENSIONS = %w[.png .jpg .gif .jpeg].freeze
-
-    def initialize(path)
-      @path = path
-    end
-
-    def validate
-      raise Errors::MissingImageInPath, @path unless VALID_EXTENSIONS.include?(extension)
-    end
-
-    private
-
-    def extension
-      File.extname(@path)
-    end
-  end
-end