hexapic 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec414c571a2ba9cd65bf7dd058f93b3520a6a400
-  data.tar.gz: 5dc1213003aede65f59fa46720ce513cb3bda170
+  metadata.gz: cc9e1b4bf02aaef6e17971a0435f97ca300b76c7
+  data.tar.gz: 21e3a40efedb163ea1629da7aa699b210141b5ef
 SHA512:
-  metadata.gz: e4920f3f2566399fea4dd0deef648c51e166731b28edffee50d643578473bd67c82aa4a85161a98a74d832cec1e51ae180a1a798b1b0f462f9f5f37f2185859f
-  data.tar.gz: a71e7d7b8cf7268a3086a879e15e4dac0a4ae7dd4a5df924200df53157bf98c7320e9860f3c7ad68d08989f2a4099db05bf10b5d2f9e8bb3584d6e2bc1f9e679
+  metadata.gz: e17b104798c2cc6acc93cef6aa34358f0f3630d051cb840bf1d0fb4e5cceb11378116b45f2849f20483bb1beb9c05d49ee249d5e16d2098d2f33a863b8ef5296
+  data.tar.gz: a895a87b30d28e3bccc241775bef9bc52ff7c31b8e12c715aa81386fe43c90d8565719e697e2f75448be42ccadbcdde2268d6e313d352c7b49cf199d973f280e

data/bin/hexapic

@@ -11,10 +11,16 @@ include Hexapic
 require 'choice'
 
 def set_wallpaper
-  tags = Choice.choices[:tags] || ENV['WALLPAPER_TAGS'] || 'nature'
   repository = Choice.choices[:repository] || ENV['WALLPAPER_REPOSITPRY'] || :instagram
-  runner = Hexapic::Runner.new(tags)
-  runner.run(repository)
+  query = Choice.choices[:tags] || Choice.choices[:username]
+  runner = Hexapic::Runner.new
+  type = if Choice.choices[:tags]
+    :tags
+  elsif Choice.choices[:username]
+    :username
+  end
+
+  runner.run(repository, query, type)
 end
 
 def print_version
@@ -33,19 +39,26 @@ Choice.options do
   option :repository do
     long '--repository=REPOSITORY'
     short '-r'
-    desc 'Chose where to load pictures. Chose one of flickr, instagram.'
+    desc 'Chose where to load pictures from. Chose one of flickr, instagram. Default is instagram'
     cast Symbol
   end
 
   option :tags do
     long '--tags=TAGS'
     short '-t'
-    desc 'comma separated list of tags'
+    desc 'Comma separated list of tags'
+    cast String
+  end
+
+  option :username do
+    long '--username=USERNAME'
+    short '-u'
+    desc 'Instagram username'
     cast String
   end
 end
 
-if Choice.choices[:tags]
+if Choice.choices[:tags] || Choice.choices[:username]
   begin
     set_wallpaper
   rescue Exception => e

data/lib/hexapic/api.rb

@@ -11,6 +11,10 @@ module Hexapic
         end
       end
 
+      def search_by_user(username, count = 100)
+        user_media(search_user(username), count)
+      end
+
       def search(tag, count = 20)
         tag = URI.encode(tag)
         res = @conn.get("tags/#{tag}/media/recent",{client_id: @client_id, count: count})
@@ -21,10 +25,39 @@ module Hexapic
             id: img['id'], 
             likes: img['likes']['count'], 
             link: img['link'], 
-            url: img['images']['standard_resolution']['url']
+            url: img['images']['standard_resolution']['url'],
+            width: img['images']['standard_resolution']['width'],
+            height: img['images']['standard_resolution']['height']
           }
         end
       end
+
+      def user_media(user_id, count)
+        res = @conn.get("users/#{user_id}/media/recent/", {client_id: @client_id, count: count})
+        data = JSON.parse(res.body)['data']
+
+        data.map do |img|
+          {
+            id: img['id'],
+            likes: img['likes']['count'],
+            link: img['link'],
+            url: img['images']['standard_resolution']['url'],
+            width: img['images']['standard_resolution']['width'],
+            height: img['images']['standard_resolution']['height']
+          }
+        end
+      end
+
+      def search_user(username)
+        puts "Searching user #{username}"
+        username = URI.encode(username)
+        res = @conn.get("users/search", {q: username, client_id: @client_id})
+        data = JSON.parse(res.body)['data'].first
+        raise UserNotFound.new("User with name #{username} not found") if data.nil?
+        puts "Find user #{data['username']} #{data['first_name']} #{data['last_name']} with id #{data['id']}"
+
+        data['id']
+      end
     end
   end
 end

data/lib/hexapic/repository.rb

@@ -31,6 +31,16 @@ module Hexapic
         raise ImagesNotFound.new("Found only #{pics.size} images. Need #{COUNT}.") if pics.size < COUNT 
         pics
       end
+
+      def find_pictures_by_username(username)
+        puts "Getting last images from user #{username}"
+        pics = @instagram.search_by_user(username).sample(COUNT).map do |r|
+          Picture.new(r[:url], r[:link], r[:id])
+        end
+
+        raise ImagesNotFound.new("Found only #{pics.size} images. Need #{COUNT}.") if pics.size < COUNT 
+        pics
+      end
     end
 
     class FlickrRepository

data/lib/hexapic/runner.rb

@@ -1,14 +1,17 @@
 module Hexapic
-  class Runner
-    def initialize(tags)
-      @tags = tags.to_s
-    end
-    
-    def run(repository = :instagram)
+  class Runner   
+    def run(repository = :instagram, query, type)
       collage = Collage.new
       setter = WallpaperSetter.build  
       repository = Repository::LIST[repository].new
-      pictures = repository.find_pictures(@tags)
+      picture = nil
+      case type
+      when :tags
+        pictures = repository.find_pictures(query)
+      when :username
+        pictures = repository.find_pictures_by_username(query)              
+      end
+      
       picture = collage.make(pictures)
 
       setter.set picture.path

data/lib/hexapic/version.rb

@@ -1,3 +1,3 @@
 module Hexapic
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapic
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ilya Siganov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler