drafter 0.2.7 → 0.2.8

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "activerecord"
+gem "diffy"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -42,6 +42,7 @@ GEM
     debugger-linecache (1.1.1)
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.1.2)
+    diffy (2.0.8)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.1)
@@ -119,6 +120,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   carrierwave
   debugger
+  diffy
   jeweler (~> 1.6.4)
   minitest
   minitest-rails-shoulda

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/drafter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "drafter"
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["futurechimp"]
@@ -28,12 +28,14 @@ Gem::Specification.new do |s|
     "lib/drafter.rb",
     "lib/drafter/apply.rb",
     "lib/drafter/creation.rb",
+    "lib/drafter/diffing.rb",
     "lib/drafter/draft.rb",
     "lib/drafter/draft_upload.rb",
     "lib/drafter/draft_uploader.rb",
     "lib/drafter/draftable.rb",
     "test/drafter/test_apply.rb",
     "test/drafter/test_creation.rb",
+    "test/drafter/test_diffing.rb",
     "test/drafter/test_draft.rb",
     "test/drafter/test_draft_upload.rb",
     "test/drafter/test_draftable.rb",
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<diffy>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
@@ -69,6 +72,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<minitest-rails-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<diffy>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
@@ -81,6 +85,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<diffy>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])

data/lib/drafter/diffing.rb

@@ -0,0 +1,16 @@
+module Diffing
+
+  # Get a diff between the current and draft status of an ActiveRecord
+  # object field.
+  #
+  # @param [Symbol] attr the attribute you want to diff.
+  # @param [Hash] options an options hash allowing you to pass a :format.
+  # @return [String] a diff string. If :format was nil, this could be a
+  #   [Diffy::Diff].
+  def differences(attr, options={:format => :html})
+    if self.draft
+      Diffy::Diff.new(self.send(attr), self.draft(attr)).to_s(options[:format])
+    end
+  end
+
+end

data/lib/drafter.rb

@@ -2,6 +2,7 @@ require 'active_support/concern'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/module/delegation'
 require 'active_record'
+require 'diffy'
 
 require File.dirname(__FILE__) + '/drafter/draft_uploader'
 
@@ -11,6 +12,7 @@ module Drafter
 
   autoload :Apply
   autoload :Creation
+  autoload :Diffing
   autoload :Draft
   autoload :Draftable
   autoload :DraftUpload
@@ -23,6 +25,7 @@ module Drafter
   included do
     include Apply
   	include Creation
+    include Diffing
     include Draftable
   end
 

data/test/drafter/test_diffing.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+class TestDrafter < MiniTest::Unit::TestCase
+
+  describe "Diffing draft and live versions" do
+    describe "a draftable object" do
+      before do
+        @article = Article.new(:text => "foo")
+      end
+
+      it "should respond_to? :differences" do
+        assert @article.respond_to?(:differences)
+      end
+
+      describe "when there is no draft version" do
+        it "should return nil" do
+          assert_equal(nil, @article.differences(:text))
+        end
+      end
+
+      describe "when there is both a draft and a persisted version" do
+        before do
+          @article.save!
+          @article.text = "superfoo"
+          @article.save_draft
+        end
+
+        describe "for a string attribute" do
+          # return an html diff string for "foo" and "superfoo"
+          it "should return an HTML diff between the draft and live object" do
+            assert (@article.reload.differences(:text)).include?(%Q(<li class=\"del\"><del>f<strong>oo</strong></del></li>))
+          end
+        end
+      end
+
+    end
+  end
+end

data/test/helper.rb

@@ -51,8 +51,8 @@ end
 
 MiniTest::Unit.autorun
 
-Turn.config do |c|
- c.format  = :outline
- c.trace   = false
- c.natural = true
-end
+# Turn.config do |c|
+#  c.format  = :outline
+#  c.trace   = false
+#  c.natural = true
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drafter
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164678200 !ruby/object:Gem::Requirement
+  requirement: &2164564480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164678200
+  version_requirements: *2164564480
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: &2164563780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2164563780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164677140 !ruby/object:Gem::Requirement
+  requirement: &2164562600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164677140
+  version_requirements: *2164562600
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2164675820 !ruby/object:Gem::Requirement
+  requirement: &2164562060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164675820
+  version_requirements: *2164562060
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2164674820 !ruby/object:Gem::Requirement
+  requirement: &2164561420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164674820
+  version_requirements: *2164561420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164673680 !ruby/object:Gem::Requirement
+  requirement: &2164560500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164673680
+  version_requirements: *2164560500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164666060 !ruby/object:Gem::Requirement
+  requirement: &2164554580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2164666060
+  version_requirements: *2164554580
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164664820 !ruby/object:Gem::Requirement
+  requirement: &2164553700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164664820
+  version_requirements: *2164553700
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2164664120 !ruby/object:Gem::Requirement
+  requirement: &2164552780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164664120
+  version_requirements: *2164552780
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2164663480 !ruby/object:Gem::Requirement
+  requirement: &2164551960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164663480
+  version_requirements: *2164551960
 - !ruby/object:Gem::Dependency
   name: minitest-rails-shoulda
-  requirement: &2164662820 !ruby/object:Gem::Requirement
+  requirement: &2164551280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164662820
+  version_requirements: *2164551280
 description: A
 email: dave.hrycyszyn@headlondon.com
 executables: []
@@ -140,12 +151,14 @@ files:
 - lib/drafter.rb
 - lib/drafter/apply.rb
 - lib/drafter/creation.rb
+- lib/drafter/diffing.rb
 - lib/drafter/draft.rb
 - lib/drafter/draft_upload.rb
 - lib/drafter/draft_uploader.rb
 - lib/drafter/draftable.rb
 - test/drafter/test_apply.rb
 - test/drafter/test_creation.rb
+- test/drafter/test_diffing.rb
 - test/drafter/test_draft.rb
 - test/drafter/test_draft_upload.rb
 - test/drafter/test_draftable.rb
@@ -173,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2112331208103230589
+      hash: -2897349280807350836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: