images_from_link 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1898d9b69a6941bf657a8f397059d208e6a1551a
-  data.tar.gz: aea71848eafa0c0b8df073dd82b4c079492716bd
+  metadata.gz: 522fc31690af948adc4b51612c4d25d38b0c12f3
+  data.tar.gz: b26d5ef7ab8aa05bc43d00cf202d0d07e000987b
 SHA512:
-  metadata.gz: 523b977f91b97bd5e7cef2024eb217f97f2e9d416fe53f3fafed90a439686a9e2e9b64cad91f8b4b040d339403c1e3df32f7b979bfb47cd1c38d607381814e66
-  data.tar.gz: f7b8cb0e6817a9d6888730c516c5ac3f94c90d59a539114b6fbcca6dff9c4d78c85bdfe76b9e14e92d26ba200c5dd6637a93f84c65d9ff8b64818224ead3d868
+  metadata.gz: fbcd60da05ca7a14e0cd8de84b42cdb6fbed090e90533c81cd871e6c7eac54990f17f90b89baff426a41392bf0ee97bad1e79873c2d1ded1beb80266a1ce316a
+  data.tar.gz: 358f80bb52a5129d91947eead0cd68dab285f569d487b7b3752f311c8440f9b7c4640b1ca5a6c52badd6239898e139944e9d88e5869a84345b3a40bd9a06af80

data/README.md

