controlled_versioning 0.7.2 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDg0NzM1MTM3ZWQxODQ0NWE0OWFlYTlmZDYzOThjYThkOGUxYmY4ZA==
+    Mjk3OGY1NzhhMTZjMzU0NzBkYjE1MjhhZWRiYTdlNmZhZTNiMzFiYg==
   data.tar.gz: !binary |-
-    NzVkOTAwNTMxZWNkMDU0YzNmNzE5NmZhNTc1ZDk4ZGI4MmRhM2E1Mw==
+    MTg1MzA2ZDA3MzIzOGNkMGY0NDc3ZmM1MmEwYjljOGVjOGIzZjU2Nw==
 SHA512:
   metadata.gz: !binary |-
-    ODY3N2JiYzZkMTI4NWQ1YWViODA0NjAzMmM4NjExM2QyYTdiNDc5ZDIxZjUz
-    NTliZmVmNTFlYWI4NzFhY2M3YTk0MWJjZGRlNDUzYTM3YzQ2MTRmMTQ0NmE0
-    MTk4MWVmYmE3NDQzMzYxN2RiYjFjOTU2OWZiMDdiOTZlOTgyYjU=
+    MmUzOTBhMmI3NThmOWM3NGFiYWNkMzUwNjJiYjMzN2E1OTJlZmI1ODIyYjRk
+    NTVkMmQzMWNiMzA5MmVhOTZlZDA1Yjg0NjU4M2U5YmNjNDQ5ZDIxOTc1Zjcy
+    NDJhMDBhMTgwZTg2OTRhMWIyODJjMzQxZmVkMzAyMzYzODYyYzM=
   data.tar.gz: !binary |-
-    OWJhOTE5MTNjNDkwM2JlZjNiYjM3ZTQxZTljZjYzNjRkZjlhYjY0OWUzMDc5
-    NmJmY2FiN2E0Zjk4NTU5MGI5NmE1Y2U1ODY1YzlkY2VmMmEwMjFjODU4MGEy
-    NmI0ZDc5MTQxNzhiYWVkMTJiOTE4NDdjY2YxODIxNjY5M2MyMjE=
+    OWVkYTdhMGU5MGI0YzRjN2JmZDRjM2NmMWRhMzU1MjJmNzVjNGQ1OTM1Yzk4
+    OWNlYzFhYjIwODE0NWUyZjgyYTM0YTkxZWU2ZDcxNmQ3NDZlYjJjMGY5ZWFj
+    OGRhMWIzM2UxYzVkNjc0NTY3MzlkMGVjZTljY2Y2NDUyOGQzMzQ=

data/app/models/controlled_versioning/version.rb

@@ -5,19 +5,23 @@ module ControlledVersioning
     has_many :version_attributes, as: :version
     has_many :version_children, as: :version
 
-    validates :versionable, presence: true
-
     scope :pending, -> { where(pending: true) }
     scope :accepted, -> { where(accepted: true) }
     scope :declined, -> { where(declined: true) }
 
     def accept
-      Revision::Publisher.new(self).accept_revision unless initial?
-      update_attributes(pending: false, accepted: true)
+      if pending?
+        Revision::Publisher.new(self).accept_revision unless initial?
+        update_attributes(pending: false, accepted: true)
+      end
     end
 
     def decline
-      update_attributes(pending: false, declined: true)
+      update_attributes(pending: false, declined: true) if pending?
+    end
+
+    def changes
+      ChangeTracker.new(self).get_changes
     end
   end
 end

data/app/models/controlled_versioning/version_child.rb

@@ -5,5 +5,9 @@ module ControlledVersioning
     belongs_to :version, polymorphic: true
     has_many :version_attributes, as: :version
     has_many :version_children, as: :version
+
+    def changes
+      ChangeTracker.new(self).get_changes
+    end
   end
 end

data/{spec/dummy/db/migrate/20140206173609_create_controlled_versioning_version_children.controlled_versioning.rb → db/migrate/20140206204920_create_controlled_versioning_version_children.rb}

@@ -6,9 +6,13 @@ class CreateControlledVersioningVersionChildren < ActiveRecord::Migration
       t.integer  :version_id, null: false
       t.string   :versionable_type
       t.integer  :versionable_id
+      t.string   :association_name, null: false
 
       t.boolean  :marked_for_removal, null: false, default: false
     end
+    add_index :controlled_versioning_version_children,
+      :association_name,
+      name: "controlled_versioning_version_children_on_association"
     add_index :controlled_versioning_version_children,
       [:version_type, :version_id],
       name: "controlled_versioning_version_children_on_version"

data/lib/controlled_versioning/change_tracker.rb

@@ -0,0 +1,32 @@
+class ChangeTracker < Version
+
+  attr_reader :version
+  def initialize(version)
+    @version = version
+  end
+
+  def get_changes
+    changed_attributes.merge(marked_for_removal).merge(changed_children)
+  end
+
+  private
+  def changed_attributes
+    version_attributes.each_with_object({}) do |v, h|
+      h[v.name] = { new_value: v.new_value, old_value: v.old_value }
+    end
+  end
+
+  def marked_for_removal
+    version.marked_for_removal? ? { marked_for_removal: true } : {}
+  end
+
+  def changed_children
+    version_children.each_with_object({}) do |v, h|
+      if h[v.association_name].present?
+        h[v.association_name] += [{ id: v.versionable_id}.merge(v.changes)]
+      else
+        h[v.association_name] = [{ id: v.versionable_id}.merge(v.changes)]
+      end
+    end
+  end
+end

data/lib/controlled_versioning/initial_version/factory.rb

@@ -1,27 +1,18 @@
 class InitialVersion::Factory < InitialVersion
 
   attr_reader :versionable, :version
-  def initialize(versionable)
-    @versionable = versionable
-    @version = build_version_type
+  def initialize(args)
+    @versionable = args[:versionable]
+    @version = args[:version]
   end
 
   def build
     build_version_attributes
-    version.save
+    build_children
+    version
   end
 
   private
-  def build_version_type
-    if versionable_is_a_nested_association?
-      versionable_parent.initial_version.version_children.
-        build(versionable: versionable)
-    else
-      versionable.versions.build(initial: true, notes: versionable_notes, user:
-        versionable_user)
-    end
-  end
-
   def build_version_attributes
     versionable_attributes.each do |attr|
       attr = AttributeEncapsulator.new(attr)
@@ -35,4 +26,22 @@ class InitialVersion::Factory < InitialVersion
       new_value: attr.value)
   end
 
+  def build_children
+    versionable_nested_associations.each do |association|
+      versionable.public_send(association).each do |child|
+        build_child(child, association)
+      end
+    end
+  end
+
+  def build_child(child, association)
+    version_child = build_version_child(child, association)
+    InitialVersion::Factory.new(versionable: child,
+      version: version_child).build
+  end
+
+  def build_version_child(child, association)
+    version_children.build(association_name: association, versionable: child)
+  end
+
 end

data/lib/controlled_versioning/revision/factory.rb

@@ -44,24 +44,26 @@ class Revision::Factory < Revision
   def build_children
     versionable_nested_associations.each do |association|
       versionable.public_send(association).each do |child|
-        build_child(child)
+        build_child(child, association)
       end
     end
   end
 
-  def build_child(child)
+  def build_child(child, association)
     if Revision::Auditor.new(child).changes_original?
-      version_child = build_version_child(child)
+      version_child = build_version_child(child, association)
       Revision::Factory.new(versionable: child, version: version_child).build
     end
   end
 
-  def build_version_child(child)
+  def build_version_child(child, association)
+    version_child = version_children.build(association_name: association)
     if child.new_record?
-      version_children.build(versionable_type: child.class.name)
+      version_child.versionable_type = child.class.name
     else
-      version_children.build(versionable: child)
+      version_child.versionable = child
     end
+    version_child
   end
 
 end

data/lib/controlled_versioning/revision.rb

@@ -5,10 +5,6 @@ class Revision < Version
     versionable.changed_attributes
   end
 
-  def version_children
-    version.version_children
-  end
-
   def versionable_changes(key)
     values = versionable.changes[key]
     ValueChange.new(values[0], values[1])

data/lib/controlled_versioning/version.rb

@@ -17,6 +17,10 @@ class Version
     versionable.class.nested_associations
   end
 
+  def version_children
+    version.version_children
+  end
+
   def versionable_notes
     versionable.notes
   end

data/lib/controlled_versioning/version_number.rb

@@ -1,3 +1,3 @@
 module ControlledVersioning
-  VERSION_NUMBER = "0.7.2"
+  VERSION_NUMBER = "0.8.0"
 end

data/lib/controlled_versioning.rb

@@ -3,6 +3,8 @@ require "controlled_versioning/engine"
 # Core
 require "controlled_versioning/version"
 
+require "controlled_versioning/change_tracker"
+
 require "controlled_versioning/initial_version"
 require "controlled_versioning/initial_version/factory"
 
@@ -44,8 +46,6 @@ module ControlledVersioning
 
         attr_accessor :user, :notes
 
-        after_create :create_initial_version
-
         cattr_accessor :nested_within
         self.nested_within = options[:nested_within]
 
@@ -68,6 +68,19 @@ module ControlledVersioning
         self.versionable_attribute_names = options[:versionable_attributes] ||
                                            set_versionable_attribute_names(
                                            options[:nonversionable_attributes])
+        
+        def new_with_version(attributes)
+          resource = self.new(attributes)
+          return resource.errors if resource.invalid?
+          resource.build_initial_version
+          resource
+        end
+
+        def create_with_version(attributes)
+          resource = new_with_version(attributes)
+          resource.save
+          resource
+        end
       end
     end
 
@@ -82,6 +95,11 @@ module ControlledVersioning
         self.attributes.slice(*versionable_attributes)
       end
 
+      def build_initial_version
+        version = versions.build(initial: true, notes: notes, user: user)
+        InitialVersion::Factory.new(versionable: self, version: version).build
+      end
+
       def initial_version
         if is_a_nested_association?
           version_children.first
@@ -105,10 +123,6 @@ module ControlledVersioning
         end
       end
 
-      private
-      def create_initial_version
-        InitialVersion::Factory.new(self).build
-      end
     end
   end
 end

data/spec/controlled_versioning_spec.rb

@@ -53,38 +53,7 @@ describe "ControlledVersioning" do
           r_float: 90.1)
     expect(revision.notes).to be_nil
   end
-
-  context 'has a scope that' do
-    before :each do
-      @resource = create(:versionable_resource)
-      @accepted_1 = @resource.submit_revision(r_string: "accepted 1")
-      @accepted_2 = @resource.submit_revision(r_string: "accepted 2")
-      @declined_1 = @resource.submit_revision(r_string: "declined 1")
-      @declined_2 = @resource.submit_revision(r_string: "declined 2")
-      @pending_1 = @resource.initial_version
-      @pending_2 = @resource.submit_revision(r_string: "pending 2")
-      @accepted_1.accept
-      @accepted_2.accept
-      @declined_1.decline
-      @declined_2.decline
-    end
-
-    it 'returns an array of pending versions' do
-      expect(@resource.versions.pending).to match_array(
-        [@pending_1, @pending_2])
-    end
-
-    it 'returns an array of accepted versions' do
-      expect(@resource.versions.accepted).to match_array(
-        [@accepted_1, @accepted_2])
-    end
-
-    it 'returns an array of declined versions' do
-      expect(@resource.versions.declined).to match_array(
-        [@declined_1, @declined_2])
-    end
-  end
-
+  
   context 'by default' do
     before :each do
       @resource = create(:versionable_resource)
@@ -169,7 +138,27 @@ describe "ControlledVersioning" do
 
   context 'with nested attributes' do
     before :each do
-      @resource = create(:parent_with_grand_children)
+      @resource = ParentResource.create_with_version({ r_string: "my string",
+        r_float: 3.14, child_resources_attributes: [
+          { r_string: "my string", r_float: 3.14,
+            grand_child_resources_attributes: [
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 }
+            ] },
+          { r_string: "my string", r_float: 3.14,
+            grand_child_resources_attributes: [
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 }
+            ] },
+          { r_string: "my string", r_float: 3.14,
+            grand_child_resources_attributes: [
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 }
+            ] }
+        ] })
     end
 
     it 'creates version children' do
@@ -210,6 +199,56 @@ describe "ControlledVersioning" do
       end
     end
 
