diffrent 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
data/.document ADDED
@@ -0,0 +1,5 @@
1
+ lib/**/*.rb
2
+ bin/*
3
+ -
4
+ features/**/*.feature
5
+ LICENSE.txt
data/Gemfile ADDED
@@ -0,0 +1,15 @@
1
+ source "http://rubygems.org"
2
+ # Add dependencies required to use your gem here.
3
+ # Example:
4
+ # gem "activesupport", ">= 2.3.5"
5
+ gem 'diffy'
6
+ gem 'vestal_versions', :git => "git://github.com/futurechimp/vestal_versions.git"
7
+
8
+ # Add dependencies to develop your gem here.
9
+ # Include everything needed to run rake, tests, features, etc.
10
+ group :development do
11
+ gem "minitest", ">= 0"
12
+ gem "bundler", "~> 1.0.0"
13
+ gem "jeweler", "~> 1.6.4"
14
+ gem "simplecov", :require => false
15
+ end
data/Gemfile.lock ADDED
@@ -0,0 +1,50 @@
1
+ GIT
2
+ remote: git://github.com/futurechimp/vestal_versions.git
3
+ revision: e7e14a35d6ef42d96fbbd8b8c02ff4358f06cfa8
4
+ specs:
5
+ vestal_versions (1.2.2)
6
+ activerecord (>= 3.0.0)
7
+ activesupport (>= 3.0.0)
8
+
9
+ GEM
10
+ remote: http://rubygems.org/
11
+ specs:
12
+ activemodel (3.2.3)
13
+ activesupport (= 3.2.3)
14
+ builder (~> 3.0.0)
15
+ activerecord (3.2.3)
16
+ activemodel (= 3.2.3)
17
+ activesupport (= 3.2.3)
18
+ arel (~> 3.0.2)
19
+ tzinfo (~> 0.3.29)
20
+ activesupport (3.2.3)
21
+ i18n (~> 0.6)
22
+ multi_json (~> 1.0)
23
+ arel (3.0.2)
24
+ builder (3.0.0)
25
+ diffy (2.0.6)
26
+ git (1.2.5)
27
+ i18n (0.6.0)
28
+ jeweler (1.6.4)
29
+ bundler (~> 1.0)
30
+ git (>= 1.2.5)
31
+ rake
32
+ minitest (2.12.1)
33
+ multi_json (1.3.2)
34
+ rake (0.9.2.2)
35
+ simplecov (0.6.1)
36
+ multi_json (~> 1.0)
37
+ simplecov-html (~> 0.5.3)
38
+ simplecov-html (0.5.3)
39
+ tzinfo (0.3.33)
40
+
41
+ PLATFORMS
42
+ ruby
43
+
44
+ DEPENDENCIES
45
+ bundler (~> 1.0.0)
46
+ diffy
47
+ jeweler (~> 1.6.4)
48
+ minitest
49
+ simplecov
50
+ vestal_versions!
data/LICENSE.txt ADDED
@@ -0,0 +1,20 @@
1
+ Copyright (c) 2012 Dave Hrycyszyn
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md ADDED
@@ -0,0 +1,144 @@
1
+ diffrent
2
+ ========
3
+
4
+ Diffrent is a very simple way to do ActiveRecord version diffing. It provides
5
+ a convenient interface to two other libraries
6
+ ([Diffy](https://github.com/samg/diffy) and [Vestal Versions](https://github.com/laserlemon/vestal_versions)), combining their functionality.
7
+
8
+ It makes no assumption about what web framework you're using - it can be used in
9
+ Sinatra, Padrino, Rails, or with no framework at all.
10
+
11
+ Installation:
12
+ -------------
13
+
14
+ gem install diffrent
15
+
16
+ In a Gemfile:
17
+
18
+ gem 'diffrent'
19
+
20
+ Usage
21
+ -----
22
+
23
+ Let's say you've got a `Post` model, with a title and a body. You've already
24
+ set up Vestal Versions, and
25
+ your Post model looks like this:
26
+
27
+ ```ruby
28
+ class Post
29
+ versioned
30
+ end
31
+ ```
32
+
33
+ With this all set up, you'll get a new version every time you save a Post object
34
+ instance. How to get the differences between arbitrary versions? This is where
35
+ diffrent comes in.
36
+
37
+ After adding 'diffrent' to your Gemfile and running 'bundle install', you can
38
+ change your Post model so it looks like this:
39
+
40
+ ```ruby
41
+ class Post
42
+ versioned
43
+ include Diffrent
44
+ end
45
+ ```
46
+
47
+ This give you the ability to pick up changes between different versions of your
48
+ Post objects. For example:
49
+
50
+ > @post = Post.create(:title => "Arnold says", :body => "What you talking about, Willis?")
51
+ > @post.body = "This is what Willis is talking about"
52
+ > @post.save # creates a new version
53
+
54
+ Now we can:
55
+
56
+ > @post.diff_for(:body, 1,2)
57
+
58
+ => "<div class=\"diff\">\n <ul>\n <li class=\"del\"><del><strong>This is w</strong>hat <strong>Willis is</strong> talking about</del></li>\n <li class=\"ins\"><ins><strong>W</strong>hat <strong>you</strong> talking about<strong>, Willis?</strong></ins></li>\n </ul>\n</div>\n"
59
+
60
+ By default, you'll get back HTML in your diffs. There's a final options hash
61
+ on the `diff_for` method call, so that you can pass a :format option to Diffy:
62
+
63
+ > # get back raw text
64
+ > p.diff_for(:body, 1, 2, :format => :text)
65
+ => "-This is what Willis is talking about\n\\n+What you talking about, Willis?\n\\n"
66
+
67
+ > # get back coloured text
68
+ > p.diff_for(:body, 1, 2, :format => :color)
69
+ => "\e[31m-This is what Willis is talking about\e[0m\n\\n\e[32m+What you talking about, Willis?\e[0m\n\\n"
70
+
71
+ You can also pass a format of `nil` to get back a raw Diffy object if you need one.
72
+
73
+
74
+ Using it in a web app
75
+ ---------------------
76
+
77
+ Here's one way to incorporate Diffrent into a webapp to provide a user interface
78
+ for viewing change. It's a Padrino example, but Sinatra or Rails will be
79
+ substantially the same.
80
+
81
+ First, you'll need a controller action:
82
+
83
+ ```ruby
84
+ get :view_differences, :map => "/posts/:id/view_differences/:old/:new" do
85
+ @post = Post.find(params[:id])
86
+ render 'posts/view_differences'
87
+ end
88
+ ```
89
+
90
+ Your view code can then look like this (please excuse my awesome HTML):
91
+
92
+ ```erb
93
+ <% new_version = params[:new].to_i %>
94
+ <% old_version = params[:old].to_i %>
95
+
96
+ <p>Title:
97
+ <%= @post.diff_for(:title, old_version, new_version) %>
98
+ </p>
99
+ <p>Body:
100
+ <%= @post.diff_for(:body, old_version, new_version) %>
101
+ </p>
102
+
103
+ <p>
104
+ <% if @post.has_versions_before?(new_version) %>
105
+ <%= link_to("<< earlier",
106
+ url(:posts, :view_differences, :id => @post.to_param,
107
+ :old => new_version - 2,
108
+ :new => new_version - 1)) %>
109
+ <% end %>
110
+
111
+ <% if @post.has_versions_after?(new_version) %>
112
+ <%= link_to("later >>",
113
+ url(:posts, :view_differences, :id => @post.to_param,
114
+ :old => new_version,
115
+ :new => new_version + 1)) %>
116
+ <% end %>
117
+ </p>
118
+ ```
119
+
120
+ As you can see, it's a bit manual - it seemed best to make very few assumptions
121
+ about how people will want to use this.
122
+
123
+ Because of the (wonderful and simple) way that Vestal Versions works, you can
124
+ diff arbitrary versions using this controller action and view - for instance,
125
+ hitting a route like `/posts/1/view_differences/3/50` would give you a diff
126
+ on the title and body for all revisions between r3 and r50.
127
+
128
+
129
+ Contributing to diffrent
130
+ ------------------------
131
+
132
+ * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
133
+ * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
134
+ * Fork the project
135
+ * Start a feature/bugfix branch
136
+ * Commit and push until you are happy with your contribution
137
+ * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
138
+ * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
139
+
140
+ == Copyright
141
+
142
+ Copyright (c) 2012 Dave Hrycyszyn. See LICENSE.txt for
143
+ further details.
144
+
data/Rakefile ADDED
@@ -0,0 +1,45 @@
1
+ # encoding: utf-8
2
+
3
+ require 'rubygems'
4
+ require 'bundler'
5
+ begin
6
+ Bundler.setup(:default, :development)
7
+ rescue Bundler::BundlerError => e
8
+ $stderr.puts e.message
9
+ $stderr.puts "Run `bundle install` to install missing gems"
10
+ exit e.status_code
11
+ end
12
+ require 'rake'
13
+
14
+ require 'jeweler'
15
+ Jeweler::Tasks.new do |gem|
16
+ # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
17
+ gem.name = "diffrent"
18
+ gem.homepage = "http://github.com/futurechimp/diffrent"
19
+ gem.license = "MIT"
20
+ gem.summary = %Q{Simple}
21
+ gem.description = %Q{A}
22
+ gem.email = "dave.hrycyszyn@headlondon.com"
23
+ gem.authors = ["Dave Hrycyszyn"]
24
+ # dependencies defined in Gemfile
25
+ end
26
+ Jeweler::RubygemsDotOrgTasks.new
27
+
28
+ require 'rake/testtask'
29
+ Rake::TestTask.new(:test) do |test|
30
+ test.libs << 'lib' << 'test'
31
+ test.pattern = 'test/**/test_*.rb'
32
+ test.verbose = true
33
+ end
34
+
35
+ task :default => :test
36
+
37
+ require 'rdoc/task'
38
+ Rake::RDocTask.new do |rdoc|
39
+ version = File.exist?('VERSION') ? File.read('VERSION') : ""
40
+
41
+ rdoc.rdoc_dir = 'rdoc'
42
+ rdoc.title = "diffrent #{version}"
43
+ rdoc.rdoc_files.include('README*')
44
+ rdoc.rdoc_files.include('lib/**/*.rb')
45
+ end
data/VERSION ADDED
@@ -0,0 +1 @@
1
+ 0.1.0
data/diffrent.gemspec ADDED
@@ -0,0 +1,65 @@
1
+ # Generated by jeweler
2
+ # DO NOT EDIT THIS FILE DIRECTLY
3
+ # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
+ # -*- encoding: utf-8 -*-
5
+
6
+ Gem::Specification.new do |s|
7
+ s.name = "diffrent"
8
+ s.version = "0.1.0"
9
+
10
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
+ s.authors = ["Dave Hrycyszyn"]
12
+ s.date = "2012-04-18"
13
+ s.description = "A"
14
+ s.email = "dave.hrycyszyn@headlondon.com"
15
+ s.extra_rdoc_files = [
16
+ "LICENSE.txt",
17
+ "README.md"
18
+ ]
19
+ s.files = [
20
+ ".document",
21
+ "Gemfile",
22
+ "Gemfile.lock",
23
+ "LICENSE.txt",
24
+ "README.md",
25
+ "Rakefile",
26
+ "VERSION",
27
+ "diffrent.gemspec",
28
+ "lib/diffrent.rb",
29
+ "test/helper.rb",
30
+ "test/test_diffrent.rb"
31
+ ]
32
+ s.homepage = "http://github.com/futurechimp/diffrent"
33
+ s.licenses = ["MIT"]
34
+ s.require_paths = ["lib"]
35
+ s.rubygems_version = "1.8.17"
36
+ s.summary = "Simple"
37
+
38
+ if s.respond_to? :specification_version then
39
+ s.specification_version = 3
40
+
41
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
42
+ s.add_runtime_dependency(%q<diffy>, [">= 0"])
43
+ s.add_runtime_dependency(%q<vestal_versions>, [">= 0"])
44
+ s.add_development_dependency(%q<minitest>, [">= 0"])
45
+ s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
46
+ s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
47
+ s.add_development_dependency(%q<simplecov>, [">= 0"])
48
+ else
49
+ s.add_dependency(%q<diffy>, [">= 0"])
50
+ s.add_dependency(%q<vestal_versions>, [">= 0"])
51
+ s.add_dependency(%q<minitest>, [">= 0"])
52
+ s.add_dependency(%q<bundler>, ["~> 1.0.0"])
53
+ s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
54
+ s.add_dependency(%q<simplecov>, [">= 0"])
55
+ end
56
+ else
57
+ s.add_dependency(%q<diffy>, [">= 0"])
58
+ s.add_dependency(%q<vestal_versions>, [">= 0"])
59
+ s.add_dependency(%q<minitest>, [">= 0"])
60
+ s.add_dependency(%q<bundler>, ["~> 1.0.0"])
61
+ s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
62
+ s.add_dependency(%q<simplecov>, [">= 0"])
63
+ end
64
+ end
65
+
data/lib/diffrent.rb ADDED
@@ -0,0 +1,20 @@
1
+ module Diffrent
2
+
3
+ def diff_for(attr, old_version, new_version, options={:format => :html})
4
+ changes = self.changes_between(new_version, old_version)
5
+ if changes.key?(attr)
6
+ Diffy::Diff.new(changes[attr].first, changes[attr].last).to_s(options[:format])
7
+ else
8
+ self.send(attr)
9
+ end
10
+ end
11
+
12
+ def has_versions_before?(v)
13
+ self.versions.at(v - 1)
14
+ end
15
+
16
+ def has_versions_after?(v)
17
+ self.versions.at(v + 1)
18
+ end
19
+
20
+ end
data/test/helper.rb ADDED
@@ -0,0 +1,22 @@
1
+ require 'rubygems'
2
+ require 'bundler'
3
+ begin
4
+ Bundler.setup(:default, :development)
5
+ rescue Bundler::BundlerError => e
6
+ $stderr.puts e.message
7
+ $stderr.puts "Run `bundle install` to install missing gems"
8
+ exit e.status_code
9
+ end
10
+ require 'minitest/unit'
11
+
12
+ $LOAD_PATH.unshift(File.dirname(__FILE__))
13
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
14
+ require 'diffrent'
15
+
16
+ require 'simplecov'
17
+ SimpleCov.start
18
+
19
+ class MiniTest::Unit::TestCase
20
+ end
21
+
22
+ MiniTest::Unit.autorun
@@ -0,0 +1,7 @@
1
+ require 'helper'
2
+
3
+ class TestDiffrent < MiniTest::Unit::TestCase
4
+ def test_something_for_real
5
+ flunk "hey buddy, you should probably rename this file and start testing for real"
6
+ end
7
+ end
metadata ADDED
@@ -0,0 +1,127 @@
1
+ --- !ruby/object:Gem::Specification
2
+ name: diffrent
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.1.0
5
+ prerelease:
6
+ platform: ruby
7
+ authors:
8
+ - Dave Hrycyszyn
9
+ autorequire:
10
+ bindir: bin
11
+ cert_chain: []
12
+ date: 2012-04-18 00:00:00.000000000Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ name: diffy
16
+ requirement: &2174695800 !ruby/object:Gem::Requirement
17
+ none: false
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
22
+ type: :runtime
23
+ prerelease: false
24
+ version_requirements: *2174695800
25
+ - !ruby/object:Gem::Dependency
26
+ name: vestal_versions
27
+ requirement: &2174695300 !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
33
+ type: :runtime
34
+ prerelease: false
35
+ version_requirements: *2174695300
36
+ - !ruby/object:Gem::Dependency
37
+ name: minitest
38
+ requirement: &2174694820 !ruby/object:Gem::Requirement
39
+ none: false
40
+ requirements:
41
+ - - ! '>='
42
+ - !ruby/object:Gem::Version
43
+ version: '0'
44
+ type: :development
45
+ prerelease: false
46
+ version_requirements: *2174694820
47
+ - !ruby/object:Gem::Dependency
48
+ name: bundler
49
+ requirement: &2174694340 !ruby/object:Gem::Requirement
50
+ none: false
51
+ requirements:
52
+ - - ~>
53
+ - !ruby/object:Gem::Version
54
+ version: 1.0.0
55
+ type: :development
56
+ prerelease: false
57
+ version_requirements: *2174694340
58
+ - !ruby/object:Gem::Dependency
59
+ name: jeweler
60
+ requirement: &2174693860 !ruby/object:Gem::Requirement
61
+ none: false
62
+ requirements:
63
+ - - ~>
64
+ - !ruby/object:Gem::Version
65
+ version: 1.6.4
66
+ type: :development
67
+ prerelease: false
68
+ version_requirements: *2174693860
69
+ - !ruby/object:Gem::Dependency
70
+ name: simplecov
71
+ requirement: &2174693360 !ruby/object:Gem::Requirement
72
+ none: false
73
+ requirements:
74
+ - - ! '>='
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
77
+ type: :development
78
+ prerelease: false
79
+ version_requirements: *2174693360
80
+ description: A
81
+ email: dave.hrycyszyn@headlondon.com
82
+ executables: []
83
+ extensions: []
84
+ extra_rdoc_files:
85
+ - LICENSE.txt
86
+ - README.md
87
+ files:
88
+ - .document
89
+ - Gemfile
90
+ - Gemfile.lock
91
+ - LICENSE.txt
92
+ - README.md
93
+ - Rakefile
94
+ - VERSION
95
+ - diffrent.gemspec
96
+ - lib/diffrent.rb
97
+ - test/helper.rb
98
+ - test/test_diffrent.rb
99
+ homepage: http://github.com/futurechimp/diffrent
100
+ licenses:
101
+ - MIT
102
+ post_install_message:
103
+ rdoc_options: []
104
+ require_paths:
105
+ - lib
106
+ required_ruby_version: !ruby/object:Gem::Requirement
107
+ none: false
108
+ requirements:
109
+ - - ! '>='
110
+ - !ruby/object:Gem::Version
111
+ version: '0'
112
+ segments:
113
+ - 0
114
+ hash: -3278078638270233273
115
+ required_rubygems_version: !ruby/object:Gem::Requirement
116
+ none: false
117
+ requirements:
118
+ - - ! '>='
119
+ - !ruby/object:Gem::Version
120
+ version: '0'
121
+ requirements: []
122
+ rubyforge_project:
123
+ rubygems_version: 1.8.17
124
+ signing_key:
125
+ specification_version: 3
126
+ summary: Simple
127
+ test_files: []