secretary-rails 1.0.0 → 1.1.0

data/spec/lib/generators/secretary/install_generator_spec.rb

@@ -12,6 +12,11 @@ describe Secretary::InstallGenerator do
   end
 
   it 'copies the migration file' do
-    assert_migration "db/migrate/create_versions"
+    assert_migration "db/migrate/secretary_create_versions"
   end
+
+  it 'copies the config' do
+    assert_file "config/initializers/secretary.rb"
+  end
+
 end

data/spec/lib/secretary/dirty_singular_association_spec.rb

@@ -33,8 +33,9 @@ describe "Dirty Singular Association" do
       version.object_changes["image"][0].should eq Hash[]
 
       version.object_changes["image"][1].should eq Hash[{
-        "title" => "Superman",
-        "url" => "superman.jpg"
+        "title"       => "Superman",
+        "url"         => "superman.jpg",
+        "story_id"    => story.id
       }]
     end
 
@@ -49,8 +50,9 @@ describe "Dirty Singular Association" do
 
       versions = story.versions.order('version_number').to_a
       versions.last.object_changes["image"][0].should eq Hash[{
-        "title" => "Superman",
-        "url" => "superman.jpg"
+        "title"       => "Superman",
+        "url"         => "superman.jpg",
+        "story_id"    => story.id
       }]
       versions.last.object_changes["image"][1].should eq Hash[]
     end
@@ -70,8 +72,9 @@ describe "Dirty Singular Association" do
         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"
+          "title"       => "Superman",
+          "url"         => "super.jpg",
+          "story_id"    => story.id
         }]
       end
 
@@ -91,12 +94,14 @@ describe "Dirty Singular Association" do
 
         version = story.versions.order('version_number').last
         version.object_changes["image"][0].should eq Hash[{
-          "title" => "Superman",
-          "url" => "superman.jpg"
+          "title"       => "Superman",
+          "url"         => "superman.jpg",
+          "story_id"    => story.id
         }]
         version.object_changes["image"][1].should eq Hash[{
           "title" => "Lemon",
-          "url" => "superman.jpg"
+          "url" => "superman.jpg",
+          "story_id" => story.id
         }]
       end
 
@@ -116,8 +121,9 @@ describe "Dirty Singular Association" do
 
         version = story.versions.order('version_number').last
         version.object_changes["image"][0].should eq Hash[{
-          "title" => "Superman",
-          "url" => "superman.jpg"
+          "title"       => "Superman",
+          "url"         => "superman.jpg",
+          "story_id"    => story.id
         }]
         version.object_changes["image"][1].should eq Hash[]
       end
@@ -205,6 +211,17 @@ describe "Dirty Singular Association" do
       }]
     end
 
+    it "tracks the foreign key as the normally" do
+      image.story_id = story.id
+      image.save!
+      image.versions.count.should eq 2
+
+      version = image.versions.order('version_number').last
+      version.object_changes["story_id"][0].should eq nil
+      version.object_changes["story_id"][1].should eq story.id
+      version.description.should eq "Changed Story"
+    end
+
     it 'makes a version when removing' do
       image.story = story
       image.save!

data/spec/lib/secretary/user_activity_association.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Secretary::UserActivityAssociation do
+  it "adds an activities association to the user class" do
+    user = build :user
+    user.activities.to_a.should eq []
+  end
+end

data/spec/models/secretary/version_spec.rb

@@ -9,6 +9,14 @@ describe Secretary::Version do
       Secretary::Version.count.should eq 2
       story.versions.last.should eq version
     end
+
+    it "sets the user association" do
+      user = create :user
+      story   = create :story, logged_user_id: user.id
+      version = Secretary::Version.generate(story)
+
+      story.versions.last.user.should eq user
+    end
   end
 
 
@@ -24,8 +32,14 @@ describe Secretary::Version do
 
     it "generates a description with the changed attributes on update" do
       story.save!
-      story.update_attributes(:headline => "Another Headline", :body => "New Body")
-      story.versions.last.description.should eq "Changed headline and body"
+      image = create :image
+
+      image.update_attributes({
+        :story_id   => story.id,
+        :url        => "http://kitty.com/kitty.jpg"
+      })
+
+      image.versions.last.description.should eq("Changed Story and Url")
     end
   end
 

data/spec/tmp/config/initializers/secretary.rb

@@ -0,0 +1,4 @@
+Secretary.configure do |config|
+  # config.user_class = "::User"
+  # config.ignored_attributes = ["id", "created_at", "updated_at"]
+end