+    context 'handles revision for multiple children' do
+      before :each do
+        @first_child_resource = @resource.child_resources[0]
+        @second_child_resource = @resource.child_resources[1]
+        @version = @resource.submit_revision(child_resources_attributes: [
+          {id: @first_child_resource.id, r_string: "new string"},
+          {id: @second_child_resource.id, r_string: "second new string"}
+        ])
+      end
+
+      it 'by creating versions for the full family' do
+        expect(@version.version_children.length).to eq 2
+        first_changed_attribute = @version.version_children.
+                            find_by(versionable: @first_child_resource).
+                            version_attributes.find_by(name: "r_string")
+        second_changed_attribute = @version.version_children.
+                            find_by(versionable: @second_child_resource).
+                            version_attributes.find_by(name: "r_string")
+        expect(first_changed_attribute.new_value).to eq "new string"
+        expect(first_changed_attribute.old_value).to eq "my string"
+        expect(second_changed_attribute.new_value).to eq "second new string"
+        expect(second_changed_attribute.old_value).to eq "my string"
+      end
+
+      it 'by updating all children if its revisions are approved' do
+        @version.accept
+        @first_child_resource.reload
+        @second_child_resource.reload
+        expect(@first_child_resource.r_string).to eq "new string"
+        expect(@second_child_resource.r_string).to eq "second new string"
+      end
+
+      it 'returns a hash of changed attributes for the full family' do
+        expect(@version.changes).to eq "child_resources" => [
+          { id: @second_child_resource.id,
+            "r_string" => {
+              new_value: "second new string",
+              old_value: "my string"
+            }
+          },
+          { id: @first_child_resource.id,
+            "r_string" => {
+              new_value: "new string",
+              old_value: "my string"
+            }
+          }
+        ]
+      end
+    end
+
     context 'handles revision for deeply nested children' do
       before :each do
         @first_child_resource = @resource.child_resources[0]
@@ -238,6 +277,15 @@ describe "ControlledVersioning" do
         @first_grand_child_resource.reload
         expect(@first_grand_child_resource.r_string).to eq "new string"
       end
+
+      it 'returns a hash of changed attributes for the full family' do
+        expect(@version.changes).to eq "child_resources" => [{ id:
+          @first_child_resource.id, "grand_child_resources" => [{ id:
+            @first_grand_child_resource.id, "r_string" => { new_value:
+              "new string", old_value: "my string" }
+            }]
+          }]
+      end
     end
 
     context 'handles new children' do
@@ -264,6 +312,14 @@ describe "ControlledVersioning" do
         @resource.reload
         expect(@resource.child_resources.find_by(r_float: 14.0)).to_not be_nil
       end
+
+      it 'returns a hash of attributes for new children' do
+        expect(@version.changes).to eq "child_resources" => [{ id:
+          nil, "r_float" => { new_value: "14.0", old_value: nil },
+          "parent_resource_id" => { new_value: @resource.id.to_s,
+            old_value: nil}
+        }]
+      end
     end
 
     context 'handles child destruction' do
@@ -294,6 +350,12 @@ describe "ControlledVersioning" do
         @resource.reload
         expect(@resource.child_resources.length).to eq 2
       end
+
+      it 'returns a hash noting marked children' do
+        expect(@version.changes).to eq "child_resources" => [{ id:
+          @first_child_resource.id, marked_for_removal: true
+        }]
+      end
     end
   end
 

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140206173609) do
+ActiveRecord::Schema.define(version: 20140206204920) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -46,9 +46,11 @@ ActiveRecord::Schema.define(version: 20140206173609) do
     t.integer "version_id",                         null: false
     t.string  "versionable_type"
     t.integer "versionable_id"
+    t.string  "association_name",                   null: false
     t.boolean "marked_for_removal", default: false, null: false
   end
 
+  add_index "controlled_versioning_version_children", ["association_name"], name: "controlled_versioning_version_children_on_association", using: :btree
   add_index "controlled_versioning_version_children", ["version_type", "version_id"], name: "controlled_versioning_version_children_on_version", using: :btree
   add_index "controlled_versioning_version_children", ["versionable_type", "versionable_id"], name: "controlled_versioning_version_children_on_versionable", using: :btree
 

data/spec/factories/child_resources.rb

@@ -18,7 +18,7 @@ FactoryGirl.define do
             grand_children_count 3
         end
 
-        after(:create) do |child, evaluator|
+        before(:create) do |child, evaluator|
             create_list(:grand_child_resource, evaluator.grand_children_count,
                 child_resource: child)
         end

data/spec/factories/parent_resources.rb

@@ -15,7 +15,7 @@ FactoryGirl.define do
             children_count 3
         end
 
-        after(:create) do |parent, evaluator|
+        before(:create) do |parent, evaluator|
             create_list(:child_resource, evaluator.children_count, parent_resource: parent)
         end
     end
@@ -25,11 +25,13 @@ FactoryGirl.define do
             children_count 3
         end
 
-        after(:create) do |parent, evaluator|
+        before(:create) do |parent, evaluator|
             create_list(:child_with_grand_children, evaluator.children_count,
                 parent_resource: parent)
         end
     end
 
+    initialize_with { ParentResource.create_with_version(attribute_lists) }
+
   end
 end

data/spec/factories/partially_exclusive_versionable_resources.rb

@@ -10,5 +10,7 @@ FactoryGirl.define do
     r_text "my text"
     r_time Time.now
 
+    initialize_with { PartiallyExclusiveVersionableResource.create_with_version(attributes) }
+
   end
 end

data/spec/factories/partially_inclusive_versionable_resources.rb

@@ -10,5 +10,7 @@ FactoryGirl.define do
     r_text "my text"
     r_time Time.now
 
+    initialize_with { PartiallyInclusiveVersionableResource.create_with_version(attributes) }
+
   end
 end

data/spec/factories/unversionable_resources.rb

@@ -10,5 +10,7 @@ FactoryGirl.define do
     r_text "my text"
     r_time Time.now
 
+    initialize_with { NonVersionableResource.create_with_version(attributes) }
+
   end
 end

data/spec/factories/versionable_resources.rb

@@ -10,5 +10,7 @@ FactoryGirl.define do
     r_text "my text"
     r_time Time.now
 
+    initialize_with { VersionableResource.create_with_version(attributes) }
+
   end
 end

data/spec/models/controlled_versioning/version_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe ControlledVersioning::Version do
+
+  it 'returns a hash of changed attributes' do
+    resource = create(:versionable_resource)
+    version = resource.submit_revision(r_string: "new string", r_float: 90.1)
+    expect(version.changes).to eq "r_string" => { new_value: "new string",
+      old_value: "my string" }, "r_float" => { new_value: "90.1",
+      old_value: "3.14" }
+  end
+
+  context 'has a scope that' do
+    before :each do
+      @resource = create(:versionable_resource)
+      @accepted_1 = @resource.submit_revision(r_string: "accepted 1")
+      @accepted_2 = @resource.submit_revision(r_string: "accepted 2")
+      @declined_1 = @resource.submit_revision(r_string: "declined 1")
+      @declined_2 = @resource.submit_revision(r_string: "declined 2")
+      @pending_1 = @resource.initial_version
+      @pending_2 = @resource.submit_revision(r_string: "pending 2")
+      @accepted_1.accept
+      @accepted_2.accept
+      @declined_1.decline
+      @declined_2.decline
+    end
+
+    it 'returns an array of pending versions' do
+      expect(@resource.versions.pending).to match_array(
+        [@pending_1, @pending_2])
+    end
+
+    it 'returns an array of accepted versions' do
+      expect(@resource.versions.accepted).to match_array(
+        [@accepted_1, @accepted_2])
+    end
+
+    it 'returns an array of declined versions' do
+      expect(@resource.versions.declined).to match_array(
+        [@declined_1, @declined_2])
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controlled_versioning
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - timothythehuman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,7 +128,11 @@ files:
 - app/models/controlled_versioning/version_attribute.rb
 - app/models/controlled_versioning/version_child.rb
 - app/views/layouts/controlled_versioning/application.html.erb
+- db/migrate/20140206204853_create_controlled_versioning_versions.rb
+- db/migrate/20140206204910_create_controlled_versioning_version_attributes.rb
+- db/migrate/20140206204920_create_controlled_versioning_version_children.rb
 - lib/controlled_versioning.rb
+- lib/controlled_versioning/change_tracker.rb
 - lib/controlled_versioning/engine.rb
 - lib/controlled_versioning/initial_version.rb
 - lib/controlled_versioning/initial_version/factory.rb
@@ -185,16 +189,12 @@ files:
 - spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
 - spec/dummy/db/migrate/20140117222841_create_child_resources.rb
 - spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
-- spec/dummy/db/migrate/20140206173607_create_controlled_versioning_versions.controlled_versioning.rb
-- spec/dummy/db/migrate/20140206173608_create_controlled_versioning_version_attributes.controlled_versioning.rb
-- spec/dummy/db/migrate/20140206173609_create_controlled_versioning_version_children.controlled_versioning.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/factories/child_resources.rb
-- spec/factories/controlled_versioning_versions.rb
 - spec/factories/grand_child_resources.rb
 - spec/factories/parent_resources.rb
 - spec/factories/partially_exclusive_versionable_resources.rb
@@ -202,6 +202,7 @@ files:
 - spec/factories/unversionable_resources.rb
 - spec/factories/users.rb
 - spec/factories/versionable_resources.rb
+- spec/models/controlled_versioning/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/timothythehuman/controlled_versioning
 licenses: []
@@ -228,65 +229,62 @@ specification_version: 4
 summary: Adds model versioning to a Rails app, with the ability to approve and declined
   revisions.
 test_files:
-- spec/dummy/README.rdoc
+- spec/spec_helper.rb
+- spec/factories/parent_resources.rb
+- spec/factories/partially_inclusive_versionable_resources.rb
+- spec/factories/unversionable_resources.rb
+- spec/factories/grand_child_resources.rb
+- spec/factories/users.rb
+- spec/factories/versionable_resources.rb
+- spec/factories/child_resources.rb
+- spec/factories/partially_exclusive_versionable_resources.rb
+- spec/models/controlled_versioning/version_spec.rb
+- spec/controlled_versioning_spec.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/Rakefile
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/public/422.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/models/child_resource.rb
-- spec/dummy/app/models/parent_resource.rb
 - spec/dummy/app/models/nonversionable_resource.rb
-- spec/dummy/app/models/partially_inclusive_versionable_resource.rb
-- spec/dummy/app/models/partially_exclusive_versionable_resource.rb
-- spec/dummy/app/models/grand_child_resource.rb
 - spec/dummy/app/models/versionable_resource.rb
+- spec/dummy/app/models/grand_child_resource.rb
+- spec/dummy/app/models/partially_exclusive_versionable_resource.rb
+- spec/dummy/app/models/parent_resource.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/db/migrate/20140206173608_create_controlled_versioning_version_attributes.controlled_versioning.rb
+- spec/dummy/app/models/partially_inclusive_versionable_resource.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/config.ru
+- spec/dummy/README.rdoc
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20140117222815_create_partially_exclusive_versionable_resources.rb
+- spec/dummy/db/migrate/20140117222808_create_versionable_resources.rb
 - spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
-- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
-- spec/dummy/db/migrate/20140206173609_create_controlled_versioning_version_children.controlled_versioning.rb
-- spec/dummy/db/migrate/20140206173607_create_controlled_versioning_versions.controlled_versioning.rb
 - spec/dummy/db/migrate/20140117222800_create_users.rb
 - spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
-- spec/dummy/db/migrate/20140117222815_create_partially_exclusive_versionable_resources.rb
-- spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb
-- spec/dummy/db/migrate/20140117222808_create_versionable_resources.rb
 - spec/dummy/db/migrate/20140117222841_create_child_resources.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/500.html
-- spec/dummy/Rakefile
-- spec/dummy/bin/rails
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rake
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config.ru
-- spec/spec_helper.rb
-- spec/controlled_versioning_spec.rb
-- spec/factories/unversionable_resources.rb
-- spec/factories/child_resources.rb
-- spec/factories/users.rb
-- spec/factories/parent_resources.rb
-- spec/factories/partially_exclusive_versionable_resources.rb
-- spec/factories/grand_child_resources.rb
-- spec/factories/versionable_resources.rb
-- spec/factories/partially_inclusive_versionable_resources.rb
-- spec/factories/controlled_versioning_versions.rb
+- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
+- spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb

data/spec/factories/controlled_versioning_versions.rb

@@ -1,7 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :controlled_versioning_version, :class => 'Version' do
-    pending false
-  end
-end