snafu 0.1.1 → 0.1.2

data/CHANGELOG.textile

@@ -1,3 +1,6 @@
+h2. 0.1.2
+* Glitch Locations (Hubs, Streets, etc.) may have strings or integers for their IDs. Street#id,  and Hub#id now always return a String
+
 h2. 0.1.1
 * Fixed an issue where Hub.new would not populate steet names when given the raw result from Glitch
 

data/lib/snafu/locations.rb

@@ -13,6 +13,15 @@ module Snafu
       hubs
     end
 
+    # A variant of the get_hubs method which makes two calls to the Glitch API:
+    # 
+    # 1. locations.getHubs to retrieve all hubs in Glitch
+    # 2. locations.getStreets for each hub returned from locations.getHubs
+    #
+    def get_hubs!
+      # TODO
+    end
+
     # Accesses the "locations.getStreets" method from the Glitch API passing in
     # the supplied Hub ID.
     # 

data/lib/snafu/models/location.rb

@@ -3,15 +3,18 @@ module Snafu
     # Defines a generic location class with <tt>id</tt> and <tt>name</tt> 
     # properties.
     class Location
-      attr_reader :id, :name
+      attr_reader :name
       # Accepts an options hash with <tt>:id</tt> or <tt>:name</tt>
       def initializer(options={})
-        @id = options[:id]
+        @id = options[:id].to_s
         @name = options[:name]
       end
       def to_s
         "#{self.id} - #{self.name}"
       end
+      def id
+        @id.to_s
+      end
     end
   end
 end

data/lib/snafu/version.rb

@@ -1,3 +1,3 @@
 module Snafu
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/fixtures/vcr_cassettes/Snafu_Models_Street_new/should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml

@@ -0,0 +1,40 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://api.glitch.com:80/simple/locations.streetInfo?street_tsid=LM416LNIKVLM1
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      access-control-allow-credentials:
+      - 'false'
+      access-control-allow-methods:
+      - POST, GET, OPTIONS
+      access-control-allow-origin:
+      - ! '*'
+      access-control-max-age:
+      - '1728000'
+      cache-control:
+      - no-cache="set-cookie"
+      content-type:
+      - text/plain; charset=utf-8
+      date:
+      - Sun, 11 Dec 2011 07:06:46 GMT
+      server:
+      - Apache/2.2.17
+      set-cookie:
+      - AWSELB=F7715B6B10BD5947A6E9DAE19D6F6DD7D91A271FB7C136A73584C8A9C7D99844891B9CE4098DC7B1C7896C3495C0321477EE3FFB6D062BCC604E27B432E4350AD26F2A097D;PATH=/;MAX-AGE=600
+      content-length:
+      - '665'
+      connection:
+      - Close
+    body: ! '{"ok":1,"tsid":"LM416LNIKVLM1","name":"Baby Steppes","hub":{"id":27,"name":"Ix"},"mote":{"id":9,"name":"Ur"},"active_project":false,"features":["<b>13
+      Piggies<\/b>, <b>6 Butterflies<\/b>, <b>5 Chickens<\/b>, and <b>6 Spice Plants<\/b>."],"connections":{"LM4115NJ46G8M":{"name":"Groddle
+      Ladder","hub":{"id":27,"name":"Ix"},"mote":{"id":9,"name":"Ur"}},"LM410TMR0S2S1":{"name":"Ruta
+      Asuncion","hub":{"id":27,"name":"Ix"},"mote":{"id":9,"name":"Ur"}},"LM4109NI2R640":{"name":"Guillermo
+      Gamera Way","hub":{"id":27,"name":"Ix"},"mote":{"id":9,"name":"Ur"}}},"image":{"url":"http:\/\/c2.glitch.bz\/streets\/2011-11-27\/LM416LNIKVLM1_main_1322382945.jpg","w":720,"h":120}}'
+    http_version: '1.1'

data/spec/snafu/models/street_spec.rb

@@ -5,12 +5,17 @@ module Snafu
     describe Snafu::Models::Street do
       before(:each) do
         @snafu = Snafu.new(:api_key => GLITCH_API_KEY, :oauth_token => GLITCH_OAUTH_TOKEN)
-        @test_hub_id = 27
+        @test_hub_id = "27"
         @test_hub_name = "Ix"
         @test_street_id = "LM416LNIKVLM1"
         @test_street_name = "Baby Steppes"
       end
-      context "initialize()" do
+      context "#new" do
+        it "should return ID as a string" do
+          new_street = Street.new(:id => @test_hub_id)
+          new_street.id.should be_a String
+        end
+
         it "should populate values if given an options hash", :vcr do
           expected_id = "1"
           expected_name = "Some street"

data/spec/snafu/models_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
 describe Snafu::Models::Hub do
-  it "should retain the ID & Name of the hub if given a valid " do
-    hub = Snafu::Models::Hub.new(:id => @test_hub_id, :name => @test_hub_name)
-    hub.id.should eql(@test_hub_id)
-    hub.name.should eql(@test_hub_name)
-  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snafu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70226305981700 !ruby/object:Gem::Requirement
+  requirement: &70277761501020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226305981700
+  version_requirements: *70277761501020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70226305980900 !ruby/object:Gem::Requirement
+  requirement: &70277761496860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226305980900
+  version_requirements: *70277761496860
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70226305980060 !ruby/object:Gem::Requirement
+  requirement: &70277761493740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226305980060
+  version_requirements: *70277761493740
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70226305979120 !ruby/object:Gem::Requirement
+  requirement: &70277761480920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226305979120
+  version_requirements: *70277761480920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70226305978600 !ruby/object:Gem::Requirement
+  requirement: &70277761479300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226305978600
+  version_requirements: *70277761479300
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70226305977020 !ruby/object:Gem::Requirement
+  requirement: &70277761478120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70226305977020
+  version_requirements: *70277761478120
 description: ! "Snafu is an interface to API for Glitch, an online multi-player\n
   \   game created by Tiny Speck."
 email:
@@ -119,6 +119,7 @@ files:
 - spec/fixtures/vcr_cassettes/Snafu_Models_Hub/initialize_should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml
 - spec/fixtures/vcr_cassettes/Snafu_Models_Hub/initialize_should_populate_values_if_given_the_raw_response_from_Glitch.yml
 - spec/fixtures/vcr_cassettes/Snafu_Models_Street/initialize_should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml
+- spec/fixtures/vcr_cassettes/Snafu_Models_Street_new/should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml
 - spec/fixtures/vcr_cassettes/calendar_getHoldays/valid_calendar.yml
 - spec/snafu/client_spec.rb
 - spec/snafu/locations_spec.rb
@@ -171,6 +172,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/Snafu_Models_Hub/initialize_should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml
 - spec/fixtures/vcr_cassettes/Snafu_Models_Hub/initialize_should_populate_values_if_given_the_raw_response_from_Glitch.yml
 - spec/fixtures/vcr_cassettes/Snafu_Models_Street/initialize_should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml
+- spec/fixtures/vcr_cassettes/Snafu_Models_Street_new/should_populate_values_if_given_the_raw_JSON_response_from_HTTParty.yml
 - spec/fixtures/vcr_cassettes/calendar_getHoldays/valid_calendar.yml
 - spec/snafu/client_spec.rb
 - spec/snafu/locations_spec.rb