drafter 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/drafter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "drafter"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["futurechimp"]

data/lib/drafter/draft.rb

@@ -72,10 +72,53 @@ class Draft < ActiveRecord::Base
     draftabl
 	end
 
-  def approve_subdrafts
-    subdrafts.each do |subdraft|
-      subdraft.approve!
+  # It's possible to use the :delegate_approval_to => :foo option in the
+  # draftable class method, so that this model can be approved as part of its
+  # parent model. This method finds the 'approver', i.e. the Draft object which
+  # is the parent object of this one and for which calling the 'approve' method
+  # will approve this subdraft too.
+  #
+  # This is currently quite weak, in the sense that it'll screw up as soon
+  # as you depart from standard AR class naming conventions. It's a good
+  # target for future development, but I think at the moment, IAGNI.
+  #
+  # At the moment, we just return the parent if a delegate exists. This should
+  # do the trick for us right now, as we're not using deeply nested object
+  # graphs that need approvals. I've got the start of an alternate, somewhat
+  # stronger implementation, underneath that, but we don't have time to do up
+  # the general case right now.
+  #
+  # @return [Draft] approver the draft object which serves as the approval
+  #   context for this one. Returns self or a delegated draft object.
+  def approver
+    delegate = self.inflate.class.delegate_approval_to
+    if delegate
+      parent
+    else
+      self
     end
   end
+  #
+  # Alternate implementation:
+  # def approver
+  #   if delegate.nil?
+  #     self
+  #   elsif delegate == self.parent.draftable_type.underscore.to_sym
+  #     self.parent
+  #   else
+  #     For polymorphs, if we wanted to be really tight about things, we'd
+  #     check here to see whether the inflated parent object has a has_many
+  #     which matches this draft's parent_association_name, and if it does,
+  #     and that association name matches up with the draftable's class name
+  #     (or a :class_name specified in the relation), then we can conclude
+  #     that the parent delegation is correct. It might look like:
+      # if everything_matches_up <<<< do the code to match the previous paragraph
+      #   parent
+      # else
+      #   raise "It is unclear what Draft object you're looking for. Please ensure
+      #   that :delegate_approval_to => :foo points at a valid parent :foo"
+      # end
+    # end
+  # end
 
 end

data/lib/drafter/draftable.rb

@@ -11,6 +11,9 @@ module Drafter
         cattr_accessor :polymorphic_as
         self.polymorphic_as = options[:polymorphic_as]
 
+        cattr_accessor :delegate_approval_to
+        self.delegate_approval_to = options[:delegate_approval_to]
+
         class << self
           def draftable?
             true

data/test/drafter/test_creation.rb

@@ -166,7 +166,7 @@ class TestCreation < Minitest::Unit::TestCase
 		# down the chain.
 		#
 		# For the moment, it should work if you save from the top of the chain.
-		# Given the time constraints right now, let's use that for the moment.
+		# Given the time constraints right now, let's use that.
 		#
 		# describe "a class which may belongs_to something else, e.g. a Comment" do
 			# describe "when no associated class is set, e.g. there's no Article" do

data/test/drafter/test_draft.rb

@@ -323,4 +323,64 @@ class TestDraft < Minitest::Unit::TestCase
 		end
 	end
 
+	describe "delegating approval" do
+	  before do
+	    @article = Article.new(:text => "I'm an article.")
+	  end
+
+	  describe "a non-delegated model" do
+	  	before do
+	  	  @draft = @article.save_draft
+	  	end
+
+	    it "should return its own draft" do
+	    	assert_equal(@draft, @draft.approver)
+	    end
+	  end
+
+	  describe "to a parent model, when the sub-draft is a draft for" do
+	    describe "just a regular model" do
+	      before do
+	        @comment = Comment.new
+	        @article.comments << @comment
+	        @article.save_draft
+	        @article_draft = Draft.first
+	        @comment_draft = Draft.last
+	      end
+
+	      it "should return the parent" do
+	        assert_equal(@article_draft, @comment_draft.approver)
+	      end
+	    end
+
+	    describe "a polymorphic model" do
+	    	before do
+					@article.save_draft
+	        @like = Like.new(:likeable => @article) # hack for polymorph
+	        @draft = @like.save_draft(@article.draft, :likes)
+	        @article_draft = Draft.first
+	        @like_draft = Draft.last
+	    	end
+
+	      it "should return the parent" do
+	      	assert_equal(@article_draft, @like_draft.approver)
+	      end
+	    end
+
+    	before do
+				@article.save_draft
+        @like = ReallyLike.new(:likeable => @article) # hack for polymorph
+        @draft = @like.save_draft(@article.draft, :likes)
+        @article_draft = Draft.first
+        @like_draft = Draft.last
+    	end
+
+      it "should return the parent" do
+      	assert_equal(@article_draft, @like_draft.approver)
+      end
+	  end
+
+
+	end
+
 end

data/test/drafter/test_subdrafts.rb

@@ -81,7 +81,7 @@ class TestSubdrafts < Minitest::Unit::TestCase
       before do
         @like_count = Like.count
         @article.save_draft
-        @like = Like.new(:likeable => @article)
+        @like = Like.new(:likeable => @article) # hack for polymorph
         @draft = @like.save_draft(@article.draft, :likes)
         @article_draft = Draft.first
         @like_draft = Draft.last
@@ -128,7 +128,7 @@ class TestSubdrafts < Minitest::Unit::TestCase
       before do
         @really_like_count = ReallyLike.count
         @article.save_draft
-        @really_like = ReallyLike.new(:likeable => @article)
+        @really_like = ReallyLike.new(:likeable => @article) # hack for polymorph
         @draft = @really_like.save_draft(@article.draft, :likes)
         @article_draft = Draft.first
         @really_like_draft = Draft.last

data/test/support/models.rb

@@ -17,7 +17,7 @@ end
 #
 # We can use this to test out has_many associations.
 class Comment < ActiveRecord::Base
-  draftable
+  draftable :delegate_approval_to => :article
 
   belongs_to :article
   has_many :likes, :as => :likeable
@@ -30,7 +30,7 @@ end
 # has_many relationship.
 class Like < ActiveRecord::Base
 
-  draftable(:polymorphic_as => :likeable)
+  draftable(:polymorphic_as => :likeable, :delegate_approval_to => :likeable)
 
   belongs_to :likeable, :polymorphic => true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drafter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2168697080 !ruby/object:Gem::Requirement
+  requirement: &2155591120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168697080
+  version_requirements: *2155591120
 - !ruby/object:Gem::Dependency
   name: diffy
-  requirement: &2168689840 !ruby/object:Gem::Requirement
+  requirement: &2155587140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168689840
+  version_requirements: *2155587140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168688720 !ruby/object:Gem::Requirement
+  requirement: &2155586280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168688720
+  version_requirements: *2155586280
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2168687540 !ruby/object:Gem::Requirement
+  requirement: &2155585300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168687540
+  version_requirements: *2155585300
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2168686500 !ruby/object:Gem::Requirement
+  requirement: &2155583900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168686500
+  version_requirements: *2155583900
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2168685820 !ruby/object:Gem::Requirement
+  requirement: &2155583160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168685820
+  version_requirements: *2155583160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168684900 !ruby/object:Gem::Requirement
+  requirement: &2155582360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2168684900
+  version_requirements: *2155582360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2168684240 !ruby/object:Gem::Requirement
+  requirement: &2155581640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2168684240
+  version_requirements: *2155581640
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2168683540 !ruby/object:Gem::Requirement
+  requirement: &2155580740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168683540
+  version_requirements: *2155580740
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2168682640 !ruby/object:Gem::Requirement
+  requirement: &2155579900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168682640
+  version_requirements: *2155579900
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2168676860 !ruby/object:Gem::Requirement
+  requirement: &2155572600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168676860
+  version_requirements: *2155572600
 - !ruby/object:Gem::Dependency
   name: minitest-rails-shoulda
-  requirement: &2168676200 !ruby/object:Gem::Requirement
+  requirement: &2155571900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168676200
+  version_requirements: *2155571900
 description: A
 email: dave.hrycyszyn@headlondon.com
 executables: []
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1334542519238778841
+      hash: 1555687896561378054
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: