edgarj 0.01.21 → 0.01.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317f70ed3709d6a35763886431d0f77ff2ca7e3d
-  data.tar.gz: 14fdce26cd0837305697830c4151bf6ae9f5106c
+  metadata.gz: b0eda9922434a94f760aad1bd2abc1a1dfc0f916
+  data.tar.gz: 7f6c4d0e0184a2f8744558a4ef0bbf965364c63b
 SHA512:
-  metadata.gz: 4363e3aea59fefe7e6705b9851239d0a64819ff13aaa516fc0f525d4ef2fa06d6bbd4da3dbc2351e7657e17826e38f131d7374410e6669fd463668d3cd72e552
-  data.tar.gz: 0a4b1b3ae101acf955e47bdae2afc3374b894bfa8f97c58a404d28a5b0b479b4b435b5a1307dcd44cb3ac820bd9d939c69194ca3179854b016e07ab326ebc869
+  metadata.gz: 2fd098c60063a214c6af73a74aabae7cd36018560edbc77aa86bb26dd7100163d6a82d92540a5ef5e1d88a93e1919fba026339954a96f2d5d6d96132ca3eee1b
+  data.tar.gz: 937b28340f7e2ce9477a2c032114fc53a1dc5d43193d88c8bf1187a2d6bc7f1f532a4e2a6d514b127ae4c00efc848ae8105771e796dc97655232808d7458b9c8

data/app/{models → helpers}/edgarj/drawer/base.rb

@@ -1,8 +1,13 @@
 module Edgarj
   module Drawer
     # 'Mediator' to draw list and form of the model on the view.
+    #
+    # This collaborate with the following sub classes:
+    # Edgarj::ListDrawer::Normal::    for list
+    # Edgarj::FormDrawer::Base::      for data entry form
+    # Edgarj::FormDrawer::Search::    for search form
     class Base
-      attr_accessor :vc
+      attr_accessor :vc, :params, :model, :page_info
 
       # * options
       #   * list_drawer_options   - options for Edgarj::ListDrawer::Normal
@@ -109,45 +114,6 @@ module Edgarj
             id_target:  popup_field.id_target)
       end
 
-      # draw sort link on list column header
-      #
-      # === INPUTS
-      # col::         column data
-      # options::     options to url_for
-      def draw_sort(col, options={})
-        label = @model.human_attribute_name(col.name)
-        dir   = 'asc'
-        if @page_info.order_by == fullname(col)
-          # toggle direction
-          if @page_info.dir == 'asc' || @page_info.dir.blank?
-            label += '▲'
-            dir    = 'desc'
-          else
-            label += '▼'
-          end
-        end
-        @vc.link_to(label,
-            {
-            :controller                   => @params[:controller],
-            :action                       => 'page_info_save',
-            :id                           => @page_info.id,
-            'edgarj_page_info[order_by]'   => fullname(col),
-            'edgarj_page_info[dir]'        => dir
-            }.merge(options),
-            :remote => true,
-            :method => :put)
-      end
-
-      # draw list column header for both usual list and popup list
-      def draw_list_column_header(col, options={})
-        parent = @model.belongs_to_AR(col)
-        if parent then
-          @vc.draw_belongs_to_label_sub(@model, col.name, parent)
-        else
-          draw_sort(col, options)
-        end
-      end
-
       def list_drawer_class
         Edgarj::ListDrawer::Normal
       end
@@ -162,9 +128,7 @@ module Edgarj
           @vc.content_tag(:tr) do
             ''.html_safe.tap do |result|
               for col in columns_for(list_columns) do
-                result << @vc.content_tag(:th) do
-                  draw_list_column_header(col)
-                end
+                result << d.draw_column_header(col)
               end
             end
           end +

data/app/{models → helpers}/edgarj/drawer/popup.rb

@@ -19,9 +19,7 @@ module Edgarj
           @vc.content_tag(:tr) do
             ''.html_safe.tap do |result|
               for col in columns_for(list_columns) do
-                result << @vc.content_tag(:th) do
-                  draw_list_column_header(col, id_target: @params[:id_target])
-                end
+                result << d.draw_column_header(col, id_target: @params[:id_target])
               end
             end
           end +

data/app/helpers/edgarj/list_drawer.rb

@@ -8,6 +8,7 @@ module Edgarj
     class Base
       include ERB::Util
 
+      # * drawer        - Edgarj::Drawer::Base object
       # * options
       #   * namespace   - namespace for path (ex: :admin)
       #
@@ -22,6 +23,12 @@ module Edgarj
         @belongs_to_link  = false   # doesn't make link on belongs_to
       end
 
+      def draw_column_header(col, options={})
+        @vc.content_tag(:th) do
+          draw_column_header_sub(col, options)
+        end
+      end
+
       def draw_column(rec, col)
         @parent_rec = rec.belongs_to_AR(col)
         @vc.content_tag(:td, td_options(rec, col)) do
@@ -85,6 +92,44 @@ module Edgarj
         s.join('')
       end
 
+      # draw sort link on list column header
+      #
+      # === INPUTS
+      # col::         column data
+      # options::     options to url_for
+      def draw_sort(col, options={})
+        label = @drawer.model.human_attribute_name(col.name)
+        dir   = 'asc'
+        if @drawer.page_info.order_by == @drawer.fullname(col)
+          # toggle direction
+          if @drawer.page_info.dir == 'asc' || @drawer.page_info.dir.blank?
+            label += '▲'
+            dir    = 'desc'
+          else
+            label += '▼'
+          end
+        end
+        @vc.link_to(label,
+            {
+            :controller                   => @drawer.params[:controller],
+            :action                       => 'page_info_save',
+            :id                           => @drawer.page_info.id,
+            'edgarj_page_info[order_by]'   => @drawer.fullname(col),
+            'edgarj_page_info[dir]'        => dir
+            }.merge(options),
+            :remote => true,
+            :method => :put)
+      end
+
+      # draw list column header for both usual list and popup list
+      def draw_column_header_sub(col, options={})
+        parent = @drawer.model.belongs_to_AR(col)
+        if parent then
+          @vc.draw_belongs_to_label_sub(@drawer.model, col.name, parent)
+        else
+          draw_sort(col, options)
+        end
+      end
 
       # draw rec.col other than 'belongs_to'
       # 1. DateTime format is YYYY-MM-DD hh:mm:ss.

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = "0.01.21"
+  VERSION = "0.01.22"
 end

data/lib/generators/edgarj/popup_scaffold/templates/functional_test.rb

@@ -13,6 +13,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target: "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert_not_nil assigns(:list)
+      assert_no_app_error
     end
   
     should 'paginate' do
@@ -20,6 +21,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target: "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert_not_nil assigns(:list)
+      assert_no_app_error
     end
   
     should 'sort' do
@@ -33,6 +35,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
       assert_not_nil assigns(:list)
       assert_equal 'asc',         assigns(:page_info).dir
       assert_equal 'created_at',  assigns(:page_info).order_by
+      assert_no_app_error
     end
 
     should 'search' do
@@ -40,6 +43,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target:        "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert assigns(:list).count >= 1
+      assert_no_app_error
     end
   end
 
@@ -62,6 +66,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target: "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert_not_nil assigns(:list)
+      assert_no_app_error
     end
   
     should 'paginate' do
@@ -70,6 +75,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target: "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert_not_nil assigns(:list)
+      assert_no_app_error
     end
   
     should 'sort' do
@@ -84,6 +90,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
       assert_not_nil assigns(:list)
       assert_equal 'asc',         assigns(:page_info).dir
       assert_equal 'created_at',  assigns(:page_info).order_by
+      assert_no_app_error
     end
 
     should 'search' do
@@ -92,6 +99,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target:        "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert assigns(:list).count >= 1
+      assert_no_app_error
     end
   end
 
@@ -114,6 +122,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target:        "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert_equal 1, assigns(:list).count
+      assert_no_app_error
     end
 
     should 'not search since key is out-of-scope' do
@@ -122,6 +131,7 @@ class <%= controller_class_name %>PopupControllerTest < ActionController::TestCa
           id_target:        "PARENT_MODEL_DOM_ID"
       assert_response :success
       assert_equal 0, assigns(:list).count
+      assert_no_app_error
     end
   end
 

data/test/dummy/test/functional/authors_popup_controller_test.rb

@@ -0,0 +1,205 @@
+require 'test_helper'
+
+class AuthorsPopupControllerTest < ActionController::TestCase
+  context 'root user' do
+    setup do
+      login_as(:root)
+      @pi = create_page_info(@sssn, 'authors', Author)
+    end
+  
+    should 'get index' do
+      xhr :get, :index,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert_not_nil assigns(:list)
+      assert_no_app_error
+    end
+  
+    should 'paginate' do
+      xhr :get, :index, page: 2,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert_not_nil assigns(:list)
+      assert_no_app_error
+    end
+  
+    should 'sort' do
+      xhr :put, :page_info_save, id: @pi.id,
+          id_target:        "PARENT_MODEL_DOM_ID",
+          edgarj_page_info:  {
+            dir:              'asc',
+            order_by:         'created_at'
+          }
+      assert_response :success
+      assert_not_nil assigns(:list)
+      assert_equal 'asc',         assigns(:page_info).dir
+      assert_equal 'created_at',  assigns(:page_info).order_by
+      assert_no_app_error
+    end
+
+    should 'search' do
+      xhr :get, :search, edgarj_search_form: {},
+          id_target:        "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert assigns(:list).count >= 1
+      assert_no_app_error
+    end
+  end
+
+  # All of tests in this context is skipped because it is required
+  # to prepare read-only user.
+  # When complete the preparation, delete the skip lines.
+  context 'read-only user' do
+    setup do
+      # prepare fixtures of model_permissions, user_groups, and
+      # user_group_users for read-only user of the
+      # AuthorsController and login by him/her.
+      #
+      login_as(:author_reader)
+      @pi = create_page_info(@sssn, 'authors', Author)
+    end
+  
+    should 'get index' do
+      skip 'get index'
+      xhr :get, :index,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert_not_nil assigns(:list)
+      assert_no_app_error
+    end
+  
+    should 'paginate' do
+      skip 'get paginate'
+      xhr :get, :index, page: 2,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert_not_nil assigns(:list)
+      assert_no_app_error
+    end
+  
+    should 'sort' do
+      skip 'sort'
+      xhr :put, :page_info_save, id: @pi.id,
+          id_target:        "PARENT_MODEL_DOM_ID",
+          edgarj_page_info:  {
+            dir:              'asc',
+            order_by:         'created_at'
+          }
+      assert_response :success
+      assert_not_nil assigns(:list)
+      assert_equal 'asc',         assigns(:page_info).dir
+      assert_equal 'created_at',  assigns(:page_info).order_by
+      assert_no_app_error
+    end
+
+    should 'search' do
+      skip 'search'
+      xhr :get, :search, edgarj_search_form: {},
+          id_target:        "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert assigns(:list).count >= 1
+      assert_no_app_error
+    end
+  end
+
+  # All of tests in this context is skipped because it is required
+  # to prepare 'permitted but user_scoped' user.
+  # When complete the preparation, delete the skip lines.
+  context 'permitted and user_scoped user' do
+    setup do
+      # prepare fixtures of model_permissions, user_groups, and
+      # user_group_users for read-only user of the
+     #login_as(:permitted_n_user_scoped_on_authors)
+     #@pi = create_page_info(@sssn, 'authors', Author)
+      @author             = authors(:m_polanyi)
+      @author_scoped_out  = authors(:t_nangou)
+    end
+  
+    should 'search since role and user_scoped satisfy' do
+      skip 'search since role and user_scoped satisfy'
+      xhr :get, :search, edgarj_search_form: {col: 'id', val: @author.id},
+          id_target:        "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert_equal 1, assigns(:list).count
+      assert_no_app_error
+    end
+
+    should 'not search since key is out-of-scope' do
+      skip 'not search since key is out-of-scope'
+      xhr :get, :search, edgarj_search_form: {col: 'id', val: @author_scoped_out.id},
+          id_target:        "PARENT_MODEL_DOM_ID"
+      assert_response :success
+      assert_equal 0, assigns(:list).count
+      assert_no_app_error
+    end
+  end
+
+  context 'not-permitted user' do
+    setup do
+      login_as(:not_permitted)
+      @pi = create_page_info(@sssn, 'authors', Author)
+    end
+
+    should 'not get index' do
+      xhr :get, :index,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_template 'message_popup'
+      assert_equal I18n.t('edgarj.default.permission_no'), flash[:error]
+    end
+  
+    should 'not paginate' do
+      xhr :get, :index, page: 2,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_template 'message_popup'
+      assert_equal I18n.t('edgarj.default.permission_no'), flash[:error]
+    end
+  
+    should 'not sort' do
+      xhr :put, :page_info_save, id: @pi.id,
+          id_target:        "PARENT_MODEL_DOM_ID",
+          edgarj_page_info:  {
+            dir:              'asc',
+            order_by:         'created_at'
+          }
+      assert_template 'message_popup'
+      assert_equal I18n.t('edgarj.default.permission_no'), flash[:error]
+    end
+
+    should 'not search' do
+      xhr :get, :search, edgarj_search_form: {},
+          id_target:        "PARENT_MODEL_DOM_ID"
+      assert_template 'message_popup'
+      assert_equal I18n.t('edgarj.default.permission_no'), flash[:error]
+    end
+  end
+
+  context 'not-login' do
+    should 'not get index' do
+      xhr :get, :index,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_equal I18n.t('edgarj.default.login_failed'), flash[:error]
+    end
+  
+    should 'not paginate' do
+      xhr :get, :index, page: 2,
+          id_target: "PARENT_MODEL_DOM_ID"
+      assert_equal I18n.t('edgarj.default.login_failed'), flash[:error]
+    end
+  
+    should 'not sort' do
+      xhr :put, :page_info_save, id: 0,
+          id_target:        "PARENT_MODEL_DOM_ID",
+          edgarj_page_info:  {
+            dir:              'asc',
+            order_by:         'created_at'
+          }
+      assert_equal I18n.t('edgarj.default.login_failed'), flash[:error]
+    end
+
+    should 'not search' do
+      xhr :get, :search, edgarj_search_form: {},
+          id_target:        "PARENT_MODEL_DOM_ID"
+      assert_equal I18n.t('edgarj.default.login_failed'), flash[:error]
+    end
+  end
+end

