sc2ranks 0.1.5 → 0.1.6

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -1,10 +1,11 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem 'httparty'
 
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem 'rspec', '~> 2.3.0'
+  gem 'cucumber', '>= 0'
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rcov', '>= 0'
 end

data/Gemfile.lock

@@ -1,7 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    builder (3.0.0)
     crack (0.1.8)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
     git (1.2.5)
     httparty (0.6.1)
       crack (= 0.1.8)
@@ -9,16 +19,26 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.4.6)
     rake (0.8.7)
     rcov (0.9.9)
-    shoulda (2.11.3)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    term-ansicolor (1.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  cucumber
   httparty
   jeweler (~> 1.5.2)
   rcov
-  shoulda
+  rspec (~> 2.3.0)

data/README.rdoc

@@ -24,6 +24,7 @@ This will return an object with the following methods
 
 +name+:: Character name
 +bnet_id+:: Battle.net ID
++bnet_url+:: Passed in Battle.net profile url
 +region+:: Battle.net region
 +id+:: Sc2ranks id
 +updated_at+:: When the sc2ranks data was last updated
@@ -78,7 +79,7 @@ teams (or [] if there are none.)
 Once you get the team you can use the following methods to reach the data.
 
 +bracket+:: The number of the bracket (1, 2, 3 or 4)
-+is_random+:: Whether this is a random team (true or false)
++is_random+:: Whether this is a random team (true or false), also aliased as <tt>is_random?</tt>
 +fav_race+:: Race most played for this team (zerg, terran or protoss)
 +updated_at+:: Time that sc2ranks.com last updated this team's data
 +league+:: League that this team is currently in (bronze, silver, gold, platinum or diamond)

data/Rakefile

@@ -26,21 +26,21 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :default => :test
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
+
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/features/sc2ranks.feature

@@ -0,0 +1,9 @@
+Feature: something something
+  In order to something something
+  A user something something
+  something something something
+
+  Scenario: something something
+    Given inspiration
+    When I create a sweet new gem
+    Then everyone should see how awesome I am

data/{test/helper.rb → features/support/env.rb}

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
@@ -7,12 +6,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
-require 'shoulda'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'sc2ranks'
 
-class Test::Unit::TestCase
-end
+require 'rspec/expectations'

data/lib/sc2ranks.rb

@@ -14,16 +14,15 @@ class Sc2ranks
   end
 
   def character(url)
-    parse_bnet_url url
+    region, char = parse_bnet_url url
 
-    data = self.class.get("/api/base/teams/#{@region}/#{@character}.xml")
-    Character.new data['hash']
+    data = self.class.get("/api/base/teams/#{region}/#{char}.xml")
+
+    Character.new url, data['hash']
   end
 
   def parse_bnet_url(url)
     Sc2ranks::RE =~ url
-
-    @region = $1
-    @character = "#{$3}!#{$2}"
+    return $1, "#{$3}!#{$2}"
   end
 end

data/lib/sc2ranks/character.rb

@@ -1,29 +1,24 @@
-class Sc2ranks
-  class Character
-    attr_reader :region
-    attr_reader :name
-    attr_reader :bnet_id
-    attr_reader :id
-    attr_reader :updated_at
-    attr_reader :achievement_points
-    attr_reader :character_code
-    attr_reader :portrait
-    attr_reader :teams
-
-    def initialize(http)
-      @region = http['region']
-      @name = http['name']
-      @bnet_id = http['bnet_id']
-      @id = http['id']
-      @updated_at = http['updated_at']
-      @achievement_points = http['achievement_points']
-      @character_code = http['character_code']
+require 'sc2ranks/team'
+require 'sc2ranks/portrait'
 
-      @portrait = Portrait.new(http['portrait'])
-
-      @teams = []
-      http['teams'].each do |data|
-        @teams << Team.new(data)
+class Sc2ranks
+  class Character < Struct.new(:name, :bnet_url, :bnet_id, :id, :region, :updated_at, :achievement_points, :character_code, :portrait, :teams)
+    def initialize(url, data)
+      self.bnet_url = url
+
+      (members - ['bnet_url']).each do |member|
+        case member
+        when 'portrait'
+          self.portrait = Portrait.new(data[member])
+        when 'teams'
+          self.teams = []
+
+          data['teams'].each do |team|
+            self.teams << Team.new(team)
+          end
+        else
+          self[member] = data[member]
+        end
       end
     end
 
@@ -33,62 +28,14 @@ class Sc2ranks
     # array of teams (or an empty array if their are none).
     def team(bracket, is_random = false)
       if bracket == 1 or is_random
-        @teams.detect do |team|
+        self.teams.detect do |team|
           team.bracket == bracket and team.is_random == is_random
         end
       else
-        @teams.select do |team|
+        self.teams.select do |team|
           team.bracket == bracket and team.is_random == is_random
         end
       end
     end
-
-    class Team
-      attr_reader :bracket
-      attr_reader :is_random
-      attr_reader :fav_race
-      attr_reader :updated_at
-      attr_reader :league
-      attr_reader :division
-      attr_reader :division_rank
-      attr_reader :world_rank
-      attr_reader :region_rank
-      attr_reader :wins
-      attr_reader :losses
-      attr_reader :points
-      attr_reader :ratio
-
-      def initialize(http)
-        @bracket = http['bracket']
-        @is_random = http['is_random']
-        @fav_race = http['fav_race']
-        @updated_at = http['updated_at']
-        @league = http['league']
-        @division = http['division']
-        @division_rank = http['division_rank']
-        @world_rank = http['world_rank']
-        @region_rank = http['region_rank']
-        @wins = http['wins']
-        @losses = http['losses']
-        @points = http['points']
-        @ratio = http['ratio']
-      end
-
-      def is_random?
-        @is_random
-      end
-    end
-
-    class Portrait
-      attr_reader :icon_id
-      attr_reader :column
-      attr_reader :row
-
-      def initialize(http)
-        @icon_id = http['icon_id']
-        @column = http['column']
-        @row = http['row']
-      end
-    end
   end
 end

data/lib/sc2ranks/portrait.rb

@@ -0,0 +1,9 @@
+class Sc2ranks
+  class Portrait < Struct.new(:icon_id,:column,:row)
+    def initialize(data)
+      members.each do |member|
+        self[member] = data[member]
+      end
+    end
+  end
+end

data/lib/sc2ranks/team.rb

@@ -0,0 +1,11 @@
+class Sc2ranks
+  class Team < Struct.new(:bracket,:is_random,:fav_race,:updated_at,:league,:division,:division_rank,:world_rank,:region_rank,:wins,:losses,:points,:ratio)
+    def initialize(data)
+      members.each do |member|
+        self[member] = data[member]
+      end
+    end
+
+    alias :is_random? :is_random
+  end
+end

data/sc2ranks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sc2ranks}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher Giroir"]
-  s.date = %q{2011-01-09}
+  s.date = %q{2011-01-10}
   s.description = %q{This gem allows you to access data from http://sc2ranks.com}
   s.email = %q{kelsin@valefor.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
@@ -25,11 +26,16 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "features/sc2ranks.feature",
+    "features/step_definitions/sc2ranks_steps.rb",
+    "features/support/env.rb",
     "lib/sc2ranks.rb",
     "lib/sc2ranks/character.rb",
+    "lib/sc2ranks/portrait.rb",
+    "lib/sc2ranks/team.rb",
     "sc2ranks.gemspec",
-    "test/helper.rb",
-    "test/test_sc2ranks.rb"
+    "spec/sc2ranks_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Kelsin/sc2ranks}
   s.licenses = ["MIT"]
@@ -37,8 +43,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A gem to access the api of sc2ranks.com}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_sc2ranks.rb"
+    "spec/sc2ranks_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -47,20 +53,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/spec/sc2ranks_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Sc2ranks" do
+  it "fails" do
+    fail "hey buddy, you should probably rename this file and start specing for real"
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'sc2ranks'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sc2ranks
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Christopher Giroir
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 -05:00
+date: 2011-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,8 +35,24 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: shoulda
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: cucumber
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +61,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +93,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,7 +107,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
 description: This gem allows you to access data from http://sc2ranks.com
 email: kelsin@valefor.com
 executables: []
@@ -103,6 +119,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -110,11 +127,16 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- features/sc2ranks.feature
+- features/step_definitions/sc2ranks_steps.rb
+- features/support/env.rb
 - lib/sc2ranks.rb
 - lib/sc2ranks/character.rb
+- lib/sc2ranks/portrait.rb
+- lib/sc2ranks/team.rb
 - sc2ranks.gemspec
-- test/helper.rb
-- test/test_sc2ranks.rb
+- spec/sc2ranks_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/Kelsin/sc2ranks
 licenses: 
@@ -150,5 +172,5 @@ signing_key:
 specification_version: 3
 summary: A gem to access the api of sc2ranks.com
 test_files: 
-- test/helper.rb
-- test/test_sc2ranks.rb
+- spec/sc2ranks_spec.rb
+- spec/spec_helper.rb

data/test/test_sc2ranks.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSc2ranks < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end