redmine_extensions 0.3.00 → 0.3.2

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

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

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

@@ -1,24 +1,3 @@
 module <%= controller_class %>Helper
 
-  def render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-    api.<%= model_name_underscored %> do
-      api.id <%= model_name_underscored %>.id
-      <%- db_columns.keys.each do |column_name| -%>
-      api.<%= column_name %> <%= model_name_underscored %>.<%= column_name %>
-      <%- end -%>
-      <%- if acts_as_customizable? -%>
-      render_api_custom_values <%= model_name_underscored %>.visible_custom_field_values, api
-      <%- end -%>
-      <%- if acts_as_attachable? -%>
-      api.array :attachments do
-        <%= model_name_underscored %>.attachments.each do |attachment|
-          render_api_attachment(attachment, api)
-        end
-      end if include_in_api_response?('attachments')
-      <%- end -%>
-
-      call_hook(:helper_render_api_<%= model_name_underscored %>, {api: api, <%= model_name_underscored %>: <%= model_name_underscored %>})
-    end
-  end
-
 end

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

@@ -1,5 +1,3 @@
 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
+  render(@entities, {api: api})
+end

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

@@ -1,11 +1,12 @@
-class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
+class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration[<%= ActiveRecord::Migration::Current.current_version %>]
   def change
-    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
+    create_table :<%= model_name_pluralize_underscored %> do |t|
       <%- columns = db_columns.reject{|k| k.in?(["created_at", "updated_at"])} -%>
       <%- columns.each do |column_name, column_attrs| -%>
       t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
       <%- end -%>
-      t.timestamps null: false
+
+      t.timestamps
     end
   end
 end

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

@@ -59,7 +59,7 @@ class <%= model_name %> < ActiveRecord::Base
   after_update :send_update_notification
   <%- end -%>
 
-  def self.visible_condition(user, options={})
+  def self.visible_condition(user, options = {})
   <%- if project? -%>
     Project.allowed_to_condition(user, :<%= view_permission %>, options)
   <%- else -%>

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

@@ -1 +1 @@
-render_api_<%= model_name_underscored %>(api, @<%= model_name_underscored %>)
+render(@<%= model_name_underscored %>, { api: api })

data/lib/generators/redmine_extensions/entity/templates/spec/requests/%model_name_underscored%_spec.rb.tt

@@ -0,0 +1,19 @@
+RSpec.describe "<%= model_name_pluralize_underscored %>", type: :request do
+  describe "API" do
+    context "logged", logged: true do
+      before(:each) do
+        role = Role.non_member
+        role.add_permission! :view_<%= model_name_pluralize_underscored %>
+      end
+
+      it "list" do
+        FactoryBot.create_list :<%= model_name_underscored %>, 2
+        get <%= model_name_pluralize_underscored %>_path(format: "json")
+        expect(response).to have_http_status :success
+        expect(response.body).to include "limit", "offset"
+        expect(response.body).to match /total_count.{,2}:2/
+      end
+    end
+
+  end
+end

data/lib/redmine_extensions/engine.rb

@@ -2,6 +2,7 @@ require 'active_support/dependencies'
 require_relative './patch_manager'
 require_relative './redmine_patches/controllers/application_controller_patch'
 require_relative './redmine_patches/models/project_patch'
+require_relative './redmine_patches/models/custom_field_patch'
 
 require_relative './query_output'
 

data/lib/redmine_extensions/redmine_patches/models/custom_field_patch.rb

@@ -0,0 +1,11 @@
+module RedmineExtensions
+  module CustomFieldPatch
+
+    def translated_name
+      self.name
+    end
+
+  end
+end
+
+RedmineExtensions::PatchManager.register_model_patch 'CustomField', 'RedmineExtensions::CustomFieldPatch', if: -> { !Redmine::Plugin.installed?(:easy_extensions) }

data/lib/redmine_extensions/tags/autocomplete_field.rb

@@ -18,7 +18,7 @@ module RedmineExtensions
 
       def render
         options = @options.stringify_keys
-        options["value"] = options.fetch("value") { value_before_type_cast(object) }
+        options["value"] = options.fetch("value") { value_before_type_cast }
         add_default_name_and_id(options)
         @template_object.autocomplete_field_tag(options.delete('name'), @choices, options.delete('value'), options.symbolize_keys)
       end

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.3.00'
+  VERSION = '0.3.2'
 end

data/spec/factories/easy_settings.rb

@@ -1,13 +1,14 @@
 FactoryBot.define do
+
   factory :easy_setting do
 
-    name 'my_setting'
-    value 'my_value'
+    name { 'my_setting' }
+    value { 'my_value' }
     project
 
     trait :global do
-      value 'my_global_value'
-      project nil
+      value { 'my_global_value' }
+      project { n il}
     end
   end
 

data/spec/features/autocomplete_spec.rb

@@ -1,6 +1,4 @@
-require 'rails_helper'
-
-RSpec.describe 'autocomplete', type: :feature, js: true do
+RSpec.describe 'autocomplete', type: :feature, js: true, logged: :admin do
 
   describe 'render' do
     it 'generate default autocomplete' do

data/spec/features/jasmine_spec.rb

@@ -1,6 +1,4 @@
-require 'rails_helper'
-
-RSpec.describe 'jasmine', type: :feature, js: true do
+RSpec.describe 'jasmine', type: :feature, js: true, logged: :admin do
 
   it 'run tests' do
     visit "/dummy_entities?jasmine=true"

data/spec/init_rails.rb

@@ -0,0 +1,13 @@
+possible_app_dirs = [
+  ENV['DUMMY_PATH'],
+  File.join(Dir.pwd, 'test/dummy'),
+  Bundler.root.join('test/dummy'),
+]
+
+possible_app_dirs.each do |dir|
+  next if !dir
+  next if !Dir.exist?(dir)
+
+  require File.join(dir, 'plugins/easyproject/easy_plugins/easy_extensions/test/spec/rails_helper')
+  break
+end

data/spec/models/easy_setting_spec.rb

@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 RSpec.describe EasySetting, type: :model do
 
   let(:project) { FactoryBot.create(:project, name: 'My project') }

data/spec/presenters/easy_settings/params_wrapper_spec.rb

@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 module EasySettings
   RSpec.describe ParamsWrapper, clear_cache: true do
 
@@ -14,6 +12,8 @@ module EasySettings
       end
 
       it 'create project setting' do
+        EasySetting.where(name: ['key', 'key2']).destroy_all
+
         presenter = EasySettings::ParamsWrapper.from_params({'key' => 'value', 'key2' => 'value2'}, project: project)
         expect{ presenter.save }.to change(EasySetting, :count).by(2)
         expect( EasySetting.where(project_id: project.id).count ).to eq(2)

data/spec/spec_helper.rb

@@ -1,69 +1,2 @@
-# This file was generated by the `rails generate rspec:install` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
-end
+require_relative 'init_rails'
+require Rails.root.join('plugins/easyproject/easy_plugins/easy_extensions/test/spec/spec_helper')

data/spec/support/plugin_generator.rb

@@ -4,13 +4,6 @@ module PluginGenerator
   def self.generate_test_plugin!
     Rails::Generators.invoke 'redmine_extensions:plugin', ['DummyPlugin'], behavior: :revoke, destination_root: Rails.root
     Rails::Generators.invoke 'redmine_extensions:plugin', ['DummyPlugin'], behavior: :invoke, destination_root: Rails.root
-    # if Rails::VERSION::MAJOR >= 5
-    #   Rails.application.reloader.reload!
-    # else
-    #   ActionDispatch::Reloader.cleanup!
-    #   ActionDispatch::Reloader.prepare!
-    # end
-
     generate_autocomplete!
   end
 
@@ -25,7 +18,7 @@ module PluginGenerator
   def self.generate_dummy_entity!
     File.open( Rails.root.join('plugins', 'dummy_plugin', 'db', 'migrate', '20162010160230_create_dummy_entities.rb'), 'w' ) do |file|
       file.write( <<-END_RUBY )
-        class CreateDummyEntities < ActiveRecord::Migration
+        class CreateDummyEntities < ActiveRecord::Migration[4.2]
           def change
             create_table :dummy_entities do |t|
               t.string :name
@@ -47,8 +40,6 @@ module PluginGenerator
                           'project_id',
                           'array_of_dummies'
 
-          attr_protected :id
-
           serialize :array_of_dummies, Array
         end
       END_RUBY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.00
+  version: 0.3.2
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,110 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.1
-- !ruby/object:Gem::Dependency
-  name: factory_bot_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.6'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 description: Redmine Extensions provide many extended functionalities for Redmine
   project.
 email:
@@ -199,6 +95,7 @@ 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/_sidebar.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb
@@ -230,6 +127,7 @@ 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/requests/%model_name_underscored%_spec.rb.tt
 - lib/generators/redmine_extensions/plugin/USAGE
 - lib/generators/redmine_extensions/plugin/plugin_generator.rb
 - lib/generators/redmine_extensions/plugin/templates/Gemfile.erb
@@ -276,22 +174,17 @@ files:
 - lib/redmine_extensions/rails_patches/form_builder_patch.rb
 - lib/redmine_extensions/rails_patches/route_set_generator_patch.rb
 - lib/redmine_extensions/redmine_patches/controllers/application_controller_patch.rb
+- lib/redmine_extensions/redmine_patches/models/custom_field_patch.rb
 - lib/redmine_extensions/redmine_patches/models/project_patch.rb
 - lib/redmine_extensions/tags/autocomplete_field.rb
 - lib/redmine_extensions/version.rb
 - lib/tasks/redmine_extensions_tasks.rake
-- spec/factories/easy_queries.rb
 - spec/factories/easy_settings.rb
-- spec/factories/issues.rb
-- spec/factories/projects.rb
-- spec/factories/time_entries.rb
-- spec/factories/trackers.rb
-- spec/factories/users.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/jasmine_spec.rb
+- spec/init_rails.rb
 - spec/models/easy_setting_spec.rb
 - spec/presenters/easy_settings/params_wrapper_spec.rb
-- spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/plugin_generator.rb
 homepage: https://www.easyredmine.com
@@ -313,24 +206,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 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/rails_helper.rb
-- spec/factories/easy_queries.rb
-- spec/factories/trackers.rb
-- spec/factories/users.rb
-- spec/factories/easy_settings.rb
-- spec/factories/time_entries.rb
-- spec/factories/issues.rb
-- spec/factories/projects.rb
+- spec/presenters/easy_settings/params_wrapper_spec.rb
 - spec/support/plugin_generator.rb
+- spec/init_rails.rb
 - spec/models/easy_setting_spec.rb
-- spec/spec_helper.rb
-- spec/presenters/easy_settings/params_wrapper_spec.rb
-- spec/features/autocomplete_spec.rb
 - spec/features/jasmine_spec.rb
+- spec/features/autocomplete_spec.rb
+- spec/factories/easy_settings.rb
+- spec/spec_helper.rb