twitter_images 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20dbabd1b8ed7d7b58e062c56e3a1912ee07b250
-  data.tar.gz: 8de26899a00b93007b8338a588514fbba231f781
+  metadata.gz: f2efcf33670803f3ef9bb96883e19350d8c64aa1
+  data.tar.gz: c00d26f7028c0f8691af0d17175ac2600e5d5587
 SHA512:
-  metadata.gz: 62d203269ee201430588c11da10ac95dac38cd514a68ba3e3dd589cff06083d61ec4ff2bc0a3e5b4e46ba324818901f875db37b30e80c1a54c919f4ac2756564
-  data.tar.gz: f91bd4f69ce6bd9fb4e8d33fb151d5a2ef29f21b37b363660d5a8b360b3ec1154fe5525718f8f4d02dc8cdb7118501f210d3518e7a2d2e337ae50bb336581f44
+  metadata.gz: 62a688ae4b999dc38232e9d4d1cef356ab2b3de75d45545dc4f1cee9ab3b628f5f265e0c792cdb39a924991bc019b701bba0d4b2cd7a8ef65bcc7c4097983639
+  data.tar.gz: 3369306d11cb49cc8cc60cf076cbf558094fdea04dab12d4e16059d860a4c555669d765d81a47635bf0f6bb836267457548508d39dfa32c3f4d1262b3ed82bc8

data/bin/twitter_images

@@ -3,8 +3,4 @@
 $LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 require "twitter_images"
 
-downloader = TwitterImages::Downloader.new
-requester = TwitterImages::Requester.new(downloader)
-configuration = TwitterImages::Configuration.new(requester)
-
-TwitterImages::CLI.new(configuration).run
+TwitterImages::CLI.new(ARGV).run

data/lib/twitter_images.rb

@@ -5,9 +5,11 @@ require "json"
 require "oauth"
 require "ruby-progressbar"
 require "typhoeus"
+require "optparse"
 
 require "twitter_images/cli"
 require "twitter_images/configuration"
 require "twitter_images/requester"
+require "twitter_images/parser"
 require "twitter_images/downloader"
 require "twitter_images/version"

data/lib/twitter_images/cli.rb

@@ -2,12 +2,40 @@ module TwitterImages
   class CLI
     attr_reader :configuration
 
-    def initialize(configuration)
-      @configuration = configuration
+    def initialize(argv)
+      @argv = argv
+      @configuration = Configuration.new
+      @options = {}
     end
 
     def run
-      configuration.prepare
+      parse_command_line_options
+      configuration.prepare(@options)
+    end
+
+    private
+
+    def parse_command_line_options
+      global_options.parse!(@argv)
+      @options[:path] = @argv[0]
+      @options[:term] = @argv[1..-2].join
+      @options[:amount] = @argv[-1]
+    end
+
+    def global_options
+      OptionParser.new do |opts|
+        opts.banner = "usage: twitter_images [-v | --version] [-h | --help] [options] [path] [search terms] [amount]"
+
+        opts.on("-v", "--version", "Display the version and exit") do
+          puts "Version: #{TwitterImages::VERSION}"
+          exit
+        end
+
+        opts.on("-h", "--help", "Display this help message and exit") do
+          puts opts
+          exit
+        end
+      end
     end
   end
 end

data/lib/twitter_images/configuration.rb

@@ -1,45 +1,42 @@
 module TwitterImages
   class Configuration
-    attr_reader   :requester
+    attr_reader   :options, :requester
     attr_accessor :search, :directory, :amount
 
-    def initialize(requester)
-      @requester = requester
+    def initialize
+      @requester = Requester.new
     end
 
-    def prepare
-      set_directory
-      get_search
-      get_amount
+    def prepare(options)
+      set_directory(options[:path])
+      get_search(options[:term])
+      get_amount(options[:amount])
       start
     end
 
     private
 
-    def set_directory
-      puts "Please enter the directory to save the images in: "
-      @directory = gets.chomp
+    def set_directory(dir)
+      @directory = File.expand_path(dir)
       raise StandardError, "Directory doesn't exist" unless directory_exists?
       change_directory
     end
 
     def directory_exists?
-      Dir.exist?(File.expand_path(@directory))
+      Dir.exist?(@directory)
     end
 
     def change_directory
-      Dir.chdir(File.expand_path(@directory))
+      Dir.chdir(@directory)
     end
 
-    def get_search
-      puts "Please enter the search terms: "
-      @search = gets.chomp.gsub(/\s/, "%20")
+    def get_search(term)
+      @search = term.chomp.gsub(/\s/, "%20").gsub(/\#/, "%23")
       raise StandardError, "The search string is empty" if @search.empty?
     end
 
-    def get_amount
-      puts "Please enter the number of images to download: "
-      @amount = gets.chomp.to_i
+    def get_amount(number)
+      @amount = number.to_i
       raise StandardError, "The number is too small" if @amount <= 0
     end
 

data/lib/twitter_images/downloader.rb

@@ -2,8 +2,8 @@ module TwitterImages
   class Downloader
     attr_accessor :output, :images
 
-    def download(all_links)
-      save_images(all_links)
+    def download(parsed_links)
+      save_images(parsed_links)
     end
 
     private
@@ -14,11 +14,11 @@ module TwitterImages
       file.close
     end
 
-    def save_images(all_links)
-      progressbar = ProgressBar.create(:total => all_links.count)
+    def save_images(parsed_links)
+      progressbar = ProgressBar.create(:total => parsed_links.count)
       hydra = Typhoeus::Hydra.new
 
-      all_links.each do |src|
+      parsed_links.each do |src|
         request = Typhoeus::Request.new(src + ":large")
         request.on_complete do |response|
           write_file(src, response.body)
@@ -27,7 +27,7 @@ module TwitterImages
         hydra.queue request
       end
       hydra.run
-      puts "Downloaded #{all_links.count} pictures!"
+      puts "Downloaded #{parsed_links.count} pictures!"
     end
   end
 

data/lib/twitter_images/parser.rb

@@ -0,0 +1,35 @@
+module TwitterImages
+  class Parser
+    attr_reader :response
+    attr_accessor :parsed_links, :max_id
+
+    def initialize
+      @parsed_links = []
+    end
+
+    def parse(response)
+      parsed = JSON.parse(response.body)
+      get_max_id(parsed)
+      collect_responses(parsed)
+    end
+
+    def trim_links(amount)
+      @parsed_links = @parsed_links.slice!(0...amount)
+    end
+
+    private
+
+    def get_max_id(parsed)
+      ids = []
+      parsed["statuses"].each do |tweet|
+        ids << tweet["id"]
+      end
+      @max_id = ids.min - 1
+    end
+
+    def collect_responses(parsed)
+      @parsed_links += parsed.inspect.scan(/https:\/\/pbs.twimg.com\/media\/\w+\.(?:jpg|png|gif)/)
+      @parsed_links.uniq!
+    end
+  end
+end

data/lib/twitter_images/requester.rb

@@ -1,11 +1,11 @@
 module TwitterImages
   class Requester
-    attr_reader   :consumer_key, :access_token, :downloader, :search
-    attr_accessor :https, :address, :response, :max_id, :all_links
+    attr_reader   :consumer_key, :access_token, :downloader, :search, :parser
+    attr_accessor :https, :address, :response
 
-    def initialize(downloader)
-      @downloader = downloader
-      @all_links = []
+    def initialize
+      @downloader = Downloader.new
+      @parser = Parser.new
     end
 
     def start(search, amount)
@@ -16,22 +16,26 @@ module TwitterImages
 
     def get_links(search, amount)
       loop do
-        setup_address(search)
-        setup_https
-        issue_request
-        parse_response
-        break if all_links.count > amount
+        configure_request(search)
+        parse
+        break if @parser.parsed_links.count > amount
       end
       trim_links(amount)
     end
 
     private
 
+    def configure_request(search)
+      setup_address(search)
+      setup_https
+      issue_request
+    end
+
     def setup_address(search)
-      unless @max_id.nil?
-        @address = URI("https://api.twitter.com/1.1/search/tweets.json?q=%23#{search}&result_type=recent&count=100&max_id=#{@max_id}")
+      unless parser.max_id.nil?
+        @address = URI("https://api.twitter.com/1.1/search/tweets.json?q=#{search}&result_type=recent&count=100&max_id=#{parser.max_id}")
       else
-        @address = URI("https://api.twitter.com/1.1/search/tweets.json?q=%23#{search}&result_type=recent&count=100")
+        @address = URI("https://api.twitter.com/1.1/search/tweets.json?q=#{search}&result_type=recent&count=100")
       end
     end
 
@@ -67,31 +71,16 @@ module TwitterImages
       @response = https.request(request)
     end
 
-    def parse_response
-      filtered = JSON.parse(@response.body)
-      get_max_id(filtered)
-      collect_responses(filtered)
-    end
-
-    def get_max_id(filtered)
-      ids = []
-      filtered["statuses"].each do |tweet|
-        ids << tweet["id"]
-      end
-      @max_id = ids.min - 1
-    end
-
-    def collect_responses(filtered)
-      @all_links += filtered.inspect.scan(/https:\/\/pbs.twimg.com\/media\/\w+\.(?:jpg|png|gif)/)
-      @all_links.uniq!
+    def parse
+      parser.parse(response)
     end
 
     def trim_links(amount)
-      @all_links = @all_links.slice!(0...amount)
+      parser.trim_links(amount)
     end
 
     def download
-      downloader.download(@all_links)
+      downloader.download(parser.parsed_links)
     end
   end
 end

data/lib/twitter_images/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_images
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexey Zabelin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils
@@ -199,6 +199,7 @@ files:
 - lib/twitter_images/cli.rb
 - lib/twitter_images/configuration.rb
 - lib/twitter_images/downloader.rb
+- lib/twitter_images/parser.rb
 - lib/twitter_images/requester.rb
 - lib/twitter_images/version.rb
 homepage: https://github.com/alexeyzab/twitter_images