collector 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f67cd923c0bfdec2effecea4b750ba9b3f7ba8a
-  data.tar.gz: 94cd9b47c2060bd13ffd3325775324c1d4d461dd
+  metadata.gz: abed7c5e4060dc56b6f1bfd6c1d663ccb99d3266
+  data.tar.gz: c15c846510d601f66b03ca4dee9bd5961cce54f3
 SHA512:
-  metadata.gz: cb4e10a1276cf3e249f253ddbdcd625c83bac8ca57cc5b9d1f8b59d3c9a4fc3645566dd20927ee30dfb6a5519a6314e11f688868b93cd56d166df3d7ee26c945
-  data.tar.gz: ff6096b388a902c66c9475458781678bc3ff457548ec4b6f0ee5e20e3bd56326c6556e1ded1cdb84214e11f5ac34bcaec00748473ca399a2d2a83c5e9b685c2d
+  metadata.gz: b1df54655d7eb6080b59a5c7f8916e31770f46849739097da2f7dae472f8c9d35de2dce56c3eb7fb1fe028edbac5c037e2b41cf125e476af207de92e1944b4d8
+  data.tar.gz: cbbbcc86b3b015f76112a2c2d375e1d97dd16c482196f526e61ac0423489ae40bf0c1dbf22fde3953ac70f6a5801472d6739b179a5cc85e9676124c8e1967bdd

data/Gemfile

@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 group :test do
   gem "rake",     "~> 0.9.2.2"
-  gem "turn",     "~> 0.9.6"
   gem "minitest", "~> 4.1.0"
   gem "mocha",    "~> 0.12.7", require: false
   gem "timecop",  "~> 0.5.3"

data/lib/collector/model.rb

@@ -23,5 +23,10 @@ module Collector
       end
     end
 
+    def ==(other_model)
+      return nil if self.id.nil? || other_model.id.nil?
+      self.id == other_model.id
+    end
+
   end
 end

data/lib/collector/version.rb

@@ -1,3 +1,3 @@
 module Collector
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/collector/model_spec.rb

@@ -68,4 +68,27 @@ describe Collector::Model do
     end
   end
 
+  describe "#==" do
+    it "compares two models with the same id" do
+      model_1 = TestModel.new(id: "foobar")
+      model_2 = TestModel.new(id: "foobar")
+
+      model_1.must_equal model_2
+    end
+
+    it "compares two models with different ids" do
+      model_1 = TestModel.new(id: "foobar")
+      model_2 = TestModel.new(id: "barfoo")
+
+      model_1.wont_equal model_2
+    end
+
+    it "compares two models with no ids" do
+      model_1 = TestModel.new(id: nil)
+      model_2 = TestModel.new(id: nil)
+
+      model_1.wont_equal model_2
+    end
+  end
+
 end

data/test/collector/repository_spec.rb

@@ -9,27 +9,27 @@ describe Collector::Repository do
     end
 
     Object.send(:remove_const, :TestRepository) if Object.const_defined?(:TestRepository)
-    class TestRepository
+    class TestModelRepository
       include Collector::Repository
     end
   end
 
   it "has a model derived from its class name" do
-    TestRepository.model.name.must_equal "Test"
+    TestModelRepository.model.name.must_equal "TestModel"
   end
 
   it "has a collection_name derived from its model" do
-    TestRepository.collection_name.must_equal "tests"
+    TestModelRepository.collection_name.must_equal "test_models"
   end
 
   describe "collection" do
     describe "when a connection is set" do
       it "returns the mongo collection" do
         collection = mock()
-        connection = mock { stubs(:[]).with("tests").returns(collection) }
+        connection = mock { stubs(:[]).with("test_models").returns(collection) }
         Collector.stubs(:connection).returns(connection)
 
-        TestRepository.collection.must_equal collection
+        TestModelRepository.collection.must_equal collection
       end
     end
   end
@@ -37,33 +37,32 @@ describe Collector::Repository do
   describe "save" do
     it "touches the model and then saves it" do
       model = mock(:touch)
-      TestRepository.expects(:save_without_updating_timestamps).with(model)
-      TestRepository.save(model)
+      TestModelRepository.expects(:save_without_updating_timestamps).with(model)
+      TestModelRepository.save(model)
     end
   end
 
   describe "save_without_updating_timestamps" do
     it "serializes the model and then saves it into the collection" do
       model = stub()
