edgarj 4.00.04 → 4.01.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e354eb22c54ed1a8d2b4f36fafb43d3dc4f3af4
-  data.tar.gz: 753e8b133475f62e837f19fb584a6616ce217b82
+  metadata.gz: c8b1ee705a94b09bfc44212b36254af434d80cc3
+  data.tar.gz: e5e0bbe5a297528159e2143abe70932c8b6306fa
 SHA512:
-  metadata.gz: e7916712333a9a729e84114bfe33d5f228f7e0a18c848d6f319ddb2fd6ff3936cbd7daa33bb147a5bcbfc0381ffd4041bee92ac707084916815c132c51dcb63d
-  data.tar.gz: 720a8b32847a8d53cfd7b3d7fa6c7c7d77b03a443cb67415f7ec87e338aba799bb9de9b4fa89084fe3ad79d9a5a8792283a0f942b72ab163ab39652bab387450
+  metadata.gz: aa4d540716d0c53cfd790c843d90f1f76dcf49538d41fa4030284939c99e24b8d77a8697dd8d6200500690eaeee9897ddac21a38f8f86ee7a960c9b1d9ee3d0a
+  data.tar.gz: 4a6af60d04ce9edc7c99baf9fa7e3d7f808f13bf61622100f73d2c8e9fa945b95b1b1ae4374e36b453d572338963117667702d3fb9fe86276d05a80c13450ffa

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

@@ -118,8 +118,20 @@ module Edgarj
         Edgarj::ListDrawer::Normal
       end
 
+      def url_for_show(record)
+        @vc.url_for(action: 'show', id: record.id, format: :js)
+      end
+
+      def draw_row(record, &block)
+        @vc.content_tag(:tr,
+            class:  "list_line#{@line_color} edgarj_row",
+            data:   {url: url_for_show(record)}) do
+          yield
+        end
+      end
+
       def draw_list(list)
-        line_color  = 1
+        @line_color = 1
         d           = list_drawer_class.new(
             self,
             @options[:list_drawer_options] || {})
@@ -134,9 +146,8 @@ module Edgarj
           end +
           ''.html_safe.tap do |trs|
             for rec in list do
-              line_color = 1 - line_color
-              d.set_path(rec)
-              trs << @vc.content_tag(:tr, class: "list_line#{line_color}") do
+              @line_color = 1 - @line_color
+              trs << draw_row(rec) do
                 ''.html_safe.tap do |cols|
                   for col in columns_for(list_columns) do
                     cols << d.draw_column(rec, col)

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

@@ -9,8 +9,16 @@ module Edgarj
     # * options
     #   * list_drawer_options   - options for Edgarj::ListDrawer::Normal
     class Popup < Base
+      def draw_row(record, &block)
+        @vc.content_tag(:tr,
+            class:  "list_line#{@line_color} edgarj_row edgarj_popup_list_row",
+            data:   {id: record.id, name: record.name}) do
+          yield
+        end
+      end
+
       def draw_list(list)
-        line_color  = 1
+        @line_color = 1
         d           = Edgarj::ListDrawer::Normal.new(
             self,
             @options[:list_drawer_options] || {})
@@ -25,11 +33,8 @@ module Edgarj
           end +
           ''.html_safe.tap do |trs|
             for rec in list do
-              line_color = 1 - line_color
-              d.set_path(rec)
-              trs << @vc.content_tag(:tr,
-                        class:  "list_line#{line_color} edgarj_popup_list_row",
-                        data:   {id: rec.id, name: rec.name}) do
+              @line_color = 1 - @line_color
+              trs << draw_row(rec) do
                 ''.html_safe.tap do |cols|
                   for col in columns_for(list_columns) do
                     cols << d.draw_column(rec, col)

data/app/helpers/edgarj/field_helper.rb

@@ -15,7 +15,6 @@ module Edgarj
     # :save::         html options for 'save' button.
     # :search_form::  html options for 'search_form' button.
     # :delete::       html options for 'delete' button.
