datacatalog 0.3.6 → 0.3.7

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "datacatalog"
-    gem.version = '0.3.6'
+    gem.version = '0.3.7'
     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.3.6"
+  s.version = "0.3.7"
 
   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-11-17}
+  s.date = %q{2009-12-01}
   s.description = %q{A Ruby client library for the National Data Catalog API}
   s.email = %q{luigi@sunlightfoundation.com}
   s.extra_rdoc_files = [

data/lib/base.rb

@@ -78,7 +78,13 @@ module DataCatalog
     end
     
     def self.filterize(conditions)
-      conditions.map { |k, v| %(#{k}:"#{v}") }.join(" ")
+      conditions.map do |k, v|
+        "#{k}" + if v.is_a?(Regexp)
+          %(:"#{v.source}")
+        else
+          %(="#{v}")
+        end
+      end.join(" ")
     end
     
     def method_missing(method_name, *args)

data/lib/resources/favorite.rb

@@ -2,7 +2,7 @@ module DataCatalog
 
   class Favorite < Base
     
-    def self.all(conditions={})      
+    def self.all(conditions={})
       many(http_get(uri, :query => query_hash(conditions)))
     end
 

data/lib/resources/source.rb

@@ -5,11 +5,11 @@ module DataCatalog
     def self.all(conditions={})      
       many(http_get(uri, :query => query_hash(conditions)))
     end
-    
+
     def self.search(term)
-      many(http_get(uri, :query => {:search => term.downcase}))
+      many(http_get(uri, :query => { :search => term.downcase }))
     end
-    
+
     def self.create(params={})
       one(http_post(uri, :body => params))
     end
@@ -17,21 +17,21 @@ module DataCatalog
     def self.destroy(id)
       one(http_delete(uri(id)))
     end
-    
-    def self.first(conditions= {})
+
+    def self.first(conditions={})
       one(http_get(uri, :query => query_hash(conditions)).first)
     end
 
     def self.get(id)
       one(http_get(uri(id)))
     end
-    
+
     def self.update(id, params={})
       one(http_put(uri(id), :body => params))
     end
 
     # == Helpers
-    
+
     def self.uri(id=nil)
       "/sources/#{id}"
     end

data/spec/base_spec.rb

@@ -127,14 +127,18 @@ describe Base do
   end
   
   describe ".filterize" do
-    it "should work with 1 param" do
-      %(name:"John Doe").should == Base.filterize(:name => "John Doe")
+    it "should work with 1 string param" do
+      %(name="John Doe").should == Base.filterize(:name => "John Doe")
     end
 
-    it "should work with 2 params" do
+    it "should work with 1 regex param" do
+      %(name:"John Doe").should == Base.filterize(:name => /John Doe/)
+    end
+
+    it "should work with 2 string params" do
       [
-        %(zip:"20036" name:"John Doe"),
-        %(name:"John Doe" zip:"20036")
+        %(zip="20036" name="John Doe"),
+        %(name="John Doe" zip="20036")
       ].should include(Base.filterize(:name => "John Doe", :zip => "20036"))
     end
   end

data/spec/favorite_spec.rb

@@ -7,12 +7,16 @@ describe Favorite do
     setup_api
     clean_slate
     
-    @user = User.create(:name  => "Ted Smith",
-                        :email => "ted@email.com")
+    @user = User.create(
+      :name  => "Ted Smith",
+      :email => "ted@email.com"
+    )
     
-    @source = Source.create(:title       => "Some FCC Data",
-                            :url         => "http://fcc.gov/somedata.csv",
-                            :source_type => "dataset")
+    @source = Source.create(
+      :title       => "Some FCC Data",
+      :url         => "http://fcc.gov/somedata.csv",
+      :source_type => "dataset"
+    )
     
     DataCatalog.with_key(@user.primary_api_key) do
       @favorite = Favorite.create(:source_id => @source.id)
@@ -22,7 +26,7 @@ describe Favorite do
   
   describe ".create" do
 
-    it "should create a favorite when valid params are passed in" do      
+    it "should create a favorite when valid params are passed in" do
       refreshed_user = User.get(@user.id)
       refreshed_user.favorites.first.title.should == "Some FCC Data"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datacatalog
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Luigi Montanez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -05:00
+date: 2009-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency