edgarj 4.06.09 → 4.06.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ecf7542bf96fd9bd6303af4432e571db94ccd92fe1424cbd3ff8fa5e7ce3f05
-  data.tar.gz: 6400727335190648b3cf59f3a023e44e5e3d8dbd867e70472165c2bfb408af33
+  metadata.gz: a903fc5f0f33be670bc43b83e7cf4688733a964ffaa19945f709b20e8e92ced9
+  data.tar.gz: 9546ae4a090b925449e88ce6654bdac0f03232dc40adc38634645084d6d8cdf1
 SHA512:
-  metadata.gz: 20b360a507bf1cd7b2ea313db855ce878a991a6920258553b2bece8c05f7b2ef9310209a670ce03bf22509a36e68dbe9702236a80d06e1314641e17288a55e52
-  data.tar.gz: c5e5106c13070d36653cc14d04340eb41b15a5fa16820231b41c58390e0ad1fc5b6c5208dd6ef983e314eb8d171016b969a513bf1c2528ea9b8455e3c4038dde
+  metadata.gz: 8fc02a00e1a6ac4fcd987a322db68718dd33c2aa5759109fba64b1559e70a840dedf38b0d83f3a48d57975e65e08dbe15faf85062b1e120fb4f540d4b50b6f69
+  data.tar.gz: 72824a2d4968d5fd801ad86dc0e7e4e2690f28217496b701c92a91603ffb55e6293f8d9809403ccbf68a399ed516fe6b6f139eb41d49a874824de4faa44abfcf

data/app/controllers/edgarj/edgarj_controller.rb

@@ -327,10 +327,13 @@ module Edgarj
     # FIXME: file.close(true) deletes files *BEFORE* actually send file
     # so that comment it out.  Need to clean these work files.
     def csv_download
+      dir = '/tmp/edgarj/csv_download'
+      FileUtils.mkdir_p(dir)
+
       filename    = sprintf("%s-%s.csv",
                         model_name,
                         Time.now.strftime("%Y%m%d-%H%M%S"))
-      file        = Tempfile.new(filename, Settings.edgarj.csv_dir)
+      file        = Tempfile.new(filename, dir)
       csv_visitor = EdgarjHelper::CsvVisitor.new(view_context)
       file.write CSV.generate_line(model.columns.map{|c| c.name})
       for rec in user_scoped.where(page_info.record.conditions).
@@ -344,8 +347,7 @@ module Edgarj
         end
         file.write CSV.generate_line(array)
       end
-      file.close 
-      File.chmod(Settings.edgarj.csv_permission, file.path)
+      file.close
       send_file(file.path, {
           type:     'text/csv',
           filename: filename})

data/app/helpers/edgarj/assoc_helper.rb

@@ -164,7 +164,7 @@ module Edgarj
 
       link_to(
           draw_belongs_to_label_sub(model, col.name, parent_model).html_safe +
-          Settings.edgarj.belongs_to.link_tag.html_safe,
+          '<span class="edgarj_field_belongs_to_button">選択</span>'.html_safe,
           popup_path,
           remote: true)
     end
@@ -177,16 +177,7 @@ module Edgarj
     # popup_field:: Edgarj::PopupHelper::PopupField object
     # parent_name:: initial parent name
     def draw_belongs_to_clear_link(f, col_name, popup_field, parent_name, default_label)
-      if Settings.edgarj.belongs_to.disable_clear_link
-        f.hidden_field(col_name)
-      else
-        ('&nbsp;&nbsp;' +
-            link_to("[#{I18n.t('edgarj.default.clear')}]", '#',
-                onClick:  "Edgarj.Popup.clear('#{j(popup_field.id_target)}','#{j(default_label)}'); return false;",
-                id:       popup_field.clear_link,
-                style:    'display:' + (parent_name.blank? ? 'none' : '')) +
-            f.hidden_field(col_name)).html_safe
-      end
+      f.hidden_field(col_name)
     end
 
     # draw 'belongs_to' popup data-entry field
@@ -211,30 +202,17 @@ module Edgarj
       label = content_tag(:span,
           parent_obj ? parent_obj.name : default_label.html_safe,
           id: popup_field.label_target)
-      link_tag = Settings.edgarj.belongs_to.link_tag.html_safe
+      link_tag = '<span class="edgarj_field_belongs_to_button">選択</span>'.html_safe
       if parent_obj
-        if Settings.edgarj.belongs_to.popup_on == 'field'
-          link_to(
-              label + link_tag,
-              popup_path,
-              remote: true)
-        else
-          link_to(label,
-              # TODO: Hardcoded 'master' prefix should be fixed
-              controller: url_prefix + parent_obj.class.name.underscore.pluralize,
-              action:     'show',
-              id:         parent_obj,
-              topic_path: 'add')
-        end
+        link_to(
+            label + link_tag,
+            popup_path,
+            remote: true)
       else
-        if Settings.edgarj.belongs_to.popup_on == 'field'
-          link_to(
-              label + link_tag,
-              popup_path,
-              remote: true)
-        else
-          label
-        end
+        link_to(
+            label + link_tag,
+            popup_path,
+            remote: true)
       end +
       draw_belongs_to_clear_link(f, col.name, popup_field,
           parent_obj && parent_obj.name,

data/app/helpers/edgarj/form_drawer.rb

@@ -157,10 +157,7 @@ module Edgarj
 
       # draw 'belongs_to' field for AR
       def _draw_belongs_to_field(parent_model, col)
-        label = Settings.edgarj.belongs_to.popup_on == 'field' ?
-            nil :
-            @vc.draw_belongs_to_label(@f, @drawer.popup_path(col), col.name)
-        _draw_head(col, label){
+        _draw_head(col, nil){
           @vc.draw_belongs_to_field(@f, @drawer.popup_path(col), col.name)
         }
       end

data/app/models/edgarj/page_info.rb

@@ -8,7 +8,7 @@ module Edgarj
       if !sssn || !(page_info = sssn.page_infos.find_by_view(view))
         page_info = sssn.page_infos.build(
             view:     view,
-            lines:    Settings.edgarj.page_info.default_lines,
+            lines:    20,
             order_by: '',
             dir:      '',
             page:     1)

data/lib/edgarj/engine.rb

@@ -8,15 +8,6 @@ module Edgarj
       g.templates.unshift File::expand_path('../templates', __FILE__)
     end
 
-    # load this engine's config
-    # (rails_config default loads from only Rails.root/config/...)
-    def self.load_config
-      engine_config_dir = Pathname.new(File.expand_path('../../../config', __FILE__))
-      Settings.prepend_source!((engine_config_dir + 'settings.yml').to_s)
-      Settings.prepend_source!((engine_config_dir + "settings/#{Rails.env}.yml").to_s)
-      Settings.reload!
-    end
-
     # Require/load application side edgarj config in RAILS_ROOT/config/edgarj/
     def self.load_edgarj_conf_in_app
       [
@@ -45,14 +36,16 @@ module Edgarj
 
     # make edgarj related work directories
     def self.make_work_dir
-      for dir in [Settings.edgarj.work_dir, Settings.edgarj.csv_dir] do
+      work_dirs = [
+        Rails.root + 'tmp/edgarj'
+      ]
+      for dir in work_dirs do
         FileUtils.mkdir_p(dir) if !File.directory?(dir)
       end
     end
 
     initializer "edgarj" do
       ActiveRecord::SessionStore::Session.table_name = 'edgarj_sssns'
-      Engine::load_config
       Engine::load_edgarj_conf_in_app
       Engine::load_decorators
       for file in Dir.glob(File.join(File.dirname(__FILE__), "../../locale/*.yml")) do

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = '4.06.08'
+  VERSION = '4.06.09'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 4.06.09
+  version: 4.06.10
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,20 +64,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -413,8 +399,8 @@ test_files:
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/config.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
@@ -426,12 +412,12 @@ test_files:
 - test/dummy/config/settings/development.yml
 - test/dummy/config/settings/production.yml
 - test/dummy/config/settings/test.yml
+- test/dummy/config/settings.yml
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/routes.rb
-- test/dummy/config/settings.yml
 - test/dummy/db/migrate/20131107120635_create_authors.rb
 - test/dummy/db/migrate/20131218011851_create_books.rb
 - test/dummy/db/migrate/20140201000000_add_user_group_id_to_authors.rb
@@ -445,9 +431,9 @@ test_files:
 - test/dummy/test/controllers/authors_popup_controller_test.rb
 - test/dummy/test/controllers/books_controller_test.rb
 - test/dummy/test/helpers/authors_helper_test.rb
+- test/dummy/test/models/rails_config_test.rb
 - test/dummy/test/models/author_test.rb
 - test/dummy/test/models/book_test.rb
-- test/dummy/test/models/rails_config_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/config.ru