datacatalog 0.4.16 → 0.4.17

data/spec/download_spec.rb

@@ -23,6 +23,15 @@ describe Download do
     )
   end
 
+  describe ".all" do
+    it "should return an enumeration of downloads" do
+      downloads = Download.all(:source_id => @source.id)
+      downloads.each do |o|
+        o.should be_an_instance_of(Download)
+      end
+    end
+  end
+
   describe ".create" do
     it "should create a download when valid params are passed in" do
       refreshed_source = Source.get(@source.id)
@@ -30,6 +39,18 @@ describe Download do
     end
   end
 
+  describe ".destroy" do
+    it "should destroy an existing download as an admin" do
+      Download.destroy(@download.id).should be_true
+    end
+
+    it "should raise NotFound when attempting to destroy non-existing download" do
+      executing do
+        Download.destroy(mangle(@download.id))
+      end.should raise_error(NotFound)
+    end
+  end
+
   describe ".get" do
     it "should return a download" do
       download = Download.get(@download.id)
@@ -44,15 +65,6 @@ describe Download do
     end
   end
 
-  describe ".all" do
-    it "should return an enumeration of downloads" do
-      downloads = Download.all(:source_id => @source.id)
-      downloads.each do |o|
-        o.should be_an_instance_of(Download)
-      end
-    end
-  end
-
   describe ".update" do
     it "should update an existing download with valid params" do
       Download.update(@download.id, :preview => "10,11,12,13")
@@ -61,16 +73,4 @@ describe Download do
     end
   end
 
-  describe ".destroy" do
-    it "should destroy an existing download as an admin" do
-      Download.destroy(@download.id).should be_true
-    end
-
-    it "should raise NotFound when attempting to destroy non-existing download" do
-      executing do
-        Download.destroy(mangle(@download.id))
-      end.should raise_error(NotFound)
-    end
-  end
-
 end

data/spec/favorite_spec.rb

@@ -20,45 +20,23 @@ describe Favorite do
     end
   end
 
-  describe ".create" 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
-
-  end # describe ".create"
-
-  describe ".get" do
-
-    it "should return a favorite" do
-      favorite = Favorite.get(@favorite.id)
-      favorite.should be_an_instance_of(Favorite)
-      favorite.user_id.should == @user.id
-    end
-
-    it "should raise NotFound if no favorite exists" do
-      executing do
-        Favorite.get(mangle(@favorite.id))
-      end.should raise_error(NotFound)
-    end
-
-  end # describe ".get"
-
   describe ".all" do
-
     it "should return an enumeration of favorites" do
       favorites = Favorite.all(:user_id => @user.id)
       favorites.each do |o|
         o.should be_an_instance_of(Favorite)
       end
     end
+  end
 
-  end # describe ".all"
-
+  describe ".create" 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
+  end
 
   describe ".destroy" do
-
     it "should destroy an existing favorite as an admin" do
       Favorite.destroy(@favorite.id).should be_true
     end
@@ -74,7 +52,26 @@ describe Favorite do
         Favorite.destroy(mangle(@favorite.id))
       end.should raise_error(NotFound)
     end
+  end
+
+  describe ".first" do
+    it "should return the first Favorite" do
+      Favorite.first.id.should == @favorite.id
+    end
+  end
 
-  end # describe ".destroy"
+  describe ".get" do
+    it "should return a favorite" do
+      favorite = Favorite.get(@favorite.id)
+      favorite.should be_an_instance_of(Favorite)
+      favorite.user_id.should == @user.id
+    end
+
+    it "should raise NotFound if no favorite exists" do
+      executing do
+        Favorite.get(mangle(@favorite.id))
+      end.should raise_error(NotFound)
+    end
+  end
 
-end
+end

data/spec/import_spec.rb

@@ -16,32 +16,26 @@ describe Import do
     @imports = [
       Import.create({
         :importer_id => @importer.id,
-        :status      => 'success',
+        :status      => 'succeeded',
         :started_at  => timestamp - 3645,
         :finished_at => timestamp - 3600,
       }),
       Import.create({
         :importer_id => @importer.id,
-        :status      => 'success',
+        :status      => 'succeeded',
         :started_at  => timestamp - 45,
         :finished_at => timestamp,
       }),
     ]
   end
 
