open311 0.0.1 → 0.1.0

data/.gitignore

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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    open311 (0.0.1)
-      faraday (~> 0.5.2)
-      faraday_middleware (~> 0.2.3)
+    open311 (0.1.0)
+      faraday (~> 0.5.3)
+      faraday_middleware (~> 0.3.0)
       hashie (~> 0.4.0)
       multi_json (~> 0.0.5)
       multi_xml (~> 0.2.0)
@@ -15,52 +15,61 @@ 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.2.3)
-      faraday (~> 0.5.2)
+    faraday_middleware (0.3.0)
+      faraday (~> 0.5.3)
     hashie (0.4.0)
-    libxml-ruby (1.1.4)
+    json (1.4.6)
+    json (1.4.6-java)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
     multi_json (0.0.5)
     multi_xml (0.2.0)
     multipart-post (1.0.1)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
     rack (1.2.1)
     rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    webmock (1.5.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    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)
+    weakling (0.0.4-java)
+    webmock (1.6.1)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    yajl-ruby (0.7.8)
-    yard (0.6.1)
+    yard (0.6.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   ZenTest (~> 4.4)
   bundler (~> 1.0)
-  faraday (~> 0.5.2)
-  faraday_middleware (~> 0.2.3)
+  faraday (~> 0.5.3)
+  faraday_middleware (~> 0.3.0)
   hashie (~> 0.4.0)
-  libxml-ruby (~> 1.1)
+  json (~> 1.4)
+  maruku (~> 0.6)
   multi_json (~> 0.0.5)
   multi_xml (~> 0.2.0)
+  nokogiri (~> 1.4)
   open311!
   rake (~> 0.8)
-  rcov (~> 0.9)
-  rspec (~> 2.0.1)
+  rspec (~> 2.1)
+  simplecov (~> 0.3)
   webmock (~> 1.5)
-  yajl-ruby (~> 0.7)
   yard (~> 0.6)

data/README.mkd

@@ -12,7 +12,7 @@ Installation
 
 Documentation
 -------------
-<http://rdoc.info/gems/open311>
+<http://rdoc.info/github/cfalabs/open311/master/frames>
 
 Usage Examples
 --------------
@@ -20,13 +20,28 @@ Usage Examples
     
     # Certain methods require an API key
     Open311.configure do |config|
-      config.endpoint     = 'https://open311.sfgov.org/'
-      config.format       = 'xml'
+      config.endpoint     = 'https://open311.sfgov.org/dev/v2/'
+      config.api_key      = 'yourkeyforpostrequests'
       config.jurisdiction = 'sfgov.org'
     end
     
     # Provide a list of acceptable 311 service request types and their associated service codes
     Open311.service_list
+    
+    # If meta data is available, provide attributes and definition for the service code
+    Open311.service_definition('033')
+    
+    # Grab service requests, limited to 90 days or 1000 entries
+    Open311.service_requests
+    
+    # Grab a service request, requires ID
+    Open311.get_service_request('12345')
+    
+    # Post a service request, requires an api key
+    Open311.post_service_request
+    
+    # Get a service_request_id using a token after a post_service_request
+    Open311.request_id('12345')
 
 Contributing
 ------------
@@ -61,7 +76,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.)
 

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/faraday/raise_error.rb

@@ -28,7 +28,6 @@ module Faraday
 
     def initialize(app)
       super
-      @parser = nil
     end
 
     private

data/lib/open311.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../open311/configuration', __FILE__)
 require File.expand_path('../open311/client', __FILE__)
+require File.expand_path('../open311/service_request', __FILE__)
 
 module Open311
   extend Configuration

data/lib/open311/client/connection.rb

@@ -15,12 +15,17 @@ module Open311
           :url => endpoint
         }
 
-        Faraday::Connection.new(options) do |builder|
-          builder.use Faraday::Request::Multipart
-          builder.adapter(adapter)
-          builder.use Faraday::Response::RaiseError
-          builder.use Faraday::Response::Parse unless raw
-          builder.use Faraday::Response::Mashify unless raw
+        Faraday::Connection.new(options) do |connection|
+          connection.use Faraday::Request::Multipart
+          connection.adapter(adapter)
+          connection.use Faraday::Response::RaiseError
+          unless raw
+            case format.to_s.downcase
+            when 'json' then connection.use Faraday::Response::ParseJson
+            when 'xml' then connection.use Faraday::Response::ParseXml
+            end
+            connection.use Faraday::Response::Mashify
+          end
         end
       end
     end

data/lib/open311/client/request.rb

@@ -26,7 +26,7 @@ module Open311
               request.url(formatted_path(path), options)
             when :post, :put
               request.path = formatted_path(path)
-              request.body = options
+              request.body = options unless options.empty?
           end
         end
         raw ? response : response.body

data/lib/open311/client/service.rb

@@ -3,7 +3,6 @@ module Open311
     module Service
       # Provide a list of acceptable 311 service request types and their associated service codes
       #
-      # @todo Overload the method to allow fetching of the authenticated user's screen name from configurati
       # @format :xml
       # @key false
       # @param options [Hash] A customizable set of options.
@@ -13,9 +12,79 @@ module Open311
       #   Open311.service_list
       def service_list(options={})
         options.merge!(:jurisdiction_id => jurisdiction)
-        response = get('dev/v2/services', options)
+        response = get('services', options)
         format.to_s.downcase == 'xml' ? response['services']['service'] : response
       end
+
+      # @format :xml
+      # @key false
+      # @param id String the service code
+      # @param options [Hash] A customizable set of options.
+      # @return Hash
+      # @see http://wiki.open311.org/GeoReport_v2#GET_Service_Definition
+      # @example define attributes associated with a service code, i.e. 033
+      #   Open311.service_definition
+      def service_definition(id, options={})
+        options.merge!(:jurisdiction_id => jurisdiction)
+        response = get("services/#{id}", options)
+        format.to_s.downcase == 'xml' ? response['service_definition'] : response
+      end
+
+      # @format :xml
+      # @key false
+      # @param options [Hash] A customizable set of options.
+      # @return [Array]
+      # @see http://wiki.open311.org/GeoReport_v2#GET_Service_Requests
+      #   Open311.service_requests
+      def service_requests(options={})
+        options.merge!(:jurisdiction_id => jurisdiction)
+        response = get("requests", options)
+        if format.to_s.downcase == 'xml'
+          response.service_requests.request.map do |request|
+            ServiceRequest.new(request)
+          end
+        else
+          response
+        end
+      end
+
+      # @format :xml
+      # @key true
+      # @param options [Hash] A customizable set of options.
+      # @return Hash
+      # @see http://wiki.open311.org/GeoReport_v2#POST_Service_Request
+      #   Open311.post_service_request
+      def post_service_request(options={})
+        options.merge!(:jurisdiction_id => jurisdiction, :api_key => api_key)
+        response = post("requests", options)
+        format.to_s.downcase == 'xml' ? response['service_requests']['request'] : response
+      end
+
+      # @format :xml
+      # @key false
+      # @param id String of the service request id
+      # @param options [Hash] A customizable set of options.
+      # @return Hash
+      # @see http://wiki.open311.org/GeoReport_v2#GET_Service_Requests
+      #   Open311.get_service_request
+      def get_service_request(id, options={})
+        options.merge!(:jurisdiction_id => jurisdiction)
+        response = get("requests/#{id}", options)
+        format.to_s.downcase == 'xml' ? ServiceRequest.new(response.service_requests.request.first) : response
+      end
+
+      # @format :xml
+      # @key false
+      # @param token_id A token included in the response to .service_response request
+      # @param options [Hash] A customizable set of options.
+      # @return Array
+      # @see http://wiki.open311.org/GeoReport_v2#GET_request_id_from_a_token
+      #   Open311.request_id
+      def request_id(token_id, options = {})
+        options.merge!(:jurisdiction_id => jurisdiction)
+        response = get("tokens/#{token_id}", options)
+        format.to_s.downcase == 'xml' ? ServiceRequest.new(response.service_requests.request) : response
+      end
     end
   end
 end

data/lib/open311/configuration.rb

@@ -9,7 +9,7 @@ module Open311
     DEFAULT_ADAPTER      = Faraday.default_adapter.freeze
     DEFAULT_API_KEY      = nil.freeze
     DEFAULT_ENDPOINT     = nil.freeze
-    DEFAULT_FORMAT       = :json.freeze
+    DEFAULT_FORMAT       = :xml.freeze
     DEFAULT_JURISDICTION = nil.freeze
     DEFAULT_PROXY        = nil.freeze
     DEFAULT_USER_AGENT   = "Open311 Ruby Gem #{Open311::VERSION}".freeze

data/lib/open311/service_request.rb

@@ -0,0 +1,17 @@
+module Open311
+  class ServiceRequest
+    attr_reader :token, :id
+
+    def initialize(hash)
+      @hash = hash
+      @id = hash.service_request_id.to_i
+      @token = hash.token.to_i
+    end
+
+    # Delegate to the hash
+    def self.method_missing(method, *args, &block)
+      return super unless @hash.has_key?(method)
+      @hash[method]
+    end
+  end
+end

data/lib/open311/version.rb

@@ -1,3 +1,3 @@
 module Open311
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/open311.gemspec

@@ -3,17 +3,18 @@ require File.expand_path("../lib/open311/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.add_development_dependency("bundler", "~> 1.0")
-  s.add_development_dependency("libxml-ruby", "~> 1.1")
+  s.add_development_dependency("json", "~> 1.4")
+  s.add_development_dependency("maruku", "~> 0.6")
+  s.add_development_dependency("nokogiri", "~> 1.4")
   s.add_development_dependency("rake", "~> 0.8")
-  s.add_development_dependency("rcov", "~> 0.9")
-  s.add_development_dependency("rspec", "~> 2.0.1")
+  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("yajl-ruby", "~> 0.7")
   s.add_development_dependency("yard", "~> 0.6")
   s.add_development_dependency("ZenTest", "~> 4.4")
   s.add_runtime_dependency("hashie", "~> 0.4.0")
-  s.add_runtime_dependency("faraday", "~> 0.5.2")
-  s.add_runtime_dependency("faraday_middleware", "~> 0.2.3")
+  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.add_runtime_dependency("multi_xml", "~> 0.2.0")
   s.authors = ["Dan Melton", "Erik Michaels-Ober"]

data/spec/fixtures/403.xml

@@ -0,0 +1,4 @@
+HTTP/1.1 403 Forbidden 
+
+<?xml version="1.0" encoding="utf-8"?>
+<error>Invalid api_key received -- can't proceed with create_request.</error>

data/spec/fixtures/get_service_request.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service_requests>
+<request>
+	<service_request_id>638344</service_request_id>
+	<status>closed</status>
+	<status_notes>Duplicate request.</status_notes>
+	<service_name>Sidewalk and Curb Issues</service_name>
+	<service_code>006</service_code>
+	<description></description>
+	<agency_responsible></agency_responsible>
+	<service_notice></service_notice>
+	<requested_datetime>2010-04-14T06:37:38-08:00</requested_datetime>
+	<updated_datetime>2010-04-14T06:37:38-08:00</updated_datetime>
+	<expected_datetime>2010-04-15T06:37:38-08:00</expected_datetime>
+	<address>8TH AVE and JUDAH ST</address>
+	<address_id>545483</address_id>
+	<zipcode>94122</zipcode>
+	<lat>37.762221815</lat>
+	<long>-122.4651145</long>
+	<media_url>http://open311.city.gov.s3.amazonaws.com/requests/media/638344.rss </media_url>
+</request>
+
+</service_requests>

data/spec/fixtures/post_service_request.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service_requests>
+	<request>
+		<service_request_id>293944</service_request_id>
+		<service_notice>
+			The City will inspect and require the responsible party to correct within 24 hours and/or issue a Correction Notice or Notice of Violation of the Public Works Code
+		</service_notice>
+		<account_id/>
+	</request>
+</service_requests>

data/spec/fixtures/request_id_from_token.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service_requests>
+	<request>
+		<service_request_id>638344</service_request_id>
+		<token>12345</token>
+	</request>
+</service_requests>

data/spec/fixtures/service_definition.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service_definition>
+	<service_code>DMV66</service_code>	
+	<attribute>
+		<variable>true</variable>
+		<code>WHISHETN</code>
+		<datatype>singlevaluelist</datatype>
+		<required>true</required>
+		<datatype_description></datatype_description>		
+		<order>1</order>	
+		<description>What is the ticket/tag/DL number?</description>
+		<values>
+		    <value>
+			 	<key>123</key>
+				<name>Ford</name>
+			</value>
+		    <value>
+			 	<key>124</key>
+				<name>Chrysler</name>
+			</value>			
+		</values>
+	</attribute>	
+</service_definition>

data/spec/fixtures/service_requests.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service_requests>
+<request>
+	<service_request_id>638344</service_request_id>
+	<status>closed</status>
+	<status_notes>Duplicate request.</status_notes>
+	<service_name>Sidewalk and Curb Issues</service_name>
+	<service_code>006</service_code>
+	<description></description>
+	<agency_responsible></agency_responsible>
+	<service_notice></service_notice>
+	<requested_datetime>2010-04-14T06:37:38-08:00</requested_datetime>
+	<updated_datetime>2010-04-14T06:37:38-08:00</updated_datetime>
+	<expected_datetime>2010-04-15T06:37:38-08:00</expected_datetime>
+	<address>8TH AVE and JUDAH ST</address>
+	<address_id>545483</address_id>
+	<zipcode>94122</zipcode>
+	<lat>37.762221815</lat>
+	<long>-122.4651145</long>
+	<media_url>http://open311.city.gov.s3.amazonaws.com/requests/media/638344.rss </media_url>
+</request>
+<request>
+	<service_request_id>638349</service_request_id>
+	<status>open</status>
+	<status_notes></status_notes>
+	<service_name>Sidewalk and Curb Issues</service_name>
+	<service_code>006</service_code>
+	<description></description>
+	<agency_responsible></agency_responsible>
+	<service_notice></service_notice>
+	<requested_datetime>2010-04-19T06:37:38-08:00</requested_datetime>
+	<updated_datetime>2010-04-19T06:37:38-08:00</updated_datetime>
+	<expected_datetime>2010-04-19T06:37:38-08:00</expected_datetime>
+	<address>8TH AVE and JUDAH ST</address>
+	<address_id>545483</address_id>
+	<zipcode>94122</zipcode>
+	<lat>37.762221815</lat>
+	<long>-122.4651145</long>
+	<media_url>http://open311.city.gov.s3.amazonaws.com/requests/media/638349.rss </media_url>
+</request>
+</service_requests>

data/spec/open311_spec.rb

@@ -1,27 +1,163 @@
+require 'rubygems'
+require 'json'
 require File.expand_path('../spec_helper', __FILE__)
 
 describe Open311, ".service_list" do
   before do
     Open311.configure do |config|
-      config.endpoint     = 'https://open311.sfgov.org/'
-      config.format       = 'xml'
-      config.jurisdiction = 'sfgov.org'
+      config.endpoint     = 'http://api.dc.org/open311/v2_dev/'
+      config.jurisdiction = 'dc.gov'
     end
-    stub_request(:get, 'https://open311.sfgov.org/dev/v2/services.xml').
-      with(:query => {:jurisdiction_id => 'sfgov.org'}).
+    stub_request(:get, 'http://api.dc.org/open311/v2_dev/services.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
       to_return(:body => fixture('services.xml'), :headers => {'Content-Type' => 'text/xml; charset=utf-8'})
   end
 
   it "should request the correct resource" do
-    Open311.service_list
-    a_request(:get, 'https://open311.sfgov.org/dev/v2/services.xml').
-      with(:query => {:jurisdiction_id => 'sfgov.org'}).
+    Open311.service_list(:lat => '38.888486', :long => '-77.020179')
+    a_request(:get, 'http://api.dc.org/open311/v2_dev/services.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
       should have_been_made
   end
 
   it "should return the correct results" do
-    services = Open311.service_list
+    services = Open311.service_list(:lat => '38.888486', :long => '-77.020179')
     services.should be_an Array
     services.first.service_code.should == '001'
   end
 end
+
+describe Open311, ".service_definition" do
+  before do
+    Open311.configure do |config|
+      config.endpoint     = 'http://blasius.ws:3003/open311/'
+      config.jurisdiction = 'dc.gov'
+    end
+    stub_request(:get, 'http://blasius.ws:3003/open311/services/033.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
+      to_return(:body => fixture('service_definition.xml'), :headers => {'Content-Type' => 'text/xml; charset=utf-8'})
+  end
+
+  it "should request the correct resource" do
+    Open311.service_definition('033', :lat => '38.888486', :long => '-77.020179')
+    a_request(:get, 'http://blasius.ws:3003/open311/services/033.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
+      should have_been_made
+  end
+
+  it "should return the correct results" do
+    service_def = Open311.service_definition('033', :lat => '38.888486', :long => '-77.020179')
+    service_def.should be_an Hash
+    service_def.service_code.should == "DMV66"
+  end
+end
+
+describe Open311, ".service_requests" do
+  before do
+    Open311.configure do |config|
+      config.endpoint     = 'http://blasius.ws:3003/open311/'
+      config.jurisdiction = 'dc.gov'
+    end
+    stub_request(:get, 'http://blasius.ws:3003/open311/requests.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
+      to_return(:body => fixture('service_requests.xml'), :headers => {'Content-Type' => 'text/xml; charset=utf-8'})
+  end
+
+  it "should request the correct resource" do
+    Open311.service_requests(:lat => '38.888486', :long => '-77.020179')
+    a_request(:get, 'http://blasius.ws:3003/open311/requests.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
+      should have_been_made
+  end
+
+  it "should return the correct results" do
+    service_requests = Open311.service_requests(:lat => '38.888486', :long => '-77.020179')
+    service_requests.should be_an Array
+    service_requests.length.should == 2
+    service_requests.first.id.should == 638344
+  end
+end
+
+describe Open311, ".get_service_request" do
+  before do
+    Open311.configure do |config|
+      config.endpoint     = 'http://blasius.ws:3003/open311/'
+      config.jurisdiction = 'dc.gov'
+    end
+    stub_request(:get, 'http://blasius.ws:3003/open311/requests/638344.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
+      to_return(:body => fixture('service_requests.xml'), :headers => {'Content-Type' => 'text/xml; charset=utf-8'})
+  end
+
+  it "should request the correct resource" do
+    Open311.get_service_request('638344', :lat => '38.888486', :long => '-77.020179')
+    a_request(:get, 'http://blasius.ws:3003/open311/requests/638344.xml').
+      with(:query => {:jurisdiction_id => 'dc.gov', :lat => '38.888486', :long => '-77.020179'}).
+      should have_been_made
+  end
+
+  it "should return the correct results" do
+    service_request = Open311.get_service_request(638344, :lat => '38.888486', :long => '-77.020179')
+    service_request.id.should == 638344
+  end
+end
+
+describe Open311, ".post_service_request" do
+  before do
+    Open311.configure do |config|
+      config.endpoint     = 'http://blasius.ws:3003/open311/'
+      config.jurisdiction = 'dc.gov'
+      config.api_key      = 'xyz'
+    end
+
+    @service_request_params = {
+      :service_code   => '001',
+      :address_string => '1234 5th street',
+      :email          => 'smit222@sfgov.edu',
+      :device_id      => 'tt222111',
+      :account_id     => '123456',
+      :first_name     => 'john',
+      :last_name      => 'smith',
+      :phone          => '111111111',
+      :description    => 'A large sinkhole is destroying the street',
+      :media_url      => 'http://farm3.static.flickr.com/2002/2212426634_5ed477a060.jpg',
+      :lat            => '38.888486',
+      :long           => '-77.020179',
+    }
+    stub_request(:post, 'blasius.ws:3003/open311/requests.xml').
+      with(:body => {:jurisdiction_id => 'dc.gov', :api_key => 'xyz'}.merge(@service_request_params)).
+      to_return(:body => fixture('post_service_request.xml'), :headers => {'Content-Type' => 'text/xml; charset=utf-8'})
+  end
+
+  it "should return the correct results" do
+    service_request_response = Open311.post_service_request(@service_request_params)
+    service_request_response.service_request_id.should == '293944'
+  end
+end
+
+describe Open311, ".request_id" do
+
+  before do
+    Open311.configure do |config|
+      config.endpoint     = 'http://open311.sfgov.org/dev/v2/'
+      config.jurisdiction = 'sfgov.org'
+    end
+    stub_request(:get, 'http://open311.sfgov.org/dev/v2/tokens/12345.xml').
+      with(:query => {:jurisdiction_id => 'sfgov.org'}).
+      to_return(:body => fixture('request_id_from_token.xml'), :headers => {'Content-Type' => 'text/xml; charset=utf-8'})
+  end
+
+  it "should request the correct resource" do
+    Open311.request_id(12345)
+    a_request(:get, 'http://open311.sfgov.org/dev/v2/tokens/12345.xml').
+      with(:query => {:jurisdiction_id => 'sfgov.org'}).
+      should have_been_made
+  end
+
+  it "should return the correct result" do
+    service_request = Open311.request_id(12345)
+    service_request.id.should == 638344
+    service_request.token.should == 12345
+  end
+
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: open311
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dan Melton
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -35,206 +33,206 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
-        - 1
-        version: "1.1"
+        - 4
+        version: "1.4"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: maruku
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
-        - 8
-        version: "0.8"
+        - 6
+        version: "0.6"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: nokogiri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
-        - 0
-        - 9
-        version: "0.9"
+        - 1
+        - 4
+        version: "1.4"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 2
         - 0
-        - 1
-        version: 2.0.1
+        - 8
+        version: "0.8"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
+        - 2
         - 1
-        - 5
-        version: "1.5"
+        version: "2.1"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: simplecov
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
-        - 7
-        version: "0.7"
+        - 3
+        version: "0.3"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: webmock
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 6
         version: "0.6"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: ZenTest
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 4
         - 4
         version: "4.4"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 4
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: faraday
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 3
+        version: 0.5.3
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: faraday_middleware
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
-        - 2
         - 3
-        version: 0.2.3
+        - 0
+        version: 0.3.0
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 0
         - 5
         version: 0.0.5
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: multi_xml
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 description: A Ruby wrapper for the Open311 API v2.
 email: 
 - dan@codeforamerica.org
@@ -262,8 +260,15 @@ files:
 - lib/open311/client/request.rb
 - lib/open311/client/service.rb
 - lib/open311/configuration.rb
+- lib/open311/service_request.rb
 - lib/open311/version.rb
 - open311.gemspec
+- spec/fixtures/403.xml
+- spec/fixtures/get_service_request.xml
+- spec/fixtures/post_service_request.xml
+- spec/fixtures/request_id_from_token.xml
+- spec/fixtures/service_definition.xml
+- spec/fixtures/service_requests.xml
 - spec/fixtures/services.xml
 - spec/open311_spec.rb
 - spec/spec_helper.rb
@@ -284,7 +289,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -293,7 +297,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -307,6 +310,12 @@ signing_key:
 specification_version: 3
 summary: A Ruby wrapper for the Open311 API v2.
 test_files: 
+- spec/fixtures/403.xml
+- spec/fixtures/get_service_request.xml
+- spec/fixtures/post_service_request.xml
+- spec/fixtures/request_id_from_token.xml
+- spec/fixtures/service_definition.xml
+- spec/fixtures/service_requests.xml
 - spec/fixtures/services.xml
 - spec/open311_spec.rb
 - spec/spec_helper.rb