datacatalog 0.4.16 → 0.4.17

data/spec/organization_spec.rb

@@ -20,7 +20,6 @@ describe Organization do
   end
 
   describe ".all" do
-
     before do
       create_3_organizations
     end
@@ -39,23 +38,39 @@ describe Organization do
       orgs = Organization.all(:name => "Federal Communications Commission")
       orgs.map(&:name).should == ["Federal Communications Commission"]
     end
+  end
 
-  end # describe ".all"
+  describe ".create" do
+    it "should create a new organization when valid params are passed in" do
+      org = Organization.create(:name => "Federal Communications Commission", :org_type => "governmental")
+      org.should be_an_instance_of(Organization)
+      org.name.should == "Federal Communications Commission"
+    end
 
-  describe ".search" do
+    it "should raise BadRequest when a bad URL is passed in" do
+      executing do 
+        Organization.create(:name => "Bad Org", :url => "htt:p//jlkj!3", :org_type => "governmental")
+      end.should raise_error(BadRequest)
+    end
+  end
+
+  describe ".destroy" do
     before do
-      create_3_organizations
+      @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
     end
 
-    it "should return correct search result" do
-      @organizations = Organization.search("Federal")
-      @organizations.size.should == 2
-      @organizations.first.name.should == "Federal Communications Commission"
+    it "should destroy an existing organization" do
+      Organization.destroy(@organization.id).should be_true
     end
-  end # describe organizations
 
-  describe ".first" do
+    it "should raise NotFound when attempting to destroy non-existing organization" do
+      executing do
+        Organization.destroy(mangle(@organization.id))
+      end.should raise_error(NotFound)
+    end
+  end
 
+  describe ".first" do
     before do
       create_3_organizations
     end
@@ -64,11 +79,9 @@ describe Organization do
       org = Organization.first(:name => "Federal Communications Commission")
       org.name.should == "Federal Communications Commission"
     end
-
-  end # describe ".first"
+  end
 
   describe ".get" do
-
     before do
       @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
     end
@@ -84,27 +97,21 @@ describe Organization do
         Organization.get(mangle(@organization.id))
       end.should raise_error(NotFound)
     end
+  end
 
-  end # describe ".get"
-
-  describe ".create" do
-
-    it "should create a new organization when valid params are passed in" do
-      org = Organization.create(:name => "Federal Communications Commission", :org_type => "governmental")
-      org.should be_an_instance_of(Organization)
-      org.name.should == "Federal Communications Commission"
+  describe ".search" do
+    before do
+      create_3_organizations
     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", :org_type => "governmental")
-      end.should raise_error(BadRequest)
+    it "should return correct search result" do
+      @organizations = Organization.search("Federal")
+      @organizations.size.should == 2
+      @organizations.first.name.should == "Federal Communications Commission"
     end
-
-  end # describe ".create"
+  end
 
   describe ".update" do
-
     before do
       @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
     end
@@ -114,25 +121,6 @@ describe Organization do
       organization.should be_an_instance_of(Organization)
       organization.url.should == "http://fec.gov/"
     end
+  end
 
-  end # describe ".update" 
-
-  describe ".destroy" do
-
-    before do
-      @organization = Organization.create(:name => "Federal Election Commission", :org_type => "governmental")
-    end
-
-    it "should destroy an existing organization" do
-      Organization.destroy(@organization.id).should be_true
-    end
-
-    it "should raise NotFound when attempting to destroy non-existing organization" do
-      executing do
-        Organization.destroy(mangle(@organization.id))
-      end.should raise_error(NotFound)
-    end
-
-  end # describe ".destroy"
-
-end
+end

data/spec/rating_spec.rb

@@ -27,8 +27,27 @@ describe Rating do
     end
   end
 
-  describe ".create" do
+  describe ".all" do
+    before do
+      DataCatalog.with_key(@user.primary_api_key) do
+        @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 5)
+      end
 
+      DataCatalog.with_key(@user2.primary_api_key) do
+        @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 3)
+      end
+    end
+
+    it "should return a collection of all the source's ratings" do
+      ratings = Rating.all(:source_id => @source.id)
+
+      ratings[0].should be_an_instance_of(Rating)
+      ratings[0].value.should == 5
+      ratings[1].value.should == 3
+    end
+  end
+
+  describe ".create" do
     it "should create a source rating when valid params are passed in" do
       DataCatalog.with_key(@user.primary_api_key) do
         @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 5)
@@ -48,56 +67,53 @@ describe Rating do
       refreshed_comment.rating_stats.average.should == 1
       refreshed_comment.rating_stats.total.should == 1
     end
+  end
 
-  end # describe ".create"
-
-  describe ".get" do
-
+  describe ".destroy" do
     before do
       DataCatalog.with_key(@user.primary_api_key) do
         @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 5)
       end
     end
 
-    it "should return a rating" do
-      rating = Rating.get(@rating.id)
-      rating.should be_an_instance_of(Rating)
-      rating.value.should == 5
+    it "should destroy an existing rating as an admin" do
+      Rating.destroy(@rating.id).should be_true
     end
 
-    it "should raise NotFound if no rating exists" do
+    it "should destroy an existing rating as the user" do
+      DataCatalog.with_key(@user.primary_api_key) do
+        Rating.destroy(@rating.id).should be_true
+      end
+    end
+
+    it "should raise NotFound when attempting to destroy non-existing rating" do
       executing do
-        Rating.get(mangle(@rating.id))
+        Rating.destroy(mangle(@rating.id))
       end.should raise_error(NotFound)
     end
+  end
 
-  end # describe ".get"
-
-  describe ".all" do
-
+  describe ".get" do
     before do
       DataCatalog.with_key(@user.primary_api_key) do
         @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 5)
       end
-
-      DataCatalog.with_key(@user2.primary_api_key) do
-        @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 3)
-      end
-
     end
 
-    it "should return a collection of all the source's ratings" do
-      ratings = Rating.all(:source_id => @source.id)
-
-      ratings[0].should be_an_instance_of(Rating)
-      ratings[0].value.should == 5
-      ratings[1].value.should == 3
+    it "should return a rating" do
+      rating = Rating.get(@rating.id)
+      rating.should be_an_instance_of(Rating)
+      rating.value.should == 5
     end
 
-  end # describe ".all"
+    it "should raise NotFound if no rating exists" do
+      executing do
+        Rating.get(mangle(@rating.id))
+      end.should raise_error(NotFound)
+    end
+  end
 
   describe ".update" do
-
     before do
       DataCatalog.with_key(@user.primary_api_key) do
         @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 5)
@@ -113,33 +129,5 @@ describe Rating do
       refreshed_rating.value.should == 3
       refreshed_rating.previous_value.should == 5
     end
-
-  end # describe ".update"
-
-  describe ".destroy" do
-
-    before do
-      DataCatalog.with_key(@user.primary_api_key) do
-        @rating = Rating.create(:kind => "source", :source_id => @source.id, :value => 5)
-      end
-    end
-
-    it "should destroy an existing rating as an admin" do
-      Rating.destroy(@rating.id).should be_true
-    end
-
-    it "should destroy an existing rating as the user" do
-      DataCatalog.with_key(@user.primary_api_key) do
-        Rating.destroy(@rating.id).should be_true
-      end
-    end
-
-    it "should raise NotFound when attempting to destroy non-existing rating" do
-      executing do
-        Rating.destroy(mangle(@rating.id))
-      end.should raise_error(NotFound)
-    end
-
-  end # describe ".destroy"
-
-end
+  end
+end

data/spec/report_spec.rb

@@ -13,45 +13,6 @@ describe Report do
     )
   end
 
-  describe ".create" do
-    it "should create a new report when valid params are passed in" do
-      DataCatalog.with_key(@john.primary_api_key) do
-        @report = Report.create(
-          :text   => "Report 1 by John",
-          :status => "new"
-        )
-      end
-      @report.should be_an_instance_of(Report)
-      refreshed_report = Report.get(@report.id)
-      refreshed_report.text.should == "Report 1 by John"
-      refreshed_report.status.should == "new"
-      refreshed_report.user_id.should == @john.id
-    end
-  end
-
-  describe ".get" do
-    before do
-      DataCatalog.with_key(@john.primary_api_key) do
-        @report = Report.create(
-          :text   => "Report 1 by John",
-          :status => "new"
-        )
-      end
-    end
-
-    it "should return a report" do
-      report = Report.get(@report.id)
-      report.should be_an_instance_of(Report)
-      report.text.should == "Report 1 by John"
-    end
-
-    it "should raise NotFound if no report exists" do
-      executing do
-        Report.get(mangle(@report.id))
-      end.should raise_error(NotFound)
-    end
-  end
-
   describe ".all" do
     before do
       @jane = User.create(
@@ -74,23 +35,19 @@ describe Report do
     end
   end
 
-  describe ".update" do
-    before do
+  describe ".create" do
+    it "should create a new report when valid params are passed in" do
       DataCatalog.with_key(@john.primary_api_key) do
         @report = Report.create(
           :text   => "Report 1 by John",
           :status => "new"
         )
       end
-    end
-
-    it "should update an existing report with valid params" do
-      DataCatalog.with_key(@john.primary_api_key) do
-        Report.update(@report.id, :status => "open")
-      end
+      @report.should be_an_instance_of(Report)
       refreshed_report = Report.get(@report.id)
       refreshed_report.text.should == "Report 1 by John"
-      refreshed_report.status.should == "open"
+      refreshed_report.status.should == "new"
+      refreshed_report.user_id.should == @john.id
     end
   end
 
@@ -121,4 +78,47 @@ describe Report do
     end
   end
 
+  describe ".get" do
+    before do
+      DataCatalog.with_key(@john.primary_api_key) do
+        @report = Report.create(
+          :text   => "Report 1 by John",
+          :status => "new"
+        )
+      end
+    end
+
+    it "should return a report" do
+      report = Report.get(@report.id)
+      report.should be_an_instance_of(Report)
+      report.text.should == "Report 1 by John"
+    end
+
+    it "should raise NotFound if no report exists" do
+      executing do
+        Report.get(mangle(@report.id))
+      end.should raise_error(NotFound)
+    end
+  end
+
+  describe ".update" do
+    before do
+      DataCatalog.with_key(@john.primary_api_key) do
+        @report = Report.create(
+          :text   => "Report 1 by John",
+          :status => "new"
+        )
+      end
+    end
+
+    it "should update an existing report with valid params" do
+      DataCatalog.with_key(@john.primary_api_key) do
+        Report.update(@report.id, :status => "open")
+      end
+      refreshed_report = Report.get(@report.id)
+      refreshed_report.text.should == "Report 1 by John"
+      refreshed_report.status.should == "open"
+    end
+  end
+
 end

data/spec/source_spec.rb

@@ -61,9 +61,7 @@ describe Source do
       @sources.map(&:title).sort.should == expected.sort
     end
 
-
     describe "with cursor" do
-
       it "should raise an error on bad index" do
         executing do
           @sources.page(0)
@@ -77,7 +75,6 @@ describe Source do
         sources.page(1).size.should == 20
         sources.page(2).size.should == 13
       end
-
     end
   end
 
@@ -99,18 +96,6 @@ describe Source do
     end
   end
 
-  describe ".search" do
-    before do
-      create_3_sources
-    end
-
-    it "should return correct search result" do
-      @sources = Source.search("FCC")
-      @sources.size.should == 1
-      @sources.first.title.should == "FCC Data"
-    end
-  end
-
   describe ".create" do
     it "should create a new source from basic params" do
       source = create_source
@@ -140,6 +125,23 @@ describe Source do
     end
   end
 
+  describe ".destroy" do
+    before do
+      @source = create_source
+    end
+
+    it "should destroy an existing source" do
+      result = Source.destroy(@source.id)
+      result.should be_true
+    end
+
+    it "should raise NotFound when attempting to destroy non-existing source" do
+      executing do
+        Source.destroy(mangle(@source.id))
+      end.should raise_error(NotFound)
+    end
+  end
+
   describe ".first" do
     before do
       create_3_sources
@@ -175,6 +177,18 @@ describe Source do
     end
   end
 
+  describe ".search" do
+    before do
+      create_3_sources
+    end
+
+    it "should return correct search result" do
+      @sources = Source.search("FCC")
+      @sources.size.should == 1
+      @sources.first.title.should == "FCC Data"
+    end
+  end
+
   describe ".update" do
     before do
       @source = create_source
@@ -189,21 +203,4 @@ describe Source do
     end
   end
 
-  describe ".destroy" do
-    before do
-      @source = create_source
-    end
-
-    it "should destroy an existing source" do
-      result = Source.destroy(@source.id)
-      result.should be_true
-    end
-
-    it "should raise NotFound when attempting to destroy non-existing source" do
-      executing do
-        Source.destroy(mangle(@source.id))
-      end.should raise_error(NotFound)
-    end
-  end
-
 end