-    # :namespace::    delete url namespace
     def draw_form_buttons(options = {})
       content_tag(:table) do
         content_tag(:tr) do

data/app/helpers/edgarj/list_drawer.rb

@@ -10,7 +10,6 @@ module Edgarj
 
       # * drawer        - Edgarj::Drawer::Base object
       # * options
-      #   * namespace   - namespace for path (ex: :admin)
       #
       # TODO: enum_cache は止め、グローバルに１つのキャッシュを作る。
       def initialize(drawer, options = {})
@@ -191,23 +190,14 @@ module Edgarj
        #@belongs_to_link  = true    # make link on belongs_to
       end
 
-      # prepare path for the rec, which will be drawn later.
-      def set_path(rec)
-        @path = @vc.polymorphic_path([@options[:namespace], rec], format: :js)
-      end
-
       # <td> options
       #
       # add Edgarj.click_listCB() with base result.
       # When the column is parent, do nothing.
       def td_options(rec, col)
-        result = super.merge(
+        super.merge(
             style:  'cursor:pointer;',
             class:  '_edgarj_list_column')
-       #if !@parent_rec
-          result[:'data-url'] = @path
-       #end
-        result
       end
     end
   end

data/app/views/edgarj/edgarj/_list.html.erb

@@ -45,7 +45,7 @@
   
     /* show detail on clicking a list row */
     $('._edgarj_list_column').click(function(){
-      $.ajax($(this).attr('data-url'));
+      $.ajax($(this).closest('.edgarj_row').attr('data-url'));
     });
   });
   <% end %>

data/lib/core_ext/resources.rb

@@ -1,20 +1,24 @@
 module ActionDispatch::Routing::Mapper::Resources
-  # add followings to work on Edgarj::EdgarjController derived class to
-  # default resource routing:
+  # define edgarj specific routing for CRUD.
   #
-  #   collection do
-  #     get :clear
-  #     get :csv_download
-  #     get :search
-  #     get :search_clear
-  #     get :search_save
-  #     get :search_load
-  #   end
+  # Following declaration in config/routes.rb:
   #
-  #   member do
-  #     put :page_info_save
-  #   end
+  #   edgarj_resources :photos
   #
+  # creates the following routes in addition to the default routes
+  # in your application,
+  # all mapping to the Photos controller which inherits from
+  # Edgarj::EdgarjController:
+  #
+  #   GET       /photos/clear
+  #   GET       /photos/csv_download
+  #   GET       /photos/search
+  #   GET       /photos/search_clear
+  #   GET       /photos/zip_complete
+  #   PATCH/PUT /photos/:id/page_info_save
+  #
+  # 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
       yield if block_given?
@@ -30,29 +34,30 @@ module ActionDispatch::Routing::Mapper::Resources
       end
 
       member do
-        put :page_info_save
+        put   :page_info_save
+        patch :page_info_save
       end
     end
 
     self
   end
 
-  # add followings to work on Edgarj::PopupController derived class to
-  # default resource routing:
+  # define edgarj specific routing for popup.
+  #
+  # Following declaration in config/routes.rb:
+  #
+  #   edgarj_popup_resources :photos_popup
   #
-  #   collection do
-  #     get :clear
-  #     get :csv_download
-  #     get :search
-  #     get :search_clear
-  #     get :search_save
-  #     get :search_load
-  #   end
+  # creates the following routes in your application,
+  # all mapping to the Photos controller which inherits from
+  # Edgarj::PopupController:
   #
-  #   member do
-  #     put :page_info_save
-  #   end
+  #   GET       /photos_popup/index
+  #   GET       /photos_popup/search
+  #   PATCH/PUT /photos_popup/:id/page_info_save
   #
+  # 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
       yield if block_given?

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = "4.00.04"
+  VERSION = "4.01.00"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 4.00.04
+  version: 4.01.00
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails