mlb 0.4.0 → 0.5.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.rbc
 .DS_Store
 .bundle
 .yardoc

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    mlb (0.4.0)
-      faraday (~> 0.5.2)
-      yajl-ruby (~> 0.7.8)
+    mlb (0.5.0)
+      faraday (~> 0.5.3)
+      faraday_middleware (~> 0.3.0)
+      multi_json (~> 0.0.5)
 
 GEM
   remote: http://rubygems.org/
@@ -12,14 +13,20 @@ GEM
     addressable (2.2.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    faraday (0.5.2)
+    faraday (0.5.3)
       addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
       rack (>= 1.1.0, < 2)
+    faraday_middleware (0.3.0)
+      faraday (~> 0.5.3)
+    json (1.4.6)
+    json (1.4.6-java)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    multi_json (0.0.5)
     multipart-post (1.0.1)
     rack (1.2.1)
     rake (0.8.7)
-    rcov (0.9.9)
     rspec (2.1.0)
       rspec-core (~> 2.1.0)
       rspec-expectations (~> 2.1.0)
@@ -28,23 +35,30 @@ GEM
     rspec-expectations (2.1.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.1.0)
+    simplecov (0.3.7)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
+    syntax (1.0.0)
     webmock (1.5.0)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    yajl-ruby (0.7.8)
     yard (0.6.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   ZenTest (~> 4.4)
   bundler (~> 1.0)
-  faraday (~> 0.5.2)
+  faraday (~> 0.5.3)
+  faraday_middleware (~> 0.3.0)
+  json (~> 1.4.6)
+  maruku (~> 0.6)
   mlb!
+  multi_json (~> 0.0.5)
   rake (~> 0.8)
-  rcov (~> 0.9)
   rspec (~> 2.1)
+  simplecov (~> 0.3)
   webmock (~> 1.5)
-  yajl-ruby (~> 0.7.8)
   yard (~> 0.6)

data/README.mkd

@@ -64,7 +64,7 @@ Submitting a Pull Request
 4. Add documentation for your feature or bug fix.
 5. Run <tt>bundle exec rake doc:yard</tt>. If your changes are not 100% documented, go back to step 4.
 6. Add specs for your feature or bug fix.
-7. Run <tt>bundle exec rake spec:rcov</tt>. If your changes are not 100% covered, go back to step 6.
+7. Run <tt>bundle exec rake spec</tt>. If your changes are not 100% covered, go back to step 6.
 8. Commit and push your changes.
 9. Submit a pull request. Please do not include changes to the gemspec, version, or history file. (If you want to create your own version for some reason, please do so in a separate commit.)
 
@@ -74,11 +74,11 @@ Many thanks to:
 
 * [Bundler](http://gembundler.com/)
 * [Freebase](http://www.freebase.com/)
-* [faraday](https://github.com/technoweenie/faraday/)
+* [Faraday](https://github.com/technoweenie/faraday/)
 * [Markdown](http://daringfireball.net/projects/markdown/)
 * [MultiJSON](https://github.com/intridea/multi_json/)
-* [rcov](https://github.com/relevance/rcov/)
 * [RSpec](http://relishapp.com/rspec/)
+* [SimpleCov](https://github.com/colszowka/simplecov)
 * [SQLite](http://www.sqlite.org/)
 * [WebMock](https://github.com/bblimke/webmock/)
 * [YARD](http://yardoc.org/)

data/Rakefile

@@ -4,19 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-namespace :spec do
-  desc "Run all examples using rcov"
-  RSpec::Core::RakeTask.new(:rcov => :cleanup_rcov_files) do |task|
-    task.rcov = true
-    task.rcov_opts = %[-Ilib -Ispec --exclude "gems/*,features,specs" --text-report --sort coverage]
-  end
-end
-
-task :cleanup_rcov_files do
-  rm_rf 'coverage'
-end
-
-task :default => ["spec:rcov"]
+task :default => :spec
 
 namespace :doc do
   require 'yard'

data/lib/mlb/request.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'faraday_middleware'
 
 module MLB
   # @private
@@ -15,7 +16,7 @@ module MLB
 
     def self.connection(raw=false)
       Faraday::Connection.new(:url => 'http://api.freebase.com') do |connection|
-        connection.use Faraday::Response::Yajl unless raw
+        connection.use Faraday::Response::ParseJson unless raw
         connection.adapter Faraday.default_adapter
       end
     end

data/lib/mlb/team.rb

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 module MLB
   class Team
     private_class_method :new
@@ -47,7 +49,7 @@ module MLB
     end
 
     def self.results_from_cache
-      Yajl::Parser.parse(file_from_cache("teams.json"))
+      MultiJson.decode(file_from_cache("teams.json").read)
     end
 
     def self.file_from_cache(file_name)

data/lib/mlb/version.rb

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

data/mlb.gemspec

@@ -3,14 +3,17 @@ require File.expand_path("../lib/mlb/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.add_development_dependency("bundler", "~> 1.0")
+  s.add_development_dependency("json", "~> 1.4.6")
+  s.add_development_dependency("maruku", "~> 0.6")
   s.add_development_dependency("rake", "~> 0.8")
-  s.add_development_dependency("rcov", "~> 0.9")
   s.add_development_dependency("rspec", "~> 2.1")
+  s.add_development_dependency("simplecov", "~> 0.3")
   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("faraday", "~> 0.5.3")
+  s.add_runtime_dependency("faraday_middleware", "~> 0.3.0")
+  s.add_runtime_dependency("multi_json", "~> 0.0.5")
   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/spec_helper.rb

@@ -1,5 +1,11 @@
+require 'simplecov'
+SimpleCov.start do
+  add_group 'Libraries', 'lib'
+end
+
 require File.expand_path('../../lib/mlb', __FILE__)
 
+require 'rspec'
 require 'webmock/rspec'
 RSpec.configure do |config|
   config.include WebMock::API

metadata

@@ -1,163 +1,185 @@
 --- !ruby/object:Gem::Specification 
 name: mlb
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+    - 0
+    - 5
+    - 0
+  version: 0.5.0
 platform: ruby
 authors: 
-- Erik Michaels-Ober
+  - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -07:00
+date: 2010-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 4
-        - 4
-        version: "4.4"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: faraday
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
-  type: :runtime
-  version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+            version: "1.0"
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 4
+              - 6
+            version: 1.4.6
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: maruku
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 6
+            version: "0.6"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 8
+            version: "0.8"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 1
+            version: "2.1"
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: simplecov
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 3
+            version: "0.3"
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: webmock
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 5
+            version: "1.5"
+    type: :development
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: yard
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 6
+            version: "0.6"
+    type: :development
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: ZenTest
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 4
+              - 4
+            version: "4.4"
+    type: :development
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: faraday
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 5
+              - 3
+            version: 0.5.3
+    type: :runtime
+    version_requirements: *id010
+  - !ruby/object:Gem::Dependency 
+    name: faraday_middleware
+    prerelease: false
+    requirement: &id011 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 3
+              - 0
+            version: 0.3.0
+    type: :runtime
+    version_requirements: *id011
+  - !ruby/object:Gem::Dependency 
+    name: multi_json
+    prerelease: false
+    requirement: &id012 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 0
+              - 5
+            version: 0.0.5
+    type: :runtime
+    version_requirements: *id012
 description: MLB.rb is a Ruby library for retrieving current Major League Baseball players, managers, teams, divisions, and leagues.
 email: 
-- sferik@gmail.com
+  - sferik@gmail.com
 executables: []
 
 extensions: []
@@ -165,60 +187,56 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- .rspec
-- .yardopts
-- Gemfile
-- Gemfile.lock
-- LICENSE.mkd
-- README.mkd
-- Rakefile
-- autotest/discover.rb
-- 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/mlb_spec.rb
-- spec/spec_helper.rb
+  - .gitignore
+  - .rspec
+  - .yardopts
+  - Gemfile
+  - Gemfile.lock
+  - LICENSE.mkd
+  - README.mkd
+  - Rakefile
+  - autotest/discover.rb
+  - 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/mlb_spec.rb
+  - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/mlb
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 1
+          - 3
+          - 6
+        version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 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/mlb_spec.rb
-- spec/spec_helper.rb
+  - spec/mlb_spec.rb
+  - spec/spec_helper.rb