instagram 0.3.2 → 0.6

data/spec/instagram/client_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe Instagram::Client do
+  it "should connect using the endpoint configuration" do
+    client = Instagram::Client.new
+    endpoint = URI.parse(client.endpoint)
+    connection = client.send(:connection).build_url(nil).to_s
+    connection.should == endpoint.to_s
+  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")
+    client1.send(:get_username).should == "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")
+    client2.send(:get_username).should == "mikeyk"
+  end
+end

data/spec/instagram_spec.rb

@@ -0,0 +1,97 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Instagram do
+  after do
+    Instagram.reset
+  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
+
+     it "should get the correct resource" do
+       Instagram.user_media_feed()
+       a_get("users/self/feed.json").
+         should have_been_made
+     end
+
+     it "should return the same results as a client" do
+       Instagram.user_media_feed().should == Instagram::Client.new.user_media_feed()
+     end
+
+   end
+
+  describe ".client" do
+    it "should be a Instagram::Client" do
+      Instagram.client.should be_a Instagram::Client
+    end
+  end
+
+  describe ".adapter" do
+    it "should return the default adapter" do
+      Instagram.adapter.should == Instagram::Configuration::DEFAULT_ADAPTER
+    end
+  end
+
+  describe ".adapter=" do
+    it "should set the adapter" do
+      Instagram.adapter = :typhoeus
+      Instagram.adapter.should == :typhoeus
+    end
+  end
+
+  describe ".endpoint" do
+    it "should return the default endpoint" do
+      Instagram.endpoint.should == Instagram::Configuration::DEFAULT_ENDPOINT
+    end
+  end
+
+  describe ".endpoint=" do
+    it "should set the endpoint" do
+      Instagram.endpoint = 'http://tumblr.com'
+      Instagram.endpoint.should == 'http://tumblr.com'
+    end
+  end
+
+  describe ".format" do
+    it "should return the default format" do
+      Instagram.format.should == Instagram::Configuration::DEFAULT_FORMAT
+    end
+  end
+
+  describe ".format=" do
+    it "should set the format" do
+      Instagram.format = 'xml'
+      Instagram.format.should == 'xml'
+    end
+  end
+
+  describe ".user_agent" do
+    it "should return the default user agent" do
+      Instagram.user_agent.should == Instagram::Configuration::DEFAULT_USER_AGENT
+    end
+  end
+
+  describe ".user_agent=" do
+    it "should set the user_agent" do
+      Instagram.user_agent = 'Custom User Agent'
+      Instagram.user_agent.should == 'Custom User Agent'
+    end
+  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)
+          Instagram.send(key).should == key
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,54 @@
+require 'simplecov'
+SimpleCov.start do
+  add_group 'Instagram', 'lib/Instagram'
+  add_group 'Faraday Middleware', 'lib/faraday'
+  add_group 'Specs', 'spec'
+end
+
+require File.expand_path('../../lib/Instagram', __FILE__)
+
+require 'rspec'
+require 'webmock/rspec'
+RSpec.configure do |config|
+  config.include WebMock::API
+end
+
+def a_delete(path)
+  a_request(:delete, Instagram.endpoint + path)
+end
+
+def a_get(path)
+  a_request(:get, Instagram.endpoint + path)
+end
+
+def a_post(path)
+  a_request(:post, Instagram.endpoint + path)
+end
+
+def a_put(path)
+  a_request(:put, Instagram.endpoint + path)
+end
+
+def stub_delete(path)
+  stub_request(:delete, Instagram.endpoint + path)
+end
+
+def stub_get(path)
+  stub_request(:get, Instagram.endpoint + path)
+end
+
+def stub_post(path)
+  stub_request(:post, Instagram.endpoint + path)
+end
+
+def stub_put(path)
+  stub_request(:put, Instagram.endpoint + path)
+end
+
+def fixture_path
+  File.expand_path("../fixtures", __FILE__)
+end
+
+def fixture(file)
+  File.new(fixture_path + '/' + file)
+end

metadata

@@ -4,62 +4,179 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
-- "Mislav Marohni\xC4\x87"
+- Shayne Sweeney
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        version: "0"
-  type: :runtime
+        version: "1.0"
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :runtime
+        - 8
+        version: "0.8"
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nibbler
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
+        - 4
+        version: "2.4"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
         - 0
-        version: 1.2.0
+        - 6
+        version: "0.6"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 4
+        version: "4.4"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: faraday
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 4
+        version: 0.5.4
   type: :runtime
-  version_requirements: *id003
-description: Ruby library for consuming the Instagram public API.
-email: mislav.marohnic@gmail.com
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: faraday_middleware
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id011
+description: A Ruby wrapper for the Instagram REST and Search APIs
+email: 
+- shayne@instagr.am
 executables: []
 
 extensions: []
@@ -67,18 +184,91 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- .rspec
+- .yardopts
+- Gemfile
+- LICENSE.md
+- README.md
 - Rakefile
