githubris 0.0.6 → 0.0.7

data/lib/githubris/gist.rb

@@ -1,8 +1,4 @@
-require 'date'
-
 class Githubris::Gist < Githubris::Base
-  autoload :File, 'githubris/gist/file'
-
   include Githubris::Publicity
 
   datetime_attribute :created_at, :updated_at
@@ -14,15 +10,65 @@ class Githubris::Gist < Githubris::Base
     @user ||= Githubris::User.new(@attributes[:user])
   end
 
+  def star!
+    @api.put_gist_star(@attributes[:id])
+  end
+
+  def unstar!
+    @api.delete_gist_star(@attributes[:id])
+  end
+
+  def starred?
+    @api.get_gist_starred?(@attributes[:id])
+  end
+
+  def unstarred?
+    !starred?
+  end
+
+  def delete!
+    @api.delete_gist(@attributes[:id])
+  end
+
+  def history
+    @attributes[:history].map do |gist_data|
+      Githubris::Gist.new(gist_data)
+    end
+  end
+
   def reload
-    swap_attributes @api.get_gist @attributes[:id]
+    if @attributes[:id]
+      gist = @api.get_gist @attributes[:id]
+    elsif @attributes[:url]
+      gist = Githubris::Gist.new @api._get @attributes[:url]
+    else
+      raise Githubris::Error, 'Missing a unique identifier, such as an id or a url'
+    end
+    swap_attributes gist
   end
 
   def save
-    swap_attributes @api.post_gist(
+    if new?
+      saved_attributes = @api.post_gist(saving_attributes)
+    else
+      saved_attributes = @api.patch_gist(@attributes[:id], saving_attributes)
+    end
+    swap_attributes saved_attributes
+  end
+
+  def saving_attributes
+    {
       :description => @attributes[:description],
       :public => @attributes[:public],
       :files => @attributes[:files]
-    )
+    }
+  end
+
+  def new?
+    reload
+  rescue Githubris::Error
+    true
+  else
+    false
   end
 end

data/lib/githubris/oauth.rb

@@ -1,36 +1,41 @@
 class Githubris::OAuth
-  REQUEST_ACCESS_URL = "https://github.com/login/oauth/authorize"
+  REQUEST_ACCESS_URL = Addressable::URI.parse("https://github.com/login/oauth/authorize")
 
-  def initialize(client_id, client_secret)
+  def initialize(client_id, client_secret, api=Githubris::API.new)
     @client_id = client_id
     @client_secret = client_secret
+    @api = api
   end
 
-  def request_access_url(options={})
-    url = Addressable::URI.parse REQUEST_ACCESS_URL
-    query_values = {}
-    query_values[:client_id] = @client_id
+  def request_access_url(query={})
+    add_query_params_to(REQUEST_ACCESS_URL, query).to_s
+  end
+
+  def access_token(code)
+    @api.post_oauth_access_token(access_token_params(code))
+  end
 
-    redirect_uri = options.delete(:redirect_uri)
-    query_values[:redirect_uri] = redirect_uri if redirect_uri
+  private
 
-    scopes = options.delete :scopes
-    if scopes
-      scopes = scopes.join ','
-      query_values[:scopes] = scopes
+  def add_query_params_to(uri, query)
+    uri.tap do |uri|
+      uri.query_values = query_values(query)
+      uri.query = URI.decode(uri.query)
     end
+  end
 
-    url.query_values = query_values
-    url.query = URI.decode(url.query)
-    url.to_s
+  def query_values(query)
+    query_values = { :client_id => @client_id }
+    query_values[:scopes] = query[:scopes].join(',') if query[:scopes]
+    query_values[:redirect_uri] = query[:redirect_uri] if query[:redirect_uri]
+    query_values
   end
 
