dribble 0.1.2 → 0.1.3

data/Rakefile

@@ -4,16 +4,17 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "dribble"
-    gem.summary = %Q{API Wrapper for the awesome Dribbble Site}
+    gem.name        = "dribble"
+    gem.summary     = %Q{API Wrapper for the awesome Dribbble Site}
     gem.description = %Q{API Wrapper for the awesome Dribbble Site}
-    gem.email = "robert@codewranglers.org"
-    gem.homepage = "http://github.com/revans/dribble"
-    gem.authors = ["Robert R Evans"]
-    
+    gem.email       = "robert@codewranglers.org"
+    gem.homepage    = "http://github.com/revans/dribble"
+    gem.authors     = ["Robert R Evans"]
+     
     gem.add_development_dependency "rspec",   '= 1.3.0'
     gem.add_development_dependency "yard",    '= 0.5.8'
     
+    gem.add_dependency 'yajl-ruby',           '= 0.7.7'
     gem.add_dependency 'em-http-request',     '= 0.2.10'
     
   end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dribble.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dribble}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R Evans"]
-  s.date = %q{2010-08-15}
+  s.date = %q{2010-09-29}
   s.description = %q{API Wrapper for the awesome Dribbble Site}
   s.email = %q{robert@codewranglers.org}
   s.extra_rdoc_files = [
@@ -44,6 +44,8 @@ Gem::Specification.new do |s|
      "spec/core_ext/object_spec.rb",
      "spec/dribble/api/player_spec.rb",
      "spec/dribble/api/shot_spec.rb",
+     "spec/dribble/player_spec.rb",
+     "spec/dribble/request_spec.rb",
      "spec/dribble/version_spec.rb",
      "spec/fake_data/player/player_draftees.json",
      "spec/fake_data/player/player_find_shots.json",
@@ -68,6 +70,8 @@ Gem::Specification.new do |s|
      "spec/core_ext/object_spec.rb",
      "spec/dribble/api/player_spec.rb",
      "spec/dribble/api/shot_spec.rb",
+     "spec/dribble/player_spec.rb",
+     "spec/dribble/request_spec.rb",
      "spec/dribble/version_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/fake_eventmachine_requests.rb",
@@ -84,15 +88,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<yard>, ["= 0.5.8"])
+      s.add_runtime_dependency(%q<yajl-ruby>, ["= 0.7.7"])
       s.add_runtime_dependency(%q<em-http-request>, ["= 0.2.10"])
     else
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<yard>, ["= 0.5.8"])
+      s.add_dependency(%q<yajl-ruby>, ["= 0.7.7"])
       s.add_dependency(%q<em-http-request>, ["= 0.2.10"])
     end
   else
     s.add_dependency(%q<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<yard>, ["= 0.5.8"])
+    s.add_dependency(%q<yajl-ruby>, ["= 0.7.7"])
     s.add_dependency(%q<em-http-request>, ["= 0.2.10"])
   end
 end

data/lib/dribble/api/player.rb

@@ -1,76 +1,76 @@
 module Dribble
   module API
     class Player
-    
-
-      ##
-      # Find shots for a given player
-      #
-      # @param  [String/Integer]
-      # @return [Hash]
-      # @api    public
-      #
-      def self.find_shots(id, options={})
-        Dribble::Request.get("/players/#{id}/shots", setup_options(options))
-      end
+      class << self
+        
+        ##
+        # Find shots for a given player
+        #
+        # @param  [String/Integer]
+        # @return [Hash]
+        # @api    public
+        #
+        def find_shots(id, options={})
+          Dribble::Request.get("/players/#{id}/shots", setup_options(options))
+        end
     
     
-      ##
-      # Following Shots
-      #
-      # @param  [String/Integer]
-      # @return [Hash]
-      # @api    public
-      #
-      def self.following_shots(id, options={})
-        Dribble::Request.get("/players/#{id}/shots/following", setup_options(options))
-      end
+        ##
+        # Following Shots
+        #
+        # @param  [String/Integer]
+        # @return [Hash]
+        # @api    public
+        #
+        def following_shots(id, options={})
+          Dribble::Request.get("/players/#{id}/shots/following", setup_options(options))
+        end
     
     
-      ##
-      # Profile
-      #
-      # @param  [String/Integer]
-      # @return [Hash]
-      # @api    public
-      #
-      def self.profile(id)
-        Dribble::Request.get("/players/#{id}")
-      end
+        ##
+        # Profile
+        #
+        # @param  [String/Integer]
+        # @return [Hash]
+        # @api    public
+        #
+        def profile(id)
+          Dribble::Request.get("/players/#{id}")
+        end
       
       
-      ##
-      # Followers
-      #
-      # @param  [String/Integer]
-      # @return [Hash]
-      # @api    public
-      #
-      def self.followers(id, options={})
-        Dribble::Request.get("/players/#{id}/followers", setup_options(options))
-      end
+        ##
+        # Followers
+        #
+        # @param  [String/Integer]
+        # @return [Hash]
+        # @api    public
+        #
+        def followers(id, options={})
+          Dribble::Request.get("/players/#{id}/followers", setup_options(options))
+        end
       
       
       
-      ##
-      # Followers
-      #
-      # @param  [String/Integer]
-      # @return [Hash]
-      # @api    public
-      #
-      def self.draftees(id, options={})
-        Dribble::Request.get("/players/#{id}/draftees", setup_options(options))
-      end
+        ##
+        # Followers
+        #
+        # @param  [String/Integer]
+        # @return [Hash]
+        # @api    public
+        #
+        def draftees(id, options={})
+          Dribble::Request.get("/players/#{id}/draftees", setup_options(options))
+        end
 
     
-      private
+        private
       
-        def self.setup_options(options)
-          {:per_page => 30, :page => 1}.merge(options)
-        end
+          def setup_options(options)
+            {:per_page => 30, :page => 1}.merge(options)
+          end
       
-
+      end
     end
   end
 end

data/lib/dribble/api/shot.rb

@@ -2,83 +2,85 @@ module Dribble
   module API
     class Shot
 
-
-      ##
-      # By ID
-      #
-      # @param    [Integer]
-      # @return   [Hash]
-      # @api      public
-      #
-      def self.for(id)
-        Dribble::Request.get("/shots/#{id.to_i}")
-      end
+      class << self
+        
+        ##
+        # By ID
+        #
+        # @param    [Integer]
+        # @return   [Hash]
+        # @api      public
+        #
+        def for(id)
+          Dribble::Request.get("/shots/#{id.to_i}")
+        end
       
       
-      ##
-      # Following
-      #
-      # @param    [String/Integer, Hash]
-      #           e.g. {:per_page => 30, :page => 1}
-      #
-      # @return   [Hash]
-      # @api      public
-      #
-      def self.following(id, options={})
-        Dribble::Request.get("/players/#{id}/shots/following", setup_options(options))
-      end
+        ##
+        # Following
+        #
+        # @param    [String/Integer, Hash]
+        #           e.g. {:per_page => 30, :page => 1}
+        #
+        # @return   [Hash]
+        # @api      public
+        #
+        def following(id, options={})
+          Dribble::Request.get("/players/#{id}/shots/following", setup_options(options))
+        end
       
     
-      ##
-      # Everyones
-      #
-      # @param    [Hash]
-      #           e.g. {:per_page => 30, :page => 1}
-      #
-      # @return   [Array]
-      # @api      public
-      #
-      def self.everyones(options={})
-        Dribble::Request.get("/shots/everyone", setup_options(options))
-      end
-    
+        ##
+        # Everyones
+        #
+        # @param    [Hash]
+        #           e.g. {:per_page => 30, :page => 1}
+        #
+        # @return   [Array]
+        # @api      public
+        #
+        def everyones(options={})
+          Dribble::Request.get("/shots/everyone", setup_options(options))
+        end
+        alias_method :everyone, :everyones
+      
     
-      ##
-      # Debuts
-      #
-      # @param    [Hash]
-      #           e.g. {:per_page => 30, :page => 1}
-      #
-      # @return   [Array]
-      # @api      public
-      #
-      def self.debuts(options={})
-        Dribble::Request.get("/shots/debuts", setup_options(options))
-      end
+        ##
+        # Debuts
+        #
+        # @param    [Hash]
+        #           e.g. {:per_page => 30, :page => 1}
+        #
+        # @return   [Array]
+        # @api      public
+        #
+        def debuts(options={})
+          Dribble::Request.get("/shots/debuts", setup_options(options))
+        end
     
     
-      ##
-      # Popular
-      #
-      # @param    [Hash]
-      #           e.g. {:per_page => 30, :page => 1}
-      #
-      # @return   [Array]
-      # @api      public
-      #
-      def self.popular(options={})
-        Dribble::Request.get("/shots/popular", setup_options(options))
-      end
+        ##
+        # Popular
+        #
+        # @param    [Hash]
+        #           e.g. {:per_page => 30, :page => 1}
+        #
+        # @return   [Array]
+        # @api      public
+        #
+        def popular(options={})
+          Dribble::Request.get("/shots/popular", setup_options(options))
+        end
 
     
-      private
+        private
       
       
-        def self.setup_options(options)
-          {:per_page => 30, :page => 1}.merge(options)
-        end
-    
-
+          def setup_options(options)
+            {:per_page => 30, :page => 1}.merge(options)
+          end
+          
+      end
     end
   end
 end

data/lib/dribble/player.rb

@@ -1,9 +1,11 @@
 module Dribble
   class Player
-    attr_reader :id, :name, :url, :avatar_url, :location, :created_at, :draftees_count,
-                :following_count, :shots_count, :followers_count, :following, :shots,
-                :drafted_by_player_id, :draftees_count, :players, :page, :pages, :per_page, 
-                :total
+    attr_reader :id, :name, :url, :avatar_url, :location, :twitter_screen_name,
+                :drafted_by_player_id, :shots_count, :draftees_count, 
+                :followers_count, :following_count, :comments_count, :comments_received_count,
+                :likes_count, :likes_receive_count, :rebounds_count, :rebounds_received_count,
+                :created_at, 
+                :following, :shots, :players, :page, :pages, :per_page, :total
     
     
     def initialize(attr={})

data/lib/dribble/request.rb

@@ -14,10 +14,10 @@ module Dribble
       def get(query, options={})
         meth = options.delete(:api_endpoint)
         ::EventMachine.run do
-          http = ::EventMachine::HttpRequest.new("#{to_url}#{query}").get(:query => options, :timeout => 10)
+          http = ::EventMachine::HttpRequest.new("#{to_url(query)}").get(:query => options, :timeout => 10)
           http.callback do
             @response = {
-              :status => http.response_header.status,
+              :status => http.response_header.status.to_i,
               :header => http.response_header,
               :body   => http.response,
               :data   => ::Yajl::Parser.new(:symbolize_keys => true).parse(http.response)
@@ -25,15 +25,16 @@ module Dribble
             ::EventMachine.stop
           end
         end
+
         @response[:data][:api_endpoint] = meth if meth
-        @response[:data]
+        @response[:status] == 200 ? @response[:data] : @response[:data][:message]
       end    
       
       
       private
         
-        def to_url
-          "http://#{DRIBBLE_API}"
+        def to_url(query)
+          "http://#{DRIBBLE_API}#{query}"
         end
 
     end

data/lib/dribble/shot.rb

@@ -1,7 +1,8 @@
 module Dribble
   class Shot
-    attr_reader   :id, :title, :url, :image_url, :image_teaser_url, :width, :height, :created_at, :player,
-                  :views_count, :likes_count, :comments_count, :rebounds_count
+    attr_reader   :id, :title, :url, :short_url, :image_url, :image_teaser_url, :width, :height, 
+                  :views_count, :likes_count, :comments_count, :rebounds_count, :created_at, 
+                  :player
     
     
     def initialize(attributes={})

data/spec/dribble/player_spec.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe Dribble::Player do
+  describe "Successful player requests" do
+    
+  end
+end

data/spec/dribble/request_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe "The request api" do
+  
+  describe "A successful request" do
+    
+    before(:all) do
+      @success = Dribble::Request.get("/players/revans")
+    end
+    
+    it "should make a successful get request" do
+      @success.should be_true
+    end
+    
+    it "should be a hash" do
+      @success.class.should == Hash
+    end
+    
+  end
+  
+  
+  describe "An unsuccessful request" do
+    
+    before(:all) do
+      @failure = Dribble::Request.get("/players/simblebits238952352342342")
+    end
+    
+    it "should make a successful get request" do
+      @failure.should == "Not found"
+    end
+    
+  end
+  
+end

data/spec/spec_helper.rb

@@ -6,14 +6,6 @@ require 'spec/autorun'
 
 require 'rubygems'
 
-# require 'fakeweb'
-# require 'fakeweb_matcher'
-
-# Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each { |file| require file }
-# FakeWeb.allow_net_connect = false
-
-
-# require File.join(File.dirname(__FILE__), '../lib/dribble.rb')
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dribble
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Robert R Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 -07:00
+date: 2010-09-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,9 +51,25 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: yajl-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 7
+        - 7
+        version: 0.7.7
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,7 +81,7 @@ dependencies:
         - 10
         version: 0.2.10
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 description: API Wrapper for the awesome Dribbble Site
 email: robert@codewranglers.org
 executables: []
@@ -103,6 +119,8 @@ files:
 - spec/core_ext/object_spec.rb
 - spec/dribble/api/player_spec.rb
 - spec/dribble/api/shot_spec.rb
+- spec/dribble/player_spec.rb
+- spec/dribble/request_spec.rb
 - spec/dribble/version_spec.rb
 - spec/fake_data/player/player_draftees.json
 - spec/fake_data/player/player_find_shots.json
@@ -155,6 +173,8 @@ test_files:
 - spec/core_ext/object_spec.rb
 - spec/dribble/api/player_spec.rb
 - spec/dribble/api/shot_spec.rb
+- spec/dribble/player_spec.rb
+- spec/dribble/request_spec.rb
 - spec/dribble/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_eventmachine_requests.rb