secretary-rails 1.0.0.beta1 → 1.0.0.beta2

data/spec/lib/secretary/dirty/collection_association_spec.rb

@@ -0,0 +1,186 @@
+require 'spec_helper'
+
+describe Secretary::Dirty::CollectionAssociation do
+  let(:person) { create :person }
+  let(:animal) { create :animal, name: "Bob", color: "dog" }
+
+  it 'sets associations_were' do
+    person.animals << animal
+    person.animals_were.should eq []
+  end
+
+  it 'marks the association as changed when the association is changed' do
+    person.animals << animal
+    person.animals_changed?.should eq true
+  end
+
+  it 'clears out the dirty association after commit' do
+    person.animals << animal
+    person.animals_changed?.should eq true
+    person.save!
+    person.animals_changed?.should eq false
+  end
+
+  it "creates a new version when adding" do
+    person.animals = [animal]
+    person.save!
+
+    person.versions.count.should eq 2
+    version = person.versions.last
+    version.object_changes["animals"][0].should eq []
+
+    version.object_changes["animals"][1].should eq [
+      {"name" => "Bob", "color" => "dog"}
+    ]
+  end
+
+  it 'makes a version when adding' do
+    person  = create :person
+    animal  = build :animal, name: "Bryan", color: 'lame'
+
+    person.animals << animal
+    person.save!
+    person.versions.count.should eq 2
+
+    versions = person.versions.order('version_number').to_a
+    versions.last.object_changes["animals"][0].should eq []
+    versions.last.object_changes["animals"][1].should eq [{
+      "name" => "Bryan",
+      "color" => "lame"
+    }]
+  end
+
+  it 'makes a version when removing' do
+    person  = build :person
+    animal  = build :animal, name: "Bryan", color: 'lame'
+    person.animals = [animal]
+    person.save!
+    person.versions.count.should eq 1
+
+    person.animals = []
+    person.save!
+    person.versions.count.should eq 2
+
+    versions = person.versions.order('version_number').to_a
+    versions.last.object_changes["animals"][0].should eq [{
+      "name" => "Bryan",
+      "color" => "lame"
+    }]
+    versions.last.object_changes["animals"][1].should eq []
+  end
+
+
+  context 'with accepts_nested_attributes_for' do
+    it 'adds a new version when adding to collection' do
+      animals_attributes = [
+        {
+          "name" => "George",
+          "color" => "yes"
+        }
+      ]
+
+      person.animals_attributes = animals_attributes
+      person.animals_were.should eq []
+      person.save!
+      person.versions.count.should eq 2
+
+      version = person.versions.order('version_number').last
+      version.object_changes["animals"][0].should eq []
+      version.object_changes["animals"][1].should eq [{
+        "name" => "George",
+        "color" => "yes"
+      }]
+    end
+
+    it 'adds a new version when changing something in collection' do
+      animals_attributes = [
+        {
+          "id" => animal.id,
+          "name" => "Lemon"
+        }
+      ]
+
+      person.animals << animal
+      person.save!
+      person.versions.count.should eq 2
+      person.animals_attributes = animals_attributes
+      person.save!
+      person.versions.count.should eq 3
+
+      version = person.versions.order('version_number').last
+      version.object_changes["animals"][0].should eq [{
+        "name" => "Bob",
+        "color" => "dog"
+      }]
+      version.object_changes["animals"][1].should eq [{
+        "name" => "Lemon",
+        "color" => "dog"
+      }]
+    end
+
+    it 'adds a new version when removing something from collection' do
+      animals_attributes = [
+        {
+          "id" => animal.id,
+          "_destroy" => "1"
+        }
+      ]
+
+      person.animals << animal
+      person.save!
+      person.versions.count.should eq 2
+      person.animals_attributes = animals_attributes
+      person.save!
+      person.versions.count.should eq 3
+
+      version = person.versions.order('version_number').last
+      version.object_changes["animals"][0].should eq [{
+        "name" => "Bob",
+        "color" => "dog"
+      }]
+      version.object_changes["animals"][1].should eq []
+    end
+
+    it 'does not add a new version if nothing has changed' do
+      animals_attributes = [
+        {
+          "id" => animal.id,
+          "name" => "Bob"
+        }
+      ]
+
+      person.animals << animal
+      person.save!
+      person.versions.count.should eq 2
+       # this doesn't call before_add/remove callbacks
+      person.animals_attributes = animals_attributes
+      person.save!
+      person.versions.count.should eq 2
+    end
+  end
+
+  describe '#association_changed?' do
+    it 'is true if the association has changed' do
+      person.animals_changed?.should eq false
+      person.animals << animal
+      person.animals_changed?.should eq true
+    end
+
+    it 'is false after the parent object has been saved' do
+      person.animals << animal
+      person.animals_changed?.should eq true
+      person.save!
+      person.animals_changed?.should eq false
+    end
+
+    it 'is false if the association has not changed' do
+      person.animals << animal
+      person.animals_changed?.should eq true
+      person.save!
+      person.animals_changed?.should eq false
+
+      person.animals = [animal]
+      person.animals_changed?.should eq false
+    end
+  end
+end

data/spec/lib/secretary/dirty/singular_association_spec.rb

@@ -0,0 +1,248 @@
+require 'spec_helper'
+
+describe Secretary::Dirty::SingularAssociation do
+  describe 'has_one' do
+    let(:story) { create :story }
+    let(:image) { create :image, title: "Superman", url: "superman.jpg" }
+
+    it 'sets association_was' do
+      story.image = image
+      story.image_was.should eq nil
+      story.save!
+      story.image_was.should eq image
+    end
+
+    it 'marks the association as changed when the association is changed' do
+      story.image = image
+      story.image_changed?.should eq true
+    end
+
+    it 'clears out the dirty association after commit' do
+      story.image = image
+      story.image_changed?.should eq true
+      story.save!
+      story.image_changed?.should eq false
+    end
+
+    it "creates a new version when setting the association" do
+      story.image = image
+      story.save!
+
+      story.versions.count.should eq 2
+      version = story.versions.last
+      version.object_changes["image"][0].should eq Hash[]
+
+      version.object_changes["image"][1].should eq Hash[{
+        "title" => "Superman",
+        "url" => "superman.jpg"
+      }]
+    end
+
+    it 'makes a version when removing' do
+      story.image = image
+      story.save!
+      story.versions.count.should eq 2
+
+      story.image = nil
+      story.save!
+      story.versions.count.should eq 3
+
+      versions = story.versions.order('version_number').to_a
+      versions.last.object_changes["image"][0].should eq Hash[{
+        "title" => "Superman",
+        "url" => "superman.jpg"
+      }]
+      versions.last.object_changes["image"][1].should eq Hash[]
+    end
+
+
+    context 'with accepts_nested_attributes_for' do
+      it 'adds a new version when adding association' do
+        image_attributes = {
+          "title" => "Superman",
+          "url" => "super.jpg"
+        }
+
+        story.image_attributes = image_attributes
+        story.save!
+        story.versions.count.should eq 2
+
+        version = story.versions.order('version_number').last
+        version.object_changes["image"][0].should eq Hash[]
+        version.object_changes["image"][1].should eq Hash[{
+          "title" => "Superman",
+          "url" => "super.jpg"
+        }]
+      end
+
+      it 'adds a new version when changing the existing associated object' do
+        image_attributes = {
+          "id" => image.id,
+          "title" => "Lemon"
+        }
+
+        story.image = image
+        story.save!
+        story.versions.count.should eq 2
+
+        story.image_attributes = image_attributes
+        story.save!
+        story.versions.count.should eq 3
+
+        version = story.versions.order('version_number').last
+        version.object_changes["image"][0].should eq Hash[{
+          "title" => "Superman",
+          "url" => "superman.jpg"
+        }]
+        version.object_changes["image"][1].should eq Hash[{
+          "title" => "Lemon",
+          "url" => "superman.jpg"
+        }]
+      end
+
+      it 'adds a new version when removing the association' do
+        image_attributes = {
+          "id" => image.id,
+          "_destroy" => "1"
+        }
+
+        story.image = image
+        story.save!
+        story.versions.count.should eq 2
+
+        story.image_attributes = image_attributes
+        story.save!
+        story.versions.count.should eq 3
+
+        version = story.versions.order('version_number').last
+        version.object_changes["image"][0].should eq Hash[{
+          "title" => "Superman",
+          "url" => "superman.jpg"
+        }]
+        version.object_changes["image"][1].should eq Hash[]
+      end
+
+      it 'does not add a new version if nothing has changed' do
+        image_attributes = {
+          "id" => image.id,
+          "title" => "Superman"
+        }
+
+        story.image = image
+        story.save!
+        story.versions.count.should eq 2
+
+        story.image_attributes = image_attributes
+        story.save!
+        story.versions.count.should eq 2
+      end
+    end
+
+    describe '#association_changed?' do
+      it 'is true if the association has changed' do
+        story.image_changed?.should eq false
+        story.image = image
+        story.image_changed?.should eq true
+      end
+
+      it 'is false after the parent object has been saved' do
+        story.image = image
+        story.image_changed?.should eq true
+        story.save!
+        story.image_changed?.should eq false
+      end
+
+      it 'is false if the association has not changed' do
+        story.image = image
+        story.image_changed?.should eq true
+        story.save!
+        story.image_changed?.should eq false
+
+        story.image = image
+        story.image_changed?.should eq false
+      end
+    end
+  end
+
+
+
+  describe 'belongs_to' do
+    let(:story) { create :story, headline: "Headline", body: "Body" }
+    let(:image) { create :image, title: "Superman", url: "superman.jpg" }
+
+    it 'sets association_was' do
+      image.story = story
+      image.story_was.should eq nil
+      image.save!
+      image.story_was.should eq story
+    end
+
+    it 'marks the association as changed when the association is changed' do
+      image.story = story
+      image.story_changed?.should eq true
+    end
+
+    it 'clears out the dirty association after commit' do
+      image.story = story
+      image.story_changed?.should eq true
+      image.save!
+      image.story_changed?.should eq false
+    end
+
+    it "creates a new version when setting the association" do
+      image.story = story
+      image.save!
+
+      image.versions.count.should eq 2
+      version = image.versions.order('version_number').last
+      version.object_changes["story"][0].should eq Hash[]
+
+      version.object_changes["story"][1].should eq Hash[{
+        "headline" => "Headline",
+        "body" => "Body"
+      }]
+    end
+
+    it 'makes a version when removing' do
+      image.story = story
+      image.save!
+      image.versions.count.should eq 2
+
+      image.story = nil
+      image.save!
+      image.versions.count.should eq 3
+
+      versions = image.versions.order('version_number').to_a
+      versions.last.object_changes["story"][0].should eq Hash[{
+        "headline" => "Headline",
+        "body" => "Body"
+      }]
+      versions.last.object_changes["story"][1].should eq Hash[]
+    end
+
+    describe '#association_changed?' do
+      it 'is true if the association has changed' do
+        image.story_changed?.should eq false
+        image.story = story
+        image.story_changed?.should eq true
+      end
+
+      it 'is false after the parent object has been saved' do
+        image.story = story
+        image.story_changed?.should eq true
+        image.save!
+        image.story_changed?.should eq false
+      end
+
+      it 'is false if the association has not changed' do
+        image.story = story
+        image.story_changed?.should eq true
+        image.save!
+        image.story_changed?.should eq false
+
+        image.story = story
+        image.story_changed?.should eq false
+      end
+    end
+  end
+end

data/spec/lib/secretary/has_secretary_spec.rb

@@ -39,6 +39,15 @@ describe Secretary::HasSecretary do
       Secretary.versioned_models.should include "Story"
     end
 
+    it 'sets versioned attributes if option is specified' do
+      Animal.versioned_attributes.should eq ["name", "color"]
+    end
+
+    it 'sets excluded attributes if option is specified' do
+      Person.versioned_attributes.should_not include "name"
+      Person.versioned_attributes.should_not include "ethnicity"
+    end
+
     it "adds the has_many association for versions" do
       new_story.versions.to_a.should eq Array.new
     end

data/spec/lib/secretary/tracks_association_spec.rb

@@ -8,207 +8,15 @@ describe Secretary::TracksAssociation do
       }.should raise_error Secretary::NotVersionedError
     end
 
+    it "raises an error if there is no association with the given name" do
+      -> {
+        Person.tracks_association :giraffes
+      }.should raise_error Secretary::NoAssociationError
+    end
+
     it 'adds the associations to the versioned attributes' do
       Person.versioned_attributes.should include "animals"
       Person.versioned_attributes.should include "hobbies"
     end
   end
-
-
-  describe 'dirty association' do
-    let(:person) { create :person }
-    let(:animal) { create :animal }
-
-    it 'sets associations_were' do
-      person.animals << animal
-      person.animals_were.should eq []
-    end
-
-    it 'marks the association as changed when the association is changed' do
-      person.animals << animal
-      person.animals_changed?.should eq true
-    end
-
-    it 'clears out the dirty association after commit' do
-      person.animals << animal
-      person.animals_changed?.should eq true
-      person.save!
-      person.animals_changed?.should eq false
-    end
-  end
-
-
-  describe "adding to association collections" do
-    let(:person) { create :person }
-    let(:animal) { build :animal, name: "Bob", color: "dog" }
-
-    it "creates a new version when adding" do
-      person.animals = [animal]
-      person.save!
-
-      person.versions.count.should eq 2
-      version = person.versions.last
-      version.object_changes["animals"][0].should eq []
-
-      version.object_changes["animals"][1].should eq [
-        {"name" => "Bob", "color" => "dog"}
-      ]
-    end
-
-    it 'makes a version when adding' do
-      person  = create :person
-      animal  = build :animal, name: "Bryan", color: 'lame'
-
-      person.animals << animal
-      person.save!
-      person.versions.count.should eq 2
-
-      versions = person.versions.order('version_number').to_a
-      versions.last.object_changes["animals"][0].should eq []
-      versions.last.object_changes["animals"][1].should eq [{
-        "name" => "Bryan",
-        "color" => "lame"
-      }]
-    end
-
-    it 'makes a version when removing' do
-      person  = build :person
-      animal  = build :animal, name: "Bryan", color: 'lame'
-      person.animals = [animal]
-      person.save!
-      person.versions.count.should eq 1
-
-      person.animals = []
-      person.save!
-      person.versions.count.should eq 2
-
-      versions = person.versions.order('version_number').to_a
-      versions.last.object_changes["animals"][0].should eq [{
-        "name" => "Bryan",
-        "color" => "lame"
-      }]
-      versions.last.object_changes["animals"][1].should eq []
-    end
-  end
-
-
-  describe 'with accepts_nested_attributes_for' do
-    let(:animal) { create :animal, name: "Henry", color: "blind" }
-    let(:person) { create :person }
-
-    it 'adds a new version when adding to collection' do
-      animals_attributes = [
-        {
-          "name" => "George",
-          "color" => "yes"
-        }
-      ]
-
-      person.animals_attributes = animals_attributes
-      person.save!
-      person.versions.count.should eq 2
-
-      version = person.versions.order('version_number').last
-      version.object_changes["animals"][0].should eq []
-      version.object_changes["animals"][1].should eq [{
-        "name" => "George",
-        "color" => "yes"
-      }]
-    end
-
-    it 'adds a new version when changing something in collection' do
-      animals_attributes = [
-        {
-          "id" => animal.id,
-          "name" => "Lemon"
-        }
-      ]
-
-      person.animals << animal
-      person.save!
-      person.versions.count.should eq 2
-      person.animals_attributes = animals_attributes
-      person.save!
-      person.versions.count.should eq 3
-
-      version = person.versions.order('version_number').last
-      version.object_changes["animals"][0].should eq [{
-        "name" => "Henry",
-        "color" => "blind"
-      }]
-      version.object_changes["animals"][1].should eq [{
-        "name" => "Lemon",
-        "color" => "blind"
-      }]
-    end
-
-    it 'adds a new version when removing something from collection' do
-      animals_attributes = [
-        {
-          "id" => animal.id,
-          "_destroy" => "1"
-        }
-      ]
-
-      person.animals << animal
-      person.save!
-      person.versions.count.should eq 2
-      person.animals_attributes = animals_attributes
-      person.save!
-      person.versions.count.should eq 3
-
-      version = person.versions.order('version_number').last
-      version.object_changes["animals"][0].should eq [{
-        "name" => "Henry",
-        "color" => "blind"
-      }]
-      version.object_changes["animals"][1].should eq []
-    end
-
-    it 'does not add a new version if nothing has changed' do
-      animals_attributes = [
-        {
-          "id" => animal.id,
-          "name" => "Henry"
-        }
-      ]
-
-      person.animals << animal
-      person.save!
-      person.versions.count.should eq 2
-       # this doesn't call before_add/remove callbacks
-      person.animals_attributes = animals_attributes
-      person.save!
-      person.versions.count.should eq 2
-    end
-  end
-
-
-  describe '#association_changed?' do
-    let(:person) { create :person }
-    let(:animal) { create :animal }
-
-    it 'is true if the association has changed' do
-      person.animals_changed?.should eq false
-      person.animals << animal
-      person.animals_changed?.should eq true
-    end
-
-    it 'is false after the parent object has been saved' do
-      person.animals << animal
-      person.animals_changed?.should eq true
-      person.save!
-      person.animals_changed?.should eq false
-    end
-
-    it 'is false if the association has not changed' do
-      person.animals << animal
-      person.animals_changed?.should eq true
-      person.save!
-      person.animals_changed?.should eq false
-
-      person.animals = [animal]
-      person.animals_changed?.should eq false
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'combustion'
-Combustion.initialize! :active_record
+Combustion.initialize! :active_record, :action_view
 
 require 'rspec/rails'
 require 'factory_girl'