redmine_extensions 0.0.39 → 0.1.01

data/lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb

@@ -1,17 +1,17 @@
-<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular'}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <p>
-    <%%= submit_tag l(:button_update), title: l(:button_update) %>
-  </p>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular'}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <p>
+    <%%= submit_tag l(:button_update), title: l(:button_update) %>
+  </p>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb

@@ -1,5 +1,5 @@
-api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  @entities.each do |<%= model_name_underscored %>|
-    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-  end
-end
+api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
+  @entities.each do |<%= model_name_underscored %>|
+    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/index.html.erb.erb

@@ -1,5 +1,5 @@
-<%%= render @query %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= render @query %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/mail_added.html.erb.erb

@@ -1 +1 @@
-<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>
+<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>

data/lib/generators/redmine_extensions/entity/templates/mail_added.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/mail_updated.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/migration.rb.erb

@@ -1,9 +1,9 @@
-class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
-  def change
-    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
-      <%- db_columns.each do |column_name, column_attrs| -%>
-      t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
-      <%- end -%>
-    end
-  end
-end
+class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
+  def change
+    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
+      <%- db_columns.each do |column_name, column_attrs| -%>
+      t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
+      <%- end -%>
+    end
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/new.html.erb.erb

@@ -1,17 +1,17 @@
-<%%= title l(:heading_<%= model_name_underscored %>_new) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular'}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <p>
-    <%%= submit_tag l(:button_create), title: l(:button_create) %>
-  </p>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_new) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular'}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <p>
+    <%%= submit_tag l(:button_create), title: l(:button_create) %>
+  </p>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/query.rb.erb

@@ -30,7 +30,7 @@ class <%= model_name %>Query < EasyQuery
     @available_columns
   end
 
-  def default_list_columns
+  def default_columns_names
     super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_sym}[0..3].to_s %>.flat_map{|c| [c.to_s, c.to_sym]}
   end
 

data/lib/generators/redmine_extensions/entity/templates/routes.rb.erb

@@ -1,13 +1,13 @@
-<% if project? %>
-resources :projects do
-  resources :<%= model_name_pluralize_underscored %>
-end
-<% end %>
-resources :<%= model_name_pluralize_underscored %> do
-  collection do
-    get 'autocomplete'
-    get 'bulk_edit'
-    post 'bulk_update'
-    get 'context_menu'
-  end
+<% if project? %>
+resources :projects do
+  resources :<%= model_name_pluralize_underscored %>
+end
+<% end %>
+resources :<%= model_name_pluralize_underscored %> do
+  collection do
+    get 'autocomplete'
+    get 'bulk_edit'
+    post 'bulk_update'
+    get 'context_menu'
+  end
 end

data/lib/generators/redmine_extensions/entity/templates/show.html.erb.erb

@@ -1,38 +1,38 @@
-<%%= title @<%= model_name_underscored %> %>
-<div class="issue">
-  <table class="attributes">
-    <%%= issue_fields_rows do |rows| %>
-<%- safe_columns.each_with_index do |column, idx| -%>
-<%- next if description_column? && column[0] == description_column -%>
-<%- if idx % 2 == 0 -%>
-      <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
-<%- else -%>
-      <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
-<%- end -%>
-<%- end -%>
-    <%% end %>
-    <%%= render_custom_fields_rows(@<%= model_name_underscored %>) %>
-    <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
-  </table>
-<%- if description_column? -%>
-  <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
-    <hr />
-    <div class="description">
-      <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
-      <div class="wiki">
-        <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
-      </div>
-    </div>
-  <%% end %>
-<%- end -%>
-<%- if acts_as_attachable? -%>
-  <%% if @<%= model_name_underscored %>.attachments.any? -%>
-    <hr />
-    <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
-  <%% end %>
-<%- end -%>
-</div>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title @<%= model_name_underscored %> %>
+<div class="issue">
+  <table class="attributes">
+    <%%= issue_fields_rows do |rows| %>
+<%- safe_columns.each_with_index do |column, idx| -%>
+<%- next if description_column? && column[0] == description_column -%>
+<%- if idx % 2 == 0 -%>
+      <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
+<%- else -%>
+      <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
+<%- end -%>
+<%- end -%>
+    <%% end %>
+    <%%= render_custom_fields_rows(@<%= model_name_underscored %>) %>
+    <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
+  </table>
+<%- if description_column? -%>
+  <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
+    <hr />
+    <div class="description">
+      <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
+      <div class="wiki">
+        <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
+      </div>
+    </div>
+  <%% end %>
+<%- end -%>
+<%- if acts_as_attachable? -%>
+  <%% if @<%= model_name_underscored %>.attachments.any? -%>
+    <hr />
+    <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
+  <%% end %>
+<%- end -%>
+</div>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/redmine_extensions/easy_query_adapter.rb

@@ -19,138 +19,157 @@ module RedmineExtensions
     module ClassMethods
     end
   end
-end
 
-class EasyQueryAdapter < Query
+  module QueryAdapter
 
-  after_initialize :after_initialize
+    # after_initialize :after_initialize
 
-  def after_initialize
-    self.filters ||= {}
-  end
+    # def after_initialize
+    #   self.filters ||= {}
+    # end
 
-  def default_find_include
-    [].freeze
-  end
+    attr_writer :outputs
 
-  def default_find_preload
-    [].freeze
-  end
+    def outputs
+      @outputs ||= ['list']
+    end
 
-  def default_find_joins
-    [].freeze
-  end
+    def output=(output_t)
+      self.outputs = Array.wrap(output_t)
+    end
 
-  def default_list_columns
-    [].freeze
-  end
+    def filters
+      super || {}
+    end
 
-  def formatter
-    @formatter
-  end
+    def default_find_include
+      [].freeze
+    end
 
-  def init_formatter(object)
-    return @formatter if @formatter
+    def default_find_preload
+      [].freeze
+    end
+
+    def default_find_joins
+      [].freeze
+    end
 
-    if entity
-      begin
-        formatter_klass = "#{entity}Formatter".constantize
-      rescue NameError
+    def default_list_columns
+      [].freeze
+    end
+
+    def formatter
+      @formatter
+    end
+
+    def init_formatter(object)
+      return @formatter if @formatter
+
+      if entity
+        begin
+          formatter_klass = "#{entity}Formatter".constantize
+        rescue NameError
+        end
       end
+
+      formatter_klass ||= EasyEntityFormatter
+      @formatter = formatter_klass.new(object)
     end
 
-    formatter_klass ||= EasyEntityFormatter
-    @formatter = formatter_klass.new(object)
-  end
+    def entity
+      self.class.queried_class
+    end
 
-  def entity
-    self.class.queried_class
-  end
+    def entity_scope
+      if !@entity_scope.nil?
+        @entity_scope
+      elsif entity.respond_to?(:visible)
+        entity.visible
+      else
+        entity
+      end
+    end
+
+    def set_entity_scope(entity, reference_collection = nil)
+      return nil if entity.nil? || reference_collection.nil?
+
+      @entity_scope = entity.send(reference_collection.to_sym)
+
+      self.filters = {}
 
-  def entity_scope
-    if !@entity_scope.nil?
       @entity_scope
-    elsif entity.respond_to?(:visible)
-      entity.visible
-    else
-      entity
     end
-  end
-
-  def set_entity_scope(entity, reference_collection = nil)
-    return nil if entity.nil? || reference_collection.nil?
 
-    @entity_scope = entity.send(reference_collection.to_sym)
+    def create_entity_scope(options={})
+      scope = entity_scope.where(statement)
 
-    self.filters = {}
+      includes = default_find_include.dup
+      includes.concat(Array.wrap(options[:includes]))
 
-    @entity_scope
-  end
+      preload = default_find_preload.dup
+      preload.concat(Array.wrap(options[:preload]))
 
-  def create_entity_scope(options={})
-    scope = entity_scope.where(statement)
+      joins = default_find_joins.dup
+      joins.concat(Array.wrap(options[:joins]))
 
-    includes = default_find_include.dup
-    includes.concat(Array.wrap(options[:includes]))
+      filters.keys.each do |filter|
+        f = available_filters[filter]
+        next if f.blank?
 
-    preload = default_find_preload.dup
-    preload.concat(Array.wrap(options[:preload]))
+        includes.concat(Array.wrap(f[:includes])) if f[:includes]
+        joins.concat(Array.wrap(f[:joins])) if f[:joins]
+      end if filters
 
-    joins = default_find_joins.dup
-    joins.concat(Array.wrap(options[:joins]))
+      columns.each do |c|
+        includes.concat(Array.wrap(c.includes)) if c.includes
+        joins.concat(Array.wrap(c.joins)) if c.joins
+        preload.concat(Array.wrap(c.preload)) if c.preload
+      end
 
-    filters.keys.each do |filter|
-      f = available_filters[filter]
-      next if f.blank?
+      if project
+        includes << :project
+      end
 
-      includes.concat(Array.wrap(f[:includes])) if f[:includes]
-      joins.concat(Array.wrap(f[:joins])) if f[:joins]
-    end if filters
+      includes.uniq!
+      joins.uniq!
+      preload.uniq!
 
-    columns.each do |c|
-      includes.concat(Array.wrap(c.includes)) if c.includes
-      joins.concat(Array.wrap(c.joins)) if c.joins
-      preload.concat(Array.wrap(c.preload)) if c.preload
+      scope.includes(includes).references(includes).joins(joins).preload(preload)
     end
 
-    if project
-      includes << :project
+    def entities(options={})
+      create_entity_scope(options).order(options[:order]).to_a
     end
 
-    includes.uniq!
-    joins.uniq!
-    preload.uniq!
+    def add_available_column(name, options={})
+      @available_columns ||= []
 
-    scope.includes(includes).references(includes).joins(joins).preload(preload)
-  end
-
-  def entities(options={})
-    create_entity_scope(options).order(options[:order]).to_a
-  end
+      @available_columns << QueryColumn.new(name.to_sym, options)
+    end
 
-  def add_available_column(name, options={})
-    @available_columns ||= []
+    def to_partial_path
+      'easy_queries/index'
+    end
 
-    @available_columns << QueryColumn.new(name.to_sym, options)
-  end
+    def default_columns_names
+      default_list_columns
+    end
 
-  def to_partial_path
-    'easy_queries/index'
-  end
+    def queried_table_name
+      entity.table_name
+    end
 
-  def default_columns_names
-    default_list_columns
   end
 
-  def queried_table_name
-    entity.table_name
-  end
+end
 
+class EasyQueryAdapter < Query
 end
 
 if Redmine::Plugin.installed?(:easy_extensions)
   # EasyQuery exist
 else
   QueryColumn.send(:include, RedmineExtensions::QueryColumnAdapter)
+  RedmineExtensions::PatchManager.register_model_patch('Query', "RedmineExtensions::QueryAdapter")
   EasyQuery = EasyQueryAdapter
 end

data/lib/redmine_extensions/easy_query_helpers/outputs.rb

@@ -0,0 +1,69 @@
+module RedmineExtensions
+  module EasyQueryHelpers
+    # ----- OUTPUTS HELPER CLASS ----
+    class Outputs
+      include Enumerable
+
+      def initialize(presenter, view_context = nil)
+        if presenter.is_a?(RedmineExtensions::BasePresenter)
+          @presenter = presenter
+          @query = @presenter.model
+        else
+          @presenter = @query = presenter
+        end
+        @view_context = view_context
+      end
+
+      def view_context
+        @view_context || @presenter.h
+      end
+
+      def outputs
+        @outputs ||= enabled_outputs.map{|o| RedmineExtensions::QueryOutput.output_klass_for(o).new(@presenter, self) }.sort_by{|a| a.order}
+      end
+
+      def each(style = :enabled, &block)
+        if style == :enabled
+          outputs.each(&block)
+        else
+          available_outputs.each(&block)
+        end
+      end
+
+      def enabled_outputs
+        res = @query.outputs
+        res << 'list' if res.empty? && available_outputs.empty?
+        res
+      end
+
+      def available_output_names
+        @available_output_names ||= RedmineExtensions::QueryOutput.available_outputs_for( @query )
+      end
+
+      def available_outputs
+        @available_outputs ||= RedmineExtensions::QueryOutput.available_output_klasses_for( @query ).map{|klass| klass.new(@presenter, self) }
+      end
+
+      def output_enabled?(output)
+        enabled_outputs.include?(output.to_s)
+      end
+
+      def render_edit_selects(style=:check_box, options={})
+        available_output_instances.map{|o| o.render_edit_box(style, options) }.join('').html_safe
+      end
+
+      def render_edit
+        outputs.map{ |output| output.render_edit }.join('').html_safe
+      end
+
+      def method_missing(name, *args)
+        if name.to_s.ends_with?('?')
+          output_enabled?(name.to_s[0..-2])
+        else
+          super
+        end
+      end
+    end
+
+  end #EasyQueryHelpers
+end #RedmineExtensions

data/lib/redmine_extensions/engine.rb

@@ -4,6 +4,15 @@ require 'redmine_extensions/redmine_patches/patches'
 module RedmineExtensions
   class Engine < ::Rails::Engine
 
+    def self.automount!(path = nil)
+      engine = self
+      path ||= engine.to_s.underscore.split('/').first
+      Rails.application.routes.draw do
+        mount engine => path
+        resources :easy_settings, only: [:edit]
+      end
+    end
+
     config.generators do |g|
       g.test_framework      :rspec,        :fixture => false
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'
@@ -16,7 +25,8 @@ module RedmineExtensions
 
     #config.to_prepare goes after Reloader.to_prepare
     ActionDispatch::Reloader.to_prepare do
-      RedmineExtensions::QueryOutput.register_output :table, RedmineExtensions::QueryOutputs::TableOutput
+      RedmineExtensions::QueryOutput.register_output RedmineExtensions::QueryOutputs::ListOutput
+      RedmineExtensions::QueryOutput.register_output RedmineExtensions::QueryOutputs::TileOutput
       # RedmineExtensions::BasePresenter.register 'RedmineExtensions::EasyQueryPresenter', 'EasyQuery'
       # ApplicationController.send :include, RedmineExtensions::RailsPatches::ControllerQueryHelpers
       ApplicationController.send :include, RedmineExtensions::RenderingHelper