simple_changelog 0.0.9 → 0.0.10

data/app/models/simple_changelog/repository.rb

@@ -8,12 +8,12 @@ module SimpleChangelog
 
     def load_history
       history = {}
-      
+
       if @tags.any? || @commits.any?
         middle_tags = convert_tags(@tags).sort_by { |t| t.name }
-        tags = [tail_tag] + middle_tags + [head_tag]
+        tags = [tail_tag] + middle_tags
+        tags << head_tag if has_head_commits?(middle_tags)
         tags.reverse!
-
         tags.each_cons(2) do |prev, succ|
           history[prev] = commits_between(succ, prev).sort_by { |c| c.message }
         end
@@ -23,7 +23,7 @@ module SimpleChangelog
     end
 
     def current_version_tag
-      if @tags.empty?        
+      if @tags.empty?
         @commits.empty? ? '' : 'HEAD'
       else
         last_tag = @tags.sort_by { |t| t.name }.last
@@ -33,6 +33,11 @@ module SimpleChangelog
 
     private
 
+    def has_head_commits?(middle_tags)
+      commit = @repo.commits('master', 1).first
+      !middle_tags.any? { |t| t.commit_id == commit.id }
+    end
+
     def head_tag
       commit = @repo.commits('master', 1).first
       Tag.new('HEAD', commit.date, commit.id)
@@ -45,7 +50,6 @@ module SimpleChangelog
 
     def commits_between(from, to)
       commits = @repo.commits_between(from.commit_id, to.commit_id)
-      commits << @repo.commit(from.commit_id)
       convert_commits(commits)
     end
 

data/app/views/simple_changelog/repositories/_version_tag.html.erb

@@ -1,7 +1,7 @@
 <div class="version-tag">
   <h2 class="underlined"><%= version_tag.name %>&nbsp;(<%= long_date_format(version_tag.date) %>)</h2>
   <section class="commits">
-    <%= render partial: 'commit', 
-              collection: changelog[version_tag] %>
+    <%= render partial: 'commit',
+               collection: changelog[version_tag] %>
   </section>
 </div>

data/app/views/simple_changelog/repositories/show.html.erb

@@ -1,7 +1,7 @@
 <div id="app-changelog">
   <h1 class="underlined">Application repository changelog</h1>
 
-  <%= render partial: 'version_tag', 
-         collection: @changelog.keys,
-         locals: { changelog: @changelog } %>
+  <%= render partial: 'version_tag',
+             collection: @changelog.keys,
+             locals: { changelog: @changelog } %>
 </div>

data/lib/simple_changelog/version.rb

@@ -1,3 +1,3 @@
 module SimpleChangelog
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_changelog
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,28 +83,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/views/layouts/simple_changelog/application.html.erb
+- app/models/simple_changelog/repository.rb
+- app/models/simple_changelog/commit.rb
+- app/models/simple_changelog/tag.rb
+- app/assets/stylesheets/simple_changelog/repositories.css
+- app/assets/stylesheets/simple_changelog/application.css
+- app/assets/javascripts/simple_changelog/repositories.js
+- app/assets/javascripts/simple_changelog/application.js
+- app/controllers/simple_changelog/application_controller.rb
+- app/controllers/simple_changelog/repositories_controller.rb
 - app/views/simple_changelog/repositories/_version_tag.html.erb
 - app/views/simple_changelog/repositories/show.html.erb
 - app/views/simple_changelog/repositories/_commit.html.erb
+- app/views/layouts/simple_changelog/application.html.erb
 - app/helpers/simple_changelog/application_helper.rb
 - app/helpers/simple_changelog/repositories_helper.rb
-- app/models/simple_changelog/tag.rb
-- app/models/simple_changelog/commit.rb
-- app/models/simple_changelog/repository.rb
-- app/controllers/simple_changelog/application_controller.rb
-- app/controllers/simple_changelog/repositories_controller.rb
-- app/assets/javascripts/simple_changelog/application.js
-- app/assets/javascripts/simple_changelog/repositories.js
-- app/assets/stylesheets/simple_changelog/repositories.css
-- app/assets/stylesheets/simple_changelog/application.css
 - config/routes.rb
+- lib/tasks/simple_changelog_tasks.rake
 - lib/generators/templates/README
 - lib/generators/simple_changelog/install_generator.rb
-- lib/tasks/simple_changelog_tasks.rake
-- lib/simple_changelog.rb
 - lib/simple_changelog/engine.rb
 - lib/simple_changelog/version.rb
+- lib/simple_changelog.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc