mlb 0.1.2 → 0.2.0

data/.gitignore

@@ -1,7 +1,4 @@
-*.db
 *.gem
-*.sqlite
-*.sqlite3
 *~
 .#*
 .DS_Store

data/Rakefile

@@ -19,6 +19,7 @@ begin
     gemspec.homepage = HOMEPAGE
     gemspec.add_dependency("httparty", ">= 0.4.5")
     gemspec.add_dependency("json", ">= 1.1.9")
+    gemspec.add_dependency("sqlite3-ruby", ">= 1.2.5")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/mlb/player.rb

@@ -1,7 +1,12 @@
 module MLB
   class Player
-    attr_reader :name, :number, :position
-    private_class_method :new
+    attr_accessor :name, :number, :position
+
+    def initialize(attributes={})
+      attributes.each_pair do |key, value|
+        self.send("#{key}=", value) if self.respond_to?("#{key}=")
+      end
+    end
 
     protected
 
@@ -16,14 +21,5 @@ module MLB
       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

@@ -6,8 +6,7 @@ module MLB
     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
+    attr_accessor :name, :league, :division, :manager, :wins, :losses, :founded, :mascot, :ballpark, :logo_url, :players
 
     # Returns an array of Team objects
     #
@@ -25,73 +24,110 @@ module MLB
     #   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
+      @results ||= run
     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]
+      attributes.each_pair do |key, value|
+        self.send("#{key}=", value) if self.respond_to?("#{key}=")
+      end
     end
 
-    # Converts MQL query to JSON and fetches response from Freebase API
-    def self.execute(query)
+    private
+
+    # Attempt to fetch the result from the Freebase API
+    # unless there is a connection error, in which case
+    # query a static SQLite3 database.
+    def self.run
       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
+        run_team_mql
       rescue SocketError, Errno::ECONNREFUSED
-        raise Exception, "Could not connect. Unclog tubes and try again."
+        run_team_sql
       end
-      response
+    end
+
+    def self.run_team_mql
+      query = team_mql_query
+      results = get('/service/mqlread?', :query => {:query => query.to_json})
+      raise(Exception, "#{results['status']} (Transaction: #{results['transaction_id']})") unless results['code'] == '/api/status/ok'
+
+      teams = []
+      results['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']
+
+        teams << 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
+      teams
+    end
+
+    def self.setup_db
+      require 'sqlite3'
+      @db ||= SQLite3::Database.new(File.join(File.dirname(__FILE__), "..", "..", "db", "mlb.sqlite3"), :type_translation => true, :results_as_hash => true)
+    end
+
+    def self.run_team_sql
+      db = setup_db
+      query = team_sql_query
+      results = db.execute(query)
+
+      teams = []
+      results.each do |result|
+        teams << new(
+          :name     => result['name'],
+          :league   => result['league'],
+          :division => result['division'],
+          :manager  => result['manager'],
+          :wins     => result['wins'],
+          :losses   => result['losses'],
+          :founded  => result['founded'],
+          :mascot   => result['mascot'],
+          :ballpark => result['ballpark'],
+          :logo_url => result['logo_url'],
+          :players  => run_player_sql(result['name'])
+        )
+      end
+      teams
+    end
+
+    def self.run_player_sql(team_name)
+      db = setup_db
+      query = player_sql_query(team_name)
+      results = db.execute(query)
+
+      players = []
+      results.each do |result|
+        players << Player.new(
+          :name     => result['name'],
+          :position => result['position'],
+          :number   => result['number']
+        )
+      end
+      players
     end
 
     # Returns the MQL query for teams, as a Ruby hash
-    def self.query
+    def self.team_mql_query
       {
         :query => [
           {
@@ -139,5 +175,37 @@ module MLB
       }
     end
 
+    def self.team_sql_query
+      <<-eos
+        SELECT teams.name     AS name
+             , leagues.name   AS league
+             , divisions.name AS division
+             , teams.manager  AS manager
+             , teams.wins     AS wins
+             , teams.losses   AS losses
+             , teams.founded  AS founded
+             , teams.mascot   AS mascot
+             , teams.ballpark AS ballpark
+             , teams.logo_url AS logo_url
+          FROM teams
+             , divisions
+             , leagues
+         WHERE teams.division_id = divisions.id
+           AND divisions.league_id = leagues.id
+      eos
+    end
+
+    def self.player_sql_query(team_name)
+      <<-eos
+        SELECT players.name     AS name
+             , players.position AS position
+             , players.number   AS number
+          FROM players
+             , teams
+         WHERE players.team_id = teams.id
+           AND teams.name = "#{team_name}"
+      eos
+    end
+
   end
 end

data/mlb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mlb}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Michaels-Ober"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-27}
   s.description = %q{MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues.}
   s.email = %q{sferik@gmail.com}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "db/mlb.sqlite3",
      "lib/mlb.rb",
      "lib/mlb/player.rb",
      "lib/mlb/team.rb",
@@ -40,13 +41,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
       s.add_runtime_dependency(%q<json>, [">= 1.1.9"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
     else
       s.add_dependency(%q<httparty>, [">= 0.4.5"])
       s.add_dependency(%q<json>, [">= 1.1.9"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0.4.5"])
     s.add_dependency(%q<json>, [">= 1.1.9"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mlb
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.5
+    version: 
 description: MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues.
 email: sferik@gmail.com
 executables: []
@@ -47,6 +57,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- db/mlb.sqlite3
 - lib/mlb.rb
 - lib/mlb/player.rb
 - lib/mlb/team.rb