@@ -28,7 +28,7 @@ ImagesFromLink.get_images('https://www.google.com')
 =>
 [
 "https://www.google.com/textinputassistant/tia.png",
- "https://www.google.com/images/nav_logo229.png",
+"https://www.google.com/images/nav_logo229.png",
 "https://www.google.com/images/branding/googlelogo/1x/googlelogo_white_background_color_272x92dp.png"
 ]
 ```

data/lib/handler_link.rb

@@ -0,0 +1,71 @@
+module HandlerLink
+  FORMAT_IMG = ["jpg", "jpeg", "png", "gif"]
+
+  # gets the url, returns domain
+  def self.get_host_link(link)
+    uri = URI.parse(link)
+    "#{uri.scheme}://#{uri.host}"
+  end
+
+  def self.handler_links(array_links, link)
+    array_links.each do |url|
+      if url.include?("(/")
+        uri = get_host_link(link)
+
+        position = url.index("(")
+        url[position] += uri.to_s
+      end
+    end
+  end
+
+  # adds scheme if this href
+  def self.handler_prefix_link(host_link, link)
+    abort 'expect strings params' unless host_link.is_a?(String) || link.is_a?(String)
+
+    if link[0] == '/' && link[1] != '/'
+      host_link + link
+    elsif link[0..1] == '//'
+      uri = URI.parse(host_link)
+      "#{uri.scheme}:#{link}"
+    else
+      link
+    end
+  end
+
+  def self.remove_unless_symbols(array_images_links)
+    array_images_links.each do |image_url|
+      if (image_url[0..3] != "http" || image_url[0..3] != "www.") && image_url.include?("(")
+        position = image_url.index("(")
+        image_url.reverse!
+        position.times { image_url.chop! }
+        image_url.reverse!
+        image_url.delete!("(,;'')")
+      end
+    end
+  end
+
+  def self.remove_global_unless_symbols(array_images_links)
+    array_images_links.each { |link| link.delete!("(,;'')") }
+  end
+
+  # remove link if link not valid
+  def self.remove_unless_link(array_links)
+
+    array_links.each_with_index do |link, index|
+      array_links[index] = "" if link[0..3] != "http"
+
+      index_ending = nil
+
+      FORMAT_IMG.each do |i|
+        index_ending = i if link.include?(i)
+      end
+
+      unless index_ending == nil
+        position = link.index(index_ending)
+        array_links[index] = "" if (link[position + index_ending.size] =~ /[a-z]/)
+      end
+
+    end
+    array_links.delete("")
+  end
+end

data/lib/images_from_link.rb

@@ -1,9 +1,10 @@
 require "images_from_link/version"
-require 'HandlerLink'
-require 'ImagesLink'
 
 module ImagesFromLink
-  # выводит каритнки по переданному урлу
+  require_relative 'handler_link'
+  require_relative 'images_link'
+
+  # extract images from got url
   def self.get_images(link)
     images_link = ImagesLink.new(link)
     images_link.get_images_from_url

data/lib/images_from_link/version.rb

@@ -1,3 +1,3 @@
 module ImagesFromLink
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/{ImagesLink.rb → images_link.rb}

@@ -1,67 +1,78 @@
 require 'httparty'
 require 'nokogiri'
 require 'uri'
-require_relative 'HandlerLink'
+require_relative 'handler_link'
 
 class ImagesLink
 
+  # expect valid url
   def initialize(link)
     @link = link
 
     begin
       @response = HTTParty.get(@link)
     rescue Errno::ECONNREFUSED => e
-      puts "Неправильный урл"
+      puts "not valid url"
       abort e.message
     end
 
     @doc = Nokogiri::HTML(@response.body)
     @doc.search('//noscript').each { |node| node.remove } # убираю мешающие ноды
-    @arra_links = [] # сдесь будут храниться все урлы картинок
-    @handler_link = HandlerLink.new # обработчик урлов
+    @links = [] # сдесь будут храниться все урлы картинок
+    @handler_link = HandlerLink # обработчик урлов
     @link_host_name = @handler_link.get_host_link(@link) # беру имя домена
   end
 
-  # возвращает, все найденные, урлы картинок
+  # returns all found images url
   def get_images_from_url
-    @arra_links = (get_url_with_attr_img_link + get_url_with_other_attr).uniq
-    @handler_link.remove_global_unless_symbols(@arra_links)
-    @arra_links
+    @links = (images_from_img_tag + images_from_link_tag + images_from_extension).uniq
+    @handler_link.remove_global_unless_symbols(@links)
+    @links
   end
 
-  def get_url_with_attr_img_link
-    img_arra = []
-    # пробегаю по тегам img (meta og:images...), хватаю урл и закидываю в @arra_links
+  # returns all images url with tags img['src']
+  def images_from_img_tag
+    img_array = []
+    # пробегаю по тегам img (meta og:images...), хватаю урл и закидываю в @links
     @doc.xpath('//img').each do |img|
       if img['src'] != nil
-        arra = [img['src'].to_s]
-        src = @handler_link.remove_unless_symbols(arra)
+        array = [img['src'].to_s]
+        src = @handler_link.remove_unless_symbols(array)
         got_link = @handler_link.handler_prefix_link(@link_host_name, src.to_s.delete!("[\"]"))
 
-        img_arra << got_link
+        img_array << got_link
       end
     end
 
+    img_array.uniq!
+    @handler_link.remove_unless_link(img_array)
+    img_array
+  end
+
+  # returns all images url with tags link['href']
+  def images_from_link_tag
+    img_array = []
     @doc.xpath('//link').each do |link|
       if link['href'] != nil && link['type'] != nil
         if link['type'].include?("image")
           got_link = @handler_link.handler_prefix_link(@link_host_name, link['href'])
-          img_arra << got_link
+          img_array << got_link
         end
       end
     end
 
-    @arra_links.uniq!
-    @handler_link.remove_unless_link(@arra_links)
-    img_arra
+    img_array.uniq!
+    @handler_link.remove_unless_link(img_array)
+    img_array
   end
 
-  def get_url_with_other_attr
-    # нахожу все урлы с jpg, png, gif... и закидываю в @arra_links
+  # returns all images url with jpg, png, gif...
+  def images_from_extension
+    # нахожу все урлы с jpg, png, gif...
     @images_links = URI.extract(@doc.to_s.encode("UTF-16be", :invalid => :replace, :replace => "?").encode('UTF-8')).select { |l| l[/\.(?:gif|png|jpe?g)\b/] }
     @handler_link.handler_links(@images_links, @link) # обрабатываю урлы
     @handler_link.remove_unless_symbols(@images_links)
     @handler_link.remove_unless_link(@images_links)
-    @images_links
+    @images_links.uniq
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: images_from_link
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - zerocool
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,10 +96,10 @@ files:
 - bin/console
 - bin/setup
 - images_from_link.gemspec
-- lib/HandlerLink.rb
-- lib/ImagesLink.rb
+- lib/handler_link.rb
 - lib/images_from_link.rb
 - lib/images_from_link/version.rb
+- lib/images_link.rb
 homepage: https://github.com/exwarvlad/images_from_link
 licenses:
 - MIT

data/lib/HandlerLink.rb

@@ -1,70 +0,0 @@
-class HandlerLink
-  FORMAT_IMG = ["jpg", "jpeg", "png", "gif"]
-
-  # получает урл - отдает домен
-  def get_host_link(link)
-    uri = URI.parse(link)
-    "#{uri.scheme}://" + uri.host
-  end
-
-  def handler_links(arra_links, link)
-    arra_links.each do |url|
-      if url.include?("(/")
-        uri = get_host_link(link)
-
-        position = url.index("(")
-        url[position] += uri.to_s
-      end
-    end
-  end
-
-  # добавляет scheme, если это href
-  def handler_prefix_link(host_link, link)
-    abort 'в качестве аргументов передайте строки' unless host_link.is_a?(String) || link.is_a?(String)
-
-    if link[0] == '/' && link[1] != '/'
-      host_link + link
-    elsif link[0..1] == '//'
-      uri = URI.parse(host_link)
-      "#{uri.scheme}:#{link}"
-    else
-      link
-    end
-  end
-
-  def remove_unless_symbols(arra_images_links)
-    arra_images_links.each do |image_url|
-      if (image_url[0..3] != "http" || image_url[0..3] != "www.") && image_url.include?("(")
-        position = image_url.index("(")
-        image_url.reverse!
-        position.times { image_url.chop! }
-        image_url.reverse!
-        image_url.delete!("(,;'')")
-      end
-    end
-  end
-
-  def remove_global_unless_symbols(arra_images_links)
-    arra_images_links.each { |link| link.delete!("(,;'')") }
-  end
-
-  def remove_unless_link(arra_link)
-
-    arra_link.each_with_index do |link, index|
-      arra_link[index] = "" if link[0..3] != "http"
-
-      index_ending = nil
-
-      FORMAT_IMG.each do |i|
-        index_ending = i if link.include?(i)
-      end
-
-        unless index_ending == nil
-          position = link.index(index_ending)
-          arra_link[index] = "" if (link[position + index_ending.size] =~ /[a-z]/)
-        end
-
-    end
-    arra_link.delete("")
-  end
-end