-  def access_token(code)
-    access_token_params = {
+  def access_token_params(code)
+    {
       :client_id => @client_id,
       :client_secret => @client_secret,
       :code => code
     }
-    Githubris::API.new.post_oauth_access_token(access_token_params)
   end
 end

data/lib/githubris/publicity.rb

@@ -3,11 +3,11 @@ module Githubris::Publicity
     @attributes[:public]
   end
 
-  def publicize
+  def publicize!
     @attributes[:public] = true
   end
 
-  def privatize
+  def privatize!
     @attributes[:public] = false
   end
 end

data/lib/githubris/version.rb

@@ -1,3 +1,3 @@
 class Githubris
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/githubris/api/gist_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Githubris::API::Gist do
+  use_vcr_cassette
+
   subject do
     Githubris::API.new
   end
 
   describe '#get_user_gists' do
-    use_vcr_cassette
-
     let(:login) {'GithubrisTestUser'}
 
     it 'gets /users/:username/gists' do
@@ -18,8 +18,6 @@ describe Githubris::API::Gist do
   end
 
   describe '#get_public_gists' do
-    use_vcr_cassette
-
     it 'returns an array of gists' do
       subject.get_public_gists.should be_instance_of Array
       subject.get_public_gists.each do |gist|
@@ -29,8 +27,6 @@ describe Githubris::API::Gist do
   end
 
   describe '#get_gist' do
-    use_vcr_cassette
-
     let(:id) { 1 }
     it 'is a Githubris::Gist' do
       subject.get_gist(id).should be_instance_of Githubris::Gist

data/spec/githubris/api_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Githubris::API do
+  use_vcr_cassette
+
   let(:api) { Githubris::API.new }
 
   describe '#authenticated?' do
@@ -15,14 +17,10 @@ describe Githubris::API do
         api.authenticated?
       end
 
-      use_vcr_cassette
-
       it { should be_true }
     end
 
     context 'when authenticated with bad credentials' do
-      use_vcr_cassette
-
       subject do
         api.basic_auth('GithubrisTestFakeUser', 'password')
         api.authenticated?
@@ -32,8 +30,6 @@ describe Githubris::API do
     end
 
     context 'when there are no credentials' do
-      use_vcr_cassette
-
       subject do
         api.authenticated?
       end
@@ -48,25 +44,9 @@ describe Githubris::API do
       client_secret = 'client_secret'
       subject.oauth(client_id, client_secret).should be_instance_of Githubris::OAuth
     end
-
-    it 'returns a Githubris::OAuth initialized with the client id and secret' do
-      client_id = 'client_id'
-      client_secret = 'client_secret'
-      Githubris::OAuth.should_receive(:new).with(client_id, client_secret)
-      subject.oauth(client_id, client_secret)
-    end
-
-    it 'can take options' do
-      client_id = 'client_id'
-      client_secret = 'client_secret'
-      Githubris::OAuth.should_receive(:new).with(client_id, client_secret)
-      subject.oauth(client_id, client_secret)
-    end
   end
 
   describe '#post_oauth_access_token' do
-    use_vcr_cassette
-
     before do
       access_token_response =<<-RESPONSE
 HTTP/1.1 200 OK
@@ -96,6 +76,7 @@ RESPONSE
         subject.post_oauth_access_token({})
       end.should_not raise_error
     end
+
     it 'returns a string' do
       subject.post_oauth_access_token({}).should be_instance_of String
     end

data/spec/githubris/base_spec.rb

@@ -28,7 +28,7 @@ describe Githubris::Base do
     end
 
     describe '::accessible_attribute' do
-      it 'defines an instance method that returns a URI object' do
+      it 'defines an instance method that returns the attribute named by the method' do
         mock_class.class_eval do
           accessible_attribute :foo
         end

data/spec/githubris/gist_spec.rb

@@ -1,52 +1,143 @@
 require 'spec_helper'
 
 describe Githubris::Gist do
-  let(:id) { 1 }
-  subject { described_class.new :id => id }
+  use_vcr_cassette
 
-  context 'on a gist with an id' do
-    use_vcr_cassette
+  describe '#new?' do
+    it 'seems new if there are issues when reloading' do
+      gist_without_id = Githubris::Gist.new
+      gist_without_id.should be_new
+    end
 
-    describe '#reload' do
-      it 'returns the same object' do
-        obj_id = subject.object_id
-        subject.reload.object_id.should == obj_id
-      end
+    it 'seems to not be new if there are no issues' do
+      gist = Githubris::Gist.new :id => 1
+      gist.should_not be_new
     end
   end
 
-  context 'given a gist full of data' do
-    use_vcr_cassette
+  describe '#reload' do
+    it 'works with or without an id' do
+      gist = Githubris::Gist.new :url => 'https://api.github.com/gists/1'
+      lambda { gist.reload }.should_not raise_error
+      gist = Githubris::Gist.new :id => 1
+      lambda { gist.reload }.should_not raise_error
+    end
+
+    it 'returns the same object' do
+      gist = Githubris::Gist.new :id => 1
+      obj_id = gist.object_id
+      gist.reload.object_id.should == obj_id
+    end
+
+    it 'errors when any indication of identity is absent' do
+      gist = Githubris::Gist.new
+      lambda { gist.reload }.should raise_error Githubris::Error
+    end
+  end
 
-    describe '#user' do
-      it 'returns a user' do
-        subject.reload
-        subject.user.should be_instance_of Githubris::User
+  context 'on a gist with an id' do
+    let(:id) { 1 }
+    subject { described_class.new :id => 1 }
+
+    context 'given a gist full of data' do
+      describe '#user' do
+        it 'returns a user' do
+          subject.reload
+          subject.user.should be_instance_of Githubris::User
+        end
+      end
+    end
+
+    describe '#history' do
+      context 'on a gist with history' do
+        it 'is an array of gists' do
+          subject.reload
+          subject.history.each do |gist|
+            gist.should be_instance_of Githubris::Gist
+          end
+        end
       end
     end
   end
 
   describe '#save' do
-    use_vcr_cassette
-
     it 'for a public, anonymous gist' do
       gist = described_class.new :public => true, :files => {'gistfile.txt' => {:content => 'foobar'}}
       lambda { gist.save }.should_not raise_error
     end
+  end
 
-    context 'when authenticated' do
-      use_vcr_cassette
+  context 'when authenticated' do
+    let(:api) { Githubris::API.new }
+    let(:user) { api.get_authenticated_user }
 
-      let(:api) { Githubris::API.new }
+    before do
+      api.basic_auth 'GithubrisTestUser', 'password'
+      api.should be_authenticated
+    end
 
-      before do
-        api.basic_auth('GithubrisTestUser', 'password')
+    describe '#delete!' do
+      let(:gist) { api.get_authenticated_user.gists.first }
+
+      it 'deletes the gist' do
+        gist.delete!
+        lambda do
+          gist.reload
+        end.should raise_error
+      end
+    end
+
+    describe '#star!' do
+      let(:gist) { Githubris::Gist.new(:id => 1, :_api => api).reload }
+
+      it 'stars the gist' do
+        gist.star!
+        gist.should be_starred
+      end
+    end
+
+    describe '#unstar!' do
+      let(:gist) { api.get_authenticated_user.starred_gists.first }
+
+      it 'unstars the gist' do
+        gist.unstar!
+        gist.should be_unstarred
+      end
+    end
+
+    describe '#save' do
+      context "when creating a public gist" do
+        it 'does not raise an error' do
+          gist = described_class.new :_api => api, :public => true, :files => {'gistfile.txt' => {:content => 'foobar'}}
+          lambda { gist.save }.should_not raise_error
+          gist.user.login.should == 'GithubrisTestUser'
+        end
       end
 
-      it 'for a gist by an authenticated user' do
-        gist = described_class.new :_api => api, :public => true, :files => {'gistfile.txt' => {:content => 'foobar'}}
-        lambda { gist.save }.should_not raise_error
-        gist.user.login.should == 'GithubrisTestUser'
+      context 'when creating a private gist' do
+        it 'does not raise an error' do
+          gist = described_class.new :_api => api, :public => false, :files => {'gistfile.txt' => {:content => 'foobar'}}
+          lambda { gist.save }.should_not raise_error
+          gist.user.login.should == 'GithubrisTestUser'
+        end
+      end
+
+      context 'editing a file' do
+        it 'can be used to edit a file' do
+          gist = api.get_authenticated_user.gists.last
+          expected_id = gist.id
+          gist.files['gistfile.txt'] = {}
+          file = gist.files['gistfile.txt']
+          content = <<-EOF
+            lorem ipsum, all the time.
+          EOF
+
+          file[:content] = content
+          lambda { gist.save }.should_not raise_error
+
+          file[:content].should == content
+          gist.id.should == expected_id
+        end
       end
     end
   end

data/spec/githubris/oauth_spec.rb

@@ -53,6 +53,18 @@ RESPONSE
       url.should match /scopes=user,public_repo,repo,gist/
       url.should match /redirect_uri=#{URI.encode(redirect_uri)}/
     end
+
+    it 'does not include a redirect_uri when none is given' do
+      url = oauth.request_access_url
+
+      url.should_not match /redirect_uri=/
+    end
+
+    it 'does not include scopes when none are given' do
+      url = oauth.request_access_url
+
+      url.should_not match /scopes=/
+    end
   end
 
   describe '#access_token' do