edgarj 4.06.00 → 4.06.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a67b275d252a2a12248082ff6c46ad40162d5dd0f34f61554d692870c0b098c
-  data.tar.gz: 185f251a94005634be489001d8ee5896a29ced7ed2c825059fe91df48280e04c
+  metadata.gz: 3e2b4a25bc7fec12ca9810d9d828e941f84f61961ea596ef1dcc1f8491c99a23
+  data.tar.gz: 0d50818595fc1b58ad00c3b8a90b6317ae0b6867d3e83b719e0c4c81f2be8e0e
 SHA512:
-  metadata.gz: 7002726d8a3fcdd986edfa890e99329a529d91722b0b94e0aeec1a3c5f4133f9684eb5527bb3ac34b7d306586a4f499fbf3d2aff5f90663766ef08f96ff32716
-  data.tar.gz: bc0e3684c4a6982e69e0e86b66581d5c680553988ffc7b6e06e0e025b07f0f7f2e58a82284a95ae4fc81dd9046eaae0ed7d3ad71b268c9ff597d978a84615117
+  metadata.gz: 3cfc7575de7a5b9d44b96135f39435f74857e12a362fcbbe7e13237355c131e50f5300ab1384975a2d2f4447b1e73ba907562588e36875765957ab43c3bd8e34
+  data.tar.gz: e830712769b62337b0751b1ad1c6d9808a37ce40b27713a8dad7f39fa72d0003582a796edc3e226a82f2d0d1be35051ec4d91bfbeab6bd86213eee227e0a6d54

data/app/controllers/edgarj/edgarj_controller.rb

@@ -258,15 +258,15 @@ module Edgarj
     # ModelPermission::READ on this controller is required.
     #
     def search_save
-      svc = SavedVcontext.save(current_user, nil,
-                               params[:saved_page_info_name], page_info)
+      SavedVcontext.save(current_user, nil,
+                         params[:saved_page_info_name], page_info)
 
       render :update do |page|
         page << "Edgarj.SearchSavePopup.close();"
         page.replace 'edgarj_load_condition_menu',
            :partial=>'edgarj/load_condition_menu'
       end
-    rescue ActiveRecord::ActiveRecordError => ex
+    rescue ActiveRecord::ActiveRecordError
       app_rescue
       render :update do |page|
         page.replace_html 'search_save_popup_flash_error', :text=>t('save_fail')
@@ -332,7 +332,6 @@ module Edgarj
                         Time.now.strftime("%Y%m%d-%H%M%S"))
       file        = Tempfile.new(filename, Settings.edgarj.csv_dir)
       csv_visitor = EdgarjHelper::CsvVisitor.new(view_context)
-      cond        = {:conditions=>page_info.record.conditions}
       file.write CSV.generate_line(model.columns.map{|c| c.name})
       for rec in user_scoped.where(page_info.record.conditions).
           order(

data/app/helpers/edgarj/search_helper.rb

@@ -9,6 +9,6 @@ module Edgarj
       render '/edgarj/edgarj/search_operator',
           o:        o,
           method:   method
-      end
+    end
   end
 end

data/app/models/edgarj/search_form.rb

@@ -243,7 +243,6 @@ module Edgarj
 
     def validate_data_type
       for col in klass.columns do
-        col_str     = col_name(col)
         encoded_col = encode_name(col)
         val     = @attrs[encoded_col]
         case col.type

data/app/models/edgarj/sssn.rb

@@ -95,7 +95,7 @@ module Edgarj
             session_id = s.session_id
             s.destroy
             logger.info("deleting session(#{session_id})")
-          rescue ActiveRecord::RecordNotFound => ex
+          rescue ActiveRecord::RecordNotFound
             logger.warn("session not found(#{session_id})")
           end
         end

data/lib/core_ext/resources.rb

@@ -20,7 +20,7 @@ module ActionDispatch::Routing::Mapper::Resources
   # Where, :id is internally used for session so that client application
   # doesn't have to take care it.
   def edgarj_resources(*symbols, &block)
-    resources *symbols do
+    resources(*symbols) do
       yield if block_given?
 
       collection do
@@ -59,7 +59,7 @@ module ActionDispatch::Routing::Mapper::Resources
   # Where, :id is internally used for session so that client application
   # doesn't have to take care it.
   def edgarj_popup_resources(*symbols, &block)
-    resources *symbols, only: [:index] do
+    resources(*symbols, only: [:index]) do
       yield if block_given?
 
       collection do

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = '4.06.00'
+  VERSION = '4.06.05'
 end

data/test/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/test/dummy/config/environments/test.rb

@@ -1,4 +1,6 @@
 Dummy::Application.configure do
+  config.active_support.test_order = :sorted
+
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -13,7 +15,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/test/dummy/db/schema.rb

@@ -13,47 +13,47 @@
 
 ActiveRecord::Schema.define(version: 20160119053447) do
 
-  create_table "authors", force: true do |t|
-    t.string   "name"
+  create_table "authors", force: :cascade do |t|
+    t.string   "name",          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "user_group_id"
+    t.integer  "user_group_id", limit: 4
   end
 
-  create_table "books", force: true do |t|
-    t.integer  "author_id"
-    t.string   "name"
+  create_table "books", force: :cascade do |t|
+    t.integer  "author_id",  limit: 4
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "edgarj_model_permissions", force: true do |t|
-    t.integer  "user_group_id"
-    t.string   "name"
-    t.integer  "flags"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
-    t.string   "model"
+  create_table "edgarj_model_permissions", force: :cascade do |t|
+    t.integer  "user_group_id", limit: 4
+    t.string   "name",          limit: 255
+    t.integer  "flags",         limit: 4
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.string   "model",         limit: 255
   end
 
   add_index "edgarj_model_permissions", ["model"], name: "index_edgarj_model_permissions_on_model", using: :btree
 
-  create_table "edgarj_page_infos", force: true do |t|
-    t.integer  "sssn_id"
-    t.string   "view"
-    t.string   "order_by"
-    t.string   "dir"
-    t.integer  "page"
-    t.integer  "lines"
-    t.text     "record_data"
+  create_table "edgarj_page_infos", force: :cascade do |t|
+    t.integer  "sssn_id",     limit: 4
+    t.string   "view",        limit: 255
+    t.string   "order_by",    limit: 255
+    t.string   "dir",         limit: 255
+    t.integer  "page",        limit: 4
+    t.integer  "lines",       limit: 4
+    t.text     "record_data", limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "edgarj_sssns", force: true do |t|
-    t.string   "session_id", null: false
-    t.text     "data"
-    t.integer  "user_id"
+  create_table "edgarj_sssns", force: :cascade do |t|
+    t.string   "session_id", limit: 255,   null: false
+    t.text     "data",       limit: 65535
+    t.integer  "user_id",    limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -61,19 +61,19 @@ ActiveRecord::Schema.define(version: 20160119053447) do
   add_index "edgarj_sssns", ["session_id"], name: "index_edgarj_sssns_on_session_id", using: :btree
   add_index "edgarj_sssns", ["updated_at"], name: "index_edgarj_sssns_on_updated_at", using: :btree
 
-  create_table "edgarj_user_group_users", force: true do |t|
-    t.integer  "user_group_id"
-    t.integer  "user_id"
+  create_table "edgarj_user_group_users", force: :cascade do |t|
+    t.integer  "user_group_id", limit: 4
+    t.integer  "user_id",       limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "edgarj_user_groups", force: true do |t|
-    t.integer  "kind"
-    t.string   "name"
-    t.integer  "parent_id"
-    t.integer  "lft"
-    t.integer  "rgt"
+  create_table "edgarj_user_groups", force: :cascade do |t|
+    t.integer  "kind",       limit: 4
+    t.string   "name",       limit: 255
+    t.integer  "parent_id",  limit: 4
+    t.integer  "lft",        limit: 4
+    t.integer  "rgt",        limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -83,9 +83,9 @@ ActiveRecord::Schema.define(version: 20160119053447) do
   add_index "edgarj_user_groups", ["parent_id"], name: "index_edgarj_user_groups_on_parent_id", using: :btree
   add_index "edgarj_user_groups", ["rgt"], name: "index_edgarj_user_groups_on_rgt", using: :btree
 
-  create_table "users", force: true do |t|
-    t.string   "code"
-    t.string   "name"
+  create_table "users", force: :cascade do |t|
+    t.string   "code",       limit: 255
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/test/dummy/test/controllers/authors_controller_test.rb

@@ -107,8 +107,8 @@ class AuthorsControllerTest < ActionController::TestCase
       end
 
       should 'search with operator' do
-        xhr :get, :search, edgarj_search_form: {_id: @author.id},
-            edgarj_search_form: {
+        xhr :get, :search, edgarj_search_form: {
+              _id: @author.id,
               edgarj_search_form_operator: {
                 _id: '<>'
               }

data/test/dummy/test/controllers/books_controller_test.rb

@@ -107,8 +107,8 @@ class BooksControllerTest < ActionController::TestCase
       end
 
       should 'search with operator' do
-        xhr :get, :search, edgarj_search_form: {_id: @book.id},
-            edgarj_search_form: {
+        xhr :get, :search, edgarj_search_form: {
+              _id: @book.id,
               edgarj_search_form_operator: {
                 _id: '<>'
               }

data/test/test_helper.rb

@@ -1,21 +1,22 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
 require "rails/test_help"
 
-Rails.backtrace_cleaner.remove_silencers!
+# Filter out Minitest backtrace while allowing backtrace from other libraries
+# to be shown.
+Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load fixtures from the engine
-#if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+if ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-#end
-
-class ActiveSupport::TestCase
-  fixtures :all
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+  ActiveSupport::TestCase.fixtures :all
 end
 
 class ActionController::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 4.06.00
+  version: 4.06.05
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -358,96 +372,95 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Scaffold with Ajax, search, sort, 'belongs_to' popup, and more.
 test_files:
-- test/dummy/config.ru
-- test/dummy/test/controllers/books_controller_test.rb
-- test/dummy/test/controllers/authors_controller_test.rb
-- test/dummy/test/controllers/authors_popup_controller_test.rb
-- test/dummy/test/helpers/authors_helper_test.rb
-- test/dummy/test/models/author_test.rb
-- test/dummy/test/models/rails_config_test.rb
-- test/dummy/test/models/book_test.rb
+- test/controllers/edgarj/edgarj_controller_test.rb
+- test/controllers/edgarj/model_permissions_controller_test.rb
+- test/controllers/edgarj/user_group_users_controller_test.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/authors.js
+- test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/stylesheets/authors.css
 - test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/decorators/models/edgarj/user_group_decorator.rb
-- test/dummy/app/controllers/authors_popup_controller.rb
-- test/dummy/app/controllers/dummy_auth_mixin.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/books_controller.rb
 - test/dummy/app/controllers/authors_controller.rb
-- test/dummy/app/helpers/authors_popup_helper.rb
+- test/dummy/app/controllers/authors_popup_controller.rb
+- test/dummy/app/controllers/books_controller.rb
+- test/dummy/app/controllers/dummy_auth_mixin.rb
+- test/dummy/app/decorators/models/edgarj/user_group_decorator.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/authors_helper.rb
+- test/dummy/app/helpers/authors_popup_helper.rb
 - test/dummy/app/helpers/books_helper.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/author.rb
-- test/dummy/app/models/user.rb
 - test/dummy/app/models/book.rb
+- test/dummy/app/models/user.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/layouts/login.html.erb
-- test/dummy/Rakefile
-- test/dummy/config/database.yml
-- test/dummy/config/settings.yml
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/config.ru
+- test/dummy/config/application.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/edgarj/menu_config.rb
 - test/dummy/config/environment.rb
-- test/dummy/config/settings/production.yml
-- test/dummy/config/settings/development.yml
-- test/dummy/config/settings/test.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/application.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/locales/ja.yml
+- 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/filter_parameter_logging.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/config.rb
-- test/dummy/config/edgarj/menu_config.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/public/404.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
-- test/dummy/public/422.html
-- test/dummy/README.rdoc
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20140807065420_create_users.rb
-- test/dummy/db/migrate/20131218011851_create_books.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/locales/ja.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/settings.yml
+- test/dummy/config/settings/development.yml
+- test/dummy/config/settings/production.yml
+- test/dummy/config/settings/test.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
-- test/test_helper.rb
-- test/integration/navigation_test.rb
-- test/controllers/edgarj/user_group_users_controller_test.rb
-- test/controllers/edgarj/edgarj_controller_test.rb
-- test/controllers/edgarj/model_permissions_controller_test.rb
+- test/dummy/db/migrate/20140807065420_create_users.rb
+- test/dummy/db/schema.rb
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/test/controllers/authors_controller_test.rb
+- 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/author_test.rb
+- test/dummy/test/models/book_test.rb
+- test/dummy/test/models/rails_config_test.rb
+- test/edgarj_test.rb
 - test/fixtures/authors.yml
 - test/fixtures/books.yml
-- test/fixtures/users.yml
-- test/fixtures/edgarj/user_group_users.yml
-- test/fixtures/edgarj/user_groups.yml
+- test/fixtures/edgarj/model_permissions.yml
 - test/fixtures/edgarj/page_infos.yml
 - test/fixtures/edgarj/sssns.yml
-- test/fixtures/edgarj/model_permissions.yml
-- test/edgarj_test.rb
-- test/support/edgarj/controller_supporter.rb
-- test/models/helpers/edgarj/model_permissions_helper_test.rb
-- test/models/helpers/edgarj/user_group_users_helper_test.rb
-- test/models/edgarj/user_group_test.rb
-- test/models/edgarj/sssn_test.rb
+- test/fixtures/edgarj/user_group_users.yml
+- test/fixtures/edgarj/user_groups.yml
+- test/fixtures/users.yml
+- test/integration/navigation_test.rb
 - test/models/edgarj/model_permission_test.rb
 - test/models/edgarj/page_info_test.rb
+- test/models/edgarj/sssn_test.rb
+- test/models/edgarj/user_group_test.rb
 - test/models/edgarj/user_group_user_test.rb
+- test/models/helpers/edgarj/model_permissions_helper_test.rb
+- test/models/helpers/edgarj/user_group_users_helper_test.rb
+- test/support/edgarj/controller_supporter.rb
+- test/test_helper.rb