redmine_extensions 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91868f692beaaf8a3a69f028088732385f8670b4ff2103334708cf547827ae2
-  data.tar.gz: aae4b3809dd2ea1b11d8e754853d45e93c9bb1980fd0ee64cc9e1a95fde479b9
+  metadata.gz: db4258140f1bd4b853bfd72b8a7c9a315ec0719943440d5c7f8d1182a5e5a81f
+  data.tar.gz: 45e45ab584f1a1fd838fde047261fe8fb4402c0b496a70c1b9a945167b775a40
 SHA512:
-  metadata.gz: f7195001a6d347fed1b5708bfb3820d6dd9378b6a15900a9b740526bb5462f7b6a35ed1a1eac905778cd546269270179162994b14ff40f5bc81943a6cd52b8a7
-  data.tar.gz: 0d9d725a78e71b4fe08797515e02fc64930c14d4c1b89487684a67fc67d268f107b7994444e4384bb5a65ba65da5e5031ef7584c30bb704fb974fe653c4f801b
+  metadata.gz: f46c4283187a9cbcfa66017cf06a2f6f2984efd2a36624fc737b0e0a936c4358251b822110a7a43cf1949347711d0fef0df743161db485b55f6580faa32ec70a
+  data.tar.gz: c188d2f7e3f5326e4a3e068cf546d070a679077b0c51b13bac9e728b77426b534f9f815636968e89d7d309a7efbbed4a3bb713b7308e266a90b0223e4537afb2

data/lib/generators/redmine_extensions/entity/entity_generator.rb

@@ -6,7 +6,7 @@ module RedmineExtensions
     argument :model_name, type: :string, required: true, banner: 'Post'
     argument :attributes, type: :array, required: true, banner: 'field[:type][:index] field[:type][:index]'
 
-    class_option :rys, type: :boolean, default: false, required: false, desc: "Use in case of RYS"
+    class_option :rys, type: :boolean, default: false, required: false, desc: 'Use in case of RYS'
 
     class_option :associations, type: :array, required: false, banner: '--associations association_type[:association_name][:association_class]'
 
@@ -33,11 +33,11 @@ module RedmineExtensions
       @model_name_camelized = model_name.camelize
       check_existing_const
 
-      @rys = !!options["rys"]
+      @rys = !!options['rys']
       @plugin_name_underscored = plugin_name.underscore
       @plugin_pretty_name = @plugin_name_underscored.titleize
 
-      @plugin_path = rys ? "." : "plugins/#{@plugin_name_underscored}"
+      @plugin_path = rys ? '.' : "plugins/#{@plugin_name_underscored}"
       @plugin_title = @plugin_name_underscored.camelize
 
       @model_name_underscored = model_name.underscore
@@ -65,9 +65,9 @@ module RedmineExtensions
       template 'edit.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.html.erb"
       template 'edit.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.js.erb"
 
-      tests_root = rys ? "./spec" : "#{plugin_path}/test"
-      template 'controller_spec.rb.erb', "#{tests_root + (!rys && "/spec" || "")}/controllers/#{model_name_pluralize_underscored}_controller_spec.rb"
-      template 'factories.rb.erb', "#{tests_root}/factories/#{model_name_underscored}.rb"
+      tests_root = rys ? './spec' : "#{plugin_path}/test"
+      template 'spec/factories.rb.erb', "#{tests_root}/factories/#{model_name_underscored}.rb"
+      template 'spec/controllers/%model_name_underscored%_controller_spec.rb.tt', "#{tests_root}/controllers/#{model_name_underscored}_controller_spec.rb"
       template 'spec/requests/%model_name_underscored%_spec.rb.tt', "#{tests_root}/requests/#{model_name_underscored}.rb"
 
       if File.exists?("#{plugin_path}/config/locales/en.yml")
@@ -79,7 +79,7 @@ module RedmineExtensions
           File.delete("#{plugin_path}/tmp/tmp_en.yml")
 
           merged_langfile = original_langfile.deep_merge(added_translations)
-          File.open("#{plugin_path}/config/locales/en.yml", "w") do |file|
+          File.open("#{plugin_path}/config/locales/en.yml", 'w') do |file|
             file.write merged_langfile.to_yaml
           end
         end
@@ -107,7 +107,7 @@ module RedmineExtensions
       template 'new.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/new.html.erb"
       template 'new.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/new.js.erb"
 
