zorki 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa3c3b7f010024623a447e581f06d1aa5586726eee06b0e3bc04533dd86d6af
-  data.tar.gz: b9dfb531fd1207c3ece23e12132ff1d3cb57f3177eacaa1af0e4fea95d06041f
+  metadata.gz: dc52913230d63a501d9d7fba1ebb80f11cd5f47031711d0cb287da2a6b16fc93
+  data.tar.gz: 0c4aec5fcdf10a82265e9f2c405021ced45dd2c76e1e5b4ed9b8cbd275d680cf
 SHA512:
-  metadata.gz: 7c4eb7c2937b6c66529a23fc6fdbf0822ba102289a4327f8aaa5fa298692fc4a284476c5e0e4b916dd6fdc8f68618a6af5de8a2a75adec9782390bbc946a2148
-  data.tar.gz: caed78e1ef882b10d216973443fa48f75d9f090ca31c718e5dd4395f9306a36f67a8ecb056143b9ba677bb97e605ed586f11c1db00c5542425d7f6c0960c3808
+  metadata.gz: 80036f9121369b7684ef6ba739be20c83b305c53c4959f7af8918a573f0af1755a4793a8f8c089b1040618bf8c6c15229948de8d7383c10dc5b67cb63bd6a7bc
+  data.tar.gz: b3cb6f9e5846df66990294c78f8aa925e5205e413a7ef463affa9a165c98cb5cb8a24e6110b3d90486425549899d87bff8ce3872384a57cbca0baf634f2005d8

data/lib/zorki/scrapers/post_scraper.rb

@@ -165,12 +165,14 @@ module Zorki
             images << Zorki.retrieve_media(object["display_resources"].last["src"])
           end
         end
+
+        user = User.from_post_data(object["owner"])
       end
 
       screenshot_file = take_screenshot()
 
       # This has to run last since it switches pages
-      user = User.lookup([username]).first
+      user = User.lookup([username]).first if defined?(user).nil?
 
       {
         images: images,

data/lib/zorki/user.rb

@@ -12,6 +12,52 @@ module Zorki
       self.scrape(usernames)
     end
 
+    def self.from_post_data(data)
+      # "owner"=>
+      #       {"id"=>"4303258197",
+      #        "username"=>"petesouza",
+      #        "is_verified"=>true,
+      #        "profile_pic_url"=>
+      #         "https://scontent-lax3-1.cdninstagram.com/v/t51.2885-19/433045134_436644512119229_523706897615373693_n.jpg?stp=dst-jpg_s150x150&_nc_ht=scontent-lax3-1.cdninstagram.com&_nc_cat=1&_nc_ohc=N0A8l8Th9soQ7kNvgH0cKQQ&_nc_gid=29538825d3464a6f9b05bad4506fc1f9&edm=ANTKIIoBAAAA&ccb=7-5&oh=00_AYCIj0oEKb48mFW3Ag4tMW3nJitOdAe91hdIrIM_1nlwEw&oe=67163EE4&_nc_sid=d885a2",
+      #        "blocked_by_viewer"=>false,
+      #        "restricted_by_viewer"=>nil,
+      #        "followed_by_viewer"=>false,
+      #        "full_name"=>"Pete Souza",
+      #        "has_blocked_viewer"=>false,
+      #        "is_embeds_disabled"=>true,
+      #        "is_private"=>false,
+      #        "is_unpublished"=>false,
+      #        "requested_by_viewer"=>false,
+      #        "pass_tiering_recommendation"=>true,
+      #        "edge_owner_to_timeline_media"=>{"count"=>3596},
+      #        "edge_followed_by"=>{"count"=>3166659}},
+
+      new_user_hash = {
+        name: data["full_name"],
+        username: data["username"],
+        number_of_posts: data["edge_owner_to_timeline_media"]["count"],
+        number_of_followers: data["edge_followed_by"]["count"],
+        number_of_following: nil,
+        verified: data["is_verified"],
+        profile: nil,
+        profile_link: "https://www.instagram.com/#{data["username"]}",
+        profile_image: Zorki.retrieve_media(data["profile_pic_url"]),
+        profile_image_url: data["profile_pic_url"]
+      }
+
+      # Now we try and populate the profile
+      begin
+        scraped_user_hash = Zorki::UserScraper.new.parse(data["username"])
+        new_user_hash[number_of_following: scraped_user_hash[:number_of_following]]
+        new_user_hash[profile: scraped_user_hash[:profile]]
+      rescue StandardError
+        puts "#{new_user_hash[:name]}: User created, but cannot fill in the extra data"
+        # If this didn't work we'll eat the error in the interest of completing successfully.
+      end
+
+      User.new(new_user_hash)
+    end
+
     attr_reader :name,
                 :username,
                 :number_of_posts,

data/lib/zorki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zorki
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorki
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Christopher Guess