mlb 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    mlb (0.3.0)
+    mlb (0.4.0)
       faraday (~> 0.5.2)
-      sqlite3-ruby (~> 1.3.2)
       yajl-ruby (~> 0.7.8)
 
 GEM
@@ -21,17 +20,14 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    sqlite3-ruby (1.3.2)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
     webmock (1.5.0)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
@@ -48,8 +44,7 @@ DEPENDENCIES
   mlb!
   rake (~> 0.8)
   rcov (~> 0.9)
-  rspec (~> 2.0)
-  sqlite3-ruby (~> 1.3.2)
+  rspec (~> 2.1)
   webmock (~> 1.5)
   yajl-ruby (~> 0.7.8)
   yard (~> 0.6)

data/Rakefile

@@ -28,3 +28,14 @@ namespace :doc do
     ]
   end
 end
+
+namespace :cache do
+  require File.expand_path('../lib/mlb', __FILE__)
+  desc "Update the teams file cache"
+  task :update do
+    doc = MLB::Team.results_from_freebase(true)
+    File.open('cache/teams.json', 'w') do |file|
+      file.write(doc.body)
+    end
+  end
+end

data/{spec/fixtures → cache}/teams.json

@@ -7158,5 +7158,5 @@
     }
   ],
   "status": "200 OK",
-  "transaction_id": "cache;cache03.p01.sjc1:8101;2010-11-06T22:13:32Z;0003"
+  "transaction_id": "cache;cache02.p01.sjc1:8101;2010-11-07T17:25:04Z;0023"
 }

data/lib/mlb.rb

@@ -1,6 +1,5 @@
 module MLB
-  autoload :Connection, 'mlb/connection'
-  autoload :Request,    'mlb/request'
-  autoload :Team,       'mlb/team'
-  autoload :Player,     'mlb/player'
+  require File.expand_path('../mlb/request', __FILE__)
+  require File.expand_path('../mlb/team', __FILE__)
+  require File.expand_path('../mlb/player', __FILE__)
 end

data/lib/mlb/player.rb

@@ -1,15 +1,16 @@
 module MLB
   class Player
-    attr_accessor :name, :number, :position
+    private_class_method :new
+    attr_reader :name, :number, :position
+
+    private
 
     def initialize(attributes={})
       attributes.each_pair do |key, value|
-        self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        instance_eval("@#{key}=value") if self.respond_to?(key)
       end
     end
 
-    protected
-
     # Returns an array of Player objects given a team roster
     def self.all_from_roster(players)
       players.map do |player|

data/lib/mlb/request.rb

@@ -4,18 +4,18 @@ module MLB
   # @private
   class Request
     # Perform an HTTP GET request
-    def self.get(path, options={})
-      response = connection.get do |request|
+    def self.get(path, options={}, raw=false)
+      response = connection(raw).get do |request|
         request.url(path, options)
       end
-      response.body
+      raw ? response : response.body
     end
 
     private
 
-    def self.connection
+    def self.connection(raw=false)
       Faraday::Connection.new(:url => 'http://api.freebase.com') do |connection|
-        connection.use Faraday::Response::Yajl
+        connection.use Faraday::Response::Yajl unless raw
         connection.adapter Faraday.default_adapter
       end
     end

data/lib/mlb/team.rb

@@ -1,6 +1,7 @@
 module MLB
   class Team
-    attr_accessor :name, :league, :division, :manager, :wins, :losses, :founded, :mascot, :ballpark, :logo_url, :players
+    private_class_method :new
+    attr_reader :name, :league, :division, :manager, :wins, :losses, :founded, :mascot, :ballpark, :logo_url, :players
 
     # Returns an array of Team objects
     #
@@ -19,29 +20,41 @@ module MLB
     #   MLB::Team.all.first.players.first.number    # => 28
     #   MLB::Team.all.first.players.first.position  # => "Right fielder"
     def self.all
-      @results ||= run
+      # Attempt to fetch the result from the Freebase API unless there is a
+      # connection error, in which case read from a fixture file
+      @all ||= begin
+        results_to_team(results_from_freebase)
+      rescue SocketError, Errno::ECONNREFUSED, Timeout::Error
+        results_to_team(results_from_cache)
+      end
+    end
+
+    def self.reset
+      @all = nil
     end
 
+    private
+
     def initialize(attributes={})
       attributes.each_pair do |key, value|
-        self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        instance_eval("@#{key}=value") if self.respond_to?(key)
       end
     end
 
-    private
+    def self.results_from_freebase(raw=false)
+      options = {:query => mql_query}
+      Request.get('/api/service/mqlread', options, raw)
+    end
 
-    # 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
-        run_team_mql
-      rescue SocketError, Errno::ECONNREFUSED
-        run_team_sql
-      end
+    def self.results_from_cache
+      Yajl::Parser.parse(file_from_cache("teams.json"))
     end
 
-    def self.run_team_mql
-      results = Request.get('/api/service/mqlread', :query => team_mql_query)
+    def self.file_from_cache(file_name)
+      File.new(File.expand_path("../../../cache", __FILE__) + "/" + file_name)
+    end
 
+    def self.results_to_team(results)
       teams = []
       results['result'].each do |result|
         league      = result['league']
@@ -72,53 +85,8 @@ module MLB
       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.team_mql_query
+    def self.mql_query
       query = <<-eos
         [{
           "name":          null,
@@ -164,39 +132,5 @@ module MLB
       '{"query":' + query.gsub!("\n", '').gsub!(' ', '') + '}'
     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
-      ORDER BY teams.name
-      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}"
-      ORDER BY players.name
-      eos
-    end
-
   end
 end

data/lib/mlb/version.rb

@@ -1,3 +1,3 @@
 module MLB
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/mlb.gemspec

@@ -5,13 +5,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler", "~> 1.0")
   s.add_development_dependency("rake", "~> 0.8")
   s.add_development_dependency("rcov", "~> 0.9")
-  s.add_development_dependency("rspec", "~> 2.0")
+  s.add_development_dependency("rspec", "~> 2.1")
   s.add_development_dependency("webmock", "~> 1.5")
   s.add_development_dependency("yard", "~> 0.6")
   s.add_development_dependency("ZenTest", "~> 4.4")
   s.add_runtime_dependency("faraday", "~> 0.5.2")
   s.add_runtime_dependency("yajl-ruby", "~> 0.7.8")
-  s.add_runtime_dependency("sqlite3-ruby", "~> 1.3.2")
   s.authors = ["Erik Michaels-Ober"]
   s.description = %q{MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues.}
   s.email = ["sferik@gmail.com"]

data/spec/mlb_spec.rb

@@ -4,14 +4,18 @@ describe MLB::Team, ".all" do
   context "with connection" do
     before do
       stub_request(:get, 'http://api.freebase.com/api/service/mqlread').
-        with(:query => {:query => MLB::Team.team_mql_query}).
+        with(:query => {:query => MLB::Team.mql_query}).
         to_return(:body => fixture("teams.json"))
     end
 
+    after do
+      MLB::Team.reset
+    end
+
     it "should request the correct resource" do
       MLB::Team.all
       a_request(:get, 'http://api.freebase.com/api/service/mqlread').
-        with(:query => {:query => MLB::Team.team_mql_query}).
+        with(:query => {:query => MLB::Team.mql_query}).
         should have_been_made
     end
 
@@ -24,10 +28,14 @@ describe MLB::Team, ".all" do
   context "with timeout" do
     before do
       stub_request(:get, 'http://api.freebase.com/api/service/mqlread').
-        with(:query => {:query => MLB::Team.team_mql_query}).
+        with(:query => {:query => MLB::Team.mql_query}).
         to_timeout
     end
 
+    after do
+      MLB::Team.reset
+    end
+
     it "should return the correct results" do
       teams = MLB::Team.all
       teams.first.name.should == "Arizona Diamondbacks"
@@ -37,10 +45,14 @@ describe MLB::Team, ".all" do
   context "without connection" do
     before do
       stub_request(:get, 'http://api.freebase.com/api/service/mqlread').
-        with(:query => {:query => MLB::Team.team_mql_query}).
+        with(:query => {:query => MLB::Team.mql_query}).
         to_raise(SocketError)
     end
 
+    after do
+      MLB::Team.reset
+    end
+
     it "should return the correct results" do
       teams = MLB::Team.all
       teams.first.name.should == "Arizona Diamondbacks"

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ RSpec.configure do |config|
 end
 
 def fixture_path
-  File.expand_path("../fixtures", __FILE__)
+  File.expand_path("../../cache", __FILE__)
 end
 
 def fixture(file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mlb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 -07:00
+date: 2010-11-07 01:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 1
+        version: "2.1"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -155,22 +155,6 @@ dependencies:
         version: 0.7.8
   type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
-  type: :runtime
-  version_requirements: *id010
 description: MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues.
 email: 
 - sferik@gmail.com
@@ -190,15 +174,13 @@ files:
 - README.mkd
 - Rakefile
 - autotest/discover.rb
-- db/cleanup.sql
-- db/mlb.sqlite3
+- cache/teams.json
 - lib/mlb.rb
 - lib/mlb/player.rb
 - lib/mlb/request.rb
 - lib/mlb/team.rb
 - lib/mlb/version.rb
 - mlb.gemspec
-- spec/fixtures/teams.json
 - spec/mlb_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -238,6 +220,5 @@ signing_key:
 specification_version: 3
 summary: MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues.
 test_files: 
-- spec/fixtures/teams.json
 - spec/mlb_spec.rb
 - spec/spec_helper.rb

data/db/cleanup.sql

@@ -1,36 +0,0 @@
-DROP TABLE "drafts";
-
-BEGIN TRANSACTION;
-CREATE TABLE "leagues_new" ("id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "name" VARCHAR(50) NOT NULL);
-INSERT INTO "leagues_new" SELECT "id", "name" FROM "leagues";
-DROP TABLE "leagues";
-ALTER TABLE "leagues_new" RENAME TO "leagues";
-COMMIT;
-
-BEGIN TRANSACTION;
-CREATE TABLE "divisions_new" ("id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "league_id" INTEGER NOT NULL, "name" VARCHAR(50) NOT NULL);
-INSERT INTO "divisions_new" SELECT "id", "league_id", "name" FROM "divisions";
-DROP TABLE "divisions";
-ALTER TABLE "divisions_new" RENAME TO "divisions";
-CREATE INDEX "index_divisions_league_id" ON "divisions" ("league_id");
-COMMIT;
-
-BEGIN TRANSACTION;
-CREATE TABLE "players_new" ("id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "team_id" INTEGER, "name" VARCHAR(100) NOT NULL, "position" VARCHAR(50), "number" INTEGER NOT NULL);
-INSERT INTO "players_new" SELECT "id", "team_id", "name", "position", "number" FROM "players";
-DROP TABLE "players";
-ALTER TABLE "players_new" RENAME TO "players";
-CREATE INDEX "index_players_team_id" ON "players" ("team_id");
-COMMIT;
-
-BEGIN TRANSACTION;
-CREATE TABLE "teams_new" ("id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "league_id" INTEGER NOT NULL, "division_id" INTEGER NOT NULL, "name" VARCHAR(50), "logo_url" VARCHAR(255), "manager" VARCHAR(100) NOT NULL, "ballpark" VARCHAR(100), "mascot" VARCHAR(100), "founded" INTEGER NOT NULL, "wins" INTEGER NOT NULL, "losses" INTEGER NOT NULL);
-INSERT INTO "teams_new" SELECT "id", "league_id", "division_id", "name", "logo_url", "manager", "ballpark", "mascot", "founded", "wins", "losses" FROM "teams";
-DROP TABLE "teams";
-ALTER TABLE "teams_new" RENAME TO "teams";
-CREATE INDEX "index_teams_division_id" ON "teams" ("division_id");
-CREATE INDEX "index_teams_league_id" ON "teams" ("league_id");
-CREATE INDEX "index_teams_name" ON "teams" ("name");
-COMMIT;
-
-VACUUM;