-  describe ".get" do
-    it "should return an import as a basic user" do
-      import = DataCatalog.with_key(@user.primary_api_key) do
-        Import.get(@imports[0].id)
+  describe ".all" do
+    it "should return an enumeration of 2 imports" do
+      imports = Import.all
+      imports.length.should == 2
+      imports.each do |o|
+        o.should be_an_instance_of(Import)
       end
-      import.should be_an_instance_of(Import)
-      import.id.should == @imports[0].id
-    end
-
-    it "should raise NotFound if no import exists" do
-      executing do
-        Import.get(mangle(@imports[0].id))
-      end.should raise_error(NotFound)
     end
   end
 
@@ -69,33 +63,6 @@ describe Import do
     end
   end
 
-  describe ".all" do
-    it "should return an enumeration of 2 imports" do
-      imports = Import.all
-      imports.length.should == 2
-      imports.each do |o|
-        o.should be_an_instance_of(Import)
-      end
-    end
-  end
-
-  describe ".update" do
-    it "a basic user should be unauthorized" do
-      executing do
-        DataCatalog.with_key(@user.primary_api_key) do
-          Import.update(@imports[0].id, :status => 'failure')
-        end
-      end.should raise_error(Unauthorized)
-    end
-
-    it "should update an existing import with valid params" do
-      @imports[0].status.should == 'success'
-      Import.update(@imports[0].id, :status => 'failure')
-      import = Import.get(@imports[0].id)
-      import.status.should == 'failure'
-    end
-  end
-
   describe ".destroy" do
     it "should destroy an existing import as an admin" do
       Import.destroy(@imports[0].id).should be_true
@@ -116,4 +83,37 @@ describe Import do
     end
   end
 
+  describe ".get" do
+    it "should return an import as a basic user" do
+      import = DataCatalog.with_key(@user.primary_api_key) do
+        Import.get(@imports[0].id)
+      end
+      import.should be_an_instance_of(Import)
+      import.id.should == @imports[0].id
+    end
+
+    it "should raise NotFound if no import exists" do
+      executing do
+        Import.get(mangle(@imports[0].id))
+      end.should raise_error(NotFound)
+    end
+  end
+
+  describe ".update" do
+    it "a basic user should be unauthorized" do
+      executing do
+        DataCatalog.with_key(@user.primary_api_key) do
+          Import.update(@imports[0].id, :status => 'failure')
+        end
+      end.should raise_error(Unauthorized)
+    end
+
+    it "should update an existing import with valid params" do
+      @imports[0].status.should == 'succeeded'
+      Import.update(@imports[0].id, :status => 'failed')
+      import = Import.get(@imports[0].id)
+      import.status.should == 'failed'
+    end
+  end
+
 end

data/spec/importer_spec.rb

@@ -16,19 +16,13 @@ describe Importer do
     ]
   end
 
-  describe ".get" do
-    it "should return an importer as a basic user" do
-      importer = DataCatalog.with_key(@user.primary_api_key) do
-        Importer.get(@importers[0].id)
+  describe ".all" do
+    it "should return an enumeration of 2 importers" do
+      importers = Importer.all
+      importers.length.should == 2
+      importers.each do |o|
+        o.should be_an_instance_of(Importer)
       end
-      importer.should be_an_instance_of(Importer)
-      importer.id.should == @importers[0].id
-    end
-
-    it "should raise NotFound if no importer exists" do
-      executing do
-        Importer.get(mangle(@importers[0].id))
-      end.should raise_error(NotFound)
     end
   end
 
@@ -56,13 +50,39 @@ describe Importer do
     end
   end
 
-  describe ".all" do
-    it "should return an enumeration of 2 importers" do
-      importers = Importer.all
-      importers.length.should == 2
-      importers.each do |o|
-        o.should be_an_instance_of(Importer)
+  describe ".destroy" do
+    it "should destroy an existing importer as an admin" do
+      Importer.destroy(@importers[0].id).should be_true
+    end
+
+    it "should not destroy an existing importer as a basic user" do
+      DataCatalog.with_key(@user.primary_api_key) do
+        executing do
+          Importer.destroy(@importers[0].id)
+        end.should raise_error(Unauthorized)
+      end
+    end
+
+    it "should raise NotFound when attempting to destroy non-existing importer" do
+      executing do
+        Importer.destroy(mangle(@importers[0].id))
+      end.should raise_error(NotFound)
+    end
+  end
+
+  describe ".get" do
+    it "should return an importer as a basic user" do
+      importer = DataCatalog.with_key(@user.primary_api_key) do
+        Importer.get(@importers[0].id)
       end
