edgarj 0.01.29 → 0.01.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e9825ef6ec78aadf69f42ed50058dce4a39dd1
-  data.tar.gz: 10de985a13ab7162942803d38437352d338dfefd
+  metadata.gz: 651228d83ae7f3f3b5415d2ce044522c8fa5f826
+  data.tar.gz: a3ecdbfbc74287563e55d3fca86f63fd8a473fff
 SHA512:
-  metadata.gz: 5372bf5525f803339c36f7fc11cea3091db72b6300de356bb1a8c5a426cb8338d5a94bd6c1d7e82fa15805ed3dce81972693283a849762985bf670a25ed2f497
-  data.tar.gz: 3de666c3b19d419d10f670a9a2aeb6b86233f6fc909295a5f028fc09c0b8f8ce73d2c11825d16db5ee94e80440a98c41bdc4b6d3ef5edf6782ec8eccbb3518a1
+  metadata.gz: f208dcc1c0c482fa715764159a33a91c8b0be399b0eed4b1a4bdbda35eb8c079381e1e5293f29884d8e9da8689169de2cef01de34723a814988fe053eb5aa45a
+  data.tar.gz: e2648e3312e36da84403c6ad4b3a530c620e6766a9d10e52aac534ae3907089ea66dff5ff223beec70dc41a70606c5e7e5aed00000a478ca02e29874474164d3

data/app/assets/javascripts/edgarj/base.js

@@ -22,12 +22,14 @@ Edgarj.Popup = {
 
   = INPUTS
   id_target::     id target DOM
+  text::          default text on clear
   */
-  clear: function(id_target){
-  //var pf = new Edgarj.Popup.Field(id_target);
+  clear: function(id_target, text){
+    if(typeof(text)==='undefined') text = '';
+
     var pf = new this.Field(id_target);
     pf.id_target.val('');
-    pf.label_target.text('');
+    pf.label_target.text(text);
     pf.label_hidden_field.val('');
     pf.clear_link.hide();
   }

data/app/helpers/edgarj/assoc_helper.rb

@@ -151,10 +151,10 @@ module Edgarj
     # * edgarj search form(Edgarj::SearchForm) for search-condition entry
     #
     # === INPUTS
-    # f::           FormBuilder object
-    # popup_path::  popup path(url)
-    # col_name::    'belongs_to' column name
-    # model::       data model class
+    # @param f          [FormBuilder] FormBuilder object
+    # @param popup_path [String]      popup path(url)
+    # @param col_name   [String]      'belongs_to' column name
+    # @param model      [AR]          data model class
     def draw_belongs_to_label(f, popup_path, col_name, model = f.object.class)
       col   = model.columns.detect{|c| c.name == col_name.to_s}
       return "no column found" if !col
@@ -164,7 +164,7 @@ module Edgarj
 
       link_to(
           draw_belongs_to_label_sub(model, col.name, parent_model).html_safe +
-          content_tag(:span, '▼', class: 'edgarj_field_belongs_to_button'),
+          Settings.edgarj.belongs_to.link_tag.html_safe,
           popup_path,
           remote: true)
     end
@@ -176,11 +176,10 @@ module Edgarj
     # col_name::    'belongs_to' column name
     # popup_field:: Edgarj::PopupHelper::PopupField object
     # parent_name:: initial parent name
-    def draw_belongs_to_clear_link(f, col_name, popup_field, parent_name)
+    def draw_belongs_to_clear_link(f, col_name, popup_field, parent_name, default_label)
       ('  ' +
           link_to("[#{I18n.t('edgarj.default.clear')}]", '#',
-              onClick:  sprintf("Edgarj.Popup.clear('%s'); return false;",
-                                popup_field.id_target),
+              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
@@ -190,11 +189,11 @@ module Edgarj
     #
     # This is usually used with draw_belongs_to_label().
     #
-    # === INPUTS
-    # f::           FormBuilder object
-    # col_name::    'belongs_to' column name
-    # model:: data model class
-    def draw_belongs_to_field(f, col_name, model = f.object.class)
+    # @param f          [FormBuilder] FormBuilder object
+    # @param popup_path [String]      popup path(url)
+    # @param col_name   [String]      'belongs_to' column name
+    # @param model      [AR]          data model class
+    def draw_belongs_to_field(f, popup_path, col_name, model = f.object.class)
       col   = model.columns.detect{|c| c.name == col_name.to_s}
       return "no column found" if !col
 
@@ -204,20 +203,38 @@ module Edgarj
       parent_obj  = f.object.belongs_to_AR(col)
       popup_field = Edgarj::PopupHelper::PopupField.new_builder(
           f.object_name, col_name)
-      label       = sprintf("<span id='%s'>%s</span>",
-                            popup_field.label_target,
-                            parent_obj ? parent_obj.name : '').html_safe
+      default_label = '[' + draw_belongs_to_label_sub(model, col.name, parent_model) + ']'
+      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
       if parent_obj
-        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')
+        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
       else
-        label
+        if Settings.edgarj.belongs_to.popup_on == 'field'
+          link_to(
+              label + link_tag,
+              popup_path,
+              remote: true)
+        else
+          label
+        end
       end +
-      draw_belongs_to_clear_link(f, col.name, popup_field, parent_obj && parent_obj.name)
+      draw_belongs_to_clear_link(f, col.name, popup_field,
+          parent_obj && parent_obj.name,
+          default_label)
     end
 
     # Is flag in column_value on?

data/app/helpers/edgarj/form_drawer.rb

@@ -44,6 +44,10 @@ 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
@@ -157,8 +161,11 @@ module Edgarj
 
       # draw 'belongs_to' field for AR
       def _draw_belongs_to_field(parent_model, col)
-        _draw_head(col, @vc.draw_belongs_to_label(@f, @drawer.popup_path(col), col.name)){
-          @vc.draw_belongs_to_field(@f, col.name)
+        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){
+          @vc.draw_belongs_to_field(@f, @drawer.popup_path(col), col.name)
         }
       end
 
@@ -280,7 +287,9 @@ module Edgarj
             'edgarj_search_form[search_form_parent][%s]' % col.name,
             parent_name.blank? ? '' : parent_name,
             id: popup_field.label_hidden_field) +
-          @vc.draw_belongs_to_clear_link(@f, col.name, popup_field, parent_name)
+          @vc.draw_belongs_to_clear_link(@f, col.name, popup_field,
+              parent_name,
+              '[' + @vc.draw_belongs_to_label_sub(model, col.name, parent_model) + ']')
         }
       end
 

data/config/settings.yml

@@ -11,3 +11,8 @@ edgarj:
 
   page_info:
     default_lines:      10
+
+  belongs_to:
+    # locate popup link to 'field' or 'label' (default = 'field')
+    popup_on:           'field'
+    link_tag:           '<span class="edgarj_field_belongs_to_button">▼</span>'

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = "0.01.29"
+  VERSION = "0.01.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 0.01.29
+  version: 0.01.30
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -400,94 +400,94 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Scaffold with Ajax, search, sort, 'belongs_to' popup, and more.
 test_files:
-- test/integration/navigation_test.rb
-- test/unit/helpers/edgarj/model_permissions_helper_test.rb
-- test/unit/helpers/edgarj/user_group_users_helper_test.rb
-- test/unit/edgarj/user_group_user_test.rb
-- test/unit/edgarj/sssn_test.rb
-- test/unit/edgarj/user_group_test.rb
-- test/unit/edgarj/page_info_test.rb
-- test/unit/edgarj/model_permission_test.rb
-- test/support/edgarj/controller_supporter.rb
-- test/test_helper.rb
-- test/dummy/test/helpers/authors_helper_test.rb
-- test/dummy/test/unit/book_test.rb
-- test/dummy/test/unit/author_test.rb
-- test/dummy/test/unit/rails_config_test.rb
-- test/dummy/test/functional/authors_controller_test.rb
-- test/dummy/test/functional/books_controller_test.rb
-- test/dummy/test/functional/authors_popup_controller_test.rb
-- test/dummy/README.rdoc
+- test/fixtures/users.yml
+- test/fixtures/edgarj/model_permissions.yml
+- test/fixtures/edgarj/sssns.yml
+- test/fixtures/edgarj/user_group_users.yml
+- test/fixtures/edgarj/page_infos.yml
+- test/fixtures/edgarj/user_groups.yml
+- test/fixtures/authors.yml
+- test/fixtures/books.yml
+- test/dummy/Rakefile
 - test/dummy/config.ru
+- test/dummy/bin/rails
 - 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/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/edgarj/menu_config.rb
+- test/dummy/app/decorators/models/edgarj/user_group_decorator.rb
+- 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/javascripts/application.js
+- test/dummy/app/assets/javascripts/authors.js
+- test/dummy/app/views/layouts/login.html.erb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/models/author.rb
+- test/dummy/app/models/book.rb
+- test/dummy/app/models/user.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/app/controllers/books_controller.rb
+- test/dummy/app/controllers/authors_controller.rb
+- test/dummy/app/helpers/authors_helper.rb
+- test/dummy/app/helpers/authors_popup_helper.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/books_helper.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/locales/ja.yml
-- test/dummy/config/initializers/strong_parameter.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/application.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/config/environment.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/script/rails
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/strong_parameter.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/settings.yml
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
 - test/dummy/public/favicon.ico
-- test/dummy/public/404.html
 - test/dummy/public/422.html
 - 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/404.html
+- test/dummy/README.rdoc
+- test/dummy/db/schema.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/dummy/db/migrate/20140807065420_create_users.rb
+- test/dummy/test/unit/author_test.rb
+- test/dummy/test/unit/rails_config_test.rb
+- test/dummy/test/unit/book_test.rb
+- test/dummy/test/functional/books_controller_test.rb
+- test/dummy/test/functional/authors_popup_controller_test.rb
+- test/dummy/test/functional/authors_controller_test.rb
+- test/dummy/test/helpers/authors_helper_test.rb
+- test/dummy/script/rails
+- test/unit/edgarj/sssn_test.rb
+- test/unit/edgarj/model_permission_test.rb
+- test/unit/edgarj/user_group_test.rb
+- test/unit/edgarj/user_group_user_test.rb
+- test/unit/edgarj/page_info_test.rb
+- test/unit/helpers/edgarj/user_group_users_helper_test.rb
+- test/unit/helpers/edgarj/model_permissions_helper_test.rb
+- test/support/edgarj/controller_supporter.rb
 - test/edgar_test.rb
-- test/fixtures/authors.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/sssns.yml
-- test/fixtures/books.yml
+- test/test_helper.rb
+- test/integration/navigation_test.rb
 - test/functional/edgarj/user_group_users_controller_test.rb
-- test/functional/edgarj/edgarj_controller_test.rb
 - test/functional/edgarj/model_permissions_controller_test.rb
+- test/functional/edgarj/edgarj_controller_test.rb
 has_rdoc: