fcc-content-api 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
+gem "rake"
+
 # Specify your gem's dependencies in fcc-content-api.gemspec
 gemspec

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/adelevie/fcc-content-api.png?branch=master)](http://travis-ci.org/adelevie/fcc-content-api)
+
 The FCC Content API allows you to programmatically access much of the content accessible on [FCC.gov](http://fcc.gov).
 
 fcc-content-api is a lightweight Ruby wrapper for the Federal Communication Commission's Content API. The query interface resembles ActiveRecord. The response objects are simple Ruby `Hash`es and `Array`s.
@@ -27,13 +29,19 @@ FccContentApi::Content.where(:edocs => "true").where(:type => "proceeding").wher
 FccContentApi::Content.where({:edocs => "true", :type => "proceeding" :comments => "true"}).all
 ```
 
+If you know the id of the object you want, use `FccContentApi::Content#find`:
+
+```ruby
+FccContentApi::Content.find(38660)
+```
+
 ## Installation
 
 `gem install fcc-content-api` or:
 
 ```ruby
-	# Gemfile
-	gem "fcc-content-api"
+# Gemfile
+gem "fcc-content-api"
 ```
 
 ## More Info

data/fixtures/vcr_cassettes/test_all.yml

@@ -0,0 +1,42 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: http://www.fcc.gov/api/content.json
+    body: 
+      encoding: US-ASCII
+      string: ""
+    headers: 
+      Host: 
+      - www.fcc.gov
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - Ruby
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Server: 
+      - Apache
+      Last-Modified: 
+      - Fri, 13 Apr 2012 11:48:45 GMT
+      Content-Length: 
+      - "2885"
+      Content-Type: 
+      - application/json
+      Cache-Control: 
+      - no-cache, must-revalidate, post-check=0, pre-check=0
+      Expires: 
+      - Fri, 13 Apr 2012 11:45:17 GMT
+      Date: 
+      - Fri, 13 Apr 2012 11:45:17 GMT
+      Connection: 
+      - keep-alive
+    body: 
+      encoding: US-ASCII
+      string: "[{\"count\":\"21171\",\"pages\":2117,\"itemsPerPage\":10,\"currentPage\":0},{\"nid\":\"38892\",\"title\":\"Clyburn Statement on Award of Contract for Literature Review\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/clyburn-statement-award-contract-literature-review\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38892\"},{\"nid\":\"38891\",\"title\":\"Broadband Over Power Lines\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/broadband-over-power-lines\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38891\"},{\"nid\":\"38890\",\"title\":\"Ex Parte Rules and Other Procedural Rules\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/ex-parte-rules-and-other-procedural-rules\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38890\"},{\"nid\":\"38889\",\"title\":\"Commissioner McDowell Remarks: MMTC Honors Commissioner Copps\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/commissioner-mcdowell-remarks-mmtc-honors-commissioner-copps\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38889\"},{\"nid\":\"38888\",\"title\":\"WTB seeks comment on waiver of USF support methodology rule\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/wtb-seeks-comment-waiver-usf-support-methodology-rule\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38888\"},{\"nid\":\"38887\",\"title\":\"Wireline Bureau Seeks Comment on BelWave Request for Review\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/wireline-bureau-seeks-comment-belwave-request-review\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38887\"},{\"nid\":\"38884\",\"title\":\"Collocation Workshop May 1, 2012, Promoting Mobile Brandband\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/collocation-workshop-may-1-2012-promoting-mobile-brandband\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38884\"},{\"nid\":\"38883\",\"title\":\"Erratum - Al-Ihsan Academy, South Ozone Park, NY et al.\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/erratum-al-ihsan-academy-south-ozone-park-ny-et-al-0\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38883\"},{\"nid\":\"38882\",\"title\":\"LPFM Channel Finder Tool Now Available\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/lpfm-channel-finder-tool-now-available\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38882\"},{\"nid\":\"38881\",\"title\":\"DeltaCom, Inc. Order Denying Renewal Deadline Waiver Requests\",\"created\":\"2012-04-12\",\"changed\":\"2012-04-13\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/deltacom-inc-order-denying-renewal-deadline-waiver-requests\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38881\"}]"
+    http_version: 
+  recorded_at: Fri, 13 Apr 2012 11:45:17 GMT
+recorded_with: VCR 2.0.1

data/fixtures/vcr_cassettes/test_find.yml

@@ -0,0 +1,42 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: http://www.fcc.gov/api/content/38837.json
+    body: 
+      encoding: US-ASCII
+      string: ""
+    headers: 
+      Host: 
+      - www.fcc.gov
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - Ruby
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Server: 
+      - Apache
+      Last-Modified: 
+      - Fri, 13 Apr 2012 11:45:53 GMT
+      Content-Type: 
+      - application/json
+      Content-Length: 
+      - "11396"
+      Cache-Control: 
+      - no-cache, must-revalidate, post-check=0, pre-check=0
+      Expires: 
+      - Fri, 13 Apr 2012 11:45:18 GMT
+      Date: 
+      - Fri, 13 Apr 2012 11:45:18 GMT
+      Connection: 
+      - keep-alive
+    body: 
+      encoding: US-ASCII
+      string: "{\"nid\":\"38837\",\"title\":\"WCB seeks comment on petitions for ETC designations\",\"created\":\"2012-04-10\",\"changed\":\"2012-04-11\",\"type\":\"edoc\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/document\\/wcb-seeks-comment-petitions-etc-designations\",\"taxonomy\":{\"7\":{\"tid\":\"7\",\"vid\":\"1\",\"name\":\"Wireline Competition\",\"description\":\"\",\"weight\":\"21\"},\"49\":{\"tid\":\"49\",\"vid\":\"4\",\"name\":\"Public Notice\",\"description\":\"\",\"weight\":\"49\"}},\"body\":\"<A name=1><\\/a><p><b>PUBLIC NOTICE<\\/b><\\/p>\\n<p><b>Federal Communications Commission<\\/b><\\/p>\\n<p><b>News Media Information 202 \\/ 418-0500<\\/b><\\/p>\\n<b>445 12th&nbsp;St., S.W.<\\/b><br \\/>\\n<p><b>Internet: http:\\/\\/www.fcc.gov<\\/b><\\/p>\\n<p><b>Washington, D.C. 20554<\\/b><\\/p>\\n<p><b>TTY: 1-888-835-5322<\\/b><\\/p>\\n<p><b>DA 12-566<\\/b><\\/p>\\n<p><b>Release Date: &nbsp;April 10, 2012<\\/b><\\/p>\\n<p><b>WIRELINE COMPETITION BUREAU SEEKS COMMENT ON PETITIONS FOR&nbsp;<\\/b><\\/p>\\n<p><b>DESIGNATION AS A LOW-INCOME ELIGIBLE TELECOMMUNICATIONS CARRIER&nbsp;<\\/b><\\/p>\\n<p><b>FILED BY T-MOBILE, KAJEET, TAG MOBILE, TELRITE AND GLOBAL CONNECTION&nbsp;<\\/b><\\/p>\\n<p><b>WC Docket No. 09-197<\\/b><\\/p>\\n<p><b>Comment Date: &nbsp; May 10, 2012<br \\/>Reply Comment Date: &nbsp;May 25, 2012<\\/b><\\/p>\\nThe Wireline Competition Bureau seeks comment on petitions filed by T-Mobile USA, Inc. (T-<br \\/>\\nMobile),1&nbsp;kajeet, Inc. (kajeet),2&nbsp;TAG Mobile, LLC (TAG),3&nbsp;Telrite Corporation (Telrite),4&nbsp;and Global<br \\/>Connection Inc. of America (Global Connection),5&nbsp;for limited designation as eligible telecommunications&nbsp;<br \\/>carriers (ETC) for the provision of Lifeline service. &nbsp;kajeet, TAG, Telrite and Global Connection each&nbsp;<br \\/>seek designation as an ETC for the limited purpose of offering Lifeline service in Alabama, Connecticut,&nbsp;<br \\/>Delaware, District of Columbia, Florida, New Hampshire, New York, North Carolina, Tennessee and&nbsp;<br \\/>\\n&nbsp;<br \\/>\\n&nbsp;<br \\/>\\n1&nbsp;Petition of T-Mobile USA, Inc. for Designation as a Low-Income Eligible Telecommunications Carrier, WC&nbsp;<br \\/>Docket No. 09-197 (filed Jan. 23, 2012) (T-Mobile Petition).<br \\/>\\n2&nbsp;kajeet, Inc. Petition for Designation as a Lifeline Eligible Telecommunications Carrier, WC Docket No. 09-197&nbsp;<br \\/>(filed Mar. 26, 2012) (kajeet Petition). &nbsp;kajeet has a compliance plan pending with the Commission and may not be&nbsp;<br \\/>designated an ETC until that plan has been approved by the Wireline Competition Bureau. &nbsp;<i>See&nbsp;<\\/i>kajeet, Inc.&nbsp;<br \\/>Compliance Plan, WC Docket Nos. 09-197 and 11-42 (filed Mar. 26, 2012);&nbsp;<i>see also<\\/i>,&nbsp;<i>Lifeline and Link Up Reform&nbsp;<br \\/>and Modernization et al<\\/i>, WC Dkt No.11-42&nbsp;<i>et al.,&nbsp;<\\/i>Report and Order and Further Notice of Proposed Rulemaking,&nbsp;<br \\/>FCC 12-11, at&nbsp;para. 380 (rel. Feb. 6, 2012) (<i>Lifeline Reform Order<\\/i>).<br \\/>\\n3&nbsp;TAG Mobile, LLC Petition for Limited Designation as an Eligible Telecommunications Carrier in Alabama,&nbsp;<br \\/>Connecticut, Delaware, the District of Columbia, Florida, New&nbsp;Hampshire, New York, North Carolina, Tennessee&nbsp;<br \\/>and Virginia, WC Docket No. 09-197 (filed Apr. 4, 2012) (TAG Petition). &nbsp;TAG has a compliance plan pending&nbsp;<br \\/>with the Commission and may not be designated an ETC until its plan has been approved by the Wireline&nbsp;<br \\/>Competition Bureau. &nbsp;<i>See&nbsp;<\\/i>TAG Mobile, LLC Compliance Plan, WC Docket Nos. 09-197 and 11-42 (filed Mar. 6,&nbsp;<br \\/>2012);&nbsp;<i>see also<\\/i>,&nbsp;<i>Lifeline Reform Order<\\/i>, FCC 12-11, at para. 380.<br \\/>\\n4&nbsp;Telrite Corporation Petition for Limited Designation as an Eligible Telecommunications Carrier in Alabama,&nbsp;<br \\/>Connecticut, Delaware, the District of Columbia, Florida, New&nbsp;Hampshire, New York, North Carolina, Tennessee&nbsp;<br \\/>and Virginia, WC Docket No. 09-197 (filed Apr. 4, 2012) (Telrite Petition). &nbsp;Telrite has a compliance plan pending&nbsp;<br \\/>with the Commission and may not be designated an ETC until its plan has been approved by the Wireline&nbsp;<br \\/>Competition Bureau. &nbsp;<i>See&nbsp;<\\/i>Telrite Corporation Compliance Plan, WC Docket Nos. 09-197 and 11-42 (filed Mar. 12,&nbsp;<br \\/>2012);&nbsp;<i>see also<\\/i>,&nbsp;<i>Lifeline Reform Order<\\/i>, FCC 12-11, para. 380.<br \\/>\\n5&nbsp;Global Connection Inc.&nbsp;of America Petition for Limited Designation as an Eligible Telecommunications Carrier in&nbsp;<br \\/>Alabama, Connecticut, Delaware, the District of Columbia, Florida, New&nbsp;Hampshire, New York, North Carolina,&nbsp;<br \\/>Tennessee and Virginia, WC Docket No. 09-197 (filed Apr. 4, 2012) (Global Connections Petition). &nbsp;Global&nbsp;<br \\/>Connection has a compliance plan pending with the Commission and may not be designated an ETC until its plan&nbsp;<br \\/>has been approved by the Wireline Competition Bureau. &nbsp;<i>See&nbsp;<\\/i>Global Connection Inc. of America Compliance Plan,&nbsp;<br \\/>WC Docket Nos. 09-197 and 11-42 (filed Mar. 8, 2012); &nbsp;<i>see also<\\/i>,&nbsp;<i>Lifeline Reform Order<\\/i>, FCC 12-11, para. 380.<br \\/>\\n<hr>\\n<A name=2><\\/a>Virginia.6&nbsp;T-Mobile seeks ETC designation for the limited purpose of offering Lifeline service in&nbsp;<br \\/>Alabama, Connecticut, Delaware, District of Columbia, Florida, New Hampshire, New York, Tennessee&nbsp;<br \\/>and Virginia.7<br \\/>\\nPursuant to sections 1.415 and 1.419 of the Commission\\u2019s rules, interested parties may file&nbsp;<br \\/>\\ncomments and reply comments on or before the dates indicated on the first page of this document. &nbsp;<br \\/>Comments may be filed using the Commission\\u2019s Electronic Comment Filing System (ECFS).8&nbsp;&nbsp;<br \\/>\\n\\u00a7<br \\/>\\nElectronic Filers: &nbsp;Comments may be filed electronically using the Internet by accessing the&nbsp;<br \\/>ECFS: &nbsp;http:\\/\\/fjallfoss.fcc.gov\\/ecfs2\\/. &nbsp;<br \\/>\\n\\u00a7<br \\/>\\nPaper Filers: &nbsp;Parties who choose to file by paper must file an original and one copy of each&nbsp;<br \\/>filing. &nbsp;If more than one docket or rulemaking number appears in the caption of this proceeding,&nbsp;<br \\/>filers must submit two additional copies for each additional docket or rulemaking number.<br \\/>\\nFilings can be sent by hand or messenger delivery, by commercial overnight courier, or by first-<br \\/>class or overnight U.S. Postal Service mail. &nbsp;All filings must be addressed to the Commission\\u2019s&nbsp;<br \\/>Secretary, Office of the Secretary, Federal Communications Commission.<br \\/>\\n\\u00a7<br \\/>\\nAll hand-delivered or messenger-delivered paper filings for the Commission\\u2019s Secretary&nbsp;<br \\/>must be delivered to FCC Headquarters at 445 12th&nbsp;St., SW, Room TW-A325,&nbsp;<br \\/>Washington, DC 20554. &nbsp;The filing hours are 8:00 a.m. to 7:00 p.m. &nbsp; All hand deliveries&nbsp;<br \\/>must be held together with rubber bands or fasteners. &nbsp;Any envelopes and boxes must be&nbsp;<br \\/>disposed of&nbsp;before&nbsp;entering the building. &nbsp;<br \\/>\\n\\u00a7<br \\/>\\nCommercial overnight mail (other than U.S. Postal Service Express Mail and Priority&nbsp;<br \\/>Mail) must be sent to 9300 East Hampton Drive, Capitol Heights, MD &nbsp;20743.<br \\/>\\n\\u00a7<br \\/>\\nU.S. Postal Service first-class, Express, and Priority mail must be addressed to 445 12th<br \\/>Street, SW, Washington DC &nbsp;20554.<br \\/>\\nPeople&nbsp;with Disabilities: &nbsp;To request materials in accessible formats for people with disabilities (braille,&nbsp;<br \\/>large print, electronic files, audio format), send an e-mail to&nbsp;fcc504@fcc.gov&nbsp;or call the Consumer &amp;&nbsp;<br \\/>Governmental&nbsp;Affairs Bureau at 202-418-0530 (voice), 202-418-0432 (tty).<br \\/>\\nThe proceeding this Notice initiates shall be treated as a \\u201cpermit-but-disclose\\u201d proceeding in&nbsp;<br \\/>\\naccordance with the Commission\\u2019s&nbsp;<i>ex parte&nbsp;<\\/i>rules.9&nbsp;Persons making&nbsp;<i>ex parte&nbsp;<\\/i>presentations must file&nbsp;a&nbsp;<br \\/>copy of any written presentation or a memorandum summarizing any oral presentation within two&nbsp;<br \\/>business days after the presentation (unless a different deadline applicable to the Sunshine period applies). &nbsp;<br \\/>Persons making oral&nbsp;<i>ex parte&nbsp;<\\/i>presentations are reminded that memoranda summarizing the presentation&nbsp;<br \\/>must (1) list all persons attending or otherwise participating in the meeting at which the&nbsp;<i>ex parte&nbsp;<br \\/><\\/i>presentation was made, and (2) summarize all data presented and arguments made during the&nbsp;<br \\/>\\n&nbsp;<br \\/>\\n&nbsp;<br \\/>\\n6&nbsp;kajeet Petition at 1; TAG Petition at 1; Telrite Petition at 1; Global Connection Petition at 1.<br \\/>7&nbsp;T-Mobile Petition at 1.&nbsp;<br \\/>8&nbsp;<i>See&nbsp;<\\/i>47 CFR \\u00a7\\u00a7 1.415, 1.419;&nbsp;<i>Electronic Filing of Documents in Rulemaking Proceedings<\\/i>, 63 FR 24121 (1998).<br \\/>9&nbsp;47 C.F.R. \\u00a7\\u00a7 1.1200&nbsp;<i>et seq.<\\/i><br \\/>\\n2<br \\/>\\n<hr>\\n<A name=3><\\/a>presentation. &nbsp;If the presentation consisted in whole or in part of the presentation of data or arguments&nbsp;<br \\/>already reflected in the presenter\\u2019s written comments, memoranda or other filings in the proceeding, the&nbsp;<br \\/>presenter may provide citations to such data or arguments in&nbsp;his or her prior comments, memoranda, or&nbsp;<br \\/>other filings (specifying the relevant page and\\/or paragraph numbers where such data or arguments can be&nbsp;<br \\/>found) in lieu of summarizing them in the memorandum. &nbsp;Documents shown or given to Commission&nbsp;<br \\/>staff during&nbsp;<i>ex&nbsp;parte&nbsp;<\\/i>meetings are deemed to be written&nbsp;<i>ex parte&nbsp;<\\/i>presentations and must be filed&nbsp;<br \\/>consistent with rule 1.1206(b). &nbsp;In proceedings governed by rule 1.49(f) or for which the Commission has&nbsp;<br \\/>made available a method of electronic filing, written&nbsp;<i>ex parte&nbsp;<\\/i>presentations and memoranda summarizing&nbsp;<br \\/>oral&nbsp;<i>ex parte&nbsp;<\\/i>presentations, and all attachments thereto, must be filed through the electronic comment&nbsp;<br \\/>filing system available for that proceeding, and must be filed in their native format (<i>e.g.<\\/i>, .doc, .xml, .ppt,&nbsp;<br \\/>searchable .pdf). &nbsp;Participants in this proceeding should familiarize themselves with the Commission\\u2019s&nbsp;<i>ex&nbsp;<br \\/>parte&nbsp;<\\/i>rules.<br \\/>\\nFor further information, please contact Divya S. Shenoy, Telecommunications Access Policy&nbsp;<br \\/>\\nDivision, Wireline Competition Bureau at (202) 418-7400 or TTY (202) 418-0484.<br \\/>\\n<b>-&nbsp;FCC&nbsp;-<\\/b><br \\/>\\n3<br \\/>\\n<hr>\",\"vid\":\"62623\",\"field_short_title\":[{\"value\":null}],\"field_short_description\":[{\"value\":null}],\"field_author\":[{\"value\":null}],\"field_job_title\":[{\"value\":null}],\"field_edoc_internal_id\":[{\"value\":\"313517\"}],\"field_released_date\":[{\"value\":\"2012-04-10T00:00:00\"}],\"field_published_date\":[{\"value\":\"2012-04-10T00:00:00\"}],\"field_adopted_date\":[{\"value\":null}],\"field_comment_date\":[{\"value\":\"2012-05-10T00:00:00\"}],\"field_edoc_id\":[{\"value\":\"DA-12-566\"}],\"field_featured_image\":[{\"fid\":null,\"list\":null,\"data\":null}],\"topics\":[{\"nid\":\"144\",\"title\":\"Connecting America\"},{\"nid\":\"3907\",\"title\":\"Universal Service\"}],\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/38837\"}"
+    http_version: 
+  recorded_at: Fri, 13 Apr 2012 11:45:18 GMT
+recorded_with: VCR 2.0.1

data/fixtures/vcr_cassettes/test_title.yml

@@ -0,0 +1,42 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: http://www.fcc.gov/api/content.json?title=Open%2520Internet%2520Workshops%2520and%2520Speeches
+    body: 
+      encoding: US-ASCII
+      string: ""
+    headers: 
+      Host: 
+      - www.fcc.gov
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - Ruby
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Server: 
+      - Apache
+      Last-Modified: 
+      - Fri, 13 Apr 2012 11:44:53 GMT
+      Content-Length: 
+      - "319"
+      Content-Type: 
+      - application/json
+      Cache-Control: 
+      - no-cache, must-revalidate, post-check=0, pre-check=0
+      Expires: 
+      - Fri, 13 Apr 2012 11:44:18 GMT
+      Date: 
+      - Fri, 13 Apr 2012 11:44:18 GMT
+      Connection: 
+      - keep-alive
+    body: 
+      encoding: US-ASCII
+      string: "[{\"count\":\"1\",\"pages\":0,\"itemsPerPage\":10,\"currentPage\":0},{\"nid\":\"37071\",\"title\":\"Open Internet Workshops and Speeches\",\"created\":\"2011-12-21\",\"changed\":\"2011-12-21\",\"type\":\"article\",\"webUrl\":\"http:\\/\\/www.fcc.gov\\/encyclopedia\\/open-internet-workshops-and-speeches\",\"uri\":\"http:\\/\\/www.fcc.gov\\/api\\/content\\/37071\"}]"
+    http_version: 
+  recorded_at: Fri, 13 Apr 2012 11:44:18 GMT
+recorded_with: VCR 2.0.1

data/lib/fcc-content-api.rb

@@ -3,70 +3,73 @@ require "weary"
 require "json"
 
 module FccContentApi
-
-	def self.client
-		@@client ||= FccContentApi::Client.new
-	end
-
-	class Content
-		def self.where(*args)
-			Query.new(self).where(*args)
-		end
-
-		def self.all
-			Query.new(self).all
-		end
-
-		def self.find(id)
-			resp = FccContentApi::Client.new.get(:id => id).perform.body
-			JSON.parse resp
-		end
-	end
-
-	class Query
-
-		def initialize(klass); @klass = klass; end
-
-		def criteria; @criteria ||= {}; end
-
-		def where(args)
-			criteria.merge! args
-			self
-		end
-
-		def all; execute; end
-
-		def request
-			@request ||= FccContentApi::Client.new.all criteria
-		end
-
-		def execute
-			resp = request.perform.body
-			JSON.parse(resp)
-		end
-
-	end
-
-	class Client < Weary::Client
-		domain "http://www.fcc.gov/api"
-
-		get :all, "/content.json?" do |resource|
-			resource.optional :created_before, :created_after, # YYYY-MM-DD
-												:changed_before, :changed_after, # YYYY-MM-DD
-												:search_string,
-												:limit,
-												:page,
-												:fields,		# true
-												:edocs, 		# true
-												:comments, 	# true
-												:major_topics,
-												:type,
-												:term,
-												:topic,
-												:title
-		end
-
-		get :get, "/content/{id}.json"
-
-	end
-end
+  def self.client
+    @@client ||= FccContentApi::Client.new
+  end
+
+  class Content
+    def self.where(*args)
+      Query.new(self).where(*args)
+    end
+
+    def self.all
+      Query.new(self).all
+    end
+
+    def self.find(id)
+      resp = FccContentApi.client.get(:id => id).perform.body
+      JSON.parse resp
+    end
+  end
+
+  class Query
+    def initialize(klass); @klass = klass; end
+
+    def criteria; @criteria ||= {}; end
+
+    def where(args)
+      criteria.merge! args
+      self
+    end
+
+    def all; execute; end
+
+    def request
+      @request ||= FccContentApi.client.all criteria
+    end
+
+    def execute
+      resp = request.perform.body
+      JSON.parse(resp)
+    end
+
+  end
+
+  class Client < Weary::Client
+    domain "http://www.fcc.gov/api"
+
+    get :all, "/content.json?" do |resource|
+
+      resource.user_agent "rubygem/fcc-content-api/#{VERSION}"
+
+      resource.optional :created_before, :created_after, # YYYY-MM-DD
+                        :changed_before, :changed_after, # YYYY-MM-DD
+                        :search_string,
+                        :limit,
+                        :page,
+                        :fields,		# true
+                        :edocs, 		# true
+                        :comments, 	# true
+                        :major_topics,
+                        :type,
+                        :term,
+                        :topic,
+                        :title
+    end
+
+    get :get, "/content/{id}.json" do |resource|
+      resource.user_agent "rubygem/fcc-content-api/#{VERSION}"
+    end
+
+  end
+end

data/lib/fcc-content-api/version.rb

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

data/test/test_client.rb

@@ -1,51 +1,53 @@
 require "test_helper"
 
 class TestClient < Test::Unit::TestCase
-	VCR.use_cassette("test_title") do
-		def test_title
-			title = "Open Internet Workshops and Speeches"
-			resp = FccContentApi::Content.where(:title => URI.encode(title)).all
-			assert_equal resp.first.keys.sort!, ["count", "pages", "itemsPerPage", "currentPage"].sort!
-			assert_equal resp[1].keys.sort!, ["nid", "title", "created", "changed", "type", "webUrl", "uri"].sort!
-			assert_equal title, resp[1]["title"]
-		end
-	end
 
-	VCR.use_cassette("test_all") do
-		def test_all
-			resp = FccContentApi::Content.all
-			assert_equal resp.first.keys.sort!, ["count", "pages", "itemsPerPage", "currentPage"].sort!
-			assert_equal resp[1].keys.sort!, ["nid", "title", "created", "changed", "type", "webUrl", "uri"].sort!
-		end
-	end
+  def test_title
+    VCR.use_cassette("test_title") do
+      title = "Open Internet Workshops and Speeches"
+      resp = FccContentApi::Content.where(:title => URI.encode(title)).all
+      assert_equal resp.first.keys.sort!, ["count", "pages", "itemsPerPage", "currentPage"].sort!
+      assert_equal resp[1].keys.sort!, ["nid", "title", "created", "changed", "type", "webUrl", "uri"].sort!
+      assert_equal title, resp[1]["title"]
+    end
+  end
 
-	VCR.use_cassette("test_find") do
-		def test_find
-			resp = FccContentApi::Content.find 38837
-			assert_equal resp.class, Hash
-			keys = ["nid", "title", "created", "changed", 
-							"type", "webUrl", "taxonomy", "body", 
-							"vid", "field_short_title", "field_short_description", 
-							"field_author", "field_job_title", "field_edoc_internal_id", 
-							"field_released_date", "field_published_date", 
-							"field_adopted_date", "field_comment_date", "field_edoc_id", 
-							"field_featured_image", "topics", "uri"] 
-			assert_equal resp.keys.sort!, keys.sort!
-		end
-	end
+  def test_all
+    VCR.use_cassette("test_all") do
+      resp = FccContentApi::Content.all
+      assert_equal resp.first.keys.sort!, ["count", "pages", "itemsPerPage", "currentPage"].sort!
+      assert_equal resp[1].keys.sort!, ["nid", "title", "created", "changed", "type", "webUrl", "uri"].sort!
+    end
+  end
 
-	def test_params
-		params = {
-			:attribute1 => "value1", # invalid
-			:search_string => "searchq"  # valid
-		}
-		req = FccContentApi::Content.where(params).request
-		assert_equal req.uri.to_s.split("?")[1], "search_string=searchq"
-	end
+  
+  def test_find
+    VCR.use_cassette("test_find") do
+      resp = FccContentApi::Content.find 38837
+      assert_equal resp.class, Hash
+      keys = ["nid", "title", "created", "changed", 
+              "type", "webUrl", "taxonomy", "body", 
+              "vid", "field_short_title", "field_short_description", 
+              "field_author", "field_job_title", "field_edoc_internal_id", 
+              "field_released_date", "field_published_date", 
+              "field_adopted_date", "field_comment_date", "field_edoc_id", 
+              "field_featured_image", "topics", "uri"] 
+      assert_equal resp.keys.sort!, keys.sort!
+    end
+  end
 
-	def test_equivalent_queries
-		q1 = FccContentApi::Content.where({:search_string => "broadband", :created_afer => "2012-1-1"}).request
-		q2 = FccContentApi::Content.where(:search_string => "broadband").where(:created_afer => "2012-1-1").request
-		assert_equal q1.uri.to_s, q2.uri.to_s
-	end
+  def test_params
+    params = {
+      :attribute1 => "value1", # invalid
+      :search_string => "searchq"  # valid
+    }
+    req = FccContentApi::Content.where(params).request
+    assert_equal req.uri.to_s.split("?")[1], "search_string=searchq"
+  end
+
+  def test_equivalent_queries
+    q1 = FccContentApi::Content.where({:search_string => "broadband", :created_afer => "2012-1-1"}).request
+    q2 = FccContentApi::Content.where(:search_string => "broadband").where(:created_afer => "2012-1-1").request
+    assert_equal q1.uri.to_s, q2.uri.to_s
+  end
 end

data/test/test_helper.rb

@@ -4,5 +4,5 @@ require 'vcr'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
-  #c.stub_with :webmock
+  c.hook_into :webmock
 end

data/test/test_query.rb

@@ -3,24 +3,24 @@ require "test_helper"
 class TestQuery < Test::Unit::TestCase
 
 
-	def test_where
-		query = FccContentApi::Query.new(FccContentApi::Content)
-		query.where(:attribute => "value")
-		assert_equal query.criteria[:attribute], "value"
-	end
+  def test_where
+    query = FccContentApi::Query.new(FccContentApi::Content)
+    query.where(:attribute => "value")
+    assert_equal query.criteria[:attribute], "value"
+  end
 
-	def test_stacked_wheres
-		query = FccContentApi::Query.new(FccContentApi::Content)
-		query.where(:attribute => "value")
-		assert_equal query.criteria[:attribute], "value"
-		query.where(:second_attribute => "second_value")
-		assert_equal query.criteria[:second_attribute], "second_value"
-		assert_equal query.criteria[:attribute], "value"
-	end
+  def test_stacked_wheres
+    query = FccContentApi::Query.new(FccContentApi::Content)
+    query.where(:attribute => "value")
+    assert_equal query.criteria[:attribute], "value"
+    query.where(:second_attribute => "second_value")
+    assert_equal query.criteria[:second_attribute], "second_value"
+    assert_equal query.criteria[:attribute], "value"
+  end
 
-	def test_request
-		query = FccContentApi::Query.new(FccContentApi::Content)
-		assert_equal query.request.class, Weary::Request
-	end
+  def test_request
+    query = FccContentApi::Query.new(FccContentApi::Content)
+    assert_equal query.request.class, Weary::Request
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcc-content-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000Z
+date: 2012-04-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70341875787080 !ruby/object:Gem::Requirement
+  requirement: &70178652500760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341875787080
+  version_requirements: *70178652500760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70341875786580 !ruby/object:Gem::Requirement
+  requirement: &70178652500240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70341875786580
+  version_requirements: *70178652500240
 - !ruby/object:Gem::Dependency
   name: weary
-  requirement: &70341875786160 !ruby/object:Gem::Requirement
+  requirement: &70178652499600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341875786160
+  version_requirements: *70178652499600
 description: A Ruby wrapper for the FCC's Content API
 email:
 - adelevie@gmail.com
@@ -52,10 +52,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - fcc-content-api.gemspec
+- fixtures/vcr_cassettes/test_all.yml
+- fixtures/vcr_cassettes/test_find.yml
+- fixtures/vcr_cassettes/test_title.yml
 - lib/fcc-content-api.rb
 - lib/fcc-content-api/version.rb
 - test/test_client.rb