-      TestRepository.expects(:serialize!).with(model).returns({ foo: "bar" })
+      TestModelRepository.expects(:serialize!).with(model).returns({ foo: "bar" })
 
       collection = mock(save: { foo: "bar" })
-      TestRepository.stubs(:collection).returns(collection)
+      TestModelRepository.stubs(:collection).returns(collection)
 
-      TestRepository.save_without_updating_timestamps(model)
+      TestModelRepository.save_without_updating_timestamps(model)
     end
 
-    it "returns the model with the its id set" do
-      model = TestModel.new
-      TestRepository.expects(:serialize!).with(model).returns({ foo: "bar" })
+    it "returns the model with its id set" do
+      model = TestModel.new(id: "123abc")
+      TestModelRepository.expects(:serialize!).with(model).returns({ foo: "bar" })
 
       object_id  = stub(to_s: "123abc")
       collection = mock { expects(:save).with({ foo: "bar" }).returns(object_id) }
-      TestRepository.stubs(:collection).returns(collection)
+      TestModelRepository.stubs(:collection).returns(collection)
 
-      updated_model = TestRepository.save_without_updating_timestamps(model)
+      updated_model = TestModelRepository.save_without_updating_timestamps(model)
       updated_model.must_equal model
-      updated_model.id.must_equal "123abc"
     end
   end
 
@@ -72,43 +71,43 @@ describe Collector::Repository do
       model = stub(id: "50c58f4ab392d4381a000001")
 
       collection = mock { expects(:remove).with(_id: BSON::ObjectId("50c58f4ab392d4381a000001")) }
-      TestRepository.stubs(:collection).returns(collection)
+      TestModelRepository.stubs(:collection).returns(collection)
 
-      TestRepository.delete(model)
+      TestModelRepository.delete(model)
     end
   end
 
   describe "serialize!" do
     it "normalize id to _id and converts to a BSON::ObjectId" do
       model = mock(attributes: { id: "50c58f4ab392d4381a000001", foo: "bar" })
-      TestRepository.serialize!(model).must_equal({ "_id" => BSON::ObjectId("50c58f4ab392d4381a000001"), "foo" => "bar" })
+      TestModelRepository.serialize!(model).must_equal({ "_id" => BSON::ObjectId("50c58f4ab392d4381a000001"), "foo" => "bar" })
     end
 
     it "returns a model's attributes without nil values" do
       model = mock(attributes: { foo: "bar", nothing: nil })
-      TestRepository.serialize!(model).must_equal({ "foo" => "bar" })
+      TestModelRepository.serialize!(model).must_equal({ "foo" => "bar" })
     end
   end
 
   describe "serialize" do
     it "returns a model's attributes" do
       model = mock(attributes: { foo: "bar" })
-      TestRepository.serialize(model).must_equal({ "foo" => "bar" })
+      TestModelRepository.serialize(model).must_equal({ "foo" => "bar" })
     end
   end
 
   describe "deserialize!" do
     it "normalizes _id to id and converts to a string id" do
-      TestRepository.expects(:deserialize).with("id" => "50c58f4ab392d4381a000001", "name" => "Brandon")
-      TestRepository.deserialize!(_id: BSON::ObjectId("50c58f4ab392d4381a000001"), name: "Brandon")
+      TestModelRepository.expects(:deserialize).with("id" => "50c58f4ab392d4381a000001", "name" => "Brandon")
+      TestModelRepository.deserialize!(_id: BSON::ObjectId("50c58f4ab392d4381a000001"), name: "Brandon")
     end
   end
 
   describe "deserialize" do
     it "instantiates a new model from a hash of attributes" do
       attributes = { first_name: "Brandon", last_name: "Weiss" }
-      TestRepository.model.expects(:new).with(attributes)
-      TestRepository.deserialize(attributes)
+      TestModelRepository.model.expects(:new).with(attributes)
+      TestModelRepository.deserialize(attributes)
     end
   end
 
@@ -117,82 +116,82 @@ describe Collector::Repository do
       document_1 = stub
       document_2 = stub
       documents  = [document_1, document_2]
-      TestRepository.expects(:deserialize!).with(document_1)
-      TestRepository.expects(:deserialize!).with(document_2)
+      TestModelRepository.expects(:deserialize!).with(document_1)
+      TestModelRepository.expects(:deserialize!).with(document_2)
       collection = mock { expects(:find).with(attribute: "value").returns(documents) }
-      TestRepository.expects(:collection).returns(collection)
-      TestRepository.find_by(attribute: "value")
+      TestModelRepository.expects(:collection).returns(collection)
+      TestModelRepository.find_by(attribute: "value")
     end
 
     it "finds all documents if no attributes are given" do
       document_1 = stub
       document_2 = stub
       documents  = [document_1, document_2]
-      TestRepository.expects(:deserialize!).with(document_1)
-      TestRepository.expects(:deserialize!).with(document_2)
+      TestModelRepository.expects(:deserialize!).with(document_1)
+      TestModelRepository.expects(:deserialize!).with(document_2)
       collection = mock { expects(:find).with({}).returns(documents) }
-      TestRepository.expects(:collection).returns(collection)
-      TestRepository.find_by
+      TestModelRepository.expects(:collection).returns(collection)
+      TestModelRepository.find_by
     end
 
     it "normalizes the id into a BSON::ObjectId if it's valid ObjectId" do
       collection = mock { expects(:find).with(_id: BSON::ObjectId("50c58f4ab392d4381a000001")).returns([]) }
-      TestRepository.expects(:collection).returns(collection)
-      TestRepository.find_by(_id: "50c58f4ab392d4381a000001")
+      TestModelRepository.expects(:collection).returns(collection)
+      TestModelRepository.find_by(_id: "50c58f4ab392d4381a000001")
     end
 
     it "does nothing with the id if it's not a valid BSON::ObjectId" do
       collection = mock { expects(:find).with(_id: "lols").returns([]) }
-      TestRepository.expects(:collection).returns(collection)
-      TestRepository.find_by(_id: "lols")
+      TestModelRepository.expects(:collection).returns(collection)
+      TestModelRepository.find_by(_id: "lols")
     end
   end
 
   describe "find_first_by" do
     it "finds the first document by a hash of attributes" do
-      TestRepository.expects(:find_by).with(attribute: "value").returns(mock(:first))
-      TestRepository.find_first_by(attribute: "value")
+      TestModelRepository.expects(:find_by).with(attribute: "value").returns(mock(:first))
+      TestModelRepository.find_first_by(attribute: "value")
     end
   end
 
   describe "all" do
     it "finds by attributes without any attributes" do
-      TestRepository.expects(:find_by).with()
-      TestRepository.all
+      TestModelRepository.expects(:find_by).with()
+      TestModelRepository.all
     end
   end
 
   describe "find_by_id" do
     it "finds by id" do
-      TestRepository.expects(:find_by).with(_id: "bson-id")
-      TestRepository.find_by_id("bson-id")
+      TestModelRepository.expects(:find_by).with(_id: "bson-id")
+      TestModelRepository.find_by_id("bson-id")
     end
   end
 
   describe "find_first_by_id" do
     it "finds first by id" do
-      TestRepository.expects(:find_first_by).with(_id: "bson-id")
-      TestRepository.find_first_by_id("bson-id")
+      TestModelRepository.expects(:find_first_by).with(_id: "bson-id")
+      TestModelRepository.find_first_by_id("bson-id")
     end
   end
 
   describe "dynamic finders" do
     it "dynamically matches find_by_ finders" do
-      TestRepository.expects(:find_by).with(email: "foobar@fibroblast.com")
-      TestRepository.find_by_email("foobar@fibroblast.com")
+      TestModelRepository.expects(:find_by).with(email: "foobar@fibroblast.com")
+      TestModelRepository.find_by_email("foobar@fibroblast.com")
     end
 
     it "dynamically matches find_first_by_ finders" do
-      TestRepository.expects(:find_first_by).with(email: "foobar@fibroblast.com")
-      TestRepository.find_first_by_email("foobar@fibroblast.com")
+      TestModelRepository.expects(:find_first_by).with(email: "foobar@fibroblast.com")
+      TestModelRepository.find_first_by_email("foobar@fibroblast.com")
     end
 
     it "responds to dynamically matched find_by_ finders" do
-      TestRepository.respond_to?(:find_by_email).must_equal true
+      TestModelRepository.respond_to?(:find_by_email).must_equal true
     end
 
     it "responds to dynamically matched find_first_by_ finders" do
-      TestRepository.respond_to?(:find_first_by_email).must_equal true
+      TestModelRepository.respond_to?(:find_first_by_email).must_equal true
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collector
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brandon Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An implementation of the Repository Pattern for MongoDB