datacatalog 0.3.2 → 0.3.3

data/Rakefile

@@ -5,6 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "datacatalog"
+    gem.version = '0.3.3'
     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

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog}
-  s.version = "0.3.2"
+  s.version = "0.3.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-29}
+  s.date = %q{2009-11-03}
   s.description = %q{A Ruby client library for the National Data Catalog API}
   s.email = %q{luigi@sunlightfoundation.com}
   s.extra_rdoc_files = [
@@ -18,11 +18,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
-     "CHANGES.md",
      "LICENSE.md",
      "README.md",
      "Rakefile",
-     "VERSION",
      "datacatalog.gemspec",
      "lib/base.rb",
      "lib/datacatalog.rb",
@@ -93,3 +91,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 1.2.8"])
   end
 end
+

data/lib/base.rb

@@ -74,23 +74,11 @@ module DataCatalog
     end
     
     def self.query_hash(conditions)
-      if conditions.empty?
-        query_hash = {}
-      else
-        query_hash = {:filter => filterize(conditions)}
-      end
+      conditions == {} ? {} : { :filter => filterize(conditions) }
     end
     
     def self.filterize(conditions)
-      filter_string = ""
-      new_conditions = {}
-      conditions.each do |k,v|
-        new_conditions[k.to_s] = v
-      end
-      new_conditions.sort.each do |k,v|
-        filter_string += "#{k.to_s}:\"#{v}\" "
-      end
-      filter_string.strip!
+      conditions.map { |k, v| %(#{k}:"#{v}") }.join(" ")
     end
     
     def method_missing(method_name, *args)

data/lib/resources/api_key.rb

@@ -3,7 +3,7 @@ module DataCatalog
   class ApiKey < Base
     
     def self.all(user_id, conditions={})
-      many(http_get(uri(user_id), :query => conditions))
+      many(http_get(uri(user_id), :query => query_hash(conditions)))
     end
 
     def self.create(user_id, params={})
@@ -15,7 +15,7 @@ module DataCatalog
     end
 
     def self.first(user_id, conditions={})
-      one(http_get(uri(user_id), :query => conditions).first)
+      one(http_get(uri(user_id), :query => query_hash(conditions)).first)
     end
 
     def self.get(user_id, id)
@@ -28,7 +28,7 @@ module DataCatalog
     
     # == Helpers
     
-    def self.uri(user_id, id = nil)
+    def self.uri(user_id, id=nil)
       raise Error, "user_id cannot be blank" if user_id.blank?
       "/users/#{user_id}/keys/#{id}"
     end

data/lib/resources/organization.rb

@@ -3,27 +3,33 @@ module DataCatalog
   class Organization < Base
     
     def self.all(conditions={})
-      many(http_get("/organizations", :query => conditions))
+      many(http_get(uri, :query => query_hash(conditions)))
     end
 
     def self.create(params={})
-      one(http_post("/organizations", :body => params))
+      one(http_post(uri, :body => params))
     end
 
-    def self.destroy(organization_id)
-      one(http_delete("/organizations/#{organization_id}"))
+    def self.destroy(id)
+      one(http_delete(uri(id)))
     end
     
     def self.first(conditions={})
-      one(http_get("/organizations", :query => conditions).first)
+      one(http_get(uri, :query => query_hash(conditions)).first)
     end
 
     def self.get(id)
-      one(http_get("/organizations/#{id}"))
+      one(http_get(uri(id)))
     end
     
-    def self.update(organization_id, params={})
-      one(http_put("/organizations/#{organization_id}", :body => params))
+    def self.update(id, params={})
+      one(http_put(uri(id), :body => params))
+    end
+    
+    # == Helpers
+    
+    def self.uri(id=nil)
+      "/organizations/#{id}"
     end
 
   end

data/lib/resources/source.rb

@@ -3,27 +3,33 @@ module DataCatalog
   class Source < Base
     
     def self.all(conditions={})      
-      many(http_get("/sources", :query => query_hash(conditions)))
+      many(http_get(uri, :query => query_hash(conditions)))
     end
 
     def self.create(params={})
-      one(http_post("/sources", :body => params))
+      one(http_post(uri, :body => params))
     end
 
-    def self.destroy(source_id)
-      one(http_delete("/sources/#{source_id}"))
+    def self.destroy(id)
+      one(http_delete(uri(id)))
     end
     
-    def self.first(conditions={})
-     one(http_get("/sources", :query => query_hash(conditions)).first)
+    def self.first(conditions= {})
+      one(http_get(uri, :query => query_hash(conditions)).first)
     end
 
     def self.get(id)
-      one(http_get("/sources/#{id}"))
+      one(http_get(uri(id)))
     end
     
-    def self.update(source_id, params={})
-      one(http_put("/sources/#{source_id}", :body => params))
+    def self.update(id, params={})
+      one(http_put(uri(id), :body => params))
+    end
+
+    # == Helpers
+    
+    def self.uri(id=nil)
+      "/sources/#{id}"
     end
 
   end

data/lib/resources/user.rb

@@ -3,35 +3,35 @@ module DataCatalog
   class User < Base
     
     def self.all(conditions={})
-      many(http_get("/users", :query => conditions))
+      many(http_get(uri, :query => query_hash(conditions)))
     end
 
     def self.create(params={})
-      with_api_keys(one(http_post("/users", :body => params)))
+      with_api_keys(one(http_post(uri, :body => params)))
     end
 
-    def self.destroy(user_id)
-      one(http_delete("/users/#{user_id}"))
+    def self.destroy(id)
+      one(http_delete(uri(id)))
     end
 
     def self.first(conditions={})
-      one(http_get("/users", :query => conditions).first)
+      one(http_get(uri, :query => query_hash(conditions)).first)
     end
     
     def self.get(id)
-      with_api_keys(one(http_get("/users/#{id}")))
+      with_api_keys(one(http_get(uri(id))))
     end
 
     def self.get_by_api_key(api_key)
       DataCatalog.with_key(api_key) do
         checkup = one(http_get("/checkup"))
-        raise NotFound unless checkup.valid_api_key
+        raise NotFound if checkup.api_key != "valid"
         get(checkup.user.id)
       end
     end
     
-    def self.update(user_id, params)
-      one(http_put("/users/#{user_id}", :body => params))
+    def self.update(id, params)
+      one(http_put(uri(id), :body => params))
     end
 
     # == Helpers
@@ -41,6 +41,10 @@ module DataCatalog
       user
     end
     
+    def self.uri(id=nil)
+      "/users/#{id}"
+    end
+    
     # == Instance Methods
 
     def delete_api_key!(api_key_id)

data/spec/base_spec.rb

@@ -127,10 +127,16 @@ describe Base do
   end
   
   describe ".filterize" do
-    it "should create a properly formatted filter string" do
-      s = Base.filterize(:name => "John", :zip => "20036")
-      s.should == 'name:"John" zip:"20036"'
-    end    
+    it "should work with 1 param" do
+      %(name:"John Doe").should == Base.filterize(:name => "John Doe")
+    end
+
+    it "should work with 2 params" do
+      [
+        %(zip:"20036" name:"John Doe"),
+        %(name:"John Doe" zip:"20036")
+      ].should include(Base.filterize(:name => "John Doe", :zip => "20036"))
+    end
   end
 
 end

data/spec/organization_spec.rb

@@ -6,7 +6,7 @@ describe Organization do
   def create_3_organizations
     @organization_names = ["Federal Communications Commission", "Federal Election Commission", "Department of State"]
     @organization_names.each do |name|
-      Organization.create(:name => name)
+      Organization.create(:name => name, :org_type => "governmental")
     end
   end
 
@@ -56,7 +56,7 @@ describe Organization do
   describe ".get" do
 
     before do
-      @organization = Organization.create(:name => "Federal Election Commission")
+      @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
     end
 
     it "should return an organization" do
@@ -76,14 +76,14 @@ describe Organization do
   describe ".create" do
     
     it "should create a new organization when valid params are passed in" do
-      @organization = Organization.create(:name => "Federal Communications Commission")
+      @organization = Organization.create(:name => "Federal Communications Commission", :org_type => "governmental")
       @organization.should be_an_instance_of(Organization)
       @organization.name.should == "Federal Communications Commission"
     end
     
     it "should raise BadRequest when a bad URL is passed in" do
       executing do 
-        Organization.create(:name => "Bad Org", :url => "htt:p//jlkj!3")
+        Organization.create(:name => "Bad Org", :url => "htt:p//jlkj!3", :org_type => "governmental")
       end.should raise_error(BadRequest)
     end
 
@@ -92,7 +92,7 @@ describe Organization do
   describe ".update" do
 
     before do
-      @organization = Organization.create(:name => "Federal Election Commission")
+      @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
     end
   
     it "should update an existing organization from valid params" do
@@ -106,7 +106,7 @@ describe Organization do
   describe ".destroy" do
 
     before do
-      @organization = Organization.create(:name => "Federal Election Commission")
+      @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
     end
   
     it "should destroy an existing organization" do

data/spec/source_spec.rb

@@ -4,8 +4,9 @@ include DataCatalog
 module SourceHelpers
   def create_source(params={})
     valid_params = {
-      :title => "Some FCC Data",
-      :url   => "http://fcc.gov/somedata.csv"
+      :title       => "Some FCC Data",
+      :url         => "http://fcc.gov/somedata.csv",
+      :source_type => "dataset"
     }
     Source.create(valid_params.merge(params))
   end
@@ -13,8 +14,9 @@ module SourceHelpers
   def create_3_sources
     %w(FCC NASA DOE).each do |name|
       Source.create({
-        :title => "#{name} Data",
-        :url   => "http://#{name.downcase}.gov/data.xml"
+        :title        => "#{name} Data",
+        :url          => "http://#{name.downcase}.gov/data.xml",
+        :source_type  => "dataset"
       })
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datacatalog
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Luigi Montanez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-11-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,11 +84,9 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
-- CHANGES.md
 - LICENSE.md
 - README.md
 - Rakefile
-- VERSION
 - datacatalog.gemspec
 - lib/base.rb
 - lib/datacatalog.rb

data/CHANGES.md

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

data/VERSION

@@ -1 +0,0 @@
-0.3.2