sms_my_bus 0.0.1 → 0.0.2

data/lib/sms_my_bus.rb

@@ -6,9 +6,10 @@ require 'sms_my_bus/routes'
 
 require 'curb'
 require 'json'
-
+require 'uri'
 
 module SmsMyBus
+  BASE_API_URI = 'http://api.smsmybus.com/v1/'
 
   def self.key= key
     @key = key
@@ -19,4 +20,14 @@ module SmsMyBus
     @key
   end
 
+  def self.make_api_request api_method, opts = {}
+    response = Curl::Easy.http_get(SmsMyBus.request_uri(api_method, opts))
+    JSON.parse(response.body_str)
+  end
+
+  def self.request_uri api_method, opts = {}
+    opts['key'] = SmsMyBus.key
+
+    "#{BASE_API_URI}#{api_method}?#{URI.encode_www_form(opts)}"
+  end
 end

data/lib/sms_my_bus/locations.rb

@@ -1,8 +1,10 @@
 module SmsMyBus
   class Locations
     def self.get_stops route_id
-      response = Curl::Easy.http_get("http://www.smsmybus.com/api/v1/getstops?key=#{SmsMyBus.key}&routeID=#{route_id}")
-      JSON.parse(response.body_str)
+      api_method = 'getstops'
+      args = { 'routeID' => route_id }
+
+      SmsMyBus.make_api_request(api_method, args)
     end
   end
 end

data/lib/sms_my_bus/routes.rb

@@ -1,8 +1,9 @@
 module SmsMyBus
   class Routes
     def self.get_routes
-      response = Curl::Easy.http_get("http://www.smsmybus.com/api/v1/getroutes?key=#{SmsMyBus.key}")
-      JSON.parse(response.body_str)
+      api_method = 'getroutes'
+
+      SmsMyBus.make_api_request api_method
     end
   end
 end

data/lib/sms_my_bus/schedules.rb

@@ -1,8 +1,10 @@
 module SmsMyBus
   class Schedules
     def self.get_arrivals stop_id
-      response = Curl::Easy.http_get("http://www.smsmybus.com/api/v1/getarrivals?key=#{SmsMyBus.key}&stopID=#{stop_id}")
-      JSON.parse(response.body_str)
+      api_method = 'getarrivals'
+      args = { 'stopID' => stop_id }
+
+      SmsMyBus.make_api_request(api_method, args)
     end
   end
 end

data/lib/sms_my_bus/version.rb

@@ -1,3 +1,3 @@
 module SmsMyBus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/sms_my_bus_spec.rb

@@ -12,6 +12,22 @@ describe 'SmsMyBus' do
     end
   end
 
+  describe 'request_uri' do
+    context 'with opts' do
+      let(:expected_uri) { 'http://api.smsmybus.com/v1/getroutes?foo=bar&key=foobazzlew' }
+      it 'generates the correct URI' do
+        SmsMyBus.request_uri('getroutes', {:foo => 'bar'}).should == expected_uri
+      end
+    end
+    context 'with no opts' do
+      let(:expected_uri) { 'http://api.smsmybus.com/v1/getroutes?key=foobazzlew' }
+
+      it 'generates the correct URI' do
+        SmsMyBus.request_uri('getroutes').should == expected_uri
+      end
+    end
+  end
+
   describe SmsMyBus::Schedules do
     before do
       SmsMyBus.key = ENV['SMSMYBUS_KEY']
@@ -53,6 +69,4 @@ describe 'SmsMyBus' do
       end
     end
   end
-
-  describe 'Notifications'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms_my_bus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2160929340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160929340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160928920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160928920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152952280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152952280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem to talk to the awesome SMSMyBus API in Madison, WI.
 email:
 - matt.gauger@gmail.com
@@ -86,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: SMSMyBus API integration