githubris 0.0.4 → 0.0.5

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
-script: 'rake all'
+script: 'rake ci --trace'
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode
+  - rbx-19mode
   - ruby-head
   - jruby-head
+  # Breaks on the JSON stuff
+  # - 1.8.7
+  # - jruby-18mode
+  # - jruby-19mode
+  # - rbx-18mode
+  # - ree

data/Gemfile

@@ -1,16 +1,19 @@
 source "http://rubygems.org"
 
 group :development, :test do
-  gem 'cucumber'
   gem 'rspec', '~> 2.8.0'
   gem 'rspec-spies'
-  gem 'fakeweb'
+  gem 'pry'
+
   gem 'simplecov'
   gem 'flog'
   gem 'flay'
+
+  gem 'fakeweb'
+  gem 'vcr'
 end
 
-gem 'jruby-openssl', platform: 'jruby'
+gem 'jruby-openssl', :platform => 'jruby'
 
 gem 'rake'
 gemspec

data/README.md

@@ -4,6 +4,10 @@ This is the best github API wrapper ever.
 
 ##Contributing
 
+Before you contribute you need to:
+
+1. `bundle install`
+
 There are a couple of ways that you can contribute to Githubris. For example:
 
 1. You can take a bug and verify the replication steps
@@ -16,3 +20,13 @@ There are a couple of ways that you can contribute to Githubris. For example:
 5. You can open pull requests to pull in your contributions
 6. You can correct typos or grammar issues.
 7. You can help in __any__ way you want!
+
+LICENSE
+
+Copyright (C) 2012 Isaac Sanders
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,6 +1,5 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 require 'flay_task'
 require 'flog_task'
 
@@ -8,14 +7,8 @@ RSpec::Core::RakeTask.new :spec do |t|
   t.rspec_opts = '--color --format=documentation'
 end
 
-namespace :features do
-  Cucumber::Rake::Task.new :wip do |t|
-    t.cucumber_opts = '--tags @wip --tags ~@backlog'
-  end
-end
-
-Cucumber::Rake::Task.new :features do |t|
-  t.cucumber_opts = '--tags ~@wip --tags ~@backlog'
+task :cov do
+  ENV['COVERAGE'] = 'true'
 end
 
 FLAY_FLOG_OPTS_BLOCK = lambda do |t|
@@ -26,5 +19,6 @@ end
 FlayTask.new &FLAY_FLOG_OPTS_BLOCK
 FlogTask.new &FLAY_FLOG_OPTS_BLOCK
 
-task :all => [:spec, :features, :flay, :flog]
-task :default => :spec
+task :ci => [:spec]
+task :all => [:cov, :spec, :flay, :flog]
+task :default => [:cov, :spec]

data/githubris.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('httparty', '~> 0.8.1')
+  s.add_dependency('multi_json', '~> 1.1.0')
+  s.add_dependency('addressable', '~> 2.2.7')
 end

data/lib/githubris.rb

@@ -1,15 +1,16 @@
-$:.push File.expand_path("../../config", __FILE__)
-
 class Githubris
   autoload :API, 'githubris/api'
+  autoload :Base, 'githubris/base'
   autoload :Blob, 'githubris/blob'
-  autoload :Builder, 'githubris/builder'
   autoload :Comment, 'githubris/comment'
   autoload :Commit, 'githubris/commit'
+  autoload :Error, 'githubris/error'
   autoload :Event, 'githubris/event'
   autoload :Gist, 'githubris/gist'
   autoload :Issue, 'githubris/issue'
+  autoload :OAuth, 'githubris/oauth'
   autoload :Organization, 'githubris/organization'
+  autoload :Publicity, 'githubris/publicity'
   autoload :PullRequest, 'githubris/pull_request'
   autoload :Reference, 'githubris/reference'
   autoload :Repository, 'githubris/repository'
@@ -18,15 +19,24 @@ class Githubris
   autoload :User, 'githubris/user'
   autoload :Version, 'githubris/version'
 
-  attr_reader :authenticated_user
-
   def initialize
     @api = Githubris::API.new
   end
 
