lentil 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eedb412866c22824ea3454b1988e1e1ad5d7511
-  data.tar.gz: 7637990fc33cec6f64cad9150cda02b138e6f9ed
+  metadata.gz: 1c1b643648b334074ffad7cf8fa4a4c43da2349e
+  data.tar.gz: 4dd47933ed6539c5e3f713799a40de83f07af2c6
 SHA512:
-  metadata.gz: c565046bd60a22dc4712e0d9c7ad18892fb438ab5771647bfc469c3825558157091d009a638dd6c69e6f0280cfa36ee9d93ae3ae933b19f8a6ea90e88e9f5df2
-  data.tar.gz: a5a6463f9281ea17e9b85dc7f3f78b945171f6bb47a526cdc45228ed5f49bf07a9b0f8ececa91fd0852028a79566b6e7d18b578e8de86aab540b1a59dd18c80d
+  metadata.gz: 279aafee90f754a2506770cabec444429e59427dc74a59fa71902b2316f5c07e454a716380c888cec641cf07537ed8703aacdc6c7588ecf9df07214d5260bf99
+  data.tar.gz: df60455eee158f1520ae8383a71129be50a37cee7e62a4e20ca6880bfc40d24e6cf61f52bbc3a74ccb9a446a59761946775d6a2bc6e1b5054d9bb770a4221e49

data/app/models/lentil/image.rb

@@ -154,16 +154,28 @@ class Lentil::Image < ActiveRecord::Base
     url.sub(/^http:/, '').sub(/\/\/instagr\.am/, '//instagram.com')
   end
 
-  def large_url
-    protocol_relative_url + 'media/?size=l'
+  def large_url(protocol_relative = true)
+    if protocol_relative
+      protocol_relative_url + 'media/?size=l'
+    else
+      url + 'media/?size=l'
+    end
   end
 
-  def medium_url
-    protocol_relative_url + 'media/?size=m'
+  def medium_url(protocol_relative = true)
+    if protocol_relative
+      protocol_relative_url + 'media/?size=m'
+    else
+      url + 'media/?size=m'
+    end
   end
 
-  def thumbnail_url
-    protocol_relative_url + 'media/?size=t'
+  def thumbnail_url(protocol_relative = true)
+    if protocol_relative
+      protocol_relative_url + 'media/?size=t'
+    else
+      url + 'media/?size=t'
+    end
   end
 
   States = {

data/lib/lentil/instagram_harvester.rb

@@ -54,6 +54,30 @@ module Lentil
       Instagram.tag_recent_media(tag, :count=>100)
     end
 
+    def fetch_recent_images_by_tag_with_args(tag = nil, args = {:count=>100})
+      configure_connection
+      tag ||= Lentil::Engine::APP_CONFIG["default_image_search_tag"]
+      Instagram.tag_recent_media(tag, args)
+    end
+
+    def recursive_fetch(tag=nil, max_tag_id=nil, total=0)
+      case max_tag_id
+      when nil
+        instagram_metadata = fetch_recent_images_by_tag_with_args(tag)
+      else
+        instagram_metadata = fetch_recent_images_by_tag_with_args(tag, {:max_tag_id=>max_tag_id})
+      end
+      total += save_instagram_load(instagram_metadata).size
+      next_max_id = instagram_metadata.pagination.next_max_id
+      case next_max_id
+      when nil
+        puts "nil next_max_id. Previous next_max_id: " + max_tag_id.to_s
+      else
+        subtotal = recursive_fetch(tag, next_max_id, total)
+        total += subtotal.nil? ? 0 : subtotal
+      end
+      total
+    end
 
     # Queries the Instagram API for the image metadata associated with a given ID.
     #
@@ -202,7 +226,7 @@ module Lentil
     #
     # @return [String] Binary image data
     def harvest_image_data(image)
-      response = Typhoeus.get(image.large_url, followlocation: true)
+      response = Typhoeus.get(image.large_url(false), followlocation: true)
 
       if response.success?
         raise "Invalid content type: " + response.headers['Content-Type'] unless (response.headers['Content-Type'] == 'image/jpeg')
@@ -226,7 +250,7 @@ module Lentil
     #
     # @return [Boolean] Whether the image request was successful
     def test_remote_image(image)
-      response = Typhoeus.get(image.thumbnail_url, followlocation: true)
+      response = Typhoeus.get(image.thumbnail_url(false), followlocation: true)
 
       if response.success?
         true

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement