mlb 0.0.5 → 0.1.1

data/README.rdoc

@@ -5,20 +5,20 @@
 == Usage
   $ irb
   >> require 'mlb'
-  >> MLB.teams.first.name                    # => "Arizona Diamondbacks"
-  >> MLB.teams.first.league                  # => "National League"
-  >> MLB.teams.first.division                # => "National League West"
-  >> MLB.teams.first.manager                 # => "Bob Melvin"
-  >> MLB.teams.first.wins                    # => 82
-  >> MLB.teams.first.losses                  # => 80
-  >> MLB.teams.first.founded                 # => 1998
-  >> MLB.teams.first.mascot                  # => nil
-  >> MLB.teams.first.ballpark                # => "Chase Field"
-  >> MLB.teams.first.logo_url                # => "http://img.freebase.com/api/trans/image_thumb/wikipedia/images/en_id/13104064"
-  >> MLB.teams.first.players.first.name      # => "Alex Romero"
-  >> MLB.teams.first.players.first.number    # => 28
-  >> MLB.teams.first.players.first.position  # => "Right fielder"
-== Acknowledgements
+  >> MLB::Team.all.first.name                    # => "Arizona Diamondbacks"
+  >> MLB::Team.all.first.league                  # => "National League"
+  >> MLB::Team.all.first.division                # => "National League West"
+  >> MLB::Team.all.first.manager                 # => "Bob Melvin"
+  >> MLB::Team.all.first.wins                    # => 82
+  >> MLB::Team.all.first.losses                  # => 80
+  >> MLB::Team.all.first.founded                 # => 1998
+  >> MLB::Team.all.first.mascot                  # => nil
+  >> MLB::Team.all.first.ballpark                # => "Chase Field"
+  >> MLB::Team.all.first.logo_url                # => "http://img.freebase.com/api/trans/image_thumb/wikipedia/images/en_id/13104064"
+  >> MLB::Team.all.first.players.first.name      # => "Alex Romero"
+  >> MLB::Team.all.first.players.first.number    # => 28
+  >> MLB::Team.all.first.players.first.position  # => "Right fielder"
+== Credits
 Many thanks to:
 * Freebase[http://www.freebase.com]
 * httparty[http://github.com/jnunemaker/httparty]

data/Rakefile

@@ -8,44 +8,28 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://github.com/sferik/mlb"
 SUMMARY = "MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues."
-GEM_VERSION = "0.0.5"
+GEM_VERSION = "0.1.1"
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency("httparty", ">= 0.4.5")
-  s.add_dependency("json", ">= 1.1.9")
-  s.require_path = "lib"
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{doc,lib}/**/*")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = GEM_NAME
+    gemspec.version = GEM_VERSION
+    gemspec.platform = Gem::Platform::RUBY
+    gemspec.has_rdoc = true
+    gemspec.extra_rdoc_files = ["README.rdoc", "LICENSE"]
+    gemspec.summary = SUMMARY
+    gemspec.description = gemspec.summary
+    gemspec.author = AUTHOR
+    gemspec.email = EMAIL
+    gemspec.homepage = HOMEPAGE
+    gemspec.add_dependency("httparty", ">= 0.4.5")
+    gemspec.add_dependency("json", ">= 1.1.9")
+    gemspec.require_path = "lib"
+    gemspec.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{lib}/**/*")
   end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
 Rake::RDocTask.new do |rd|

data/lib/mlb.rb

@@ -1,123 +1,4 @@
-require 'httparty'
-require 'json'
-require 'ostruct'
-
-class MLB
-  include HTTParty
-  base_uri 'http://www.freebase.com/api'
-
-  # Returns an array of objects, one for each Major League Baseball team
-  #
-  #   MLB.teams.first.name                    # => "Arizona Diamondbacks"
-  #   MLB.teams.first.league                  # => "National League"
-  #   MLB.teams.first.division                # => "National League West"
-  #   MLB.teams.first.manager                 # => "Bob Melvin"
-  #   MLB.teams.first.wins                    # => 82
-  #   MLB.teams.first.losses                  # => 80
-  #   MLB.teams.first.founded                 # => 1998
-  #   MLB.teams.first.mascot                  # => nil
-  #   MLB.teams.first.ballpark                # => "Chase Field"
-  #   MLB.teams.first.logo_url                # => "http://img.freebase.com/api/trans/image_thumb/wikipedia/images/en_id/13104064"
-  #   MLB.teams.first.players.first.name      # => "Alex Romero"
-  #   MLB.teams.first.players.first.number    # => 28
-  #   MLB.teams.first.players.first.position  # => "Right fielder"
-  def self.teams
-    @query ||= team_query
-    @response ||= exec_query(@query)
-    @results ||= []
-    if @response && @results.empty?
-      @response['result'].each do |result|
-        @results << OpenStruct.new({
-          :name     => result['name'],
-          :league   => result['league']['name'],
-          :division => result['division']['name'],
-          :manager  => result['current_manager']['name'],
-          :wins     => result['team_stats'].first['wins'].to_i,
-          :losses   => result['team_stats'].first['losses'].to_i,
-          :founded  => result['/sports/sports_team/founded'].first['value'].to_i,
-          :mascot   => (result['/sports/sports_team/team_mascot'].first ? result['/sports/sports_team/team_mascot'].first['name'] : nil),
-          :ballpark => result['/sports/sports_team/arena_stadium'].first['name'],
-          :logo_url => 'http://img.freebase.com/api/trans/image_thumb' + result['/common/topic/image'].first['id'],
-          :players  => result['current_roster'].map {|player|
-            OpenStruct.new({
-              :name => player['player'],
-              :number => player['number'],
-              :position => player['position'],
-            })
-          },
-        })
-      end
-    end
-    @results
-  end
-
-  private
-
-  # Converts MQL query to JSON and fetches response from Freebase API
-  def self.exec_query(query)
-    format :json
-    begin
-      response = get('/service/mqlread?', :query => {:query => query.to_json})
-      if response['code'] != '/api/status/ok'
-        error("#{response['status']} (Transaction: #{response['transaction_id']})")
-      end
-    rescue SocketError, Errno::ECONNREFUSED => e
-      error("Could not connect. Unclog tubes and try again.")
-    end
-    response
-  end
-
-  # Returns the MQL query for teams, as a Ruby hash
-  def self.team_query
-    {
-      :query => [
-        {
-          'name' => nil,
-          'league' => {
-            'name' => nil,
-          },
-          'division' => {
-            'name' => nil,
-          },
-          'current_manager' => {
-            'name' => nil,
-          },
-          'team_stats' => [{
-            'wins' => nil,
-            'losses' => nil,
-            'season' => nil,
-            'limit' => 1,
-            'sort' => '-season',
-          }],
-          'current_roster' => [{
-            'player' => nil,
-            'position' => nil,
-            'number' => nil,
-            'sort' => 'player',
-          }],
-          '/sports/sports_team/founded' => [{
-            'value' => nil,
-          }],
-          '/sports/sports_team/team_mascot' => [{
-          }],
-          '/sports/sports_team/arena_stadium' => [{
-            'name' => nil,
-          }],
-          '/common/topic/image' => [{
-            'id' => nil,
-            'timestamp' => nil,
-            'sort' => '-timestamp',
-            'limit' => 1,
-          }],
-          'sort' => 'name',
-          'type' => '/baseball/baseball_team',
-        }
-      ]
-    }
-  end
-
-  def self.error(*messages)
-    puts messages.map{|msg| "\033[1;31mError: #{msg}\033[0m"}
-  end
-
+module MLB
+  autoload :Team, 'mlb/team'
+  autoload :Player, 'mlb/player'
 end

data/lib/mlb/player.rb

@@ -0,0 +1,29 @@
+module MLB
+  class Player
+    attr_reader :name, :number, :position
+    private_class_method :new
+
+    protected
+
+    # Returns an array of Player objects given a team roster
+    def self.all_from_roster(players)
+      players.map do |player|
+        new(
+          :name     => player['player'],
+          :number   => player['number'],
+          :position => player['position']
+        )
+      end
+    end
+
+    private
+
+    def initialize(attributes={})
+      super unless attributes.is_a?(Hash)
+      @name     = attributes[:name]
+      @number   = attributes[:number]
+      @position = attributes[:position]
+    end
+
+  end
+end

data/lib/mlb/team.rb

@@ -0,0 +1,143 @@
+require 'httparty'
+require 'json'
+
+module MLB
+  class Team
+    include HTTParty
+    format :json
+    base_uri 'http://www.freebase.com/api'
+    attr_reader :name, :league, :division, :manager, :wins, :losses, :founded, :mascot, :ballpark, :logo_url, :players
+    private_class_method :new
+
+    # Returns an array of Team objects
+    #
+    #   MLB::Team.all.first.name                    # => "Arizona Diamondbacks"
+    #   MLB::Team.all.first.league                  # => "National League"
+    #   MLB::Team.all.first.division                # => "National League West"
+    #   MLB::Team.all.first.manager                 # => "Bob Melvin"
+    #   MLB::Team.all.first.wins                    # => 82
+    #   MLB::Team.all.first.losses                  # => 80
+    #   MLB::Team.all.first.founded                 # => 1998
+    #   MLB::Team.all.first.mascot                  # => nil
+    #   MLB::Team.all.first.ballpark                # => "Chase Field"
+    #   MLB::Team.all.first.logo_url                # => "http://img.freebase.com/api/trans/image_thumb/wikipedia/images/en_id/13104064"
+    #   MLB::Team.all.first.players.first.name      # => "Alex Romero"
+    #   MLB::Team.all.first.players.first.number    # => 28
+    #   MLB::Team.all.first.players.first.position  # => "Right fielder"
+    def self.all
+      @query ||= query
+      @response ||= execute(@query)
+      @results ||= []
+      if @response && @results.empty?
+        @response['result'].each do |result|
+          league      = result['league']
+          division    = result['division']
+          manager     = result['current_manager']
+          stats       = result['team_stats'].first
+          founded     = result['/sports/sports_team/founded'].first
+          mascot      = result['/sports/sports_team/team_mascot'].first
+          ballpark    = result['/sports/sports_team/arena_stadium'].first
+          logo_prefix = 'http://img.freebase.com/api/trans/image_thumb'
+          logo_suffix = result['/common/topic/image'].first
+          players     = result['current_roster']
+
+          @results << new(
+            :name     => result['name'],
+            :league   => (league      ? league['name']                  : nil),
+            :division => (division    ? division['name']                : nil),
+            :manager  => (manager     ? manager['name']                 : nil),
+            :wins     => (stats       ? stats['wins'].to_i              : nil),
+            :losses   => (stats       ? stats['losses'].to_i            : nil),
+            :founded  => (founded     ? founded['value'].to_i           : nil),
+            :mascot   => (mascot      ? mascot['name']                  : nil),
+            :ballpark => (ballpark    ? ballpark['name']                : nil),
+            :logo_url => (logo_suffix ? logo_prefix + logo_suffix['id'] : nil),
+            :players  => (players     ? Player.all_from_roster(players) : [])
+          )
+
+        end
+      end
+      @results
+    end
+
+    private
+
+    def initialize(attributes={})
+      super unless attributes.is_a?(Hash)
+      @name     = attributes[:name]
+      @league   = attributes[:league]
+      @division = attributes[:division]
+      @manager  = attributes[:manager]
+      @wins     = attributes[:wins]
+      @losses   = attributes[:losses]
+      @founded  = attributes[:founded]
+      @mascot   = attributes[:mascot]
+      @ballpark = attributes[:ballpark]
+      @logo_url = attributes[:logo_url]
+      @players  = attributes[:players]
+    end
+
+    # Converts MQL query to JSON and fetches response from Freebase API
+    def self.execute(query)
+      begin
+        response = get('/service/mqlread?', :query => {:query => query.to_json})
+        if response['code'] != '/api/status/ok'
+          raise Exception, "#{response['status']} (Transaction: #{response['transaction_id']})"
+        end
+      rescue SocketError, Errno::ECONNREFUSED
+        raise Exception, "Could not connect. Unclog tubes and try again."
+      end
+      response
+    end
+
+    # Returns the MQL query for teams, as a Ruby hash
+    def self.query
+      {
+        :query => [
+          {
+            'name' => nil,
+            'league' => {
+              'name' => nil,
+            },
+            'division' => {
+              'name' => nil,
+            },
+            'current_manager' => {
+              'name' => nil,
+            },
+            'team_stats' => [{
+              'wins' => nil,
+              'losses' => nil,
+              'season' => nil,
+              'limit' => 1,
+              'sort' => '-season',
+            }],
+            'current_roster' => [{
+              'player' => nil,
+              'position' => nil,
+              'number' => nil,
+              'sort' => 'player',
+            }],
+            '/sports/sports_team/founded' => [{
+              'value' => nil,
+            }],
+            '/sports/sports_team/team_mascot' => [{
+            }],
+            '/sports/sports_team/arena_stadium' => [{
+              'name' => nil,
+            }],
+            '/common/topic/image' => [{
+              'id' => nil,
+              'timestamp' => nil,
+              'sort' => '-timestamp',
+              'limit' => 1,
+            }],
+            'sort' => 'name',
+            'type' => '/baseball/baseball_team',
+          }
+        ]
+      }
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mlb
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -07:00
+date: 2009-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,20 +39,22 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
+- README.rdoc
 files: 
 - LICENSE
 - README.rdoc
 - Rakefile
 - lib/mlb.rb
+- lib/mlb/player.rb
+- lib/mlb/team.rb
 has_rdoc: true
 homepage: http://github.com/sferik/mlb
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement