githubris 0.0.6 → 0.0.7

data/.travis.yml

@@ -7,8 +7,8 @@ rvm:
   - ruby-head
   - jruby-head
   # Breaks on the JSON stuff
-  # - 1.8.7
-  # - jruby-18mode
-  # - jruby-19mode
-  # - rbx-18mode
-  # - ree
+  - 1.8.7
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - ree

data/Rakefile

@@ -1,7 +1,16 @@
 require 'bundler/gem_tasks'
+require 'bundler/setup'
 require 'rspec/core/rake_task'
 require 'flay_task'
 require 'flog_task'
+require 'pry'
+
+Bundler.setup
+
+task :console do
+  Bundler.require
+  pry
+end
 
 RSpec::Core::RakeTask.new :spec do |t|
   t.rspec_opts = '--color --format=documentation'
@@ -20,5 +29,5 @@ FlayTask.new &FLAY_FLOG_OPTS_BLOCK
 FlogTask.new &FLAY_FLOG_OPTS_BLOCK
 
 task :ci => [:spec]
-task :all => [:cov, :spec, :flay, :flog]
-task :default => [:cov, :spec]
+task :specs => :spec
+task :default => [:cov, :spec, :flay, :flog]

data/githubris.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('httparty', '~> 0.8.1')
-  s.add_dependency('multi_json', '~> 1.1.0')
+  s.add_dependency('httparty', '>= 0.8.3')
+  s.add_dependency('multi_json')
+  s.add_dependency('yajl-ruby')
   s.add_dependency('addressable', '~> 2.2.7')
 end

data/lib/githubris.rb

@@ -1,21 +1,11 @@
 class Githubris
   autoload :API, 'githubris/api'
   autoload :Base, 'githubris/base'
-  autoload :Blob, 'githubris/blob'
-  autoload :Comment, 'githubris/comment'
-  autoload :Commit, 'githubris/commit'
+  autoload :CustomAttributes, 'githubris/custom_attributes'
   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'
-  autoload :Tag, 'githubris/tag'
-  autoload :Tree, 'githubris/tree'
   autoload :User, 'githubris/user'
   autoload :Version, 'githubris/version'
 

data/lib/githubris/api.rb

@@ -1,12 +1,14 @@
 require 'addressable/uri'
+require 'yajl'
 
 class Githubris::API
-
-  autoload :HTTP, 'githubris/api/http'
-  include Githubris::API::HTTP
-  autoload :Gist, 'githubris/api/gist'
+  require 'githubris/api/gist'
   include Githubris::API::Gist
-  autoload :User, 'githubris/api/user'
+  require 'githubris/api/http'
+  include Githubris::API::HTTP
+  require 'githubris/api/json'
+  include Githubris::API::JSON
+  require 'githubris/api/user'
   include Githubris::API::User
 
   def initialize
@@ -18,6 +20,7 @@ class Githubris::API
     {
       :scheme => 'https',
       :host => 'api.github.com',
+      :query => ''
     }
   end
 
@@ -29,7 +32,7 @@ class Githubris::API
   end
 
   def oauth(client_id, client_secret)
-    oauth = Githubris::OAuth.new client_id, client_secret
+    Githubris::OAuth.new client_id, client_secret, self
   end
 
   def authenticated?
@@ -39,59 +42,77 @@ class Githubris::API
   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)
+    handle_request_data get(path, options)
   end
 
   def get(path, options={})
-    @target.path = path
+    set_request_path(path)
     @target.query_values = options
-    MultiJson.encode(_get(@target.to_s))
-  end
-
-  def error_data?(data)
-    data.is_a?(Hash) and data[:message]
+    dump_json(_get.parsed_response)
   end
 
   def post_oauth_access_token(params)
-    @target.query ||= ''
     @target.query += _post(oauth_access_token_url, :query => params)
-    @target.query_values['access_token']
+    @options[:default_params] ||= {}
+    @options[:default_params][:access_token] = @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)
+    handle_request_data post(path, dump_json(params))
+  end
+
+  def post(path, params)
+    set_request(path, params)
+    dump_json(_post.parsed_response)
+  end
+
+  def patch_data_to(path, params)
+    handle_request_data patch(path, dump_json(params))
+  end
+
+  def patch(path, params)
+    set_request(path, params)
+    dump_json(_patch.parsed_response)
+  end
 
+  private
+
+  def set_request(path, params)
+    set_request_path(path)
+    set_request_params(params)
+  end
+
+  def set_request_params(params)
+    @options[:body] = params
+  end
+
+  def set_request_path(path)
+    @target.path = path
+  end
+
+  def handle_request_data(data)
+    data = load_json(data) if data.is_a? String
+    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 error_data?(data)
+    data.is_a?(Hash) and data[:message]
+  end
+
   def embed_self_in(data)
-    this = self
     if data.is_a? Array
-      data.each {|data_el| data_el[:_api] = this }
+      data.map {|data_el| embed_self_in(data_el) }
     else
-      data[:_api] = this
+      data[:_api] = self
+      data
     end
-
-    data
-  end
-
-  def post(path, params)
-    @target.path = path
-    @options[:body] = params
-    MultiJson.encode(_post(@target.to_s))
   end
 
   def oauth_access_token_url

data/lib/githubris/api/gist.rb

@@ -16,10 +16,39 @@ module Githubris::API::Gist
     get_gist_from(gist_path(id))
   end
 
+  def put_gist_star(id)
+    set_request_path(gist_star_path(id))
+    _put(@target.to_s, @options.merge(:headers => {'Content-Length' => '0'}))
+  end
+
+  def delete_gist_star(id)
+    set_request_path(gist_star_path(id))
+    _delete
+  end
+
+  def delete_gist(id)
+    set_request_path(gist_path(id))
+    _delete
+  end
+
+  def get_gist_starred?(id)
+    set_request_path(gist_star_path(id))
+    case _get.code
+    when 204
+      true
+    when 404
+      false
+    end
+  end
+
   def post_gist(params)
     post_gist_to(gists_path, params)
   end
 
+  def patch_gist(id, params)
+    patch_gist_to(gist_path(id), params)
+  end
+
   private
   def get_gists_from(path, options={})
     get_data_from(path, options).map do |gist_data|
@@ -35,8 +64,12 @@ module Githubris::API::Gist
     Githubris::Gist.new post_data_to(path, params)
   end
 
+  def patch_gist_to(path, params)
+    Githubris::Gist.new patch_data_to(path, params)
+  end
+
   def public_gists_path
-    "#{gists_path}/public"
+    '/gists/public'
   end
 
   def user_gists_path(login)
@@ -44,11 +77,15 @@ module Githubris::API::Gist
   end
 
   def user_starred_gists_path
-    "#{gists_path}/starred"
+    '/gists/starred'
+  end
+
+  def gist_star_path(id)
+    "/gists/#{id}/star"
   end
 
   def gist_path(id)
-    "#{gists_path}/#{id}"
+    "/gists/#{id}"
   end
 
   def gists_path

data/lib/githubris/api/http.rb

@@ -2,11 +2,20 @@ require 'httparty'
 
 module Githubris::API::HTTP
   private
-  def _get(path, options=@options)
-    HTTParty.get(path, options)
+
+  def self.define_httparty_method(*http_methods)
+    http_methods.each do |http_method|
+      module_eval http_method_string(http_method)
+    end
   end
 
-  def _post(path, options=@options)
-    HTTParty.post(path, options)
+  def self.http_method_string(http_method)
+    """
+    def _#{http_method}(path=@target.to_s, options=@options)
+      HTTParty.#{http_method}(path, options)
+    end
+    """
   end
+
+  define_httparty_method :get, :post, :patch, :put, :delete
 end

data/lib/githubris/api/json.rb

@@ -0,0 +1,16 @@
+require 'multi_json'
+require 'yajl'
+
+module Githubris::API::JSON
+  MultiJson.use :yajl
+
+  private
+
+  def load_json(json)
+    MultiJson.load(json, :symbolize_keys => true)
+  end
+
+  def dump_json(json)
+    MultiJson.dump(json)
+  end
+end

data/lib/githubris/base.rb

@@ -1,4 +1,6 @@
 class Githubris::Base
+  extend Githubris::CustomAttributes
+
   def initialize attributes={}
     @api = attributes.delete(:_api) || Githubris::API.new
     @attributes = attributes
@@ -13,68 +15,4 @@ class Githubris::Base
                           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

data/lib/githubris/custom_attributes.rb

@@ -0,0 +1,40 @@
+module Githubris::CustomAttributes
+  private
+
+  def accessible_attribute(*attr_names)
+    readable_attribute(*attr_names)
+    writable_attribute(*attr_names)
+  end
+
+  def uri_attribute(*attr_names)
+    attr_names.each do |name|
+      define_method name do
+        URI.parse @attributes[name]
+      end
+    end
+  end
+
+  def datetime_attribute(*attr_names)
+    attr_names.each do |name|
+      define_method name do
+        DateTime.parse @attributes[name]
+      end
+    end
+  end
+
+  def readable_attribute(*attr_names)
+    attr_names.each do |name|
+      define_method name do
+        @attributes[name]
+      end
+    end
+  end
+
+  def writable_attribute(*attr_names)
+    attr_names.each do |name|
+      define_method "#{name}=" do |new_value|
+        @attributes[name] = new_value
+      end
+    end
+  end
+end