commit_filter 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ebe1db3814ccc6cf18337f9d56d8f9f7f44f15
-  data.tar.gz: 61c048d4025d5435db733f8d63a7b042a5a230fd
+  metadata.gz: dce75b40a6b4ffd88d564ad6ca5525581035ba7f
+  data.tar.gz: f0f32bc638eb7e982f5ef4adf0afb743d4065113
 SHA512:
-  metadata.gz: 92f34814abda871cfdb5c8f4a6c5afc4ceb71d0f3090cc8220e98cfde50f2ce59900a6afc249abbd78b3afe0877ccd1d5a0ddf56f4c3a27bda301bf24554dd17
-  data.tar.gz: 12ae9c8cfbf7ef42070e69c38002f67330d9aa56e680667ddfc3b529862a2d38aac7071608ddee2d06b49ba505ea40b0b0649697d6a81e5d650c56cd60ded95a
+  metadata.gz: 1a8a3f5d6d45fb3c9b320f6483f1ef582f421d90e2f0091a72dea70cf09f9391ad6db00fc82aedfb3356c23d4a0f1d7da97213c8e707a679c22c277feb7b11d2
+  data.tar.gz: 05333085b20f7257d60232d9edf9a38db7cd570cfb8b467e1ad8b620df84f830d2d479a95060ad710daa68cc43de254efc0f2db1a2db84e45797c953e231a698

data/app/assets/javascripts/commit_filter/file_commits.js.coffee

@@ -0,0 +1,19 @@
+jQuery ->
+  $('.file_commits input').change (event) ->
+    event.preventDefault()
+    
+    fields = {}
+    
+    $.each $(this.form).serializeArray(), (index, field) ->
+      fields[field.name] = field.value
+      
+    $.each $(this.form).find('a.diff'), (index, link) ->
+      url = '#'
+      
+      if fields['rev'] == fields['rev_to'] 
+        alert 'Not implemented!'
+      else
+        url = "#{diffPath}?repository_path=#{fields['repository_path']}&path=#{fields['path']}&rev=#{fields['rev']}&rev_to=#{fields['rev_to']}"
+        
+      $(link).attr('href', url)
+      $(link).text('Diff')

data/app/assets/javascripts/commit_filter/form.js.coffee

@@ -0,0 +1,15 @@
+jQuery ->
+  $('#filter_repository_provider').change (event) ->
+    event.preventDefault()
+    
+    if $(this).val() == 'plan.io'
+      $('#plan_io_fields').show()
+    else
+      $('#plan_io_fields').hide()
+      
+    if $(this).val() == 'GitHub'
+      $('#github_fields').show()
+      $('#issue_url_field').hide()
+    else
+      $('#github_fields').hide()
+      $('#issue_url_field').show()

data/app/assets/javascripts/commit_filter/frameworks/twitter_bootstrap/3/filter_result.js.coffee

@@ -0,0 +1,8 @@
+jQuery ->
+  $(document.body).on 'click', '.commit_filter_diff_link', (event) ->
+    event.preventDefault()
+    url = $(this).attr('href')
+    $('.modal-title').text $(this).text()
+    $('.modal-body').html '<img src=\'' + spinnerImagePath + '\'/>'
+    $('#modal').modal('show')  
+    $('.modal-body').load url

data/app/assets/stylesheets/commit_filter/base.css

@@ -0,0 +1,15 @@
+body {
+  padding-top: 10px;
+}
+
+#commit_filter_form fieldset {
+  padding:10px; 
+  border:1px solid black;
+}
+
+#commit_filter_form legend {
+  width:auto; 
+  margin-bottom:0px; 
+  margin-top:0px; 
+  border-width:0px;
+}

data/app/assets/stylesheets/commit_filter/commit/diff.css

@@ -0,0 +1,65 @@
+ul.diff {
+  padding:0;
+}
+
+.diff table col.lineno {
+  width:4em;
+}
+
+.diff h2 {
+  color:#333333;
+  font-size:14px;
+  letter-spacing:normal;
+  margin:0pt auto;
+  padding:0.1em 0pt 0.25em 0.5em;
+}
+
+table.diff {
+  font-size : 9pt;
+  font-family : "lucida console", "courier new", monospace;
+  white-space : pre;
+  border : 1px solid #D7D7D7;
+  border-collapse : collapse;
+  line-height : 110%;
+  width: 100%;  
+}  
+
+.diff tr {
+  background: white;
+}
+
+.diff td {
+  border : none;
+  padding : 0px 10px;
+  margin : 0px;
+}
+
+.diff td a {
+  text-decoration: none;
+}
+
+table.diff tr.a { background : #ddffdd; }
+
+table.diff tr.r { background : #ffdddd; }
+
+table.diff tr.range { background : #EAF2F5; color : #999; }
+
+table.diff td.ln {
+  background : #ECECEC; 
+  color : #aaa;
+  border-top:1px solid #999988;
+  border-bottom:1px solid #999988;
+  border-right:1px solid #D7D7D7;
+}
+
+.diff li {
+  background:#F7F7F7 none repeat scroll 0%;
+  border:1px solid #D7D7D7;
+  list-style-type:none;
+  margin:0pt 0pt 2em;
+  padding:2px;
+}
+
+table.diff .ln a {
+  color: #aaa;
+}

data/app/controllers/commit_filter/application_controller.rb

@@ -1,4 +1,29 @@
 module CommitFilter
   class ApplicationController < ActionController::Base
+    helper_method :framework_views_path, :commit_filter_stylesheets, :commit_filter_javascripts, :framework_presenter
+  
+    def self.framework_views_path
+      "commit_filter/frameworks/#{CommitFilter.configuration.frontend_framework}"
+    end
+  
+    def framework_views_path
+      self.class.framework_views_path
+    end
+    
+    def commit_filter_stylesheets
+      @commit_filter_stylesheets || ['application', 'commit_filter/application']
+    end
+  
+    def commit_filter_javascripts
+      @commit_filter_javascripts || ['application']
+    end
+    
+    private
+    
+    def framework_presenter
+      @framework_presenter ||= CommitFilter::Presenters::Frameworks::TwitterBootstrap::Version3Presenter.new(
+        self.view_context
+      )
+    end
   end
 end

data/app/controllers/commit_filter/commit/diffs_controller.rb

@@ -0,0 +1,24 @@
+class CommitFilter::Commit::DiffsController < CommitFilter::ApplicationController
+  def new
+    repository = Grit::Repo.new(params[:repository_path])
+
+    diff = repository.diff(
+      repository.commit(params[:rev_to]), repository.commit(params[:rev]), params[:path]
+    )
+    
+    unless diff.length == 1
+      raise NotImplementedError.new(
+        t('commit_filter.diff.errors.diff_length_not_one', length: diff.length)
+      )
+    end
+    
+    render text: DiffToHtml::GitConverter.new.get_single_file_diff_body(diff.first.diff)
+  rescue Exception => e
+    if Rails.env.development?
+      raise e.class.name + ': ' + e.message + ' ... ' + e.backtrace.join("\n")
+    else
+      logger.error e.class.name + ': ' + e.message + ' ... ' + e.backtrace.join("\n")
+      render text: t('commit_filter.general.errors.internal_server_error')
+    end
+  end
+end

data/app/controllers/commit_filter/commit/filters_controller.rb

@@ -0,0 +1,28 @@
+class CommitFilter::Commit::FiltersController < CommitFilter::ApplicationController
+  layout "#{CommitFilter::ApplicationController.framework_views_path}/layouts/commit_filter/application"
+  
+  def new
+    params[:filter] ||= {}
+    @filter = CommitFilter::Model.new(params[:filter].merge(logger: logger))
+    @commit_filter_javascripts = ['application', 'commit_filter/form']
+    
+    render "#{framework_views_path}/commit/filters/new"
+  end
+
+  def create
+    params[:filter] ||= {}
+    @filter = CommitFilter::Model.create(params[:filter].merge(logger: logger))
+    
+    if @filter.valid? && @filter.last_revision.blank?
+      flash[:alert] = I18n.t('commit_filter.filters.create.errors.nothing_found')
+    end
+    
+    @commit_filter_stylesheets = ['application', 'commit_filter/application', 'commit_filter/commit/diff']
+    @commit_filter_javascripts = [
+      'application', 'commit_filter/form', 'commit_filter/file_commits', 
+      "#{CommitFilter::ApplicationController.framework_views_path}/filter_result"
+    ]
+    
+    render "#{framework_views_path}/commit/filters/new"
+  end
+end

data/app/helpers/commit_filter/application_helper.rb

@@ -1,4 +1,59 @@
 module CommitFilter
   module ApplicationHelper
+    def form_field(*args, &block)
+      framework_presenter.form_field *args, &block
+    end
+    
+    def path_id(path)
+      path.gsub(/\/|\./, '_')
+    end
+    
+    def message_with_issue_urls(message)
+      if @filter.repository_provider == 'GitHub'
+        @filter.issue_url = "https://github.com/#{@filter.user_or_organization}/#{@filter.repository}/issues/:id"
+      end  
+      
+      if @filter.issue_url.present?
+        message.gsub(/#([0-9]+)/) do |s| 
+          issue_url = @filter.issue_url.split(':id')
+          s = s.gsub('#', '')
+          issue_url = "#{issue_url[0]}#{s}#{issue_url[1]}"
+          "<a href=\"#{issue_url}\">##{s}</a>"
+        end
+      else
+        message
+      end
+    end
+    
+    def version_control_diff_link(path, rev)
+      rev = params['rev'] || rev
+      rev_to = params['rev_to'] || @filter.previous_revision_by_file[path]
+     
+      url = if rev == rev_to
+        nil
+      else
+        "#{new_commit_diff_path}?repository_path=#{@filter.repository_path}&path=#{path}&rev=#{rev}&rev_to=#{rev_to}"
+      end
+      
+      text = t('commit_filter.general.diff')
+      
+      if url.present?
+        link_to text, url, class: 'diff commit_filter_diff_link'
+      else
+        text
+      end
+    end
+    
+    def annotate_file_link(text, rev, path, options = {})
+      url = if @filter.repository_provider == 'GitHub'
+        "https://github.com/#{@filter.user_or_organization}/#{@filter.repository}/blame/#{rev}/#{path}"
+      elsif @filter.repository_provider == 'plan.io'
+        "#{@filter.repository_host}/projects/#{@filter.project_slug}/repository/revisions/#{rev}/annotate/#{path}"
+      end
+      
+      text += " (your provider is not supported)" unless url.present?
+      url = '#' unless url.present?
+      link_to text, url, target: '_blank'
+    end
   end
 end

data/app/models/commit_filter/model.rb

@@ -0,0 +1,269 @@
+class CommitFilter::Model
+  HASHTAG_REGEX = /(?:\s|^)(#(?!([0-9]?:\d+|\w+?_|_\w+?)(?:\s|$))([a-z0-9\-_]+))/i
+  
+  attr_accessor :workspace, :repository, :project_slug, :branch, :path, :author, :from, :to, :id, :hashtag
+  attr_accessor :message, :story, :tasks, :hide_merge_commits, :logger, :issue_url, :repository_provider, :user_or_organization
+  attr_accessor :repository_host, :group_by_rails_file_category
+  attr_reader :errors, :commits_count, :last_revision, :first_revision, :previous_revision, :previous_revision_by_file
+  
+  def self.create(attributes = {})
+    resource = new(attributes)
+    
+    if resource.valid?
+      begin
+        resource.commits_by_file
+      rescue Grit::Git::GitTimeout
+        @errors ||= {}
+        @errors['base'] = I18n.t('commit_filter.filters.create.errors.too_many_git_timeouts')
+      end
+    end
+    
+    resource
+  end
+  
+  def initialize(attributes = {})
+    @commits_count, @previous_revision_by_file = 0, {}
+    
+    initialize_attributes(attributes)
+    
+    self
+  end
+  
+  def repository_path; self.workspace.to_s + '/' + self.repository.to_s; end
+  
+  def valid?
+    @valid = _valid? ? true : false
+  end
+  
+  def commits_by_file
+    return {} unless valid?
+    
+    return @files if @files
+    
+    if group_by_rails_file_category
+      @files = { 
+        library: { paths: [/^lib\//, /^app\/mailers\//] }, 
+        model: { paths: [/^app\/models\//, /^db\//] }, 
+        controller: { paths: [/^app\/controllers\//] }, 
+        javascript: { paths: [/^app\/assets\/javascripts\//] },
+        view: { 
+          paths: [
+            /^app\/assets\/stylesheets\//, /^app\/views\//, /^app\/helpers\//, /^app\/presenters\//,
+            /^public\//
+          ] 
+        },
+        tests: { paths: [/^spec\//, /^features\//] },
+        configuration: { paths: [/^config\//] },
+        misc: { paths: [] }
+      }
+    else
+      @files = {}
+    end
+    
+    catch(:done) do
+      commits do |page|
+        page.each do |commit| 
+          add_commit_to_files(commit) if commit_attributes_match_criteria?(commit)
+        end
+      end 
+    end
+    
+    if group_by_rails_file_category
+      @files.each {|category, setting| @files.delete(category) unless setting[:files].try(:any?) }
+    end
+    
+    @files
+  rescue Grit::NoSuchPathError
+    @errors ||= {}
+    @errors['base'] = I18n.t('commit_filter.filters.create.errors.repository_not_found')
+  end
+  
+  def files_count; @previous_revision_by_file.keys.length; end
+  
+  private
+  
+  def initialize_attributes(attributes)
+    default_attributes = { 
+      'workspace' => CommitFilter.configuration.workspace,
+      'repository' => CommitFilter.configuration.repository,
+      'repository_provider' => CommitFilter.configuration.repository_provider,
+      'user_or_organization' => CommitFilter.configuration.user_or_organization,
+      'repository_host' => CommitFilter.configuration.repository_host,
+      'project_slug' => CommitFilter.configuration.project_slug,
+      'branch' => CommitFilter.configuration.branch, 
+      'issue_url' => CommitFilter.configuration.issue_url,
+      'hide_merge_commits' => CommitFilter.configuration.hide_merge_commits 
+    }
+    
+    if CommitFilter.configuration.workspace_and_repository_from_rails_root
+      workspace = Rails.root.to_s.split('/')
+      default_attributes['repository'] = workspace.pop
+      default_attributes['workspace'] = workspace.join('/')
+    end
+    
+    attributes = default_attributes.merge(attributes)
+    attributes['hide_merge_commits'] = false if attributes['hide_merge_commits'].to_s == '0'
+    attributes['to'] = 1.day.since.strftime('%Y-%m-%d') if attributes['from'].present? && attributes['to'].blank?
+    
+    attributes.each {|attribute, value| self.send("#{attribute}=", value) }
+  end
+  
+  def _valid?
+    @errors ||= {}
+    
+    ['workspace', 'repository', 'branch'].each do |field|
+      @errors[field] = I18n.t('commit_filter.filters.create.errors.cannot_be_blank') if self.send(field).blank?
+    end  
+    
+    if repository_provider == 'GitHub'
+      @errors['user_or_organization'] = I18n.t('commit_filter.filters.create.errors.cannot_be_blank') if user_or_organization.blank?
+    elsif repository_provider == 'plan.io'
+      ['repository_host', 'project_slug'].each do |field|
+        @errors[field] = I18n.t('commit_filter.filters.create.errors.cannot_be_blank') if self.send(field).blank?
+      end  
+    end
+    
+    if path.blank? && author.blank? && id.blank? && hashtag.blank? && message.blank? && story.blank? && tasks.blank? && from.blank? && to.blank?
+      @errors['base'] = I18n.t('commit_filter.filters.create.errors.not_enough_criteria')
+    end
+    
+    @errors.empty?
+  end
+  
+  def repository_instance
+    @repository_instance ||= Grit::Repo.new(self.repository_path)
+  end
+  
+  def commits
+    offset = 0
+    
+    if id.present?
+      yield repository_instance.commits(id).select{|commit| commit.id == id }
+    else
+      while (page = try_two_times("Get commits from #{offset} to #{(offset + 100)}") { repository_instance.commits(self.branch, 100, offset) }).length > 0
+        
+        yield page
+        
+        offset += 100
+      end
+    end
+  end
+  
+  def commit_attributes_match_criteria?(commit)
+    if hide_merge_commits && commit.message.match(/^Merge branch /)
+      false
+    elsif (
+      (message != '' && commit.message.match(message)) || 
+      commit_message_includes_hashtag(commit.message)
+    ) && (author.blank? || commit.author.name == author) && between_timespan?(commit.committed_date)
+      true
+    else
+      @previous_revision ||= commit.id
+        
+      throw :done if from.present? && Time.parse(from) > commit.committed_date
+  
+      false
+    end
+  end
+  
+  def commit_message_includes_hashtag(commit_message)
+    hashtag.present? && commit_message.scan(HASHTAG_REGEX).map(&:first).include?(hashtag)
+  end
+  
+  def add_commit_to_files(commit)
+    @previous_revision = nil
+    
+    return if hide_merge_commits && commit.message.match(/^Merge branch /)
+    
+    if commit.message.match(message) && (author.blank? || commit.author.name == author) && between_timespan?(commit.committed_date)
+      @previous_revision = nil
+    else
+      @previous_revision ||= commit.id
+      
+      throw :done if from.present? && Time.parse(from) > commit.committed_date
+
+      return
+    end
+    
+    files = try_two_times("Commit(id: #{commit.id})#stats") { commit.stats }.files.map(&:first).select do |file_path|
+      path.blank? || file_path.match(path)
+    end
+    
+    return if files.none?
+    
+    @first_revision = commit.id
+    @last_revision ||= commit.id
+    @commits_count += 1
+    
+    files.each {|file_path| add_commit_to_file(file_path, commit) }
+  end
+  
+  def between_timespan?(timestamp)
+    return true if from.blank? && to.blank?
+    
+    from_valid = from.present? && Time.parse(from) <= timestamp
+    to_valid = to.present? && Time.parse(to) >= timestamp
+    
+    valid = if from.present? && to.present? && from_valid && to_valid
+      true
+    elsif (from.blank? || to.blank?) && ((from.present? && from_valid) || (to.present? && to_valid))
+      true
+    else 
+      false
+    end
+    
+    valid
+  end
+  
+  def add_commit_to_file(file_path, commit)
+    category = nil
+    
+    if group_by_rails_file_category
+      category = :misc
+              
+      if file_path.match(/\//)
+        @files.each do |current_category, setting|
+          if setting[:paths].select{|part| file_path.match(part) }.any?  
+            category = current_category; break
+          end
+        end
+      end
+    end
+    
+    if commit.parents.any?
+      @previous_revision_by_file[file_path] = commit.parents.first.id  
+    else
+      # e.g. first commit has no parents
+      @previous_revision_by_file[file_path] = nil
+    end
+    
+    @files[category][:files] ||= {} if category.present?
+    
+    files = category.present? ? @files[category][:files] : @files
+    
+    files[file_path] ||= []
+    files[file_path] << { 
+      id: commit.id, committed_at: commit.committed_date.strftime('%d.%m.%y %H:%M'),
+      message: commit.message, author: commit.author.name
+    }
+  end
+  
+  # alternative for Integer#tries to log try number and sleep between 
+  def try_two_times(message = '')
+    tries ||= 1
+    
+    if CommitFilter.configuration.git_debug_logging
+      logger.info "#{Time.now.strftime('%H:%M:%S')} #{message} (try ##{tries})"
+    end
+    
+    yield
+  rescue Grit::Git::GitTimeout => e
+    if (tries += 1) == 2
+      sleep 2
+      
+      retry
+    else
+      raise e
+    end
+  end
+end

data/app/presenters/commit_filter/application_presenter.rb

@@ -0,0 +1,9 @@
+class CommitFilter::ApplicationPresenter < CommitFilter::Presenter
+  def flash_messages
+    raise NotImplementedError
+  end
+  
+  def form_field(filter, name, options = {})
+    raise NotImplementedError
+  end
+end

data/app/presenters/commit_filter/presenter.rb

@@ -0,0 +1,13 @@
+class CommitFilter::Presenter
+  attr_accessor :view
+  
+  def initialize(working_view)
+    self.view = working_view
+  end
+  
+  private
+  
+  def method_missing(*args, &block)
+    view.send(*args, &block)
+  end
+end

data/app/presenters/commit_filter/presenters/frameworks/twitter_bootstrap/version3_presenter.rb

@@ -0,0 +1,51 @@
+class CommitFilter::Presenters::Frameworks::TwitterBootstrap::Version3Presenter < CommitFilter::ApplicationPresenter
+  def flash_messages
+    flash_messages = []
+    
+    flash.each do |type, message|
+      flash.delete(type)
+      content =  content_tag(
+        :button, 
+        content_tag(:span, raw('&times;'), 'aria-hidden' => 'true'), 
+        class: 'close', 'data-dismiss' => 'alert', 'aria-label' => 'Close'
+      )
+      type = :success if ['notice'].include? type.to_s
+      type = :danger   if ['alert'].include? type.to_s
+      content += raw(message)
+      text = content_tag(:div, content, class: "alert fade in alert-#{type}") 
+      flash_messages << text if message
+    end
+    
+    flash_messages.join('\n').html_safe
+  end
+  
+  def form_field(filter, name, options = {})
+    options[:placeholder] = t("commit_filter.filters.form.fields.#{name}.placeholder", default: 'NULL')
+    options.delete :placeholder if options[:placeholder] == 'NULL'
+    hint = t("commit_filter.filters.form.fields.#{name}.hint", default: 'NULL')
+    hint = nil if hint == 'NULL'
+    error = (filter.errors || {})[name]
+    field = options.delete(:field)
+    
+    content_tag :div, class: 'form-group' + (error ? ' has-error' : '') do
+      content = []
+      content << label_tag("filter[#{name}]", t("commit_filter.filters.form.fields.#{name}.title"), class: 'col-sm-3 control-label')
+      
+      content << content_tag(:div, class: 'col-sm-8') do
+        controls = []
+         
+        if field.present?
+          controls << field
+        else 
+          controls << text_field_tag("filter[#{name}]", filter.send(name), { class: 'form-control' }.merge(options))
+        end
+        
+        controls << content_tag(:p, hint, class: 'help-block') if hint
+        controls << content_tag(:span, error, class: 'help-inline') if error
+        raw controls.join(' ')
+      end
+      
+      raw content.join(' ')
+    end
+  end
+end

data/app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_categories.html.erb

@@ -0,0 +1,28 @@
+<div class="panel-group" id="commit_filter_accordion" role="tablist" aria-multiselectable="true">
+  <div class="panel panel-default">
+<% index = 0 %>
+<% @filter.commits_by_file.each do |category, setting| %>
+    <div class="panel-heading" role="tab" id="heading<%= index + 1 %>">
+      <h4 class="panel-title">
+        <a 
+          data-toggle="collapse" data-parent="#commit_filter_accordion" 
+          href="#commit_category_<%= category %>" aria-expanded="true" 
+          aria-controls="commit_category_<%= category %>"
+        >
+          <%= category %> (<%= setting[:files].keys.length %> <%= t('commit_filter.general.files') %>)
+        </a>
+      </h4>
+    </div>
+    
+    <div 
+      id="commit_category_<%= category %>" class="panel-collapse collapse<% if index == 0 %> in<% end %>" 
+      role="tabpanel" aria-labelledby="heading<%= index + 1 %>"
+    >
+      <div class="panel-body" style="padding:15px 15px 0px 15px;">
+        <%= render partial: "#{framework_views_path}/commit/filters/files", locals: { commits_by_file: setting[:files], paths: setting[:paths] } %>
+      </div>
+    </div>
+  <% index += 1 %>
+<% end %>
+  </div>
+</div>

data/app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_file_commits.html.erb

@@ -0,0 +1,68 @@
+<% previous_file_rev = @filter.previous_revision_by_file[path] %>
+<p>
+  <strong><%= t('commit_filter.filters.form.fields.path.title') %>:</strong> <%= path %>
+</p>
+<%= form_tag '#', method: 'post', class: 'file_commits' do %>
+  <%= hidden_field_tag :repository_path, @filter.repository_path %>
+  <%= hidden_field_tag :project_slug, @filter.project_slug %>
+  <%= hidden_field_tag :path, path %>
+  <table class='table table-striped table-condensed'>
+    <thead>
+      <tr>
+        <th colspan="2" style="width: 50px; text-align:center">
+          <%= version_control_diff_link path, commits.first[:id].try(:to_s) %>
+        </th>
+        <th style="width:150px;"><%= t('commit_filter.general.date') %></th>
+        <th style="width:150px;"><%= t('commit_filter.filters.form.fields.author.title') %></th>
+        <th><%= t('commit_filter.filters.form.fields.message.title') %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% param = params[path_id(path)] || {} %>
+      <% commits.each_with_index do |commit, commits_index| %>
+        <tr>
+          <td style="width:25px; text-align:center">
+            <% first_commit = previous_file_rev.blank? && commit[:id].try(:to_s) == commits.last[:id].try(:to_s) %>
+            <% unless first_commit %>
+              <% checked = param['rev'] == commit[:id].try(:to_s) ? true : false %>
+              <% checked = true if commits_index == 0 && !param.has_key?('rev') %>
+              <%= radio_button_tag :rev, commit[:id].try(:to_s), checked, id: '' %>
+            <% end %>
+          </td>
+          <td style="width:25px; text-align:center">  
+            <% unless commits_index == 0 %>
+              <% checked = param['rev_to'] == commit[:id].try(:to_s) ? true : false %>
+              <% checked = true if commits_index == (commits.length - 1) && !param.has_key?('rev_to') %>
+              <%= radio_button_tag :rev_to, commit[:id].try(:to_s), checked, id: '' %>
+            <% end %>
+          </td>
+          <td style="width:150px;"><%= annotate_file_link commit[:committed_at], commit[:id], path %></td>
+          <td style="width:150px;"><%= commit[:author]%></td>
+          <td>
+            <%= raw message_with_issue_urls(commit[:message]) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+    <tfoot>
+      <% if previous_file_rev.present? %>
+        <tr>
+          <td>
+          </td>
+          <td style="width:25px; text-align:center">  
+            <% checked = param['rev_to'] == previous_file_rev ? true : false %>
+            <% checked = true unless param.has_key?('rev_to') %>
+            <%= radio_button_tag :rev_to, previous_file_rev, checked, id: '' %>
+          </td>
+          <th colspan="3"/>
+        </tr>
+      <% end %>
+      <tr>
+        <th colspan="2" style="text-align:center">
+          <%= version_control_diff_link path, commits.first[:id].try(:to_s) %>
+        </th>
+        <th colspan="3"/>
+      </tr>
+    </tfoot>
+  </table>
+<% end %>

data/app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_files.html.erb

@@ -0,0 +1,26 @@
+<% paths ||= nil %>
+
+<div role="tabpanel">
+  <ul class="nav nav-tabs" role="tablist">
+<% file_index = 0 %>
+<% commits_by_file.keys.sort_by{ |x| x.downcase }.each do |path| %>  
+  <% matching_part = paths.nil? ? nil : paths.select{|part| path.match(part) }.first %>        
+    <li role="presentation"<% if file_index == 0 %> class="active"<% end %>>
+      <a href="#commit_file_<%= path.gsub(/\/|\./, '_') %>" aria-controls="commit_file_<%= path.gsub(/\/|\./, '_') %>" role="tab" data-toggle="tab">
+        <%= matching_part ? path.gsub(matching_part, '') : path %>
+      </a>
+    </li>
+  <% file_index += 1 %>
+<% end %>
+  </ul>
+  <div class="tab-content">
+<% file_index = 0 %>
+<% commits_by_file.keys.sort_by{ |x| x.downcase }.each do |path| %>     
+  <% commits = commits_by_file[path] %>
+    <div role="tabpanel" class="tab-pane<% if file_index == 0 %> active<% end %>" id="commit_file_<%= path.gsub(/\/|\./, '_') %>">
+      <%= render "#{framework_views_path}/commit/filters/file_commits", commits: commits, path: path %>
+    </div>
+  <% file_index += 1 %>
+<% end %>
+  </div>
+</div>

data/app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_form.html.erb

@@ -0,0 +1,80 @@
+<%= form_tag commit_filter.commit_filters_path, method: 'post', class: 'form-horizontal', id: 'commit_filter_form' do %>
+  <% unless action_name == 'new' || @filter.valid? %>
+     <div class="alert fade in alert-danger">
+       <strong><%= t('commit_filter.filters.form.invalid') %></strong> 
+       <ul>
+         <% @filter.errors.each do |field, error| %>
+           <li><%= field.humanize %>: <%=error %></li>
+         <% end %>
+       </ul>
+     </div>
+  <% end %>
+  
+  <fieldset>
+    <legend>
+      <%= t('commit_filter.filters.form.tabs.basic.title') %>
+    </legend>
+    
+    <%= form_field @filter, 'workspace', size: 45 %>
+    <%= form_field(
+      @filter, 'repository_provider', size: 45, 
+      field: select_tag(
+        'filter[repository_provider]', options_for_select(['', 'GitHub', 'plan.io'], @filter.repository_provider),
+        style: 'width:325px;'
+      )
+    ) %>
+    <div id="github_fields" style="display:<%= @filter.repository_provider == 'GitHub' ? 'block' : 'none' %>">
+      <%= form_field @filter, 'user_or_organization', size: 45 %>
+    </div>
+    <div id="plan_io_fields" style="display:<%= @filter.repository_provider == 'plan.io' ? 'block' : 'none' %>">
+      <%= form_field @filter, 'repository_host', size: 45 %>
+      <%= form_field @filter, 'project_slug', size: 45 %>
+    </div>
+    <%= form_field @filter, 'repository', size: 45 %>
+    <%= form_field @filter, 'branch', size: 45 %>
+    
+    <div id="issue_url_field" style="display:<%= @filter.repository_provider == 'GitHub' ? 'none' : 'block' %>">
+      <%= form_field @filter, 'issue_url', size: 45 %>
+    </div>
+    
+    <% field = capture do %>
+      <%= radio_button_tag 'filter[group_by_rails_file_category]', '1', @filter.group_by_rails_file_category ? true : false %> 
+      <%= t('commit_filter.general.yes') %>
+      <%= radio_button_tag 'filter[group_by_rails_file_category]', '0', @filter.group_by_rails_file_category ? false : true  %> 
+      <%= t('commit_filter.general.no') %>
+    <% end %>
+    <%= form_field @filter, 'group_by_rails_file_category', size: 45, field: field %>
+  </fieldset>
+  <fieldset>
+    <legend><%= t('commit_filter.filters.form.tabs.time_span.title') %></legend>
+    
+    <%= form_field @filter, 'from', size: 45, class: 'datepicker' %>
+    <%= form_field @filter, 'to', size: 45, class: 'datepicker' %>
+  </fieldset>
+  <fieldset>
+    <legend><%= t('commit_filter.filters.form.tabs.commit.title') %></legend>
+    
+    <%= form_field @filter, 'id', size: 45 %>
+    <%= form_field @filter, 'hashtag', size: 45 %>
+    <%= form_field @filter, 'message', size: 45 %>
+    <%= form_field @filter, 'path', size: 45 %>
+    <%= form_field @filter, 'author', size: 45 %>
+    
+    <% field = capture do %>
+      <%= radio_button_tag 'filter[hide_merge_commits]', '1', @filter.hide_merge_commits ? true : false %> 
+      <%= t('commit_filter.general.yes') %>
+      <%= radio_button_tag 'filter[hide_merge_commits]', '0', @filter.hide_merge_commits ? false : true  %> 
+      <%= t('commit_filter.general.no') %>
+    <% end %>
+    <%= form_field @filter, 'hide_merge_commits', size: 45, field: field %>
+  </fieldset>
+  
+  <p>
+  </p>
+  
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-10">
+      <button type="submit" class="btn btn-primary"><%= t('commit_filter.filters.form.submit')%></button>
+    </div>
+  </div>
+<% end %>

data/app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/new.html.erb

@@ -0,0 +1,24 @@
+<div class="row">
+  <div class="col-sm-4 col-md-4">
+    <%= render "#{framework_views_path}/commit/filters/form" %>
+  </div>
+  <div class="col-sm-8 col-md-8">
+<% if @filter.valid? && @filter.last_revision.present? %>
+    <p>
+      <strong><%= t('commit_filter.general.commits') %>:</strong> <%= @filter.commits_count %> 
+      <strong><%= t('commit_filter.general.files') %>:</strong> <%= @filter.files_count %>
+    </p>
+
+  <% if @filter.group_by_rails_file_category %>
+    <%= render partial: "#{framework_views_path}/commit/filters/categories" %>
+  <% else %>
+    <%= render partial: "#{framework_views_path}/commit/filters/files", locals: { commits_by_file: @filter.commits_by_file } %>
+  <% end %>
+<% end %>
+  </div>
+</div>
+
+<% content_for :top_javascript do %>
+  var repositoryProvider = "<%= @filter.repository_provider %>";
+  var repositoryHost = "<%= @filter.repository_host %>";
+<% end %>

data/app/views/commit_filter/frameworks/twitter_bootstrap/3/layouts/commit_filter/application.html.erb

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <%= render partial: 'layouts/commit_filter/shared/head' %>
+  </head>
+  <body>
+    <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-dialog" style="width:800px; height:500px;">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title" id="myModalLabel"><%= t('general.loading') %></h4>
+          </div>
+          <div class="modal-body" style="height:400px; overflow:scroll;">
+            <%= image_tag 'commit_filter/spinner.gif' %>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.close') %></button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div id="flash">
+        <%= framework_presenter.flash_messages %>
+      </div>
+      
+      <%= yield %>
+    </div>
+    
+    <%= render partial: 'layouts/commit_filter/shared/foot' %>
+  </body>
+</html>

data/app/views/layouts/commit_filter/shared/_foot.html.erb

@@ -0,0 +1,13 @@
+<%= javascript_include_tag *commit_filter_javascripts %>
+<%= yield :javascript_includes %>
+
+<%= javascript_tag do %>
+  var diffPath = "<%= new_commit_diff_path %>";
+  var spinnerImagePath = "<%= asset_path('home_page/spinner.gif') %>";
+  
+  <%= yield :top_javascript %>
+  
+  $(function() {
+    <%= yield(:document_ready) %>
+  });
+<% end %>

data/app/views/layouts/commit_filter/shared/_head.html.erb

@@ -0,0 +1,6 @@
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title><%= t('commit_filter.general.title') %></title>
+<%= stylesheet_link_tag *commit_filter_stylesheets, media: 'all' %>
+<%= csrf_meta_tags %>

data/config/locales/en.yml

@@ -0,0 +1,84 @@
+en:
+  commit_filter:
+    general:
+      title: Commit Filter
+      commits: Commits
+      files: Files
+      yes: Yes
+      no: No
+      date: Date
+      loading: Loading
+      diff: Diff
+      close: Close
+      errors:
+        internal_server_error: Internal server error.
+      
+    filters:
+      form:
+        invalid: Filter is invalid!
+        
+        tabs:
+          basic:
+            title: Basic
+          time_span:
+            title: Time Span
+          commit:
+            title: Commit
+        
+        fields:
+          workspace:
+            title: Workspace
+            placeholder: e.g. /users/user_name/workspace
+          repository:
+            title: Repository
+          repository_provider:
+            title: Repository Provider
+          user_or_organization:
+            title: User or Organization
+          repository_host:
+            title: Repository Host
+          project_slug:
+            title: Project slug
+          branch:
+            title: Branch
+          issue_url:
+            title: Issue URL
+            placeholder: e.g. https://host/repository_path/issues/:id
+          group_by_rails_file_category:
+            title: Group by File Category
+            hint: Only for Rails apps.
+          path:
+            title: Path
+          author:
+            title: Author
+          from:
+            title: From
+            placeholder: e.g. 2015-01-01
+          to:
+            title: To
+            placeholder: e.g. 2015-01-01
+          id:
+            title: ID
+          hashtag:
+            title: Hashtag
+            hint: Including "#".
+          message:
+            title: Message
+          hide_merge_commits:
+            title: Hide merge commits
+            hint: Message matches "^Merge branch "
+           
+        submit: Submit  
+              
+      create:
+        diff_from_last_to_previous_revision: Diff from last to previous revision (currently includes commits not matching the current filter)
+        
+        errors:
+          nothing_found: Nothing found.
+          repository_not_found: Repository not found.
+          cannot_be_blank: can't be blank.
+          not_enough_criteria: "Please set at least one of these: path, author, id, hashtag, message, story, tasks, from, to."
+          too_many_git_timeouts: Too many timeouts for git connection!
+    diff:
+      errors:
+        diff_length_not_one: "Not implemented error: diff length is not 1 but %{diff.length}."

data/config/routes.rb

@@ -1,2 +1,6 @@
 CommitFilter::Engine.routes.draw do
+  namespace :commit do
+    resources :filters, only: [:new, :create]
+    resources :diffs, only: [:new]
+  end
 end

data/lib/commit_filter.rb

@@ -1,4 +1,33 @@
-require "commit_filter/engine"
+# misc
+require 'gem_config'
+require 'grit'
+
+# view
+require 'jquery-rails'
+require 'coffee_script'
+require 'diff_to_html'
+require 'pygments'
+
+require 'commit_filter/grit_extension'
+
+require 'commit_filter/engine'
 
 module CommitFilter
+  include GemConfig::Base
+
+  with_configuration do
+    has :frontend_framework, classes: String, values: ['twitter_bootstrap/3'], default: 'twitter_bootstrap/3'
+    has :workspace_and_repository_from_rails_root, classes: [TrueClass, FalseClass], default: true
+    has :workspace, classes: String
+    has :repository, classes: String
+    has :repository_provider, classes: String
+    has :user_or_organization, classes: String
+    has :repository_host, classes: String
+    has :project_slug, classes: String
+    has :branch, classes: String, default: 'master'
+    has :issue_url, classes: String
+    has :group_by_rails_file_category, classes: [TrueClass, FalseClass], default: false
+    has :hide_merge_commits, classes: [TrueClass, FalseClass], default: true
+    has :git_debug_logging, classes: [TrueClass, FalseClass], default: false
+  end
 end

data/lib/commit_filter/engine.rb

@@ -1,5 +1,14 @@
 module CommitFilter
   class Engine < ::Rails::Engine
     isolate_namespace CommitFilter
+    
+     config.to_prepare do
+       Rails.application.config.assets.precompile += %w(
+         commit_filter/commit/diff.css
+         commit_filter/form.js
+         commit_filter/file_commits.js
+         commit_filter/frameworks/twitter_bootstrap/3/filter_result.js
+       )
+     end
   end
 end

data/lib/commit_filter/grit_extension.rb

@@ -0,0 +1,15 @@
+module Grit
+  class Repo
+    def diff(a, b, *paths)
+      diff = self.git.native('diff', { 'no-ext-diff' => true }, a, b, '--', *paths)
+
+      if diff =~ /diff --git a/
+        diff = diff.sub(/.*?(diff --git a)/m, '\1')
+      else
+        diff = ''
+      end
+      
+      Diff.list_from_string(self, diff)
+    end
+  end
+end

data/lib/commit_filter/version.rb

@@ -1,3 +1,3 @@
 module CommitFilter
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,8 +24,105 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
-description: "#Ruby on #Rails engine which renders a view about (#Git) commits with
-  given criteria grouped by category (e.g. model) and file name."
+- !ruby/object:Gem::Dependency
+  name: gem_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: gitlab-grit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.3
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+- !ruby/object:Gem::Dependency
+  name: diff_to_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+description: "& grouping by category + file http://bit.ly/commit-filter-0-1-0"
 email:
 - gawlista@gmail.com
 executables: []
@@ -35,13 +132,34 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/images/commit_filter/spinner.gif
+- app/assets/javascripts/commit_filter/file_commits.js.coffee
+- app/assets/javascripts/commit_filter/form.js.coffee
+- app/assets/javascripts/commit_filter/frameworks/twitter_bootstrap/3/filter_result.js.coffee
 - app/assets/stylesheets/commit_filter/application.css
+- app/assets/stylesheets/commit_filter/base.css
+- app/assets/stylesheets/commit_filter/commit/diff.css
 - app/controllers/commit_filter/application_controller.rb
+- app/controllers/commit_filter/commit/diffs_controller.rb
+- app/controllers/commit_filter/commit/filters_controller.rb
 - app/helpers/commit_filter/application_helper.rb
-- app/views/layouts/commit_filter/application.html.erb
+- app/models/commit_filter/model.rb
+- app/presenters/commit_filter/application_presenter.rb
+- app/presenters/commit_filter/presenter.rb
+- app/presenters/commit_filter/presenters/frameworks/twitter_bootstrap/version3_presenter.rb
+- app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_categories.html.erb
+- app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_file_commits.html.erb
+- app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_files.html.erb
+- app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/_form.html.erb
+- app/views/commit_filter/frameworks/twitter_bootstrap/3/commit/filters/new.html.erb
+- app/views/commit_filter/frameworks/twitter_bootstrap/3/layouts/commit_filter/application.html.erb
+- app/views/layouts/commit_filter/shared/_foot.html.erb
+- app/views/layouts/commit_filter/shared/_head.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - lib/commit_filter.rb
 - lib/commit_filter/engine.rb
+- lib/commit_filter/grit_extension.rb
 - lib/commit_filter/version.rb
 - lib/tasks/commit_filter_tasks.rake
 homepage: http://GitHub.com/volontarian/commit_filter

data/app/views/layouts/commit_filter/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>CommitFilter</title>
-  <%= stylesheet_link_tag    "commit_filter/application", media: "all" %>
-  <%= javascript_include_tag "commit_filter/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>