twitter_images 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680f11ce26e7df87577faabdc26ad693666aab6a
-  data.tar.gz: cd696a0c46369e957d9090a248685ea950765caf
+  metadata.gz: 663c7dbbd3a7a65e9d70ade8c05a543c4d1ca7d4
+  data.tar.gz: 8ac2b5f66ef0ae89672a77add20dd02cf1ae4ca8
 SHA512:
-  metadata.gz: f95223c9dcf5183030b9573a4ace1356fb1e996885bb36b08a278f2a7b779d8d1375cef0b270298b16f1bb897032e30efeb6866ba136b8257fa341d3fb3d878c
-  data.tar.gz: a7008e590ab5b044b3a936e005641354adfac80ea4dc2a3e4aa90238a32bb47ef50af06f6e38dbf5f4bb0562d7ab8ef5efc374a83c98dba456f32f67d7b10f53
+  metadata.gz: aeac47ed15425d246891c48ef9b1fb099ae3ce510042d75db5aec2521910eb3ee3c4ce44003f89479165e8f5a32ed2f7426aa748a7ae39ea75849a0f60c7f9f2
+  data.tar.gz: 1fb08285fd02a9e62f89f97926a8fe55d33ae31906d860136e13c8505d27d672dab4bd0b8192e684e6c1d4df0c871c599c925ba3faf902bbd57da4ef1b256baa

data/lib/twitter_images.rb

@@ -1,18 +1,15 @@
 require "rubygems"
-require "open-uri"
-require "fileutils"
-require "json"
 require "oauth"
 require "ruby-progressbar"
 require "typhoeus"
 require "optparse"
 require "launchy"
+require "twitter"
 
 require "twitter_images/cli"
 require "twitter_images/configuration"
 require "twitter_images/authorizer"
 require "twitter_images/requester"
-require "twitter_images/parser"
 require "twitter_images/downloader"
 require "twitter_images/version"
 require "twitter_images/consumer"

data/lib/twitter_images/authorizer.rb

@@ -7,18 +7,14 @@ module TwitterImages
       visit_url
       get_pin
       authorize_with_pin
-      set_credentials
+      write_credentials
+      assign_credentials
       puts "Authorization successful. Credentials have been written to #{ENV['HOME']}/.twitter_imagesrc"
     end
 
-    def access_token
+    def assign_credentials
       if File.exist?(ENV["HOME"] + "/.twitter_imagesrc")
         @access_token = IO.readlines(ENV["HOME"] + "/.twitter_imagesrc")[0].chomp
-      end
-    end
-
-    def access_secret
-      if File.exist?(ENV["HOME"] + "/.twitter_imagesrc")
         @access_secret = IO.readlines(ENV["HOME"] + "/.twitter_imagesrc")[1].chomp
       end
     end
@@ -44,7 +40,7 @@ module TwitterImages
       @access_token_object = request_token.get_access_token(:oauth_verifier => @pin)
     end
 
-    def set_credentials
+    def write_credentials
       File.open(ENV["HOME"] + "/.twitter_imagesrc", "w") do |file|
         file.puts(access_token_object.token)
         file.puts(access_token_object.secret)

data/lib/twitter_images/requester.rb

@@ -1,75 +1,73 @@
 module TwitterImages
   class Requester
-    attr_reader   :consumer_key, :access_token, :downloader, :search, :parser, :authorizer
-    attr_accessor :https, :address, :response
+    attr_reader   :downloader, :authorizer, :search
+    attr_accessor :client, :tweets, :links, :max_id
 
     def initialize
       @downloader = Downloader.new
-      @parser = Parser.new
       @authorizer = Authorizer.new
+      @max_id = nil
+      @tweets = []
+      @links = []
     end
 
     def start(search, amount)
-      get_links(search, amount)
-      download
+      puts "Getting links to the pictures..."
+      send_requests(search, amount)
+      download(links)
     end
 
-    def get_links(search, amount)
+    def send_requests(search, amount)
+      configure_client
       loop do
-        configure_request(search)
-        parse
-        break if @parser.parsed_links.count > amount
+        get_tweets(search, amount)
+        break if @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 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=#{search}&result_type=recent&count=100")
+    def configure_client
+      @client = Twitter::REST::Client.new do |config|
+        config.consumer_key = CONSUMER_KEY
+        config.consumer_secret = CONSUMER_SECRET
+        config.access_token = authorizer.access_token
+        config.access_token_secret = authorizer.access_secret
       end
     end
 
-    def consumer_key
-      OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET)
-    end
-
-    def access_token
-      OAuth::Token.new(authorizer.access_token, authorizer.access_secret)
-    end
-
-    def setup_https
-      @https = Net::HTTP.new(address.host, address.port)
-      https.use_ssl = true
-      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    def get_tweets(search, amount)
+      client.search(search, result_type: "recent", max_id: @max_id).take(amount).each do |tweet|
+        @tweets << tweet
+      end
+      get_max_id(@tweets)
+      get_links(@tweets)
     end
 
-    def issue_request
-      request = Net::HTTP::Get.new(address.request_uri)
-      request.oauth!(https, consumer_key, access_token)
-      @https.start
-      @response = https.request(request)
+    def get_max_id(tweets)
+      ids = []
+      tweets.each do |tweet|
+        ids << tweet.id
+      end
+      @max_id = ids.min - 1
     end
 
-    def parse
-      parser.parse(response)
+    def get_links(tweets)
+      tweets.each do |tweet|
+        if !tweet.media.empty?
+          @links << tweet.media[0].media_url.to_s
+          @links.uniq!
+        end
+      end
     end
 
     def trim_links(amount)
-      parser.trim_links(amount)
+      @links = @links.slice(0...amount)
     end
 
-    def download
-      downloader.download(parser.parsed_links)
+    def download(links)
+      downloader.download(links)
     end
   end
 end

data/lib/twitter_images/version.rb

@@ -1,3 +1,3 @@
 module TwitterImages
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: twitter_images
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexey Zabelin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fileutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +84,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.3
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +201,6 @@ files:
 - lib/twitter_images/configuration.rb
 - lib/twitter_images/consumer.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

data/lib/twitter_images/parser.rb

@@ -1,35 +0,0 @@
-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