-      if Redmine::Plugin.installed?(:easy_extensions)
+      if easy?
         template 'easy_query.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}_query.rb"
         template 'entity_attribute_helper_patch.rb.erb', "#{plugin_path}/extra/easy_patch/easy_extensions/helpers/entity_attribute_helper_patch.rb"
 
@@ -123,7 +123,7 @@ module RedmineExtensions
                              "\n            h(value)" +
                              "\n          end" +
                              "\n        end" +
-                             "\n", after: "base.class_eval do"
+                             "\n", after: 'base.class_eval do'
 
         end
       else
@@ -133,21 +133,21 @@ module RedmineExtensions
       routes_file = "#{plugin_path}/config/routes.rb"
       if File.exists?(routes_file)
         if project?
-          insert_into_file routes_file, before: (rys ? /end\z/ : /\z/) do
-            "\nresources :projects do " +
-              "\n  resources :#{model_name_pluralize_underscored}" +
-              "\nend\n"
+          insert_into_file routes_file, before: (rys ? /^end$/ : /\z/) do
+            "\n  resources :projects do " +
+              "\n    resources :#{model_name_pluralize_underscored}" +
+              "\n  end\n"
           end
         end
-        insert_into_file routes_file, before: (rys ? /end\z/ : /\z/) do
-          "\nresources :#{model_name_pluralize_underscored} do" +
-            "\n  collection do " +
-            "\n    get 'autocomplete'" +
-            "\n    get 'bulk_edit'" +
-            "\n    post 'bulk_update'" +
-            "\n    get 'context_menu'" +
-            "\n  end" +
-            "\nend"
+        insert_into_file routes_file, before: (rys ? /^end$/ : /\z/) do
+          "\n  resources :#{model_name_pluralize_underscored} do" +
+            "\n    collection do " +
+            "\n      get 'autocomplete'" +
+            "\n      get 'bulk_edit'" +
+            "\n      post 'bulk_update'" +
+            "\n      get 'context_menu'" +
+            "\n    end" +
+            "\n  end\n"
         end
       else
         template 'routes.rb.erb', "#{plugin_path}/config/routes.rb"
@@ -187,16 +187,16 @@ module RedmineExtensions
 
         append_to_file "#{plugin_path}/after_init.rb", s
       elsif rys
-        s = ""
+        s = ''
         s << "\n  Redmine::AccessControl.map do |map|"
         s << "\n    map.easy_category :#{model_name_pluralize_underscored} do |pmap|"
         s << "\n      pmap.permission :view_#{model_name_pluralize_underscored}, { #{model_name_pluralize_underscored}: [:index, :show, :autocomplete, :context_menu] }, read: true"
         s << "\n      pmap.permission :manage_#{model_name_pluralize_underscored}, { #{model_name_pluralize_underscored}: [:new, :create, :edit, :update, :destroy, :bulk_edit, :bulk_update] }"
         s << "\n    end "
         s << "\n  end\n"
-        append_to_file "./config/initializers/01_access_control.rb", s
+        append_to_file './config/initializers/01_access_control.rb', s
 
-        s = ""
+        s = ''
         s << "\n  Redmine::MenuManager.map :top_menu do |menu|"
         s << "\n    menu.push :#{model_name_pluralize_underscored}, { controller: '#{model_name_pluralize_underscored}', action: 'index', project_id: nil }, caption: :label_#{model_name_pluralize_underscored}"
         s << "\n  end\n"
@@ -205,8 +205,8 @@ module RedmineExtensions
           s << "\n    menu.push :#{model_name_pluralize_underscored}, { controller: '#{model_name_pluralize_underscored}', action: 'index' }, param: :project_id, caption: :label_#{model_name_pluralize_underscored}"
           s << "\n  end\n"
         end
-        append_to_file "./config/initializers/02_menu_manager.rb", s
-        s = ""
+        append_to_file './config/initializers/02_menu_manager.rb', s
+        s = ''
         if acts_as_customizable?
           s << "\n  CustomFieldsHelper::CUSTOM_FIELDS_TABS << {name: '#{model_name}CustomField', partial: 'custom_fields/index', label: :label_#{model_name_pluralize_underscored}}\n"
         end
@@ -220,7 +220,7 @@ module RedmineExtensions
           s << "\n    activity.register :#{model_name_pluralize_underscored}, {class_name: %w(#{model_name}), default: false}"
           s << "\n  end\n"
         end
-        other_initializer = "./config/initializers/06_others.rb"
+        other_initializer = './config/initializers/06_others.rb'
         if File.exist?(other_initializer)
           append_file other_initializer do
             s
@@ -235,13 +235,23 @@ module RedmineExtensions
 
 
       template 'show.api.rsb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.api.rsb"
-      template '_%model_name_underscored%.api.rsb.tt', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/_#{model_name_underscored}.api.rsb"
       template 'show.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.html.erb"
       template 'show.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.js.erb"
+
+      # New templates
+      template 'app/models/%model_name_underscored%_query.rb'
+      template 'app/views/%model_name_pluralize_underscored%/_%model_name_underscored%.api.rsb'
+      template 'app/views/%model_name_pluralize_underscored%/_form.html.erb'
+      template 'app/views/%model_name_pluralize_underscored%/new.html.erb'
+      template 'app/views/%model_name_pluralize_underscored%/edit.html.erb'
     end
 
     private
 
+    def easy?
+      Redmine::Plugin.installed?(:easy_extensions)
+    end
+
     def assocs
       options[:associations]
     end

data/lib/generators/redmine_extensions/entity/templates/app/models/%model_name_underscored%_query.rb.tt

@@ -0,0 +1,42 @@
+class <%= model_name %>Query < EasyQuery
+
+  self.queried_class = <%= model_name %>
+
+  def initialize_available_filters
+    on_filter_group(default_group_label) do
+    <%- db_columns.each do |column_name, column_options| -%>
+      <%- if project? && column_name == 'project_id' -%>
+      if project.nil?
+        add_available_filter '<%= column_name %>', name: <%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] %>, values: all_projects_values
+      end
+      <%- else -%>
+      add_available_filter '<%= column_name %>', name: <%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] %>
+      <%- end -%>
+    <%- end -%>
+    <%- if acts_as_customizable? -%>
+      add_custom_fields_filters(<%= model_name %>CustomField)
+    <%- end -%>
+    end
+  end
+
+  def initialize_available_columns
+    tbl = entity.table_name
+  <%- author_col = db_columns.delete 'author_id' %>
+    on_filter_group(default_group_label) do
+    <%- db_columns.each do |column_name, column_options| -%>
+      add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: <%= model_name %>.human_attribute_name(:<%= column_name %>), title: <%= model_name %>.human_attribute_name(:<%= column_name %>)#, sortable: "#{tbl}.<%= column_name %>"
+    <%- end -%>
+    <%- if author_col -%>
+      add_available_column 'author', caption: <%= model_name %>.human_attribute_name(:author_id), title: <%= model_name %>.human_attribute_name(:author_id), sortable: proc { User.fields_for_order_statement('authors') }, preload: [author: (Setting.gravatar_enabled? ? :email_addresses : :easy_avatar)]
+    <%- end %>
+    <%- if acts_as_customizable? -%>
+      add_available_columns <%= model_name %>CustomField.sorted.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, group: l(:label_filter_group_custom_fields)) }
+    <%- end -%>
+    end
+  end
+
+  def default_list_columns
+    super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_s}[0..3].to_s %>.flat_map { |c| [c.to_s, c.to_sym] }
+  end
+
+end

data/lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/_form.html.erb.tt

@@ -0,0 +1,62 @@
+<%%= labelled_form_for([@project, @<%= model_name_underscored %>], html: { multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr? }) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%- if project? -%>
+      <%% if <%= model_name_underscored %>.safe_attribute?('project_id') && !@project %>
+      <p>
+        <%%= f.label :project_id, ::<%= model_name %>.human_attribute_name(:project_id) %>
+        <%%= f.select :project_id, Project.allowed_to(:manage_<%= model_name_pluralize_underscored %>).collect{|x| [x.name, x.id]}, include_blank: true %>
+      </p>
+      <%% end %>
+      <%- end -%>
+      <%- safe_columns.each do |column_name, column_options| -%>
+      <%% if <%= model_name_underscored %>.safe_attribute?('<%= column_name %>') %>
+      <p>
+        <%%= f.label :<%= column_name %>, ::<%= model_name %>.human_attribute_name(:<%= column_name %>) %>
+        <%- if column_options[:query_type] == 'string' || column_options[:query_type] == 'integer' -%>
+        <%%= f.text_field :<%= column_name %> %>
+        <%- elsif column_options[:query_type] == 'list' || column_options[:query_type] == 'list_optional' -%>
+        <%%= f.select :<%= column_name %>, <%= column_options[:class] %>.all.collect{|x| [x.<%= column_options[:list_class_name] %>, x.id]}.sort, include_blank: true %>
+        <%- elsif column_options[:query_type] == 'text' -%>
+        <%%= f.text_area :<%= column_name %>, :cols => 60, :rows => (<%= model_name_underscored %>.<%= column_name %>.blank? ? 10 : [[10, <%= model_name_underscored %>.<%= column_name %>.length / 50].max, 100].min), :accesskey => accesskey(:edit), :class => 'wiki-edit' %>
+        <%%= wikitoolbar_for '<%= model_name_underscored %>_<%= column_name %>' %>
+        <%- elsif column_options[:query_type] == 'boolean' -%>
+        <%%= f.radio_button :<%= column_name %>, false %>
+        <%- else -%>
+        <%%= f.text_field :<%= column_name %> %>
+        <%- end -%>
+      </p>
+      <%% end %>
+      <%- end -%>
+      <% associations.each do |assoc| %>
+        <%- next if assoc[1][:type] == 'has_many' -%>
+        <% association_name = assoc[0] %>
+        <p>
+          <%%= f.label l(:label_<%= association_name %>) %>
+          <%%= f.select :<%= association_name %>_id, <%= association_name.camelcase %>.visible.sorted.map{ |<%= association_name %>| [<%= association_name %>.to_s, <%= association_name %>.id]} %>
+        </p>
+      <% end %>
+      <%- if acts_as_customizable? -%>
+      <%% custom_field_values = <%= model_name_underscored %>.visible_custom_field_values %>
+      <%% custom_field_values.each do |value| %>
+      <p>
+        <%%= custom_field_tag_with_label :<%= model_name_underscored %>, value %>
+      </p>
+      <%% end %>
+      <%- end -%>
+      <%- if acts_as_attachable? -%>
+      <p id="attachments_form"><label><%%= l(:label_attachment_plural) %></label><%%= render :partial => 'attachments/form', :locals => {:container => <%= model_name_underscored %>} %></p>
+      <%- end -%>
+  </div>
+
+  <%% if !request.xhr? %>
+    <p>
+      <%% if f.object.new_record? %>
+        <%%= submit_tag l(:button_create), title: l(:button_create), class: "button-positive" %>
+      <%% else %>
+        <%%= submit_tag l(:button_update), title: l(:button_update), class: "button-positive" %>
+      <%% end %>
+    </p>
+  <%% end %>
+<%% end %>

data/lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/edit.html.erb.tt

@@ -0,0 +1,8 @@
+<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
+
+<%%= render partial: 'form', locals: { <%= model_name_underscored %>: @<%= model_name_underscored %>n } %>
+
+<% ### PAGE CUSTOMS ########################################################## %>
+<% content_for :sidebar do %>
+  <%= render partial: '<%= model_name_pluralize_underscored %>/sidebar' %>
+<% end %>

data/lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/new.html.erb.tt

@@ -0,0 +1,8 @@
+<%%= title l(:heading_<%= model_name_underscored %>_new) %>
+
+<%%= render partial: 'form', locals: { <%= model_name_underscored %>: @<%= model_name_underscored %>n } %>
+
+<% ### PAGE CUSTOMS ########################################################## %>
+<% content_for :sidebar do %>
+  <%= render partial: '<%= model_name_pluralize_underscored %>/sidebar' %>
+<% end %>

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

@@ -10,23 +10,20 @@ class <%= controller_class %>Controller < ApplicationController
   <%- end -%>
 
   helper :<%= model_name_pluralize_underscored %>
-  helper :custom_fields
-  helper :context_menus
-  helper :attachments
-  helper :issues
+  helper :custom_fields, :context_menus, :attachments, :issues
   include_query_helpers
 
   accept_api_auth :index, :show, :create, :update, :destroy
 
   def index
-    <% if Redmine::Plugin.installed?(:easy_extensions) %>
+    <%- if Redmine::Plugin.installed?(:easy_extensions) %>
     index_for_easy_query(<%= model_name %>Query)
     <% else %>
     retrieve_query(<%= model_name %>Query)
     @entity_count = @query.<%= model_name_pluralize_underscored %>.count
     @entity_pages = Paginator.new @entity_count, per_page_option, params['page']
     @entities = @query.<%= model_name_pluralize_underscored %>(offset: @entity_pages.offset, limit: @entity_pages.per_page)
-    <% end %>
+    <%- end %>
   end
 
   def show
@@ -192,6 +189,7 @@ class <%= controller_class %>Controller < ApplicationController
     @<%= model_name_underscored %> = @<%= model_name_pluralize_underscored %>.first if @<%= model_name_pluralize_underscored %>.count == 1
     raise ActiveRecord::RecordNotFound if @<%= model_name_pluralize_underscored %>.empty?
     raise Unauthorized unless @<%= model_name_pluralize_underscored %>.all?(&:visible?)
+
     @projects = @<%= model_name_pluralize_underscored %>.collect(&:project).compact.uniq
     @project = @projects.first if @projects.size == 1
   rescue ActiveRecord::RecordNotFound

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

@@ -2,35 +2,36 @@ class <%= model_name %>Query < EasyQuery
 
   self.queried_class = <%= model_name %>
 
-    def initialize_available_filters
+  def initialize_available_filters
+    on_filter_group(default_group_label) do
     <%- db_columns.each do |column_name, column_options| -%>
-    <%- if project? && column_name == 'project_id' -%>
+      <%- if project? && column_name == 'project_id' -%>
       if project.nil?
         add_available_filter '<%= column_name %>', name: <%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] %>, values: all_projects_values
       end
-    <%- else -%>
+      <%- else -%>
       add_available_filter '<%= column_name %>', name: <%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] %>
-    <%- end -%>
+      <%- end -%>
     <%- end -%>
     <%- if acts_as_customizable? -%>
       add_custom_fields_filters(<%= model_name %>CustomField)
     <%- end -%>
     end
+  end
 
   def initialize_available_columns
-    group = l("label_filter_group_#{self.class.name.underscore}")
-
-  <%- db_columns.each do |column_name, column_options| -%>
-    add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: <%= model_name %>.human_attribute_name(:<%= column_name %>), title: <%= model_name %>.human_attribute_name(:<%= column_name %>), group: group
-  <%- end -%>
-  <%- if acts_as_customizable? -%>
-    add_available_columns <%= model_name %>CustomField.sorted.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, group: l(:label_filter_group_custom_fields))}
-  <%- end -%>
-
+    on_filter_group(default_group_label) do
+    <%- db_columns.each do |column_name, column_options| -%>
+      add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: <%= model_name %>.human_attribute_name(:<%= column_name %>), title: <%= model_name %>.human_attribute_name(:<%= column_name %>)
+    <%- end -%>
+    <%- if acts_as_customizable? -%>
+      add_available_columns <%= model_name %>CustomField.sorted.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, group: l(:label_filter_group_custom_fields)) }
+    <%- end -%>
+    end
   end
 
   def default_list_columns
-    super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_s}[0..3].to_s %>.flat_map{|c| [c.to_s, c.to_sym]}
+    super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_s}[0..3].to_s %>.flat_map { |c| [c.to_s, c.to_sym] }
   end
 
 end

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

@@ -2,9 +2,13 @@ class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Mig
   def change
     create_table :<%= model_name_pluralize_underscored %> do |t|
       <%- columns = db_columns.reject{|k| k.in?(["created_at", "updated_at"])} -%>
+      <%- author_col = db_columns.delete "author_id" %>
+      <%- project_col = db_columns.delete "project_id" %>
       <%- columns.each do |column_name, column_attrs| -%>
       t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
       <%- end -%>
+      <%= "t.belongs_to :author" if author_col  %>
+      <%= "t.belongs_to :project" if project_col  %>
 
       t.timestamps
     end

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

@@ -4,11 +4,9 @@ class <%= model_name %> < ActiveRecord::Base
   <%= 'belongs_to :project' if project? %>
   <%= 'belongs_to :author, class_name: \'User\'' if author? %>
 
-  scope :visible, lambda { |*args|
-    where(<%= model_name %>.visible_condition(args.shift || User.current, *args))<%= '.joins(:project)' if project? %>
-  }
+  scope :visible, ->(*args) { where(<%= model_name %>.visible_condition(args.shift || User.current, *args))<%= '.joins(:project)' if project? %> }
   <% if name_column? %>
-  scope :sorted, lambda { order("#{table_name}.<%= name_column %> ASC") }
+  scope :sorted, -> { order("#{table_name}.<%= name_column %> ASC") }
   <% end %>
 
   <%- if acts_as_searchable? -%>
@@ -35,7 +33,7 @@ class <%= model_name %> < ActiveRecord::Base
 
   <%= 'validates :project_id, presence: true' if project? %>
   <%= 'validates :author_id, presence: true' if author? %>
-
+  <%= "validates :#{safe_columns.keys.first}, presence: true" if safe_columns.any? %>
 
   <%- if associations.any? -%>
   <%- associations.each do |assoc_name, values| -%>
@@ -48,7 +46,7 @@ class <%= model_name %> < ActiveRecord::Base
   <%- attributes += safe_columns.keys if safe_columns.any? -%>
   <%- attributes += ['custom_field_values', 'custom_fields'] if acts_as_customizable? -%>
   <%-attributes += associations.keys.map{ |assoc| "#{assoc}_id" } -%>
-  safe_attributes *%w(<%= attributes.join(' ') %>)
+  safe_attributes *%w[<%= attributes.join(' ') %>]
   <%- if project? -%>
   safe_attributes 'project_id', if: ->(<%= model_name_underscored %>, _user) { <%= model_name_underscored %>.new_record? }
   <%- end -%>
@@ -71,7 +69,7 @@ class <%= model_name %> < ActiveRecord::Base
   end
 
   def editable_by?(user)
-    visible?(user)
+    editable?(user)
   end
 
   <%- if !project? -%>
@@ -82,17 +80,17 @@ class <%= model_name %> < ActiveRecord::Base
 
   def visible?(user = nil)
     user ||= User.current
-    user.allowed_to?(:<%= view_permission %>, self.project, global: true)
+    user.allowed_to?(:<%= view_permission %>, project, global: true)
   end
 
   def editable?(user = nil)
     user ||= User.current
-    user.allowed_to?(:<%= edit_permission %>, self.project, global: true)
+    user.allowed_to?(:<%= edit_permission %>, project, global: true)
   end
 
   def deletable?(user = nil)
     user ||= User.current
-    user.allowed_to?(:<%= delete_permission %>, self.project, global: true)
+    user.allowed_to?(:<%= delete_permission %>, project, global: true)
   end
 
   def attachments_visible?(user = nil)
@@ -113,13 +111,8 @@ class <%= model_name %> < ActiveRecord::Base
   end
   <%- end -%>
 
-  def created_on
-    created_at
-  end
-
-  def updated_on
-    updated_at
-  end
+  alias_attribute :created_on, :created_at
+  alias_attribute :updated_on, :updated_at
 
   <%- if mail? -%>
   def notified_users

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

@@ -1,13 +1,15 @@
+
 <% 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'
+  resources :<%= model_name_pluralize_underscored %> do
+    collection do
+      get 'autocomplete'
+      get 'bulk_edit'
+      post 'bulk_update'
+      get 'context_menu'
+    end
   end
-end
+

data/lib/generators/redmine_extensions/entity/templates/spec/controllers/%model_name_underscored%_controller_spec.rb.tt

