mlb 0.6.2 → 0.6.3

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Erik Michaels-Ober
+Copyright (c) 2010-2013 Erik Michaels-Ober
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -48,14 +48,17 @@ Then, install the gem with the high security trust policy:
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
+* Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
+* Ruby 2.0.0
 * [Rubinius][]
+* [JRuby][]
 
 [rubinius]: http://rubini.us/
+[jruby]: http://jruby.org/
 
-If something doesn't work on one of these interpreters, it should be considered
-a bug.
+If something doesn't work on one of these interpreters, it's a bug.
 
 This library may inadvertently work (or seem to work) on other Ruby
 implementations, however support will only be provided for the versions listed
@@ -64,9 +67,9 @@ above.
 If you would like this library to support another Ruby version, you may
 volunteer to be a maintainer. Being a maintainer entails making sure all tests
 run and pass on that implementation. When something breaks on your
-implementation, you will be personally responsible for providing patches in a
-timely fashion. If critical issues for a particular implementation exist at the
-time of a major release, support for that Ruby version may be dropped.
+implementation, you will be responsible for providing patches in a timely
+fashion. If critical issues for a particular implementation exist at the time
+of a major release, support for that Ruby version may be dropped.
 
 ## Colophon
 MLB was built with the following tools:
@@ -96,6 +99,6 @@ MLB was built with the following tools:
 [yard]: http://yardoc.org/
 
 ## Copyright
-Copyright (c) 2010 Erik Michaels-Ober. See [LICENSE][] for details.
+Copyright (c) 2010-2013 Erik Michaels-Ober. See [LICENSE][] for details.
 
-[license]: https://github.com/sferik/mlb/blob/master/LICENSE.md
+[license]: LICENSE.md

data/lib/mlb/player.rb

@@ -15,9 +15,9 @@ module MLB
     def self.all_from_roster(players)
       players.map do |player|
         new(
-          name:     player['player'],
-          number:   player['number'],
-          position: player['position']
+          :name     => player['player'],
+          :number   => player['number'],
+          :position => player['position']
         )
       end
     end

data/lib/mlb/request.rb

@@ -1,5 +1,5 @@
 require 'faraday'
-require 'faraday_middleware'
+require 'mlb/response/parse_json'
 
 module MLB
   # @private
@@ -15,9 +15,9 @@ module MLB
     private
 
     def self.connection(raw=false)
-      Faraday.new(url: 'http://api.freebase.com') do |connection|
-        connection.use FaradayMiddleware::ParseJson unless raw
-        connection.adapter Faraday.default_adapter
+      Faraday.new(:url => 'http://api.freebase.com') do |builder|
+        builder.use MLB::Response::ParseJson unless raw
+        builder.adapter Faraday.default_adapter
       end
     end
   end

data/lib/mlb/response/parse_json.rb

@@ -0,0 +1,25 @@
+require 'faraday'
+require 'multi_json'
+
+module MLB
+  module Response
+    class ParseJson < Faraday::Response::Middleware
+
+      def parse(body)
+        case body
+        when /\A^\s*$\z/, nil
+          nil
+        else
+          MultiJson.decode(body)
+        end
+      end
+
+      def on_complete(env)
+        if respond_to?(:parse)
+          env[:body] = parse(env[:body]) unless [204, 301, 302, 304].include?(env[:status])
+        end
+      end
+
+    end
+  end
+end

data/lib/mlb/team.rb

@@ -45,12 +45,12 @@ module MLB
     end
 
     def self.results_from_freebase(raw=false)
-      options = {query: mql_query}
+      options = {:query => mql_query}
       Request.get('/api/service/mqlread', options, raw)
     end
 
     def self.results_from_cache
-      MultiJson.load(file_from_cache("teams.json").read)
+      MultiJson.decode(file_from_cache("teams.json").read)
     end
 
     def self.file_from_cache(file_name)
@@ -72,17 +72,17 @@ module MLB
         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) : [])
+          :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

data/lib/mlb/version.rb

@@ -1,3 +1,3 @@
 module MLB
-  VERSION = "0.6.2" unless defined?(MLB::VERSION)
+  VERSION = "0.6.3" unless defined?(MLB::VERSION)
 end

data/mlb.gemspec

@@ -4,9 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mlb/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'faraday', '~> 0.8'
-  spec.add_dependency 'faraday_middleware', '~> 0.8'
-  spec.add_dependency 'multi_json', '~> 1.3'
+  spec.add_dependency 'faraday', ['~> 0.8', '< 0.10']
+  spec.add_dependency 'multi_json', '~> 1.0'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.author = "Erik Michaels-Ober"
   spec.cert_chain  = ['certs/sferik.pem']
@@ -20,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.name = 'mlb'
   spec.require_paths = ['lib']
   spec.required_rubygems_version = '>= 1.3.6'
-  spec.required_ruby_version = '>= 1.9.2'
   spec.signing_key = File.expand_path("~/.gem/private_key.pem") if $0 =~ /gem\z/
   spec.summary = spec.description
   spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/mlb_spec.rb

@@ -3,7 +3,7 @@ require 'helper'
 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.mql_query}).to_return(body: fixture("teams.json"))
+      stub_request(:get, 'http://api.freebase.com/api/service/mqlread').with(:query => {:query => MLB::Team.mql_query}).to_return(:body => fixture("teams.json"))
     end
 
     after do
@@ -12,7 +12,7 @@ describe MLB::Team, ".all" do
 
     it "requests the correct resource" do
       MLB::Team.all
-      expect(a_request(:get, 'http://api.freebase.com/api/service/mqlread').with(query: {query: MLB::Team.mql_query})).to have_been_made
+      expect(a_request(:get, 'http://api.freebase.com/api/service/mqlread').with(:query => {:query => MLB::Team.mql_query})).to have_been_made
     end
 
     it "returns the correct results" do
@@ -23,7 +23,7 @@ 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.mql_query}).to_timeout
+      stub_request(:get, 'http://api.freebase.com/api/service/mqlread').with(:query => {:query => MLB::Team.mql_query}).to_timeout
     end
 
     after do
@@ -38,7 +38,7 @@ 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.mql_query}).to_raise(SocketError)
+      stub_request(:get, 'http://api.freebase.com/api/service/mqlread').with(:query => {:query => MLB::Team.mql_query}).to_raise(SocketError)
     end
 
     after do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mlb
 version: !ruby/object:Gem::Version
+  version: 0.6.3
   prerelease: 
-  version: 0.6.2
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -36,72 +36,62 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    none: false
-  type: :runtime
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
-- !ruby/object:Gem::Dependency
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
     none: false
-  type: :runtime
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
-    none: false
-  type: :runtime
+        version: '0.10'
+- !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: MLB.rb is a Ruby library for retrieving current Major League Baseball
   players, managers, teams, divisions, and leagues.
 email: sferik@gmail.com
@@ -117,6 +107,7 @@ files:
 - mlb.gemspec
 - lib/mlb/player.rb
 - lib/mlb/request.rb
+- lib/mlb/response/parse_json.rb
 - lib/mlb/team.rb
 - lib/mlb/version.rb
 - lib/mlb.rb
@@ -130,20 +121,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: MLB.rb is a Ruby library for retrieving current Major League Baseball players,