data/test/support/edgarj/controller_supporter.rb

@@ -20,4 +20,14 @@ module Edgarj::ControllerSupporter
     pi.save!
     pi
   end
+
+  # error is raised during controller-action
+  def assert_app_error(format = :html)
+    assert_not_nil flash[:error]
+  end
+
+  # error is not raised during controller-action
+  def assert_no_app_error
+    assert_nil flash[:error]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 0.01.21
+  version: 0.01.22
 platform: ruby
 authors:
 - Fuminori Ido
@@ -213,6 +213,10 @@ files:
 - app/controllers/edgarj/user_groups_popup_controller.rb
 - app/helpers/edgarj/assoc_helper.rb
 - app/helpers/edgarj/common_helper.rb
+- app/helpers/edgarj/drawer.rb
+- app/helpers/edgarj/drawer/base.rb
+- app/helpers/edgarj/drawer/normal.rb
+- app/helpers/edgarj/drawer/popup.rb
 - app/helpers/edgarj/edgarj_helper.rb
 - app/helpers/edgarj/field_helper.rb
 - app/helpers/edgarj/form_drawer.rb
@@ -226,10 +230,6 @@ files:
 - app/helpers/edgarj/user_groups_helper.rb
 - app/helpers/edgarj/user_groups_popup_helper.rb
 - app/models/edgarj.rb
-- app/models/edgarj/drawer.rb
-- app/models/edgarj/drawer/base.rb
-- app/models/edgarj/drawer/normal.rb
-- app/models/edgarj/drawer/popup.rb
 - app/models/edgarj/model_permission.rb
 - app/models/edgarj/page_info.rb
 - app/models/edgarj/search.rb
@@ -352,6 +352,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/dummy/test/functional/authors_controller_test.rb
+- test/dummy/test/functional/authors_popup_controller_test.rb
 - test/dummy/test/functional/books_controller_test.rb
 - test/dummy/test/helpers/authors_helper_test.rb
 - test/dummy/test/unit/author_test.rb
@@ -471,6 +472,7 @@ test_files:
 - 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