tao_on_rails 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723bdfc80962341e3edec02a1e904976a224c91b
-  data.tar.gz: 3721bd5ecea46051f3af0242d75543f6f14a7e22
+  metadata.gz: 7ede1d9a4377793659e2f7249f1c38b349b6d9c4
+  data.tar.gz: a161b521a9a106d62cdc0086f141f7d5730c76a3
 SHA512:
-  metadata.gz: e32ab3584038acca268311801e487c1f8478e02017aa752714afc146df51688c587deeb18f99caee457a7dda9ebb1731716de3a63ff26cf5f039eae7afc76749
-  data.tar.gz: 0058328d81ec7984f3f282faddd55a3725a5d0dff75989fa0da66ecbd656337fcb9aa92cd275149361f32eb306c021b9ed6e70ee9eb4c728545c53dbdbe0e3bb
+  metadata.gz: 6efff7e9bc759ee2079b2422ffa925bbe709b283a2aa0f95654156982916316c75c7effa25a84ee8ab43df8cff52bb4ea9b9ca7f0fe20d17c58e45d598d7f385
+  data.tar.gz: a7b284ea0d976ccc8d1a2281371fd6fd38e45d8f19173255acede3e3fc4e20296d3161838ef5b249e6c556ac74f486aa6163c2bcd5534d0a88f184bfa9d58d27

data/lib/assets/javascripts/tao/attribute_parser.coffee

@@ -53,9 +53,9 @@ class TaoAttributeParser extends TaoModule
       try
         JSON.parse value
       catch e
-        options.default || {}
+        options.default || null
     else
-      options.default || {}
+      options.default || null
 
   @aliasMethod '_parseObject', '_parseHash'
 
@@ -64,9 +64,9 @@ class TaoAttributeParser extends TaoModule
       try
         JSON.parse value
       catch e
-        options.default || []
+        options.default || null
     else
-      options.default || []
+      options.default || null
 
   _stringifyString: (value, options) ->
     value.toString()

data/lib/assets/javascripts/tao/component.coffee

@@ -109,13 +109,16 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
           @taoId = ++count
           @_init()
           @initialized = true
+          @trigger 'initialized'
 
         @_connected()
+        @trigger 'connected'
 
     disconnectedCallback: ->
       $ =>
         @connected = false
         @_disconnected()
+        @trigger 'disconnected'
 
     attributeChangedCallback: (name) ->
       return unless @connected
@@ -136,9 +139,22 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
     _attributeChanged: (name) ->
       @["_#{_.camelCase name}Changed"]?()
 
+    _reflow: ->
+      @offsetHeight
+      @
+
     beforeCache: ->
       # called before turbolinks cache pages
 
+    findComponent: (selector, readyCallback) ->
+      component = @jq.find(selector).get(0)
+      if component.connected
+        readyCallback? component
+      else
+        @one 'connected', selector, ->
+          readyCallback? component
+      component
+
     on: (args...) ->
       @jq.on args...
 
@@ -146,6 +162,9 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
       @jq.off args...
 
     trigger: (args...) ->
+      @jq.trigger(args...)
+
+    triggerHandler: (args...) ->
       @jq.triggerHandler(args...)
 
     one: (args...) ->

data/lib/generators/tao/coffee/coffee_generator.rb

@@ -14,10 +14,10 @@ module Tao
           @page_id = [class_path, file_name, action].flatten.join('-')
           if (variants = options[:variants]).any?
             variants.each do |variant|
-              template "coffee.erb", File.join("app/assets/javascripts", variant, name.pluralize, "#{action}.coffee")
+              template "coffee.erb", File.join("app/assets/javascripts", variant, name.pluralize, "#{action}_page.coffee")
             end
           else
-            template "coffee.erb", File.join('app/assets/javascripts', name.pluralize, "#{action}.coffee")
+            template "coffee.erb", File.join('app/assets/javascripts', name.pluralize, "#{action}_page.coffee")
           end
         end
       end

data/lib/generators/tao/sass/sass_generator.rb

@@ -14,10 +14,10 @@ module Tao
           @page_id = [class_path, file_name, action].flatten.join('-')
           if (variants = options[:variants]).any?
             variants.each do |variant|
-              template "sass.erb", File.join("app/assets/stylesheets", variant, name.pluralize, "#{action}.scss")
+              template "sass.erb", File.join("app/assets/stylesheets", variant, name.pluralize, "#{action}_page.scss")
             end
           else
-            template "sass.erb", File.join('app/assets/stylesheets', name.pluralize, "#{action}.scss")
+            template "sass.erb", File.join('app/assets/stylesheets', name.pluralize, "#{action}_page.scss")
           end
         end
       end

data/lib/tao_on_rails/components/base.rb

@@ -2,29 +2,36 @@ module TaoOnRails
   module Components
     class Base
 
-      attr_reader :options, :template_path, :view
+      attr_reader :options, :template_name, :template_paths, :view
 
       def initialize view, options = {}
         @view = view
         @options = options
-        @template_path = @options.delete(:template_path) || self.class.template_path
+        @template_name = self.class.template_name.dup
+        @template_paths = self.class.template_paths.dup
+        @template_paths.unshift(@options.delete(:template_path)) if @options[:template_path].present?
       end
 
       def render &block
-        if view.lookup_context.exists?(template_path, [], true)
+        if template = find_template
           if block_given?
-            block_content = view.capture(&block)
-            view.render layout: template_path, locals: {component: self} do
-              block_content
+            template.render(view, {component: self, block_given: true}) do |*name|
+              view._layout_for(*name, &block)
             end
           else
-            view.render partial: template_path, locals: {component: self}
+            template.render(view, {component: self})
           end
         else
           view.content_tag self.class.tag_name, nil, options, &block
         end
       end
 
+      def translate key
+        i18n_scope = self.class.name.underscore.split('/').join('.').gsub(/(.+)_component$/, '\1')
+        I18n.t(key, scope: i18n_scope).presence
+      end
+      alias_method :t, :translate
+
       def self.tag_name
         @tag_name ||= "#{self.tag_prefix}-#{self.component_name.to_s.dasherize}"
       end
@@ -39,8 +46,25 @@ module TaoOnRails
         :tao
       end
 
-      def self.template_path
-        @template_path ||= "components/#{self.name.underscore.gsub(/(.+)_component$/, '\1')}"
+      def self.template_paths
+        @template_paths ||= [
+          "components/#{self.name.deconstantize.underscore}",
+          "#{self.name.deconstantize.underscore}/components"
+        ]
+      end
+
+      def self.template_name
+        @template_name ||= self.name.demodulize.underscore.gsub(/(.+)_component$/, '\1')
+      end
+
+      private
+
+      def find_template
+        view.lookup_context.find_all(template_name, template_paths, true, template_keys).first
+      end
+
+      def template_keys
+        [:component, :block_given]
       end
 
     end

data/lib/tao_on_rails/version.rb

@@ -1,3 +1,3 @@
 module TaoOnRails
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tao_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Siyuan Liu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turbolinks