hexapic 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950bf10786d34787e3ff6792af617189d0488808
-  data.tar.gz: 8bb93e2566e63621992045cd501821b7a8824cc2
+  metadata.gz: b8c9ad56c1964298f5438c95706490aac86ec9a5
+  data.tar.gz: 788ab3ddb258ecec61d5b4c50afa9ff5f67bde34
 SHA512:
-  metadata.gz: 0de2939b6620e798aaa9148af6eac158ebd1b5e3817c7aca2c8ea5e4b175f4fbfc1726aea784dfd1a319722cafd68006e7df80a4a6b10af4ca497290b4f14cc5
-  data.tar.gz: 9fdd954cae4370f51ee614be2589631a8641f1cb4d05a10d2b36440d957918a45a75b3a9b6db8be62563659331f4dba619267339e36f5d0ac0e0e74523ef1381
+  metadata.gz: 930acfb7a2ada5168f13bb92dadc64756bdda060f9278c2cdcfb6fbb51bc2e0f3c246a62286028d61fbfb07cb5a29521ca7c8d920595a68d8ae24048ec664c16
+  data.tar.gz: 434a5f583f8c9b035f3a7bd44ba3b328d74cb01492a9d6a1121074081a61fb81182a4b334c62339b4b58d7140d7303a8a393a1c2db6464787eb1b09cfa324054

data/bin/hexapic

@@ -50,11 +50,11 @@ Choice.options do
 end
 
 if Choice.choices[:tags]
-  begin
+  #begin
     set_wallpaper
-  rescue Exception => e
-    puts e.message
-  end
+  #rescue Exception => e
+  #  puts e.message
+  #end
 elsif Choice.choices[:version]
   print_version
 else

data/hexapic.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.4'
   spec.add_runtime_dependency 'choice', '~> 0.1'
   spec.add_runtime_dependency 'flickr.rb', '~> 1.2' 
-  spec.add_runtime_dependency 'instagram', '~> 1.1'
+  spec.add_runtime_dependency 'faraday', '~> 0.9'
   spec.add_runtime_dependency 'mini_magick', '~> 4.0'
 end

data/lib/hexapic/api.rb

@@ -0,0 +1,34 @@
+require 'faraday'
+require 'json'
+require 'uri'
+
+module Hexapic
+  module API
+    class Instagram
+      INSTAGRAM_API_URL = 'https://api.instagram.com/v1/'
+
+      def initialize(client_id)
+        @client_id = client_id
+        @conn = Faraday.new(url: INSTAGRAM_API_URL) do |faraday|
+          faraday.request :url_encoded
+          faraday.adapter :net_http
+        end
+      end
+
+      def search(tag, count = 20)
+        tag = URI.encode(tag)
+        res = @conn.get("tags/#{tag}/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']
+          }
+        end
+      end
+    end
+  end
+end

data/lib/hexapic/repository.rb

@@ -1,6 +1,4 @@
 require 'flickr'
-require 'instagram'
-require 'uri'
 module Hexapic
   module Repository
     COUNT = 6
@@ -20,22 +18,19 @@ module Hexapic
       CLIENT_ID = '417c3ee8c9544530b83aa1c24de2abb3'
 
       def initialize
-        @instagram = Instagram.client(client_id: CLIENT_ID)
+        @instagram = API::Instagram.new(CLIENT_ID)
         puts 'Using Instagram'
       end
 
       def find_pictures(tag)
-        tag = URI.encode(tag.split(',').first)
+        tag.delete(',')
         puts "Getting last images by tag #{tag}"
-        pics = @instagram.tag_recent_media(tag).sample(COUNT).map do |r|
-          url = r.images.standard_resolution.url
-          Picture.new(url, url, url.split('/').last)
+        pics = @instagram.search(tag).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
-      rescue Exception => e
-        raise NoInternet.new(e.message)
       end
     end
 
@@ -61,8 +56,6 @@ module Hexapic
 
         raise ImagesNotFound.new("Found only #{pics.size} images. Need #{COUNT}.") if pics.size < COUNT 
         pics
-      rescue Exception => e
-        raise NoInternet.new(e.message)
       end
     end
 

data/lib/hexapic/version.rb

@@ -1,3 +1,3 @@
 module Hexapic
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/hexapic.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift File.expand_path('.')
 
 require 'hexapic/version'
 require 'hexapic/wallpaper_setter'
+require 'hexapic/api'
 require 'hexapic/repository'
 require 'hexapic/downloader'
 require 'hexapic/collage'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hexapic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ilya Siganov
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: instagram
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - bin/hexapic
 - hexapic.gemspec
 - lib/hexapic.rb
+- lib/hexapic/api.rb
 - lib/hexapic/collage.rb
 - lib/hexapic/desktop_environment.rb
 - lib/hexapic/downloader.rb