pintrest-api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c216c3168b7271066677f540a132cebbfc9d3a3d
-  data.tar.gz: aa9449ec04fe448b7e9dca912470791fb57e540c
+  metadata.gz: acd0a776db77d64d5fc3432055f521d8a932c996
+  data.tar.gz: cc004b329fbc2554b82c49b7ffa5981083b8bf49
 SHA512:
-  metadata.gz: 61bcb16cfa708aac96c2bc6d96b20808c7c303b9c64d5589b600300574a769b89147c0a7af83388371cebf9dcf7b3fc9fa154aa317bf013ff482f43c2c40319a
-  data.tar.gz: 39595bf52a6f67d2398bd82bc4cb3e37cb543a9a0a629c62cdf78b585733c8bba99920a1aa5369f1b0ecc0e8fd4ada56220a28f29930c442ec35a592780dca12
+  metadata.gz: 84860239e11a1145ccb306fd3af6464c6b888617df7ed190876cbc631ffebdb661832f40caee81c4ff7ff70c4c50df68e3dd4abf9ce25c5b3075f6fc720b58b2
+  data.tar.gz: 8f6cc6f2a94de1f9f0e6d533222ea51f99ed9468b1c2562030783eca78a93257f47120c93ee8537a6e6e8e705fa72abd9439fe6703e5a10f10e5b3c268449f67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pintrest-api (0.1.1)
+    pintrest-api (0.1.2)
       capybara (~> 2.4)
       nokogiri (~> 1.6)
       poltergeist (~> 1.5)
@@ -24,12 +24,12 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
-    poltergeist (1.5.1)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -54,9 +54,9 @@ GEM
     ruby-progressbar (1.7.1)
     slop (3.6.0)
     terminal-notifier (1.6.2)
-    websocket-driver (0.5.1)
+    websocket-driver (0.5.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.1)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/lib/pintrest_api/authentication.rb

@@ -8,11 +8,19 @@ module PintrestApi
     LOGIN_PAGE_BUTTON_CSS = '.formFooter .formFooterButtons'
     PINTREST_LOGIN_URL    = 'https://www.pinterest.com/login/'
 
+    def try_or_check_login(authentication)
+      login authentication if !@is_logged_in && authentication
+      @is_logged_in = true
+    end
+
+    private
+
     def login(authentication)
       visit PINTREST_LOGIN_URL
       @session.find(EMAIL_INPUT_CSS).set authentication[:email]
       @session.find(PASSWORD_INPUT_CSS).set authentication[:password]
       click LOGIN_PAGE_BUTTON_CSS
+      puts 'Clicking Login button'
       sleep 5
 
       puts 'Finished logging in'

data/lib/pintrest_api/board.rb

@@ -3,11 +3,11 @@ module PintrestApi
   class Board < Core
     attr_reader :title, :url, :pin_count
 
-    PINTREST_URL        = 'http://www.pintrest.com/'
+    PINTREST_URL = 'http://www.pinterest.com/'
     BOARD_PIN_COUNT_CSS = '.PinCount'
     BOARD_LINK_CSS      = '.boardLinkWrapper'
     BOARD_TITLE_CSS     = 'h3.boardName .title'
-    BOARD_ITEM_CSS      = '.GridItems > .item'
+    BOARD_ITEM_CSS      = '.UserBoards .item'
 
     ##
     # Get a instance of a board
@@ -31,6 +31,7 @@ module PintrestApi
     end
 
     class << self
+      include Authentication
       ##
       # Gets all boards from a user
       #
@@ -40,8 +41,12 @@ module PintrestApi
       # ==== Examples
       #
       # PintrestApi::Board.all('mikakalathil')
-      def all(user_name)
-        visit_page user_name
+      def all(user_name, authentication)
+        try_or_check_login authentication
+
+        session_visit user_name
+        @session.save_and_open_page
+
         parse_boards get_with_ajax_scroll(BOARD_ITEM_CSS)
       end
 
@@ -56,8 +61,10 @@ module PintrestApi
       #
       # PintrestApi::Board.pins('mikakalathil', 'My Board Name!!!', {email: 'asdf@gmail.com', password: 'asdf'})
       def pins(user_name, board_name, authentication)
+        try_or_check_login authentication
+
         board_slug = board_name.downcase.gsub(/[_\s]/, '-')
-        Pin.get_for_board_url("#{PINTREST_URL}#{user_name}/#{board_slug}", authentication)
+        Pin.get_for_board_url("#{user_name}/#{board_slug}", authentication)
       end
 
       private

data/lib/pintrest_api/core.rb

@@ -1,6 +1,7 @@
 require 'capybara'
 require 'capybara/dsl'
 require 'capybara/poltergeist'
+require 'pry'
 
 
 module PintrestApi
@@ -10,7 +11,7 @@ module PintrestApi
     attr_accessor :session
     include Capybara::DSL
 
-    PINTREST_URL = 'http://www.pintrest.com/'
+    PINTREST_URL = 'http://www.pinterest.com/'
 
     class << self
       def visit_page(user_name)
@@ -21,9 +22,11 @@ module PintrestApi
       end
 
       def session_visit(url)
+        url = PINTREST_URL + url if url !~ /pinterest/
+
         begin
           @session.visit url
-          sleep 2
+          sleep 3
         rescue Capybara::Poltergeist::TimeoutError
           puts 'Gotten blocked by pintrest waiting 2 min to try again'
           sleep 120
@@ -47,10 +50,10 @@ module PintrestApi
       def new_session
         # Register PhantomJS (aka poltergeist) as the driver to use
         Capybara.register_driver :poltergeist do |app|
-          Capybara::Poltergeist::Driver.new(app, timeout: 60)
+          Capybara::Poltergeist::Driver.new(app, timeout: 60, js_errors: false)
         end
 
-        # Use XPath as the default selector for the find method
+        # Use CSS as the default selector for the find method
         Capybara.default_selector = :css
 
         # Start up a new thread
@@ -84,8 +87,26 @@ module PintrestApi
           old_items_count = items.count
           scroll_page if old_items_count > 0
 
-          newItems = Nokogiri::HTML.parse(html).css css_selector
-          items = newItems if old_items_count === 0 || newItems.count > old_items_count
+          new_items = Nokogiri::HTML.parse(html).css css_selector
+          items = new_items if old_items_count === 0 || new_items.count > old_items_count
+          puts "New Count: #{items.count}\nOld Count: #{old_items_count}"
+        end
+
+        items
+      end
+
+      def stream_with_ajax_scroll(css_selector)
+        old_items_count = 0
+        items = []
+
+        until (items.count === old_items_count) && items.count > 0
+          old_items_count = items.count
+          scroll_page if old_items_count > 0
+
+          items = Nokogiri::HTML.parse(html).css css_selector if old_items_count === 0 || items.count > old_items_count
+
+          yield items[old_items_count..-1] if items.count > old_items_count
+
           puts "New Count: #{items.count}\nOld Count: #{old_items_count}"
         end
 

data/lib/pintrest_api/pin.rb

@@ -5,8 +5,8 @@ module PintrestApi
   class Pin < Core
     attr_reader :image_url, :title, :credits_url, :url, :description
 
-    PINTREST_URL     = 'http://www.pintrest.com'
-    PIN_BASE_CSS     = '.Grid .Module.Pin.PinBase'
+    PINTREST_URL     = 'http://www.pinterest.com'
+    PIN_BASE_CSS     = '.Grid .Pin'
     PIN_IMAGE_CSS    = '.pinHolder .pinImg'
     PIN_TITLE_CSS    = '.richPinGridTitle'
     PIN_CREDIT_CSS   = '.creditItem a'
@@ -33,23 +33,51 @@ module PintrestApi
       # * +authentication+ -
       # ==== Examples
       #
-      # PintrestApi::Pin.get_for_board_url('http://pintrest.com/mikaak/my-pins', , {email: 'asdf@gmail.com', password: 'asdf'})
+      # PintrestApi::Pin.get_for_board_url('http://pintrest.com/mikaak/my-pins', {email: 'asdf@gmail.com', password: 'asdf'})
       def get_for_board_url(board_url, authentication)
-        login authentication if !@is_logged_in && authentication
-        @is_logged_in = true
+        try_or_check_login authentication
 
         session_visit http_url(board_url)
         parse_pins get_with_ajax_scroll(PIN_BASE_CSS)
       end
 
-      def get_for_board(board, authentication)
-        login authentication if !@is_logged_in && authentication
-        @is_logged_in = true
+      ##
+      # Gets all pins from a board url
+      #
+      # ==== Attributes
+      #
+      # * +board+ - Pintrest board
+      # * +authentication+ -
+      # ==== Examples
+      #
+      # PintrestApi::Pin.get_for_board(board, {email: 'asdf@gmail.com', password: 'asdf'})
+      def get_for_board(board, authentication = nil)
+        try_or_check_login authentication
 
         session_visit http_url(board.url)
         parse_pins get_with_ajax_scroll(PIN_BASE_CSS)
       end
 
+      ##
+      # Gets all pins from a board url
+      #
+      # ==== Attributes
+      #
+      # * +board+ - Pintrest board
+      # * +authentication+ -
+      # * +&block+ - a stream of every 25ish pins
+      # ==== Examples
+      #
+      # PintrestApi::Pin.get_for_board_stream(board, {email: 'asdf@gmail.com', password: 'asdf'}) do |pins| end
+      def get_for_board_stream(board, authentication = nil)
+        try_or_check_login authentication
+
+        session_visit http_url(board.url)
+        stream_with_ajax_scroll(PIN_BASE_CSS) do |pins|
+          yield parse_pins pins
+        end
+      end
+
       ## Planned
       # def top(count)
       #   # Raise error if over 800 as page will freeze if higher

data/lib/pintrest_api/version.rb

@@ -1,3 +1,3 @@
 module PintrestApi
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pintrest-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mika Kalathil