federal_register 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/federal_register.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{federal_register}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Carpenter"]
-  s.date = %q{2011-10-29}
+  s.date = %q{2012-03-30}
   s.description = %q{Ruby API Client for FederalRegister.gov that handles searching articles and getting information about agencies}
   s.email = %q{andrew@criticaljuncture.org}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/criticaljuncture/federal_register}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Ruby API Client for FederalRegister.gov}
 
   if s.respond_to? :specification_version then

data/lib/federal_register/article.rb

@@ -1,4 +1,5 @@
 class FederalRegister::Article < FederalRegister::Base
+  class InvalidDocumentNumber < ArgumentError; end
   add_attribute :abstract,
                 :abstract_html_url,
                 :action,
@@ -17,6 +18,7 @@ class FederalRegister::Article < FederalRegister::Base
                 :pdf_url,
                 :regulation_id_numbers,
                 :start_page,
+                :subtype,
                 :title,
                 :type,
                 :volume
@@ -31,11 +33,14 @@ class FederalRegister::Article < FederalRegister::Base
   end
   
   def self.find(document_number)
+    validate_document_number!(document_number)
     attributes = get("/articles/#{document_number}.json")
     new(attributes, :full => true)
   end
 
   def self.find_all(*document_numbers)
+    document_numbers = document_numbers.flatten
+    document_numbers.each {|doc_num| validate_document_number!(doc_num)}
     result_set = FederalRegister::ResultSet.fetch("/articles/#{document_numbers.join(',')}.json", :result_class => self)
   end
   
@@ -50,4 +55,12 @@ class FederalRegister::Article < FederalRegister::Base
       self.class.get(send("#{file_type}_url")).body
     end
   end
+
+  private
+
+  def self.validate_document_number!(document_number)
+    if document_number.blank? || document_number !~ /^[a-zA-Z0-9-]+$/
+      raise InvalidDocumentNumber.new("'#{document_number}' is not a valid FR Document Number")
+    end
+  end
 end

data/lib/federal_register/base.rb

@@ -54,7 +54,5 @@ class FederalRegister::Base < FederalRegister::Client
     end
   end
 
-  private
-  
   attr_reader :attributes
 end

data/spec/article_spec.rb

@@ -24,6 +24,10 @@ describe FederalRegister::Article do
       )
       lambda{ FederalRegister::Article.find(document_number) }.should raise_error FederalRegister::Client::RecordNotFound
     end
+
+    it "throws an error when given an invalid document number" do
+      lambda{ FederalRegister::Article.find('an! invalid! document! number!') }.should raise_error FederalRegister::Article::InvalidDocumentNumber
+    end
   end
 
   describe ".find_all" do
@@ -37,6 +41,10 @@ describe FederalRegister::Article do
       result_set = FederalRegister::Article.find_all('abc','def')
       result_set.results.map(&:document_number).sort.should === ['abc','def']
     end
+
+    it "throws an error when given an invalid document number" do
+      lambda{ FederalRegister::Article.find_all('123-456','an! invalid! document! number!') }.should raise_error FederalRegister::Article::InvalidDocumentNumber
+    end
   end
 
   describe ".search" do

metadata

@@ -1,169 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: federal_register
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Andrew Carpenter
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-29 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70208318603020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
-  name: httparty
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70208318603020
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: &70208318601540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70208318601540
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70208318600540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70208318600540
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70208318599520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
-  name: jeweler
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  version_requirements: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70208318599520
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70208318598420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70208318598420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70208318588640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  name: rspec
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70208318588640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70208318587660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  name: rspec
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70208318587660
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70208318586740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
-  name: activesupport
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70208318586740
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70208318586020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
-  name: fakeweb
-  version_requirements: *id009
+  type: :development
   prerelease: false
-description: Ruby API Client for FederalRegister.gov that handles searching articles and getting information about agencies
+  version_requirements: *70208318586020
+description: Ruby API Client for FederalRegister.gov that handles searching articles
+  and getting information about agencies
 email: andrew@criticaljuncture.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .watchr
 - Gemfile
@@ -186,39 +141,32 @@ files:
 - spec/public_inspection_document_spec.rb
 - spec/result_set_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/criticaljuncture/federal_register
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1815142448098795316
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby API Client for FederalRegister.gov
 test_files: []
-