instagram-continued 1.3.0 → 1.3.1

data/spec/instagram/client/utils_spec.rb

@@ -1,29 +1,28 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe Instagram::Client do
   Instagram::Configuration::VALID_FORMATS.each do |format|
     context ".new(:format => '#{format}')" do
-
       before do
-        @client = Instagram::Client.new(:format => format, :client_id => 'CID', :client_secret => 'CS', :client_ips => '1.2.3.4', :access_token => 'AT')
+        @client = Instagram::Client.new(format: format, client_id: "CID", client_secret: "CS", client_ips: "1.2.3.4", access_token: "AT")
       end
 
-      describe '.utils_raw_response' do
+      describe ".utils_raw_response" do
         before do
-          stub_get("users/self/feed.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("user_media_feed.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("users/self/feed.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("user_media_feed.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         before(:each) do
           @response = @client.utils_raw_response
         end
 
-        it 'return raw data' do
+        it "return raw data" do
           expect(@response).to be_instance_of(Faraday::Response)
         end
 
-        it 'response content headers' do
+        it "response content headers" do
           expect(@response).to be_respond_to(:headers)
         end
       end

data/spec/instagram/client_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe Instagram::Client do
   it "should connect using the endpoint configuration" do
@@ -9,15 +9,15 @@ describe Instagram::Client do
   end
 
   it "should not cache the user account across clients" do
-    stub_get("users/self.json").
-      with(:query => {:access_token => "at1"}).
-      to_return(:body => fixture("shayne.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    client1 = Instagram::Client.new(:access_token => "at1")
+    stub_get("users/self.json")
+      .with(query: { access_token: "at1" })
+      .to_return(body: fixture("shayne.json"), headers: { content_type: "application/json; charset=utf-8" })
+    client1 = Instagram::Client.new(access_token: "at1")
     expect(client1.send(:get_username)).to eq("shayne")
-    stub_get("users/self.json").
-      with(:query => {:access_token => "at2"}).
-      to_return(:body => fixture("mikeyk.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    client2 = Instagram::Client.new(:access_token => "at2")
+    stub_get("users/self.json")
+      .with(query: { access_token: "at2" })
+      .to_return(body: fixture("mikeyk.json"), headers: { content_type: "application/json; charset=utf-8" })
+    client2 = Instagram::Client.new(access_token: "at2")
     expect(client2.send(:get_username)).to eq("mikeyk")
   end
 end

data/spec/instagram/request_spec.rb

@@ -1,55 +1,55 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe Instagram::Request do
   describe "#post" do
     before do
       @ips = "1.2.3.4"
       @secret = "CS"
-      digest = OpenSSL::Digest.new('sha256')
+      digest = OpenSSL::Digest.new("sha256")
       signature = OpenSSL::HMAC.hexdigest(digest, @secret, @ips)
-      @signed_header = [@ips, signature].join('|')
+      @signed_header = [@ips, signature].join("|")
     end
 
     context "with signature=true" do
       it "should set X-Insta-Forwarded-For header" do
-        client = Instagram::Client.new(:client_id => "CID", :client_secret => @secret, :client_ips => @ips, :access_token => "AT")
+        client = Instagram::Client.new(client_id: "CID", client_secret: @secret, client_ips: @ips, access_token: "AT")
         url = client.send(:connection).build_url("/media/123/likes.json").to_s
-        stub_request(:post, url).
-          with(:body => {"access_token"=>"AT"}).
-          to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:post, url)
+          .with(body: { "access_token" => "AT" })
+          .to_return(status: 200, body: "", headers: {})
 
-        client.post("/media/123/likes", {}, signature=true)
-        expect(a_request(:post, url).
-          with(:headers => {'X-Insta-Forwarded-For'=> @signed_header})).
-          to have_been_made
+        client.post("/media/123/likes", {}, signature = true)
+        expect(a_request(:post, url)
+          .with(headers: { "X-Insta-Forwarded-For" => @signed_header }))
+          .to have_been_made
       end
 
       it "should not set X-Insta-Fowarded-For header if client_ips is not provided" do
-        client = Instagram::Client.new(:client_id => "CID", :client_secret => @secret, :access_token => "AT")
+        client = Instagram::Client.new(client_id: "CID", client_secret: @secret, access_token: "AT")
         url = client.send(:connection).build_url("/media/123/likes.json").to_s
-        stub_request(:post, url).
-          with(:body => {"access_token"=>"AT"}).
-          to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:post, url)
+          .with(body: { "access_token" => "AT" })
+          .to_return(status: 200, body: "", headers: {})
 
-        client.post("/media/123/likes", {}, signature=true)
-        expect(a_request(:post, url).
-          with(:headers => {'X-Insta-Forwarded-For'=> @signed_header})).
-          not_to have_been_made
+        client.post("/media/123/likes", {}, signature = true)
+        expect(a_request(:post, url)
+          .with(headers: { "X-Insta-Forwarded-For" => @signed_header }))
+          .not_to have_been_made
       end
     end
 
     context "with signature=false" do
       it "should set X-Insta-Forwarded-For header" do
-        client = Instagram::Client.new(:client_id => "CID", :client_secret => @secret, :client_ips => @ips, :access_token => "AT")
+        client = Instagram::Client.new(client_id: "CID", client_secret: @secret, client_ips: @ips, access_token: "AT")
         url = client.send(:connection).build_url("/media/123/likes.json").to_s
-        stub_request(:post, url).
-          with(:body => {"access_token"=>"AT"}).
-          to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:post, url)
+          .with(body: { "access_token" => "AT" })
+          .to_return(status: 200, body: "", headers: {})
 
-        client.post("/media/123/likes", {}, signature=false)
-        expect(a_request(:post, url).
-          with(:headers => {'X-Insta-Forwarded-For'=> @signed_header})).
-          not_to have_been_made
+        client.post("/media/123/likes", {}, signature = false)
+        expect(a_request(:post, url)
+          .with(headers: { "X-Insta-Forwarded-For" => @signed_header }))
+          .not_to have_been_made
       end
     end
   end

data/spec/instagram_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path("../spec_helper", __FILE__)
 
 describe Instagram do
   after do
@@ -6,22 +6,20 @@ describe Instagram do
   end
 
   context "when delegating to a client" do
+    before do
+      stub_get("users/self/feed.json")
+        .to_return(body: fixture("user_media_feed.json"), headers: { content_type: "application/json; charset=utf-8" })
+    end
 
-     before do
-       stub_get("users/self/feed.json").
-         to_return(:body => fixture("user_media_feed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-     end
-
-     it "should get the correct resource" do
-       Instagram.user_media_feed()
-       expect(a_get("users/self/feed.json")).to have_been_made
-     end
-
-     it "should return the same results as a client" do
-       expect(Instagram.user_media_feed()).to eq(Instagram::Client.new.user_media_feed())
-     end
+    it "should get the correct resource" do
+      Instagram.user_media_feed
+      expect(a_get("users/self/feed.json")).to have_been_made
+    end
 
-   end
+    it "should return the same results as a client" do
+      expect(Instagram.user_media_feed).to eq(Instagram::Client.new.user_media_feed)
+    end
+  end
 
   describe ".client" do
     it "should be a Instagram::Client" do
@@ -50,8 +48,8 @@ describe Instagram do
 
   describe ".endpoint=" do
     it "should set the endpoint" do
-      Instagram.endpoint = 'http://tumblr.com'
-      expect(Instagram.endpoint).to eq('http://tumblr.com')
+      Instagram.endpoint = "http://tumblr.com"
+      expect(Instagram.endpoint).to eq("http://tumblr.com")
     end
   end
 
@@ -63,8 +61,8 @@ describe Instagram do
 
   describe ".format=" do
     it "should set the format" do
-      Instagram.format = 'xml'
-      expect(Instagram.format).to eq('xml')
+      Instagram.format = "xml"
+      expect(Instagram.format).to eq("xml")
     end
   end
 
@@ -76,12 +74,12 @@ describe Instagram do
 
   describe ".user_agent=" do
     it "should set the user_agent" do
-      Instagram.user_agent = 'Custom User Agent'
-      expect(Instagram.user_agent).to eq('Custom User Agent')
+      Instagram.user_agent = "Custom User Agent"
+      expect(Instagram.user_agent).to eq("Custom User Agent")
     end
   end
 
-    describe ".loud_logger" do
+  describe ".loud_logger" do
     it "should return the loud_logger status" do
       expect(Instagram.loud_logger).to eq(nil)
     end
@@ -95,9 +93,7 @@ describe Instagram do
   end
 
   describe ".configure" do
-
     Instagram::Configuration::VALID_OPTIONS_KEYS.each do |key|
-
       it "should set the #{key}" do
         Instagram.configure do |config|
           config.send("#{key}=", key)

data/spec/spec_helper.rb

@@ -1,28 +1,28 @@
 begin
-  require 'simplecov'
+  require "simplecov"
 rescue LoadError
   # ignore
 else
   SimpleCov.start do
-    add_group 'Instagram', 'lib/instagram'
-    add_group 'Faraday Middleware', 'lib/faraday'
-    add_group 'Specs', 'spec'
+    add_group "Instagram", "lib/instagram"
+    add_group "Faraday Middleware", "lib/faraday"
+    add_group "Specs", "spec"
   end
 end
 
-require File.expand_path('../../lib/instagram', __FILE__)
+require File.expand_path("../../lib/instagram", __FILE__)
 
-require 'rspec'
-require 'webmock/rspec'
+require "rspec"
+require "webmock/rspec"
 RSpec.configure do |config|
   config.include WebMock::API
 end
 
-def capture_output(&block)
+def capture_output
   begin
     old_stdout = $stdout
     $stdout = StringIO.new
-    block.call
+    yield
     result = $stdout.string
   ensure
     $stdout = old_stdout
@@ -67,5 +67,5 @@ def fixture_path
 end
 
 def fixture(file)
-  File.new(fixture_path + '/' + file)
+  File.new(fixture_path + "/" + file)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instagram-continued
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Shayne Sweeney
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -99,30 +113,30 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 description: A Ruby wrapper for the Instagram REST and Search APIs
 email:
 - shayne@instagr.am
@@ -133,6 +147,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile