datacatalog 0.4.4 → 0.4.5

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,34 +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
-    $ 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.
+# 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

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "datacatalog"
-    gem.version = '0.4.4'
+    gem.version = '0.4.5'
     gem.rubyforge_project = "datacatalog"
     gem.summary = %Q{Client for the National Data Catalog API}
     gem.description = %Q{A Ruby client library for the National Data Catalog API}

data/datacatalog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   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-12-10}
+  s.date = %q{2009-12-14}
   s.description = %q{A Ruby client library for the National Data Catalog API}
   s.email = %q{luigi@sunlightfoundation.com}
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "spec/comment_spec.rb",
      "spec/datacatalog_spec.rb",
      "spec/document_spec.rb",
+     "spec/download_spec.rb",
      "spec/favorite_spec.rb",
      "spec/note_spec.rb",
      "spec/organization_spec.rb",

data/lib/base.rb

@@ -87,7 +87,17 @@ module DataCatalog
       conditions == {} ? {} : { :filter => filterize(conditions) }
     end
     
-    def self.filterize(conditions)
+    def self.filterize(arg)
+      if arg.is_a?(Hash)
+        filterize_hash(arg)
+      elsif arg.is_a?(String)
+        arg
+      else
+        raise ArgumentError
+      end
+    end
+    
+    def self.filterize_hash(conditions)
       filtered_conditions = conditions.map do |k, v|
         "#{k}" + if v.is_a?(Regexp)
           %(:"#{v.source}")

data/lib/main.rb

@@ -1,41 +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
+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

data/sandbox_api.yml.example

@@ -1,2 +1,2 @@
-api_key: d193d1523d49e4caf46297ef94d7a2c995d3b2cb # generate with rake db:ensure_admin on datacatalog-api
-base_uri: sandbox.dc-api.local
+api_key: d193d1523d49e4caf46297ef94d7a2c995d3b2cb # generate with rake db:ensure_admin on datacatalog-api
+base_uri: sandbox.dc-api.local

data/spec/base_spec.rb

@@ -109,11 +109,11 @@ describe Base do
   
   describe ".filterize" do
     it "should work with 1 string param" do
-      %(name="John Doe").should == Base.filterize(:name => "John Doe")
+      Base.filterize(:name => "John Doe").should == %(name="John Doe")
     end
 
     it "should work with 1 regex param" do
-      %(name:"John Doe").should == Base.filterize(:name => /John Doe/)
+      Base.filterize(:name => /John Doe/).should == %(name:"John Doe")
     end
 
     it "should work with 2 string params" do
@@ -122,6 +122,18 @@ describe Base do
         %(name="John Doe" zip="20036")
       ].should include(Base.filterize(:name => "John Doe", :zip => "20036"))
     end
+    
+    it "should pass through strings" do
+      ["count > 0", "count >= 1"].each do |s|
+        Base.filterize(s).should == s
+      end
+    end
+    
+    it "should raise ArgumentError when appropriate" do
+      [nil, [1]].each do |arg|
+        executing { Base.filterize(arg) }.should raise_error(ArgumentError)
+      end
+    end
   end
 
 end

data/spec/datacatalog_spec.rb

@@ -1,36 +1,36 @@
-require File.dirname(__FILE__) + '/spec_helper'
-include DataCatalog
-
-describe DataCatalog do
-
-  describe "module accessors" do
-    it "should access the API Key" do
-      DataCatalog.api_key = "4159179f32ff8fefd2c6d48b7e675e7736bf1357"
-      DataCatalog.api_key.should == "4159179f32ff8fefd2c6d48b7e675e7736bf1357"
-    end
-
-    it "should access the base URI" do
-      DataCatalog.base_uri = 'http://somehost.com'
-      DataCatalog.base_uri.should == 'http://somehost.com'
-    end
-  end
-
-  describe ".with_key" do
-    it "should set the API key within the block" do
-      regular_key = '4159179f32ff8fefd2c6d48b7e675e7736bf1357'
-      DataCatalog.api_key = regular_key
-      temporary_key = '0000123400001234000012340000123400001234'
-      DataCatalog.with_key(temporary_key) do
-        DataCatalog.api_key.should == temporary_key
-      end
-      DataCatalog.api_key.should == regular_key
-    end
-    
-    it "should return the last value in the block" do
-      DataCatalog.with_key("0000444400004444") do
-        42
-      end.should == 42
-    end
-  end
-
-end
+require File.dirname(__FILE__) + '/spec_helper'
+include DataCatalog
+
+describe DataCatalog do
+
+  describe "module accessors" do
+    it "should access the API Key" do
+      DataCatalog.api_key = "4159179f32ff8fefd2c6d48b7e675e7736bf1357"
+      DataCatalog.api_key.should == "4159179f32ff8fefd2c6d48b7e675e7736bf1357"
+    end
+
+    it "should access the base URI" do
+      DataCatalog.base_uri = 'http://somehost.com'
+      DataCatalog.base_uri.should == 'http://somehost.com'
+    end
+  end
+
+  describe ".with_key" do
+    it "should set the API key within the block" do
+      regular_key = '4159179f32ff8fefd2c6d48b7e675e7736bf1357'
+      DataCatalog.api_key = regular_key
+      temporary_key = '0000123400001234000012340000123400001234'
+      DataCatalog.with_key(temporary_key) do
+        DataCatalog.api_key.should == temporary_key
+      end
+      DataCatalog.api_key.should == regular_key
+    end
+    
+    it "should return the last value in the block" do
+      DataCatalog.with_key("0000444400004444") do
+        42
+      end.should == 42
+    end
+  end
+
+end

data/tasks/test_api.rake

@@ -1,6 +1,6 @@
 namespace :spec do
   
-  MIN_VERSION = '0.3.0'
+  MIN_VERSION = '0.4.4'
   
   desc "Test API connection"
   task :test_api => [:check_dependencies] do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datacatalog
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Luigi Montanez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2009-12-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,6 +110,7 @@ files:
 - spec/comment_spec.rb
 - spec/datacatalog_spec.rb
 - spec/document_spec.rb
+- spec/download_spec.rb
 - spec/favorite_spec.rb
 - spec/note_spec.rb
 - spec/organization_spec.rb