twitter_images 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5396eb2858c323b0b9bc1b102349c954538adc4
-  data.tar.gz: 5fddbe2b1d551eae8e85debc0f723303fe4c36e4
+  metadata.gz: aa9d6738e520524fa87bebe3509598b51ff6b61c
+  data.tar.gz: d7021a59087e612655ec50a740ac3d02a559f94f
 SHA512:
-  metadata.gz: 95f5b0fbbc333e7edd30091f9f34d45f2f642a4f513faa71f638fc03e87283b2e0cb426af4ea00232ec13bc45f6f89193cb114ca9ff53ba23fb16eaa292ff002
-  data.tar.gz: ca4e23a17947b2f7d3718127cbd64a0e48f37059b9a98112df8e19c824066137eab412c2d92a8afb990c64e328dbd9464d33d93f6e9d4fb9202e84894d07c5fe
+  metadata.gz: 131398180fdb31450b64b8c1303637ed67b8190272d5e86206458a594c7c5b8222841190d26f0c87412ec8ccb3bcff2b635a48a15b8d10ee9c7ea39d261fd705
+  data.tar.gz: 552d52a07c0525ae55a54777785383c0823823cf21455f9090d0f16f2e3a1d9b0938b1b19b709355527bb20e1c1d06450c101fb964d0872394066d1a2fd7bf86

data/bin/twitter_images

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

data/lib/twitter_images.rb

@@ -5,7 +5,8 @@ require "json"
 require "oauth"
 require "ruby-progressbar"
 
+require "twitter_images/cli"
 require "twitter_images/configuration"
+require "twitter_images/requester"
 require "twitter_images/downloader"
-require "twitter_images/cli"
 require "twitter_images/version"

data/lib/twitter_images/cli.rb

@@ -1,15 +1,13 @@
 module TwitterImages
   class CLI
-    attr_accessor :downloader, :configuration
+    attr_accessor :configuration
 
-    def initialize(configuration, downloader)
-      @configuration = configuration
-      @downloader = downloader
+    def initialize()
+      @configuration = Configuration.new
     end
 
     def run
       configuration.prepare
-      downloader.download
     end
   end
 end

data/lib/twitter_images/configuration.rb

@@ -1,90 +1,28 @@
 module TwitterImages
   class Configuration
-    attr_accessor :search, :directory, :output, :consumer_key, :access_token,
-                  :address, :request, :http, :response
-
-    def initialize()
-      @search = search
-      @directory = directory
-      @output = output
-      @consumer_key = consumer_key
-      @access_token = access_token
-      @address = address
-      @request = request
-      @http = http
-      @response = response
-    end
+    attr_accessor :search, :directory
 
     def prepare
-      setup_credentials
-      get_directory
-      change_directory
+      set_directory
       get_search
-      establish_connection
-    end
-
-    def establish_connection
-      setup_address
-      setup_http
-      build_request
-      issue_request
-      get_output
+      Requester.new(@search).start
     end
 
     private
 
-    def setup_credentials
-      check_env
-      @consumer_key = OAuth::Consumer.new(ENV["CONSUMER_KEY"], ENV["CONSUMER_SECRET"])
-      @access_token = OAuth::Token.new(ENV["ACCESS_TOKEN"], ENV["ACCESS_SECRET"])
-    end
-
-    def check_env
-      if ENV.key?("CONSUMER_KEY") &&
-         ENV.key?("CONSUMER_SECRET") &&
-         ENV.key?("ACCESS_TOKEN") &&
-         ENV.key?("ACCESS_SECRET")
-        return true
-      else
-        return "The credentials have not been correctly set up in your ENV"
-      end
-    end
-
-    def setup_http
-      # Set up Net::HTTP to use SSL, which is required by Twitter.
-      @http = Net::HTTP.new(address.host, address.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    end
-
-    def build_request
-      # Build the request and authorize it with OAuth.
-      @request = Net::HTTP::Get.new(address.request_uri)
-      request.oauth!(http, consumer_key, access_token)
-    end
-
-    def issue_request
-      # Issue the request and return the response.
-      http.start
-      @response = http.request(request)
-    end
-
-    def get_output
-      @output = JSON.parse(response.body)
-    end
-
-    def setup_address
-      @address = URI("https://api.twitter.com/1.1/search/tweets.json?q=%23#{search}&mode=photos&count=100")
+    def set_directory
+      puts "Please enter the directory to save the images in: "
+      @directory = gets.chomp
+      raise StandardError, "Directory doesn't exist" unless directory_exists?
+      change_directory
     end
 
-    def get_directory
-      puts "Please enter the absolute path to the directory to save the images in: "
-      @directory = gets.chomp
-      raise StandardError, "Directory doesn't exist" unless Dir.exists?(@directory)
+    def directory_exists?
+      Dir.exist?(File.expand_path(@directory))
     end
 
     def change_directory
-      Dir.chdir(@directory)
+      Dir.chdir(File.expand_path(@directory))
     end
 
     def get_search

data/lib/twitter_images/downloader.rb

@@ -1,34 +1,32 @@
 module TwitterImages
   class Downloader
-    attr_accessor :images
-    attr_reader :configuration
+    attr_accessor :response, :output, :images
 
-    def initialize(configuration)
-      @images = images
-      @configuration = configuration
+    def initialize(response)
+      @response = response
     end
 
     def download
-      get_images
+      get_output
+      parse_output
       save_images
     end
 
     private
 
-    def get_images
-      @images = configuration.output.inspect.scan(/http:\/\/pbs.twimg.com\/media\/\w+\.(?:jpg|png|gif)/)
-      raise StandardError, "Couldn't find any images" unless (@images.count > 0)
+    def get_output
+      @output = JSON.parse(response.body)
     end
 
-    def make_absolute(href, root)
-      URI.parse(root).merge(URI.parse(href)).to_s
+    def parse_output
+      @images = output.inspect.scan(/https:\/\/pbs.twimg.com\/media\/\w+\.(?:jpg|png|gif)/)
+      raise StandardError, "Couldn't find any images" unless @images.count > 0
     end
 
     def save_images
       progressbar = ProgressBar.create(:total => images.count)
       images.each do |src|
-        uri = make_absolute(src, configuration.search)
-        File.open(File.basename(uri), 'wb'){ |f| f.write(open(uri).read) }
+        File.open(File.basename(src), "wb") { |f| f.write(open(src + ":large").read) }
         progressbar.increment
       end
     end

data/lib/twitter_images/requester.rb

@@ -0,0 +1,61 @@
+module TwitterImages
+  class Requester
+    attr_accessor :search, :consumer_key, :access_token, :address, :https,
+                  :request, :response
+
+    def initialize(search)
+      @search = search
+    end
+
+    def start
+      set_address
+      setup_credentials
+      setup_https
+      build_request
+      issue_request
+      Downloader.new(@response).download
+    end
+
+    private
+
+    def set_address
+      @address = URI("https://api.twitter.com/1.1/search/tweets.json?q=%23#{search}&mode=photos&count=100")
+    end
+
+    def setup_credentials
+      check_env
+      @consumer_key = OAuth::Consumer.new(ENV["CONSUMER_KEY"], ENV["CONSUMER_SECRET"])
+      @access_token = OAuth::Token.new(ENV["ACCESS_TOKEN"], ENV["ACCESS_SECRET"])
+    end
+
+    def check_env
+      if ENV.key?("CONSUMER_KEY") &&
+          ENV.key?("CONSUMER_SECRET") &&
+          ENV.key?("ACCESS_TOKEN") &&
+          ENV.key?("ACCESS_SECRET")
+        return true
+      else
+        puts "The credentials have not been correctly set up in your ENV"
+      end
+    end
+
+    def setup_https
+      # Set up Net::HTTP to use SSL, which is required by Twitter.
+      @https = Net::HTTP.new(address.host, address.port)
+      https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
+
+    def build_request
+      # Build the request and authorize it with OAuth.
+      @request = Net::HTTP::Get.new(address.request_uri)
+      request.oauth!(https, consumer_key, access_token)
+    end
+
+    def issue_request
+      # Issue the request and return the response.
+      @https.start
+      @response = https.request(request)
+    end
+  end
+end

data/lib/twitter_images/version.rb

@@ -1,3 +1,3 @@
 module TwitterImages
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

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