edgarj 4.04.01 → 4.05.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6bf27254600b6b45051cceeaa5207bb4444ed1f
-  data.tar.gz: 6e771d6939ffa603da365fd7cd4868590ef4e80d
+  metadata.gz: 752addae3c0f24a5262cdd684758c30ff23bc03a
+  data.tar.gz: 43e8070d61914fd360be71fead1543fbad84bdc8
 SHA512:
-  metadata.gz: fa01bedc497c6cab13a28fdbae2d5eefed989eb700ff550d3aedaf439042725f9fb1376dcf4aa43aed8ee6a0641712b7c550322dea38c15c616d860703f340cc
-  data.tar.gz: d1ac0b607e0602fb0149467ce411cfeeb75270ae3894301dce9a51f960b8afef6feda23ff8eb0cb081f93b7e16c0f42d8918f8974f9d05120a175fea4ff882b9
+  metadata.gz: 9c7fc86cda66c605669a55a973917250883eb84364dcf37e4fd29ce1512fa7e51a2efcec7136bb1b5cb559e0ed303485c950f97e0e2212f341b927ed448effca
+  data.tar.gz: 0a98356064af29f8853e242a802447959a5fa772947b3dd18b68425ad9d1ef4f50824c8bb41e9ca80e511c5f08fc7c48c90e03c580446a982c2fef3648908b34

data/app/helpers/edgarj/drawer/base.rb

@@ -4,9 +4,10 @@ module Edgarj
   module Drawer
     # Column-info classes to provide the following common methods:
     #
-    # * label
-    # * sort_key
-    # * column_value
+    # * label           - for column header label in the list
+    # * sort_key        - to sort list
+    # * column_value    - cell text for the column in the list
+    # * field           - for the form
     #
     # and the following optional methods:
     # * tag_options
@@ -21,6 +22,7 @@ module Edgarj
     module ColumnInfo
       # Abstract class for all of ColumnInfo
       class Base
+        # for column header label in the list
         def label(vc)
           raise 'derived should implement'
         end
@@ -29,12 +31,22 @@ module Edgarj
           raise 'derived should implement'
         end
 
+        # cell text for the column in the list
+        #
         # @param rec      [AR]
         # @param drawer   [Edgarj::Drawer::Base]
         def column_value(rec, drawer)
           rec.inspect
         end
 
+        # input field for form
+        #
+        # @param rec          [AR]
+        # @param form_drawer  [Edgarj::FormDrawer::Base]
+        def field(rec, form_drawer)
+          form_drawer.draw_field(rec, self)
+        end
+
         # HTML tag options (e.g. css-class) in Hash
         def tag_options
           {}

data/app/helpers/edgarj/form_drawer.rb

@@ -11,6 +11,7 @@ module Edgarj
     # 1. Next, when draw_ATTR() is defined, it is called.  See ModelPermissionControllerHelper for example.
     # 1. Then, consider to overwrite draw_ATTR() method.
     class Base
+      attr_accessor :vc, :f
 
       # === INPUTS
       # drawer::  Edgarj::Drawer instance
@@ -44,38 +45,33 @@ module Edgarj
       # 1. 'belongs_to' column uses:
       # ** I18n.t('activerecord.attributes.MODEL.EXT_ID')
       # ** parent.human_name
-
-# TODO: draw_field() 層があってもよい
-# form.draw() と form._draw_field(), form._draw_belongs_to_field ... は
-# あるけど、抽象化層の form.draw_field がない
       def draw()
-        adrs_field  = {}
         @vc.content_tag(:table) do
           @left       = true
-          html        = ''
-          for col in columns do
-            draw_method = "draw_#{col.name}"
-            html << if self.class.method_defined?(draw_method) then
-              send(draw_method, col)
-           #elsif edgarj_address?(col)
-           #   draw_address(col)
-           #elsif edgarj_file?(col)
-           #  draw_file(col)
-            elsif (enum = get_enum(col))
-               draw_enum(col, enum)
-            elsif (bitset = get_bitset(col))
-              draw_bitset(col, bitset)
-            else
-              parent_model = @vc.model.belongs_to_AR(col)
-              if parent_model
-                _draw_belongs_to_field(parent_model, col)
-              else
-                _draw_field(col)
-              end
+          @vc.capture do
+            for col in columns do
+              @vc.concat col.field(@record, self)
             end
+            @vc.concat('<td colspan=3></td>'.html_safe) if !@left
+          end
+        end
+      end
+
+      def draw_field(rec, col)
+        draw_method = "draw_#{col.name}"
+        if self.class.method_defined?(draw_method) then
+          send(draw_method, col)
+        elsif (enum = get_enum(col))
+          draw_enum(col, enum)
+        elsif (bitset = get_bitset(col))
+          draw_bitset(col, bitset)
+        else
+          parent_model = @vc.model.belongs_to_AR(col)
+          if parent_model
+            _draw_belongs_to_field(parent_model, col)
+          else
+            _draw_field(col)
           end
-          html << '<td colspan=3></td>'.html_safe if !@left
-          html.html_safe
         end
       end
 
@@ -110,9 +106,9 @@ module Edgarj
 
       # flip field to left-lane or right-lane
       def _draw_2_lane(&block)
-        result = @left ? '<tr>' : ''
+        result = @left ? @vc.tag(:tr, nil, true) : ''.html_safe
         result += yield
-        result += '</tr>' if !@left
+        result += '</tr>'.html_safe if !@left
         @left = !@left              # flip it
         result
       end
@@ -232,7 +228,7 @@ module Edgarj
       #
       def _draw_head(col, label=nil, &block)
         _draw_2_lane{
-          sprintf("<th>%s</th><td>", label || @vc.column_label(col)) +
+          sprintf("<th>%s</th><td>", label || @vc.column_label(col)).html_safe +
 
           # add operator for appropreate data type.
           if col.name == 'id'
@@ -244,7 +240,7 @@ module Edgarj
             else
               ''
             end
-          end + '</td><td>' + yield + '</td>'
+          end + '</td><td>'.html_safe + yield + '</td>'.html_safe
         }
       end
 

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = '4.04.01'
+  VERSION = '4.05.00'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 4.04.01
+  version: 4.05.00
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -359,96 +359,96 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Scaffold with Ajax, search, sort, 'belongs_to' popup, and more.
 test_files:
-- test/models/helpers/edgarj/model_permissions_helper_test.rb
-- test/models/helpers/edgarj/user_group_users_helper_test.rb
-- test/models/edgarj/user_group_user_test.rb
-- test/models/edgarj/sssn_test.rb
-- test/models/edgarj/user_group_test.rb
-- test/models/edgarj/page_info_test.rb
-- test/models/edgarj/model_permission_test.rb
-- test/integration/navigation_test.rb
-- test/support/edgarj/controller_supporter.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/edgarj_test.rb
-- test/test_helper.rb
+- 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/book_test.rb
 - test/dummy/test/models/author_test.rb
 - test/dummy/test/models/rails_config_test.rb
-- test/dummy/test/controllers/authors_controller_test.rb
-- test/dummy/test/controllers/books_controller_test.rb
-- test/dummy/test/controllers/authors_popup_controller_test.rb
-- test/dummy/README.rdoc
-- test/dummy/config.ru
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20131218011851_create_books.rb
-- test/dummy/db/migrate/20140807065420_create_users.rb
-- test/dummy/db/migrate/20140201000000_add_user_group_id_to_authors.rb
-- test/dummy/db/migrate/20131107120635_create_authors.rb
+- test/dummy/test/models/book_test.rb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/javascripts/authors.js
+- 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/helpers/authors_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/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/login.html.erb
 - test/dummy/Rakefile
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
 - test/dummy/config/database.yml
 - test/dummy/config/settings.yml
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/application.rb
+- test/dummy/config/boot.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/edgarj/menu_config.rb
+- 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/initializers/config.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/public/favicon.ico
+- 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/422.html
+- test/dummy/public/favicon.ico
 - test/dummy/public/500.html
-- test/dummy/app/views/layouts/login.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/decorators/models/edgarj/user_group_decorator.rb
-- test/dummy/app/helpers/authors_helper.rb
-- test/dummy/app/helpers/books_helper.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/authors_popup_helper.rb
-- test/dummy/app/models/book.rb
-- test/dummy/app/models/author.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/assets/javascripts/authors.js
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/assets/stylesheets/authors.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/authors_controller.rb
-- test/dummy/app/controllers/books_controller.rb
-- test/dummy/app/controllers/dummy_auth_mixin.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/authors_popup_controller.rb
+- 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/db/migrate/20131107120635_create_authors.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/fixtures/authors.yml
+- test/fixtures/books.yml
 - test/fixtures/users.yml
-- test/fixtures/edgarj/page_infos.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/books.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/models/edgarj/model_permission_test.rb
+- test/models/edgarj/page_info_test.rb
+- test/models/edgarj/user_group_user_test.rb
 has_rdoc: