instagram_uploader 0.1.1.3 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbeebd61f5607142327f5c671076b9a3d6142898
-  data.tar.gz: 2ff6eb4befdfa378553450352134d78c8ac316e0
+  metadata.gz: fbe2a280a2e13daa77f63c5fbd93b6a937b366ea
+  data.tar.gz: 5abc54fc8d2dcb88b64146f8bd6a746e12a47558
 SHA512:
-  metadata.gz: 4a6af2003cf43b023c501085c0895c665bc1f3caf136aa9885e1b91093b66eb6d0daeabb5bdd0a12dd1de00f1710366cec7253a3601748a282a9bdca5f57aa1a
-  data.tar.gz: 9e08b0fcd44009629a4cd6041cb20b6a38525c7886d05d82dc548a003fa41dd76420637a21a6c2bb46b8739881e94784e74ee9863b05bdaa2410a237a84c70b6
+  metadata.gz: c73e3cb66dae3dab59cc1f19ca63a0b44854b5489935e4e08696512af51fb7e4f06d2dca75601214a52b86533968636a006a9387bb14d20dde7ba6579306bf16
+  data.tar.gz: aa6502dcc15599854200365d9d772e832027d5f4c77c61b62e2e1fd5f80c6c4a0ec43c153bc1b287d1099650c2a7e63d3665548fd0f1276866edc020be1e9b78

data/lib/instagram_uploader.rb

@@ -1,9 +1,7 @@
 require "instagram_uploader/version"
 require "instagram_uploader/uploader"
-require "curb"
+
 require "json"
-require "tempfile"
-require "openssl"
 
 module InstagramUploader
 

data/lib/instagram_uploader/login.rb

@@ -0,0 +1,31 @@
+module InstagramUploader
+  module Login
+    def login
+      url = 'https://instagram.com/api/v1/accounts/login/'
+
+      data = "{'username':'#{@username}','password':'#{@password}','guid':'#{generate_guid}','device_id':'#{generate_device_id}','Content-Type':'application/x-www-form-urlencoded; charset=UTF-8'}".gsub("'", '"')
+      signature = generate_signature(data)
+      body = 'ig_sig_key_version=4&signed_body=' + signature + '.' + URI::encode(data, /\W/)
+
+      response = login_request(url, body)
+      raise Error, response['message'] if response['status'] != 'ok'
+    end
+
+    private
+
+    def login_request(url,data)
+      http = Curl::Easy.new(url)
+      http.headers["User-Agent"] = generate_user_agent
+      http.verbose = true
+      http.follow_location = true
+      http.enable_cookies = true
+      http.cookiejar = @cookie
+      http.send('post', data)
+      response = JSON.parse(http.body)
+      http.close
+      response
+    end
+    class Error < RuntimeError
+    end
+  end
+end

data/lib/instagram_uploader/photo_commit.rb

@@ -0,0 +1,71 @@
+module InstagramUploader
+  module PhotoCommit
+    require "openssl"
+
+    def commit_photo(media_id, desc)
+      url = 'https://instagram.com/api/v1/media/configure/'
+
+      device_timestamp = Time.now.to_i.to_s
+      data = "{'guid':'#{@guid}','device_id':'#{@device_id}','device_timestamp':'#{device_timestamp}','media_id':'#{media_id}','caption': '#{desc}','source_type':'5','filter_type':'0','extra':'{}','Content-Type':'application/x-www-form-urlencoded; charset=UTF-8'}".gsub("'", '"')
+      signature = generate_signature(data)
+      body = 'ig_sig_key_version=4&signed_body=' + signature + '.' + URI::encode(data, /\W/)
+
+      response = commit_request(url, body)
+       if response['status'] != 'ok'
+         raise Error, response['message']
+       else
+         response
+       end
+    end
+
+    private
+
+    def commit_request(url, data)
+      http = Curl::Easy.new(url)
+
+      http.headers["User-Agent"] = generate_user_agent
+      http.verbose = true
+      http.follow_location = true
+      http.enable_cookies = true
+
+      http.cookiefile = @cookie
+
+      http.send('post', data)
+      response = JSON.parse(http.body)
+      http.close
+
+      response
+    end
+
+    def generate_guid
+      guid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+        rand(0..65535),
+        rand(0..65535),
+        rand(0..65535),
+        rand(16384..20479),
+        rand(32768..49151),
+        rand(0..65535),
+        rand(0..65535),
+        rand(0..65535))
+    end
+
+    def generate_device_id
+      guid = generate_guid
+      "android-#{guid}"
+    end
+
+    def generate_signature(data)
+      return OpenSSL::HMAC.hexdigest('sha256', 'b4a23f5e39b5929e0666ac5de94c89d1618a2916', data)
+    end
+
+    def generate_user_agent
+      resolution = ['720x1280', '320x480', '480x800', '1024x768', '1280x720', '768x1024', '480x320'].sample
+      version = ['GT-N7000', 'SM-N9000', 'GT-I9220', 'GT-I9100'].sample
+      dpi = ['120', '160', '320', '240'].sample
+
+      'Instagram 4.' + rand(1..2).to_s + '.' + rand(0..2).to_s + ' Android (' + rand(10..11).to_s + '/' + rand(1..3).to_s + '.' + rand(3..5).to_s + '.' + rand(0..5).to_s + "; #{dpi}; #{resolution}; samsung; #{version }; #{version}; smdkc210; ru_RU)"
+    end
+    class Error < RuntimeError
+    end
+  end
+end

data/lib/instagram_uploader/photo_uploader.rb

@@ -0,0 +1,39 @@
+module InstagramUploader
+  module PhotoUploader
+
+      def upload_photo(image)
+        url = 'https://instagram.com/api/v1/media/upload/'
+        device_timestamp = Time.now.to_i.to_s
+
+        data = [
+          Curl::PostField.file('photo', image),
+          Curl::PostField.content('device_timestamp', device_timestamp)
+        ]
+        response = upload_request(url, data)
+
+        response['status'] != 'ok' ? (raise Error, response['message']) : response
+      end
+
+      private
+
+      def upload_request(url, data)
+        http = Curl::Easy.new(url)
+
+        http.headers["User-Agent"] = generate_user_agent
+        http.multipart_form_post = true
+        http.verbose = true
+        http.follow_location = true
+        http.enable_cookies = true
+
+        http.cookiefile = @cookie
+
+        http.send('post', data)
+        response = JSON.parse(http.body)
+        http.close
+
+        response
+      end
+      class Error < RuntimeError
+      end
+  end
+end

data/lib/instagram_uploader/uploader.rb

@@ -1,5 +1,17 @@
+require "instagram_uploader/login"
+require "instagram_uploader/photo_uploader"
+require "instagram_uploader/photo_commit"
+
+require "curb"
+require "tempfile"
+
 module InstagramUploader
   class Uploader
+    include Login
+    include PhotoUploader
+    include PhotoCommit
+
+
     def initialize(username, password)
       @username = username
       @password = password
@@ -13,103 +25,6 @@ module InstagramUploader
     end
 
     private
-
-    def login
-      url = 'https://instagram.com/api/v1/accounts/login/'
-
-      data = "{'username':'#{@username}','password':'#{@password}','guid':'#{generate_guid}','device_id':'#{generate_device_id}','Content-Type':'application/x-www-form-urlencoded; charset=UTF-8'}".gsub("'", '"')
-      signature = generate_signature(data)
-      body = 'ig_sig_key_version=4&signed_body=' + signature + '.' + URI::encode(data, /\W/)
-
-      response = request(url, body, false, false)
-      raise Error, response['message'] if response['status'] != 'ok'
-    end
-
-    def upload_photo(image)
-      url = 'https://instagram.com/api/v1/media/upload/'
-      device_timestamp = Time.now.to_i.to_s
-
-      data = [
-        Curl::PostField.file('photo', image),
-        Curl::PostField.content('device_timestamp', device_timestamp)
-      ]
-
-      response = request(url, data, true, true)
-
-      if response['status'] != 'ok'
-        raise Error, response['message']
-      else
-        response
-      end
-    end
-
-    def commit_photo(media_id, desc)
-      url = 'https://instagram.com/api/v1/media/configure/'
-
-      device_timestamp = Time.now.to_i.to_s
-      data = "{'guid':'#{@guid}','device_id':'#{@device_id}','device_timestamp':'#{device_timestamp}','media_id':'#{media_id}','caption': '#{desc}','source_type':'5','filter_type':'0','extra':'{}','Content-Type':'application/x-www-form-urlencoded; charset=UTF-8'}".gsub("'", '"')
-      signature = generate_signature(data)
-      body = 'ig_sig_key_version=4&signed_body=' + signature + '.' + URI::encode(data, /\W/)
-
-      response = request(url, body, false, true)
-       if response['status'] != 'ok'
-         raise Error, response['message']
-       else
-         response
-       end
-    end
-
-    def request(url, data, is_upload, cookies)
-      http = Curl::Easy.new(url)
-
-      http.headers["User-Agent"] = generate_user_agent
-      http.multipart_form_post = is_upload
-      http.verbose = true
-      http.follow_location = true
-      http.enable_cookies = true
-
-      if cookies
-        http.cookiefile = @cookie
-      else
-        http.cookiejar = @cookie
-      end
-
-      http.send('post', data)
-      response = JSON.parse(http.body)
-      http.close
-
-      response
-    end
-
-    def generate_guid
-      guid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-        rand(0..65535),
-        rand(0..65535),
-        rand(0..65535),
-        rand(16384..20479),
-        rand(32768..49151),
-        rand(0..65535),
-        rand(0..65535),
-        rand(0..65535))
-    end
-
-    def generate_device_id
-      guid = generate_guid
-      "android-#{guid}"
-    end
-
-    def generate_signature(data)
-      return OpenSSL::HMAC.hexdigest('sha256', 'b4a23f5e39b5929e0666ac5de94c89d1618a2916', data)
-    end
-
-    def generate_user_agent
-      resolution = ['720x1280', '320x480', '480x800', '1024x768', '1280x720', '768x1024', '480x320'].sample
-      version = ['GT-N7000', 'SM-N9000', 'GT-I9220', 'GT-I9100'].sample
-      dpi = ['120', '160', '320', '240'].sample
-
-      'Instagram 4.' + rand(1..2).to_s + '.' + rand(0..2).to_s + ' Android (' + rand(10..11).to_s + '/' + rand(1..3).to_s + '.' + rand(3..5).to_s + '.' + rand(0..5).to_s + "; #{dpi}; #{resolution}; samsung; #{version }; #{version}; smdkc210; ru_RU)"
-    end
-
     class Error < RuntimeError
     end
   end

data/lib/instagram_uploader/version.rb

@@ -1,3 +1,3 @@
 module InstagramUploader
-  VERSION = "0.1.1.3"
+  VERSION = "0.1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instagram_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.1.3
+  version: 0.1.2.1
 platform: ruby
 authors:
 - q3pp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,9 @@ files:
 - bin/setup
 - instagram_uploader.gemspec
 - lib/instagram_uploader.rb
+- lib/instagram_uploader/login.rb
+- lib/instagram_uploader/photo_commit.rb
+- lib/instagram_uploader/photo_uploader.rb
 - lib/instagram_uploader/uploader.rb
 - lib/instagram_uploader/version.rb
 homepage: https://github.com/q3pp/instagram_uploader