+      importer.should be_an_instance_of(Importer)
+      importer.id.should == @importers[0].id
+    end
+
+    it "should raise NotFound if no importer exists" do
+      executing do
+        Importer.get(mangle(@importers[0].id))
+      end.should raise_error(NotFound)
     end
   end
 
@@ -83,24 +103,4 @@ describe Importer do
     end
   end
 
-  describe ".destroy" do
-    it "should destroy an existing importer as an admin" do
-      Importer.destroy(@importers[0].id).should be_true
-    end
-
-    it "should not destroy an existing importer as a basic user" do
-      DataCatalog.with_key(@user.primary_api_key) do
-        executing do
-          Importer.destroy(@importers[0].id)
-        end.should raise_error(Unauthorized)
-      end
-    end
-
-    it "should raise NotFound when attempting to destroy non-existing importer" do
-      executing do
-        Importer.destroy(mangle(@importers[0].id))
-      end.should raise_error(NotFound)
-    end
-  end
-
 end

data/spec/note_spec.rb

@@ -23,19 +23,43 @@ describe Note do
     end
   end
 
-  describe ".create" do
+  describe ".all" do
+    it "should return an enumeration of notes" do
+      notes = Note.all(:user_id => @user.id)
+      notes.each do |o|
+        o.should be_an_instance_of(Note)
+      end
+    end
+  end
 
+  describe ".create" do
     it "should create a note when valid params are passed in" do
       DataCatalog.with_key(@user.primary_api_key) do
         refreshed_source = Source.get(@source.id)
         refreshed_source.notes.first.text.should == "This is my note."
       end
     end
+  end
 
-  end # describe ".create"
+  describe ".destroy" do
+    it "should destroy an existing note as an admin" do
+      Note.destroy(@note.id).should be_true
+    end
 
-  describe ".get" do
+    it "should destroy an existing note as the user" do
+      DataCatalog.with_key(@user.primary_api_key) do
+        Note.destroy(@note.id).should be_true
+      end
+    end
+
+    it "should raise NotFound when attempting to destroy non-existing note" do
+      executing do
+        Note.destroy(mangle(@note.id))
+      end.should raise_error(NotFound)
+    end
+  end
 
+  describe ".get" do
     it "should return a note" do
       note = Note.get(@note.id)
       note.should be_an_instance_of(Note)
@@ -47,22 +71,9 @@ describe Note do
         Note.get(mangle(@note.id))
       end.should raise_error(NotFound)
     end
-
-  end # describe ".get"
-
-  describe ".all" do
-
-    it "should return an enumeration of notes" do
-      notes = Note.all(:user_id => @user.id)
-      notes.each do |o|
-        o.should be_an_instance_of(Note)
-      end
-    end
-
-  end # describe ".all"
+  end
 
   describe ".update" do
-
     it "should update an existing note with valid params" do
       DataCatalog.with_key(@user.primary_api_key) do
         Note.update(@note.id, :text => "This is my updated note.")
@@ -71,27 +82,6 @@ describe Note do
       refreshed_note = Note.get(@note.id)
       refreshed_note.text.should == "This is my updated note."
     end
+  end
 
-  end # describe ".update"
-
-  describe ".destroy" do
-
-    it "should destroy an existing note as an admin" do
-      Note.destroy(@note.id).should be_true
-    end
-
-    it "should destroy an existing note as the user" do
-      DataCatalog.with_key(@user.primary_api_key) do
-        Note.destroy(@note.id).should be_true
-      end
-    end
-
-    it "should raise NotFound when attempting to destroy non-existing note" do
-      executing do
-        Note.destroy(mangle(@note.id))
-      end.should raise_error(NotFound)
-    end
-
-  end # describe ".destroy"
-
-end
+end