data/spec/tmp/db/migrate/{20131119071129_create_versions.rb → 20140320004842_secretary_create_versions.rb}

@@ -4,7 +4,7 @@ class SecretaryCreateVersions < ActiveRecord::Migration
       t.integer  "version_number"
       t.string   "versioned_type"
       t.integer  "versioned_id"
-      t.string   "user_id"
+      t.integer  "user_id"
       t.text     "description"
       t.text     "object_changes"
       t.datetime "created_at"

metadata

@@ -1,155 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: secretary-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Bryan Ricker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179114724880 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+  version_requirements: *70179114724880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179114724380 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+  version_requirements: *70179114724380
 - !ruby/object:Gem::Dependency
   name: diffy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179114723920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+  version_requirements: *70179114723920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179114723300 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70179114723300
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179114722340 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70179114722340
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179114721580 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70179114721580
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179117649920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70179117649920
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179117649500 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70179117649500
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179117649000 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+  version_requirements: *70179117649000
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70179117648500 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+  version_requirements: *70179117648500
 description: A Rails engine that provides simple versioning for your records.
 email:
 - bricker@scpr.org
@@ -157,8 +128,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/models/concerns/secretary/user_activity_association.rb
 - app/models/secretary/version.rb
 - lib/generators/secretary/install_generator.rb
+- lib/generators/secretary/templates/secretary_config.rb
 - lib/generators/secretary/templates/versions_migration.rb
 - lib/secretary/config.rb
 - lib/secretary/dirty_associations/collection.rb
@@ -185,6 +158,7 @@ files:
 - spec/internal/app/models/story.rb
 - spec/internal/app/models/story_user.rb
 - spec/internal/app/models/user.rb
+- spec/internal/config/database.yml
 - spec/internal/config/database_configs/mysql.yml
 - spec/internal/config/database_configs/postgresql.yml
 - spec/internal/config/database_configs/sqlite.yml
@@ -198,35 +172,38 @@ files:
 - spec/lib/secretary/dirty_singular_association_spec.rb
 - spec/lib/secretary/has_secretary_spec.rb
 - spec/lib/secretary/tracks_association_spec.rb
+- spec/lib/secretary/user_activity_association.rb
 - spec/lib/secretary/versioned_attributes_spec.rb
 - spec/lib/secretary_spec.rb
 - spec/models/secretary/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_setup.rb
-- spec/tmp/db/migrate/20131119071129_create_versions.rb
+- spec/tmp/config/initializers/secretary.rb
+- spec/tmp/db/migrate/20140320004842_secretary_create_versions.rb
 homepage: https://github.com/scpr/secretary-rails
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Light-weight model versioning for ActiveRecord.
 test_files:
 - spec/factories.rb
@@ -239,6 +216,7 @@ test_files:
 - spec/internal/app/models/story.rb
 - spec/internal/app/models/story_user.rb
 - spec/internal/app/models/user.rb
+- spec/internal/config/database.yml
 - spec/internal/config/database_configs/mysql.yml
 - spec/internal/config/database_configs/postgresql.yml
 - spec/internal/config/database_configs/sqlite.yml
@@ -252,10 +230,11 @@ test_files:
 - spec/lib/secretary/dirty_singular_association_spec.rb
 - spec/lib/secretary/has_secretary_spec.rb
 - spec/lib/secretary/tracks_association_spec.rb
+- spec/lib/secretary/user_activity_association.rb
 - spec/lib/secretary/versioned_attributes_spec.rb
 - spec/lib/secretary_spec.rb
 - spec/models/secretary/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_setup.rb
-- spec/tmp/db/migrate/20131119071129_create_versions.rb
-has_rdoc: 
+- spec/tmp/config/initializers/secretary.rb
+- spec/tmp/db/migrate/20140320004842_secretary_create_versions.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2d57032707a48935f4cd868ce3230c1e30628931
-  data.tar.gz: b84674f6e9d5ff487974a94657b9765ddfe37650
-SHA512:
-  metadata.gz: 1cf913c07526528e2b4c8f016a8d7f2ad72d1393b471f8590e261dc69338be83df8acb6a1262345f85693904576b0dd9acba6807a3fd9cfd84375224f8ff8e5d
-  data.tar.gz: d385d6f11fcc7db4b81a6f5791158576bd5e341fe233899e6581f25f6f514d9492e6c0f1572016b0753168ac32e19382d697c83a817d96b71179f59f63cebee6