-- lib/instagram/cached.rb
-- lib/instagram/failsafe_store.rb
-- lib/instagram/models.rb
+- instagram.gemspec
+- lib/faraday/oauth2.rb
+- lib/faraday/raise_http_4xx.rb
+- lib/faraday/raise_http_5xx.rb
 - lib/instagram.rb
-- README.md
-- MIT-LICENSE
+- lib/instagram/api.rb
+- lib/instagram/client.rb
+- lib/instagram/client/comments.rb
+- lib/instagram/client/likes.rb
+- lib/instagram/client/locations.rb
+- lib/instagram/client/media.rb
+- lib/instagram/client/real_time.rb
+- lib/instagram/client/subscriptions.rb
+- lib/instagram/client/tags.rb
+- lib/instagram/client/users.rb
+- lib/instagram/client/utils.rb
+- lib/instagram/configuration.rb
+- lib/instagram/connection.rb
+- lib/instagram/error.rb
+- lib/instagram/oauth.rb
+- lib/instagram/request.rb
+- lib/instagram/version.rb
+- spec/faraday/response_spec.rb
+- spec/fixtures/access_token.json
+- spec/fixtures/followed_by.json
+- spec/fixtures/follows.json
+- spec/fixtures/location.json
+- spec/fixtures/location_recent_media.json
+- spec/fixtures/location_search.json
+- spec/fixtures/media.json
+- spec/fixtures/media_comment.json
+- spec/fixtures/media_comment_deleted.json
+- spec/fixtures/media_comments.json
+- spec/fixtures/media_liked.json
+- spec/fixtures/media_likes.json
+- spec/fixtures/media_popular.json
+- spec/fixtures/media_search.json
+- spec/fixtures/media_unliked.json
+- spec/fixtures/mikeyk.json
+- spec/fixtures/recent_media.json
+- spec/fixtures/requested_by.json
+- spec/fixtures/shayne.json
+- spec/fixtures/subscription.json
+- spec/fixtures/subscription_deleted.json
+- spec/fixtures/subscription_payload.json
+- spec/fixtures/subscriptions.json
+- spec/fixtures/tag.json
+- spec/fixtures/tag_recent_media.json
+- spec/fixtures/tag_search.json
+- spec/fixtures/user_media_feed.json
+- spec/fixtures/user_search.json
+- spec/instagram/api_spec.rb
+- spec/instagram/client/comments_spec.rb
+- spec/instagram/client/likes_spec.rb
+- spec/instagram/client/locations_spec.rb
+- spec/instagram/client/media_spec.rb
+- spec/instagram/client/real_time_spec.rb
+- spec/instagram/client/subscriptions_spec.rb
+- spec/instagram/client/tags_spec.rb
+- spec/instagram/client/users_spec.rb
+- spec/instagram/client_spec.rb
+- spec/instagram_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/mislav/instagram
+homepage: https://github.com/Instagram/instagramrb
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ********************************************************************************
+  
+    Follow @instagram on Twitter for announcements, updates, and news.
+    https://twitter.com/instagramapi
+  
+    Join the mailing list!
+    https://groups.google.com/group/instagram-ruby-gem
+  
+  ********************************************************************************
+
 rdoc_options: []
 
 require_paths: 
@@ -97,14 +287,56 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: instagram
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Instagram API client
-test_files: []
-
+summary: Ruby wrapper for the Instagram API
+test_files: 
+- spec/faraday/response_spec.rb
+- spec/fixtures/access_token.json
+- spec/fixtures/followed_by.json
+- spec/fixtures/follows.json
+- spec/fixtures/location.json
+- spec/fixtures/location_recent_media.json
+- spec/fixtures/location_search.json
+- spec/fixtures/media.json
+- spec/fixtures/media_comment.json
+- spec/fixtures/media_comment_deleted.json
+- spec/fixtures/media_comments.json
+- spec/fixtures/media_liked.json
+- spec/fixtures/media_likes.json
+- spec/fixtures/media_popular.json
+- spec/fixtures/media_search.json
+- spec/fixtures/media_unliked.json
+- spec/fixtures/mikeyk.json
+- spec/fixtures/recent_media.json
+- spec/fixtures/requested_by.json
+- spec/fixtures/shayne.json
+- spec/fixtures/subscription.json
+- spec/fixtures/subscription_deleted.json
+- spec/fixtures/subscription_payload.json
+- spec/fixtures/subscriptions.json
+- spec/fixtures/tag.json
+- spec/fixtures/tag_recent_media.json
+- spec/fixtures/tag_search.json
+- spec/fixtures/user_media_feed.json
+- spec/fixtures/user_search.json
+- spec/instagram/api_spec.rb
+- spec/instagram/client/comments_spec.rb
+- spec/instagram/client/likes_spec.rb
+- spec/instagram/client/locations_spec.rb
+- spec/instagram/client/media_spec.rb
+- spec/instagram/client/real_time_spec.rb
+- spec/instagram/client/subscriptions_spec.rb
+- spec/instagram/client/tags_spec.rb
+- spec/instagram/client/users_spec.rb
+- spec/instagram/client_spec.rb
+- spec/instagram_spec.rb
+- spec/spec_helper.rb