@@ -0,0 +1,94 @@
+<%- unless rys %>
+require "easy_extensions/spec_helper"
+
+<% end %>
+RSpec.describe <%= controller_class %>Controller, logged: true do
+
+  describe "#index" do
+    before :each do
+      role = Role.non_member
+      role.add_permission! :view_<%= model_name_pluralize_underscored %>
+    end
+
+    it "html" do
+      get :index
+      expect(response).to have_http_status :success
+    end
+
+    it "json" do
+      get :index, params: { format: "json" }
+      expect(response).to have_http_status :ok
+    end
+  end
+
+  describe "#show" do
+    before :each do
+      role = Role.non_member
+      role.add_permission! :view_<%= model_name_pluralize_underscored %>
+    end
+    subject { FactoryBot.create(:<%= model_name_underscored %>) }
+
+    it "with id" do
+      get :show, params: { id: subject.id }
+      expect(response).to have_http_status :success
+    end
+
+    it "not found" do
+      get :show, params: { id: "invalid" }
+      expect(response).to have_http_status :not_found
+    end
+  end
+
+  context "manage <%= model_name_pluralize_underscored %>" do
+    before :each do
+      role = Role.non_member
+      role.add_permission! :manage_<%= model_name_pluralize_underscored %>
+    end
+    describe "#create" do
+      it "valid" do
+        expect {
+          post :create, params: { <%= model_name_underscored %>: FactoryBot.attributes_for(:<%= model_name_underscored %>), format: "json" }
+        }.to change(<%= model_name %>, :count).by 1
+        expect(response).to have_http_status :success
+      end
+
+      it "invalid" do
+        expect {
+          post :create, params: { <%= model_name_underscored %>: { <%= safe_columns.first[0] %>: "" }, format: "xml" }
+        }.to change(<%= model_name %>, :count).by 0
+        expect(response).to have_http_status :unprocessable_entity
+      end
+    end
+
+    describe "#update" do
+      subject { FactoryBot.create(:<%= model_name_underscored %>, <%= safe_columns.first[0] %>: 'value1') }
+      it "valid" do
+        expect {
+          put :update, params: { id: subject, <%= model_name_underscored %>: FactoryBot.attributes_for(:<%= model_name_underscored %>), format: "json" }; subject.reload
+        }.to change(subject, :<%= safe_columns.first[0] %>)
+        expect(response).to have_http_status :success
+      end
+
+      it "invalid" do
+        expect {
+          put :update, params: { id: subject, <%= model_name_underscored %>: { <%= safe_columns.first[0] %>: '' }, format: "xml" }; subject.reload
+        }.not_to change(subject, :<%= safe_columns.first[0] %>)
+        expect(response).to have_http_status :unprocessable_entity
+      end
+    end
+
+    describe "#destroy" do
+      before :each do
+        Role.non_member.add_permission! :view_<%= model_name_pluralize_underscored %>
+      end
+      subject! { FactoryBot.create(:<%= model_name_underscored %>) }
+      it { expect { delete :destroy, params: { id: subject } }.to change(<%= model_name %>, :count).by -1 }
+
+      it "record not found" do
+        expect { delete :destroy, params: { id: "none", format: "json" } }.to change(<%= model_name %>, :count).by 0
+        expect(response).to have_http_status :not_found
+      end
+    end
+  end
+
+end

data/lib/generators/redmine_extensions/entity/templates/{factories.rb.erb → spec/factories.rb.erb}

@@ -2,7 +2,7 @@ FactoryBot.define do
 
   factory :<%= model_name_underscored %> do
     <%- string_columns.each_key do |c| -%>
-    sequence(:<%= c %>) { | n | "<%= c %>-#{n}"}
+    sequence(:<%= c %>) { |n| "<%= c %>-#{n}"}
         <%-  end -%>
     <%= 'association :author, factory: :user' if author? %>
     <%= 'project' if project? %>

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.3.4'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,20 +95,22 @@ files:
 - db/migrate/20190206121100_remove_foreign_key_from_easy_settings.rb
 - lib/generators/redmine_extensions/entity/USAGE
 - lib/generators/redmine_extensions/entity/entity_generator.rb
-- lib/generators/redmine_extensions/entity/templates/_%model_name_underscored%.api.rsb.tt
 - lib/generators/redmine_extensions/entity/templates/_form.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/_list.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/_sidebar.html.erb.erb
+- lib/generators/redmine_extensions/entity/templates/app/models/%model_name_underscored%_query.rb.tt
+- lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/_%model_name_underscored%.api.rsb.tt
+- lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/_form.html.erb.tt
+- lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/edit.html.erb.tt
+- lib/generators/redmine_extensions/entity/templates/app/views/%model_name_pluralize_underscored%/new.html.erb.tt
 - lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/controller.rb.erb
-- lib/generators/redmine_extensions/entity/templates/controller_spec.rb.erb
 - lib/generators/redmine_extensions/entity/templates/custom_field.rb.erb
 - lib/generators/redmine_extensions/entity/templates/easy_query.rb.erb
 - lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb
 - lib/generators/redmine_extensions/entity/templates/en.yml.erb
 - lib/generators/redmine_extensions/entity/templates/entity_attribute_helper_patch.rb.erb
-- lib/generators/redmine_extensions/entity/templates/factories.rb.erb
 - lib/generators/redmine_extensions/entity/templates/helper.rb.erb
 - lib/generators/redmine_extensions/entity/templates/hooks.rb.erb
 - lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb
@@ -128,6 +130,8 @@ files:
 - lib/generators/redmine_extensions/entity/templates/show.api.rsb.erb
 - lib/generators/redmine_extensions/entity/templates/show.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/show.js.erb.erb
+- lib/generators/redmine_extensions/entity/templates/spec/controllers/%model_name_underscored%_controller_spec.rb.tt
+- lib/generators/redmine_extensions/entity/templates/spec/factories.rb.erb
 - lib/generators/redmine_extensions/entity/templates/spec/requests/%model_name_underscored%_spec.rb.tt
 - lib/generators/redmine_extensions/plugin/USAGE
 - lib/generators/redmine_extensions/plugin/plugin_generator.rb
@@ -207,17 +211,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Redmine Extensions is set of usefull features for Redmine. Main focus is
   on development helpers, but many users can find it helpfull
 test_files:
-- spec/presenters/easy_settings/params_wrapper_spec.rb
-- spec/support/plugin_generator.rb
+- spec/spec_helper.rb
 - spec/init_rails.rb
-- spec/models/easy_setting_spec.rb
 - spec/features/jasmine_spec.rb
 - spec/features/autocomplete_spec.rb
+- spec/models/easy_setting_spec.rb
+- spec/presenters/easy_settings/params_wrapper_spec.rb
+- spec/support/plugin_generator.rb
 - spec/factories/easy_settings.rb
-- spec/spec_helper.rb

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

@@ -1,75 +0,0 @@
-<% unless rys %>
-require "easy_extensions/spec_helper"
-<% end %>
-RSpec.describe <%= controller_class %>Controller, logged: true do
-  let(:<%= model_name_underscored %>) { FactoryBot.create(:<%= model_name_underscored %>) }
-  let(:<%= model_name_pluralize_underscored %>) { FactoryBot.create_list(:<%= model_name_underscored %>, 2) }
-
-  before(:each) do
-    role = Role.non_member
-    role.add_permission! :view_<%= model_name_pluralize_underscored %>
-    role.add_permission! :manage_<%= model_name_pluralize_underscored %>
-  end
-
-  render_views
-
-  it 'index' do
-    <%= model_name_pluralize_underscored %>
-
-    get :index
-    expect(response).to have_http_status(:success)
-    expect(response).to render_template('<%= model_name_pluralize_underscored %>/index')
-  end
-
-  it 'show' do
-    get :show, params: { id: <%= model_name_underscored %> }
-    expect(response).to have_http_status(:success)
-    expect(response).to render_template('<%= model_name_pluralize_underscored %>/show')
-  end
-
-  it 'new' do
-    get :new
-    expect(response).to have_http_status(:success)
-    expect(response).to render_template('<%= model_name_pluralize_underscored %>/new')
-  end
-
-  it 'create with invalid' do
-    post :create, params: { <%= model_name_underscored %>: { } }
-    expect(response).to render_template('<%= model_name_pluralize_underscored %>/new')
-    expect(assigns[:<%= model_name_underscored %>]).to be_a_new(<%= model_name %>)
-  end
-
-  it 'create with valid' do
-    post :create, params: { <%= model_name_underscored %>: FactoryBot.attributes_for(:<%= model_name_underscored %>) }
-    expect(response).to redirect_to(<%= model_name_underscored %>_path(assigns[:<%= model_name_underscored %>]))
-    expect(assigns[:<%= model_name_underscored %>]).not_to be_a_new(<%= model_name %>)
-  end
-
-  it 'edit' do
-    get :edit, params: { id: <%= model_name_underscored %> }
-    expect(response).to have_http_status(:success)
-    expect(response).to render_template('<%= model_name_pluralize_underscored %>/edit')
-  end
-
-  it 'update with invalid' do
-    put :update, params: { id: <%= model_name_underscored %>, <%= model_name_underscored %>: { <%= safe_columns.first[0] %>: '' } }
-    expect(response).to render_template('<%= model_name_pluralize_underscored %>/edit')
-    expect(assigns[:<%= model_name_underscored %>].valid?).to be false
-  end
-
-  it 'update with valid' do
-    put :update, params: { id: <%= model_name_underscored %>, <%= model_name_underscored %>: { <%= safe_columns.first[0] %>: 'Tralalala' } }
-    expect(response).to redirect_to(<%= model_name_underscored %>_path(assigns[:<%= model_name_underscored %>]))
-    expect(assigns[ :<%= model_name_underscored %>].valid?).to be true
-  end
-
-  it 'destroy' do
-      <%= model_name_underscored %>
-      <%= model_name_pluralize_underscored %>
-
-    expect(<%= model_name %>.count).to eq(3)
-    expect { delete :destroy, params: { id: <%= model_name_underscored %> } }.to change(<%= model_name %>, :count).by(-1)
-    expect(response).to redirect_to(<%= model_name_pluralize_underscored %>_path)
-    expect(response).to redirect_to(<%= model_name_pluralize_underscored %>_path)
-  end
-end