instagrammer 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6b1334dcecbe5eaa59cdbe222fbe7d26d194ef7adcb3f38f69e051208da203
-  data.tar.gz: f795b469c1611e5eb355c9db5848d671cdeeeb4455350909c812ef37f425477c
+  metadata.gz: c3a1ab2d4f1152a6bf11cdb8b1b6056feeeb0dad5947d57ca20892b0c70b2756
+  data.tar.gz: 9fbcd09a13b62e6b35610a115a3bf156b5811abf85cf2c6651973e848808c3f3
 SHA512:
-  metadata.gz: d440948e383e41ebf587abaa96dc89dd5e72e165ff14f12062031f438a1026ea787e945b7511239bbc0d7df5d0850cae117e86bd63ff8aa5f0ed407cf541276f
-  data.tar.gz: 1c0d923c19ebcbeb8c650ee3f11217b3ff32185c25da94b56c6993ec7ffd52397a798a26880551ac2144cf44a1a5a9768f5c593b91526a3dafea2cd0eece9f3f
+  metadata.gz: 43be16412153206a20a053232c664f26607c71beb84b50cd57e8214961f6bfa24ffd426929665311ad967ce1a10f33fcd6983bf09e494957f4d95b264f3763de
+  data.tar.gz: b72aec029920c4e24794ce657fd3b1900557bfcde326791b59adac3adb34124738e17d3fafc5d6ec3dcf44b867ddf7e67d0752f07251245f84383a0bd160ace7

data/.travis.yml

@@ -25,7 +25,6 @@ before_script:
 
 script:
   - bundle exec rake test
-  - bundle exec rubocop
 
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2019-07-14
+### Changed
+- Refactor page status internals
+- Lazy load post attributes
+
+### Fixed
+- Check page status before accessing data (closes [#2](https://github.com/richardvenneman/instagrammer/issues/2))
+
 ## [0.1.3] - 2019-06-20
 ### Changed
 - Setup test coverage

data/Guardfile

@@ -2,7 +2,7 @@
 
 ignore([%r{^(bin)/*}])
 
-guard :minitest do
+guard :minitest all_on_start: false do
   watch(%r{^lib/(.+)\.rb$}) { |m| "test/lib/#{m[1]}_test.rb" }
   watch(%r{^test/.+_test\.rb$})
   watch(%r{^test/test_helper\.rb$}) { "test" }

data/instagrammer.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard", "~> 2.15"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rubocop-rails_config", "~> 0.6"
   spec.add_development_dependency "simplecov", "~> 0.16"
 end

data/lib/instagrammer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "instagrammer/version"
+require "instagrammer/utils"
 require "instagrammer/config/capybara"
 require "instagrammer/post"
 require "instagrammer/user"
@@ -11,6 +12,7 @@ module Instagrammer
   class UserNotFound < StandardError; end
 
   class PrivatePost < StandardError; end
+  class PostInvalid < StandardError; end
   class PostNotFound < StandardError; end
 
   def self.new(username)

data/lib/instagrammer/post.rb

@@ -2,12 +2,13 @@
 
 class Instagrammer::Post
   include Capybara::DSL
+  include Instagrammer::Utils
 
   attr_reader :shortcode, :image_url, :image_urls
 
   def initialize(shortcode)
     @shortcode = shortcode
-    visit_page
+    @data = nil
   end
 
   def inspect
@@ -17,8 +18,24 @@ class Instagrammer::Post
     "#<#{self.class.name}:#{object_id} #{attributes.map { |attr| "#{attr}:#{send(attr).inspect}" }.join(", ")}>"
   end
 
+  def public?
+    get_data unless @data
+    @status == :public
+  end
+
+  def data
+    get_data unless @data
+
+    case @status
+    when :private then raise Instagrammer::PrivatePost.new("Private post: #{@shortcode}")
+    when :not_found then raise Instagrammer::PostNotFound.new("Post not found: #{@shortcode}")
+    when :invalid then raise Instagrammer::PostInvalid.new("Post invalid: #{@shortcode}")
+    else @data
+    end
+  end
+
   def type
-    @data["@type"] == "ImageObject" ? :photo : :video
+    data["@type"] == "ImageObject" ? :photo : :video
   end
 
   def photo?
@@ -30,43 +47,38 @@ class Instagrammer::Post
   end
 
   def user
-    Instagrammer::User.new @data["author"]["alternateName"]
+    Instagrammer::User.new data["author"]["alternateName"]
   end
 
   def caption
-    @data["caption"]
+    data["caption"]
   end
 
   def upload_date
-    DateTime.parse @data["uploadDate"]
+    DateTime.parse data["uploadDate"]
   end
 
   def comment_count
-    @data["commentCount"].to_i
+    data["commentCount"].to_i
   end
 
   def like_count
-    @data["interactionStatistic"]["userInteractionCount"].to_i if photo?
+    data["interactionStatistic"]["userInteractionCount"].to_i if photo?
   end
 
   def watch_count
-    @data["interactionStatistic"]["userInteractionCount"].to_i if video?
+    data["interactionStatistic"]["userInteractionCount"].to_i if video?
   end
 
   private
-    def visit_page
+    def get_data
       visit "https://www.instagram.com/p/#{@shortcode}/"
-      check_status
-
-      @data = JSON.parse(page.first(:json_ld, visible: false).text(:all))
-      set_image_attributes if photo?
-    end
+      @status = get_page_status
 
-    def check_status
-      if page.has_content?("Private")
-        raise Instagrammer::PrivatePost.new("Private post: #{@shortcode}")
-      elsif page.has_content?("Sorry")
-        raise Instagrammer::PostNotFound.new("Post not found: #{@shortcode}")
+      if @status == :public
+        node = page.first(:json_ld, visible: false)
+        @data = JSON.parse(node.text(:all))
+        set_image_attributes if photo?
       end
     end
 

data/lib/instagrammer/user.rb

@@ -2,11 +2,13 @@
 
 class Instagrammer::User
   include Capybara::DSL
+  include Instagrammer::Utils
 
   attr_reader :posts
 
   def initialize(username)
     @username = username.delete_prefix("@")
+    @data = nil
     @posts = []
   end
 
@@ -98,7 +100,7 @@ class Instagrammer::User
   private
     def get_data
       visit "https://www.instagram.com/#{@username}/"
-      @status = get_account_status
+      @status = get_page_status
       @meta = get_metadata unless @status == :not_found
 
       if @status == :public
@@ -111,16 +113,4 @@ class Instagrammer::User
     def get_metadata
       @meta = page.first(:meta_description, visible: false)["content"].match META_RE
     end
-
-    def get_account_status
-      if page.has_content?("Private")
-        :private
-      elsif page.has_content?("Sorry")
-        :not_found
-      elsif page.find(:json_ld, visible: false)
-        :public
-      end
-    rescue Capybara::ElementNotFound
-      :invalid
-    end
 end

data/lib/instagrammer/utils.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Instagrammer::Utils
+  def get_page_status
+    if page.has_content?("Private")
+      :private
+    elsif page.has_content?("Sorry")
+      :not_found
+    elsif page.find(:json_ld, visible: false)
+      :public
+    end
+  rescue Capybara::ElementNotFound
+    :invalid
+  end
+end

data/lib/instagrammer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Instagrammer
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instagrammer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Venneman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails_config
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ files:
 - lib/instagrammer/config/capybara.rb
 - lib/instagrammer/post.rb
 - lib/instagrammer/user.rb
+- lib/instagrammer/utils.rb
 - lib/instagrammer/version.rb
 homepage: https://github.com/richardvenneman/instagrammer
 licenses: