we_bridge-auto_view_helper 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1bc8d0f694c9f0ecc38fbd07fb2b675e159f942
-  data.tar.gz: 9f16c13e44ba68e9e8e73242573e15c2475ba721
+  metadata.gz: 774247dc9896f0b70a682faea977ce18483704fb
+  data.tar.gz: 9888a9b0a076fdf981595e90f5d9a0062dea0a69
 SHA512:
-  metadata.gz: bd9486c63d731eafa348af5f2e1450c4ea962a7bc99db3141a32a0e5e270b83c0673c7c419f1ff1c6e50c358fb93e332c1b45278b4baaf905d1d14f50a34bd17
-  data.tar.gz: 4a42d8888b766c85ad61eaa3fa2688cb0b70bbbea14c0853228f72ce23bebf8ab5a38471d9925efcf94b707dc835d73dee845096c1ed709f05e87bccd57b5648
+  metadata.gz: 6322e251d8f270429e17926e2c9bcbe04160b45664499513c713e909e403467e1deb7d5a83684074e4dde2ceee819cb78c6c1125b8d320c911156227f6ed5e8f
+  data.tar.gz: deb8eda3359f8567062e4781b17937028aed10837848c1a9d7948d171bc2e9b64333abcf91f0da37c72480161fb38365e3b2f68f7319b6968478078d7f43cf5e

data/lib/we_bridge/auto_view_helper.rb

@@ -81,30 +81,42 @@ module WeBridge
 
       title ||= "Edit " + record.class.name
       method = options[:method]
+
+      klass = record.class
+
       markup do |m|
         m.section do
           m.h2 title
           m << form_tag(url, method: method || :post, multipart: true) do
             markup do |m2|
               m2.dl do
-                klass = record.class
                 syms = klass.try(:editable_columns) || klass.try(:content_columns).try(:map, &:name) || []
                 syms.each do |sym|
                   m2.dt t_xxx(record.class.table_name,sym)
                   m2.dd { m2 << auto_input_tag(sym,record.class,"#{record.class.table_name}[#{sym}]",record.__send__(sym)) }
                 end
+              end
 
-                m2.div class: locale do
-                  if record.respond_to?(:text) && record.respond_to?(:text) && record.respond_to?(:texts) && (text = record.text(locale))
-                    syms = text.try(:editable_columns) || text.try(:content_columns).try(:map, &:name) || []
-                    syms.each do |sym|
-                      column = text.class.columns_hash[sym.to_s]
-                      m2.dt t_xxx(text.class.table_name,sym)
-                      m2.dd { m2 << text_tag(column.type,"#{text.class.table_name}[#{locale}][#{sym}]",text.__send__(sym)) }
+              if text_class = klass.try(:text)
+                text_table_name = text_class.table_name
+                lang_model = defined?(::Lang) ? ::Lang : ActiveRecord::Mlang::Lang
+                langs = lang_model.all.to_a
+                langs.each do |lang|
+                  m2.fieldset class: lang.code do
+                    m2.legend lang.code
+                    syms = text_class.try(:editable_columns) || text_class.try(:content_columns).try(:map, &:name) || []
+                    text = record.try(:text,lang.code) || text_class.new
+                    m2.dl do
+                      syms.each do |sym|
+                        column = text_class.columns_hash[sym.to_s]
+                        m2.dt t_xxx(text_table_name,sym)
+                        m2.dd { m2 << auto_input_tag(sym,text_class,"#{text_table_name}[#{lang.code}][#{sym}]",text.__send__(sym)) }
+                      end
                     end
                   end
                 end
               end
+
               m2 << submit_tag("Save")
             end.html_safe
           end
@@ -141,6 +153,7 @@ module WeBridge
         m.section do
           m.h2 "show "
           m << self.show_record(record)
+          m << self.show_record_text(record)
           if edit_path
             m.div do
               m.a "Edit", href: edit_path
@@ -171,21 +184,33 @@ module WeBridge
             m.dt t_xxx(record.class.table_name,mn)
             m.dd { m << display_tag(mn,record) }
           end
+        end
+      end
+    end
 
-          if record.respond_to?(:text) && model.respond_to?(:text)
-            text_model = model.text
-            mns = text_model.try(:showable_methods) || text_model.content_columns.map(&:name) || []
-            if mns.present?
-              lang_model = defined?(::Lang) ? ::Lang : ActiveRecord::Mlang::Lang
-              langs = lang_model.all.to_a
-              langs.each do |lang|
-                text = record.text(lang.code)
-                mns.each do |mn|
-                  m.div class: lang.code do
-                    m.dt t_xxx(record.class.text.table_name,mn)
-                    m.dd { m << (display_tag(mn,text) || "N/A") }
-                  end
-                end
+    def show_record_text(record)
+      model = record.class
+      if !((text_model = model.try(:text)) && record.respond_to?(:text))
+        return ""
+      end
+
+      mns = text_model.try(:showable_methods) || text_model.content_columns.map(&:name) || []
+
+      if !mns.present?
+        return ""
+      end
+
+      lang_model = defined?(::Lang) ? ::Lang : ActiveRecord::Mlang::Lang
+      langs = lang_model.all.to_a
+      markup do |m|
+        langs.each do |lang|
+          text = record.text(lang.code)
+          m.fieldset class: lang.code do
+            m.legend lang.code
+            m.dl do
+              mns.each do |mn|
+                m.dt t_xxx(text_model.table_name,mn)
+                m.dd { m << (display_tag(mn,text) || "N/A") }
               end
             end
           end

data/lib/we_bridge/auto_view_helper/version.rb

@@ -1,5 +1,5 @@
 module WeBridge
   module AutoViewHelper
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: we_bridge-auto_view_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Shinjiro Itagaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview