datacatalog 0.1.0 → 0.2.3

data/.gitignore

@@ -1,5 +1,5 @@
-.DS_Store
-coverage
-setup.rb
-datacatalog*.gem
+.DS_Store
+coverage
+setup.rb
+datacatalog*.gem
 sandbox_api.yml

data/CHANGES.md

@@ -1,2 +1,2 @@
-### 0.1.0 / 2009-08-15
-* Initial version
+### 0.1.0 / 2009-08-15
+* Initial version

data/LICENSE.md

@@ -1,11 +1,11 @@
-Copyright (c) 2009, Sunlight Foundation. 
-
-All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- 
-  * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-  * Neither the name of Sunlight Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2009, Sunlight Foundation. 
+
+All rights reserved.
+ 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+  * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+  * Neither the name of Sunlight Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,31 +1,34 @@
-# Ruby Gem for the National Data Catalog API
-
-Under heavy development.
-
-## Installation
-
-For now, the gem will not be packaged. Instead, install it manually:
-
-    $ git clone git clone git://github.com/sunlightlabs/ruby-datacatalog.git 
-    $ cd ruby-datacatalog
-    $ gem build datacatalog.gemspec
-    $ gem install datacatalog-0.1.0.gem
-
-## Usage
-
-    require 'rubygems'
-    require 'datacatalog'
-
-    DataCatalog.api_key = 'c40505247a5e308a24d70a0118f76534b543795b'
-    
-## Running Specs
-
-We're not mocking out any of the web API calls in the specs. Instead, we expect developers who wish to run the specs to download and run a local sandbox instance of the [Data Catalog API](http://github.com/sunlightlabs/datacatalog-api), a Sinatra app:
-
-    git clone git://github.com/sunlightlabs/datacatalog-api.git
-
-Get the app running like any normal Sinatra app, so you can choose to use thin or Passenger or new hotness like [Unicorn](http://unicorn.bogomips.org/). Some special considerations:
-
-1. We recommend creating a `sandbox` entry in `datacatalog-api`'s `config.yml`.
-2. Run `RACK_ENV=sandbox rake db:ensure_admin` in the `datacatalog-api` project to create a super admin for the API instance.
-3. Back here in `ruby-datacatalog`, use the example file in `spec/` to create your own `spec/sandbox_api.yml` with the API key of the admin and your local URI.
+# Ruby Gem for the National Data Catalog API
+
+Under heavy development.
+
+## Installation
+
+For now, the gem will not be packaged. Instead, install it manually:
+
+    $ git clone git clone git://github.com/sunlightlabs/ruby-datacatalog.git 
+    $ cd ruby-datacatalog
+    $ rake check_dependencies
+    $ rake build
+    $ rake install # uses sudo
+    # Or, instead of the line above:
+    $ gem install pkg/datacatalog-0.1.0.gem
+
+## Usage
+
+    require 'rubygems'
+    require 'datacatalog'
+
+    DataCatalog.api_key = 'c40505247a5e308a24d70a0118f76534b543795b'
+    
+## Running Specs
+
+We're not mocking out any of the web API calls in the specs. Instead, we expect developers who wish to run the specs to download and run a local sandbox instance of the [Data Catalog API](http://github.com/sunlightlabs/datacatalog-api), a Sinatra app:
+
+    git clone git://github.com/sunlightlabs/datacatalog-api.git
+
+Get the app running like any normal Sinatra app, so you can choose to use thin or Passenger or new hotness like [Unicorn](http://unicorn.bogomips.org/). Some special considerations:
+
+1. We recommend creating a `sandbox` entry in `datacatalog-api`'s `config.yml`.
+2. Run `RACK_ENV=sandbox rake db:ensure_admin` in the `datacatalog-api` project to create a super admin for the API instance.
+3. Back here in `ruby-datacatalog`, use the example file in `spec/` to create your own `spec/sandbox_api.yml` with the API key of the admin and your local URI.

data/Rakefile

@@ -1,49 +1,51 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "datacatalog"
-    gem.summary = %Q{Wrapper for the National Data Catalog API}
-    gem.description = %Q{Ruby library that wraps the National Data Catalog API}
-    gem.email = "luigi@sunlightfoundation.com"
-    gem.homepage = "http://github.com/sunlightlabs/datacatalog"
-    gem.authors = ["Luigi Montanez", "David James"]
-    gem.add_development_dependency "rspec"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "datacatalog #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "datacatalog"
+    gem.rubyforge_project = "datacatalog"
+    gem.summary = %Q{Wrapper for the National Data Catalog API}
+    gem.description = %Q{Ruby library that wraps the National Data Catalog API}
+    gem.email = "luigi@sunlightfoundation.com"
+    gem.homepage = "http://github.com/sunlightlabs/datacatalog"
+    gem.authors = ["Luigi Montanez", "David James"]
+    gem.add_dependency('activesupport', ">= 2.3.4")
+    gem.add_dependency('httparty', ">= 0.4.5")
+    gem.add_dependency('mash', ">= 0.0.3")
+    gem.add_development_dependency("jeweler", ">= 1.2.1")
+    gem.add_development_dependency("rspec", ">= 1.2.8")
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_opts = ['--color']
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.rcov = true
+  spec.rcov_opts = ['--exclude', '^spec,/gems/']
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "datacatalog #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.3

data/datacatalog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog}
-  s.version = "0.1.0"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luigi Montanez", "David James"]
-  s.date = %q{2009-10-05}
+  s.date = %q{2009-10-09}
   s.description = %q{Ruby library that wraps the National Data Catalog API}
   s.email = %q{luigi@sunlightfoundation.com}
   s.extra_rdoc_files = [
@@ -24,17 +24,18 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "datacatalog.gemspec",
-     "doc/api_key_spec_for_rest_api.txt",
-     "doc/api_key_spec_for_ruby_api.rb",
-     "doc/mocking_options.md",
+     "lib/base.rb",
      "lib/datacatalog.rb",
-     "lib/datacatalog/api_key.rb",
-     "lib/datacatalog/base.rb",
-     "lib/datacatalog/source.rb",
-     "lib/datacatalog/user.rb",
+     "lib/main.rb",
+     "lib/resources/about.rb",
+     "lib/resources/api_key.rb",
+     "lib/resources/source.rb",
+     "lib/resources/user.rb",
      "sandbox_api.yml.example",
+     "spec/about_spec.rb",
      "spec/api_key_spec.rb",
      "spec/base_spec.rb",
+     "spec/datacatalog_spec.rb",
      "spec/source_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -43,11 +44,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/sunlightlabs/datacatalog}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datacatalog}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Wrapper for the National Data Catalog API}
   s.test_files = [
-    "spec/api_key_spec.rb",
+    "spec/about_spec.rb",
+     "spec/api_key_spec.rb",
      "spec/base_spec.rb",
+     "spec/datacatalog_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb",
      "spec/user_spec.rb"
@@ -58,11 +62,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
+      s.add_runtime_dependency(%q<mash>, [">= 0.0.3"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.2.1"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
     else
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_dependency(%q<httparty>, [">= 0.4.5"])
+      s.add_dependency(%q<mash>, [">= 0.0.3"])
+      s.add_dependency(%q<jeweler>, [">= 1.2.1"])
+      s.add_dependency(%q<rspec>, [">= 1.2.8"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+    s.add_dependency(%q<httparty>, [">= 0.4.5"])
+    s.add_dependency(%q<mash>, [">= 0.0.3"])
+    s.add_dependency(%q<jeweler>, [">= 1.2.1"])
+    s.add_dependency(%q<rspec>, [">= 1.2.8"])
   end
 end

data/lib/base.rb

@@ -0,0 +1,77 @@
+module DataCatalog
+
+  class Base < Mash
+    
+    DEFAULT_BASE_URI = 'http://api.nationaldatacatalog.com'
+
+    include HTTParty
+
+    format :json
+    base_uri DEFAULT_BASE_URI
+    
+    class << self
+      alias_method :_delete, :delete
+      alias_method :_get,    :get
+      alias_method :_post,   :post
+      alias_method :_put,    :put
+      
+      undef_method :delete
+      undef_method :get
+      undef_method :post
+      undef_method :put
+    end
+    
+    def self.http_delete(path, options={})
+      check_status(_delete(path, options))
+    end
+    
+    def self.http_get(path, options={})
+      check_status(_get(path, options))
+    end
+
+    def self.http_post(path, options={})
+      check_status(_post(path, options))
+    end
+
+    def self.http_put(path, options={})
+      check_status(_put(path, options))
+    end
+
+    # == protected
+    
+    def self.check_status(response)
+      case response.code
+      when 400: raise BadRequest,          error(response)
+      when 401: raise Unauthorized,        error(response)
+      when 403: raise Forbidden,           error(response)
+      when 404: raise NotFound,            error(response)
+      when 409: raise Conflict,            error(response)
+      when 500: raise InternalServerError, error(response)
+      end
+      response
+    end
+    
+    def self.error(response)
+      parsed_body = JSON.parse(response.body)
+      if parsed_body.empty?
+        "Response was empty"
+      elsif parsed_body["errors"]
+        parsed_body["errors"].inspect
+      else
+        response.body
+      end
+    rescue JSON::ParserError
+      "Unable to parse: #{response.body.inspect}"
+    end
+    
+    def self.many(response)
+      response.map { |item| new(item) }
+    end
+
+    def self.one(response)
+      response.blank? ? nil : new(response)
+    end
+
+  end
+
+end

data/lib/datacatalog.rb

@@ -1,28 +1,8 @@
-require 'rubygems'
-require 'activesupport'
-require 'httparty'
-require 'mash'
-
-module DataCatalog
-  mattr_accessor :api_key, :base_uri
-  class Error                     < RuntimeError; end
-  class BadRequest                < Error; end # 400
-  class Unauthorized              < Error; end # 401
-  class Forbidden                 < Error; end # 403
-  class NotFound                  < Error; end # 404
-  class Conflict                  < Error; end # 409
-  class InternalServerError       < Error; end # 500
-  class ApiKeyNotConfigured       < Error; end
-  class CannotDeletePrimaryApiKey < Error; end
-  
-  def self.with_key(temp_key)
-    original_key = DataCatalog.api_key 
-    DataCatalog.api_key = temp_key
-    yield
-    DataCatalog.api_key = original_key
-  end
-  
-end
-
-require "#{File.dirname(__FILE__)}/datacatalog/base.rb"
-Dir["#{File.dirname(__FILE__)}/datacatalog/*.rb"].each { |source_file| require source_file }
+require 'rubygems'
+require 'activesupport'
+require 'httparty'
+require 'mash'
+
+require File.dirname(__FILE__) + '/main'
+require File.dirname(__FILE__) + '/base'
+Dir.glob(File.dirname(__FILE__) + '/resources/*.rb').each { |f| require f }

data/lib/main.rb

@@ -0,0 +1,41 @@
+module DataCatalog
+  
+  # == Exceptions
+  
+  class Error                     < RuntimeError; end
+  class BadRequest                < Error; end # 400
+  class Unauthorized              < Error; end # 401
+  class Forbidden                 < Error; end # 403
+  class NotFound                  < Error; end # 404
+  class Conflict                  < Error; end # 409
+  class InternalServerError       < Error; end # 500
+  class ApiKeyNotConfigured       < Error; end
+  class CannotDeletePrimaryApiKey < Error; end
+  
+  # == Accessors
+  
+  def self.api_key
+    Base.default_params[:api_key]
+  end
+  
+  def self.api_key=(key)
+    Base.default_params :api_key => key
+  end
+  
+  def self.base_uri
+    Base.base_uri
+  end
+  
+  def self.base_uri=(uri)
+    Base.base_uri(uri.blank? ? Base::DEFAULT_BASE_URI : uri)
+  end
+  
+  def self.with_key(temp_key)
+    original_key = DataCatalog.api_key
+    DataCatalog.api_key = temp_key
+    result = yield
+    DataCatalog.api_key = original_key
+    result
+  end
+
+end