-  def authenticate(login, password)
-    @api.authenticate! :login => login, :password => password
-    @authenticated_user = Githubris::User.new
+  def basic_auth(login, password)
+    @api.basic_auth login, password
+  end
+
+  def oauth(client_id, client_secret)
+    @api.oauth client_id, client_secret
+  end
+
+  def authenticated_user
+    @api.get_authenticated_user
+  end
+
+  def authenticated?
+    @api.authenticated?
   end
 
   def find_user(login)

data/lib/githubris/api.rb

@@ -1,22 +1,100 @@
-require 'httparty'
+require 'addressable/uri'
 
 class Githubris::API
-  include HTTParty
 
-  require_relative 'api/gist'
+  autoload :HTTP, 'githubris/api/http'
+  include Githubris::API::HTTP
+  autoload :Gist, 'githubris/api/gist'
   include Githubris::API::Gist
-
-  require_relative 'api/user'
+  autoload :User, 'githubris/api/user'
   include Githubris::API::User
 
-  base_uri 'https://api.github.com'
-  format :json
-
   def initialize
-    @builder = Githubris::Builder.new
+    @target = Addressable::URI.new default_uri_options
+    @options = {}
+  end
+
+  def default_uri_options
+    {
+      :scheme => 'https',
+      :host => 'api.github.com',
+    }
+  end
+
+  def basic_auth login, password
+    @options[:basic_auth] = {
+      :username => login,
+      :password => password
+    }
+  end
+
+  def oauth(client_id, client_secret)
+    oauth = Githubris::OAuth.new client_id, client_secret
+  end
+
+  def authenticated?
+    get_authenticated_user
+  rescue Githubris::Error::RequiresAuthentication, Githubris::Error::BadCredentials
+    nil
+  end
+
+  def get_data_from(path, options={})
+    this = self
+    data = get(path, options)
+    data = MultiJson.decode(data, :symbolize_keys => true)
+    raise build_error data if error_data?(data)
+
+    embed_self_in data
+  end
+
+  def build_error data
+    words = data[:message].split(' ')
+    error_class_name = words.map {|word| word.capitalize}.join
+    Githubris::Error.const_get(error_class_name)
+  end
+
+  def get(path, options={})
+    @target.path = path
+    @target.query_values = options
+    MultiJson.encode(_get(@target.to_s))
+  end
+
+  def error_data?(data)
+    data.is_a?(Hash) and data[:message]
+  end
+
+  def post_oauth_access_token(params)
+    @target.query ||= ''
+    @target.query += _post(oauth_access_token_url, :query => params)
+    @target.query_values['access_token']
+  end
+
+  def post_data_to(path, params)
+    data = post(path, MultiJson.encode(params))
+    data = MultiJson.decode(data, :symbolize_keys => true) if data.is_a? String
+    raise build_error data if error_data?(data)
+
+    embed_self_in data
+  end
+
+  def embed_self_in(data)
+    this = self
+    if data.is_a? Array
+      data.each {|data_el| data_el[:_api] = this }
+    else
+      data[:_api] = this
+    end
+
+    data
+  end
+
+  def post(path, params)
+    @target.path = path
+    @options[:body] = params
+    MultiJson.encode(_post(@target.to_s))
   end
 
-  def authenticate!(options={})
-    Githubris::API.basic_auth options[:login], options[:password]
+  def oauth_access_token_url
+    'https://github.com/login/oauth/access_token'
   end
 end

data/lib/githubris/api/gist.rb

@@ -1,38 +1,57 @@
 module Githubris::API::Gist
-  PUBLIC_GISTS_PATH = '/gists/public'
 
-  def get_user_public_gists(login)
-    get user_gists_path(login)
+  def get_user_gists(login, options={})
+    get_gists_from(user_gists_path(login), options)
   end
 
-  def get_public_gists(options={})
-    login = options.delete(:user)
-    return get_user_public_gists(login) if login
+  def get_user_starred_gists(options={})
+    get_gists_from(user_starred_gists_path, options)
+  end
 
-    get public_gists_path_for_page(options[:page])
+  def get_public_gists(options={})
+    get_gists_from(public_gists_path, options)
   end
 
   def get_gist(id)
-    get gist_path(id)
+    get_gist_from(gist_path(id))
   end
 
-  def get(path)
-    @builder.build_gists attributes_from(path)
+  def post_gist(params)
+    post_gist_to(gists_path, params)
   end
 
-  def attributes_from(path)
-    self.class.get(path)
+  private
+  def get_gists_from(path, options={})
+    get_data_from(path, options).map do |gist_data|
+      Githubris::Gist.new gist_data
+    end
   end
 
-  def public_gists_path_for_page page_number=1
-    "#{PUBLIC_GISTS_PATH}?page=#{page_number}"
+  def get_gist_from(path)
+    Githubris::Gist.new get_data_from(path)
+  end
+
+  def post_gist_to(path, params)
+    Githubris::Gist.new post_data_to(path, params)
+  end
+
+  def public_gists_path
+    "#{gists_path}/public"
   end
 
   def user_gists_path(login)
     "/users/#{login}/gists"
   end
 
+  def user_starred_gists_path
+    "#{gists_path}/starred"
+  end
+
   def gist_path(id)
-    "/gists/#{id}"
+    "#{gists_path}/#{id}"
+  end
+
+  def gists_path
+    '/gists'
   end
 end

data/lib/githubris/api/http.rb

@@ -0,0 +1,12 @@
+require 'httparty'
+
+module Githubris::API::HTTP
+  private
+  def _get(path, options=@options)
+    HTTParty.get(path, options)
+  end
+
+  def _post(path, options=@options)
+    HTTParty.post(path, options)
+  end
+end

data/lib/githubris/api/user.rb

@@ -1,13 +1,19 @@
 module Githubris::API::User
-  USERS_PATH = '/users'
 
   def get_user(login)
-    data = self.class.get user_path(login)
-    @builder.build_user data
+    Githubris::User.new get_data_from(user_path(login))
+  end
+
+  def get_authenticated_user
+    Githubris::User.new get_data_from(authenticated_user_path)
   end
 
   private
   def user_path(login)
-    "#{USERS_PATH}/#{login}"
+    "/users/#{login}"
+  end
+
+  def authenticated_user_path
+    '/user'
   end
 end

data/lib/githubris/base.rb

@@ -0,0 +1,80 @@
+class Githubris::Base
+  def initialize attributes={}
+    @api = attributes.delete(:_api) || Githubris::API.new
+    @attributes = attributes
+  end
+
+  def ==(other)
+    @attributes == other.instance_variable_get(:@attributes)
+  end
+
+  def swap_attributes(other)
+    instance_variable_set(:@attributes,
+                          other.instance_variable_get(:@attributes))
+    self
+  end
+
+  private
+
+  class << self
+    def accessible_attribute(*attr_names)
+      attr_names.each do |name|
+        class_eval accessible_methods_called(name)
+      end
+    end
+
+    def accessible_methods_called(name)
+      """
+      def #{name}
+        @attributes[:#{name}]
+      end
+
+      def #{name}=(#{name})
+        @attributes[:#{name}] = #{name}
+      end
+      """
+    end
+
+    def uri_attribute(*attr_names)
+      attr_names.each do |name|
+        class_eval uri_method_called(name)
+      end
+    end
+
+    def uri_method_called(name)
+      """
+      def #{name}
+        URI.parse @attributes[:#{name}]
+      end
+      """
+    end
+
+    def datetime_attribute(*attr_names)
+      attr_names.each do |name|
+        class_eval datetime_method_called(name)
+      end
+    end
+
+    def datetime_method_called(name)
+      """
+      def #{name}
+        DateTime.parse @attributes[:#{name}]
+      end
+      """
+    end
+
+    def readable_attribute(*attr_names)
+      attr_names.each do |name|
+        class_eval readable_method_called(name)
+      end
+    end
+
+    def readable_method_called(name)
+      """
+      def #{name}
+        @attributes[:#{name}]
+      end
+      """
+    end
+  end
+end