tao_on_rails 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3c6267c2913b2dde1120969bb3d9aaf31fbd44a
-  data.tar.gz: 348f07e5e6b7ae5bf850e2f1739cbe2c10939045
+  metadata.gz: 68741607aaee03755cb22bdc37f591a968ef990a
+  data.tar.gz: 11202a57a4788bb0bb3bf732930d34d6fa9d4600
 SHA512:
-  metadata.gz: 2b2ca6b983f5edbbaa9485f758226393ad1a0381cf571ba7c822d57f586531a630f6420ff91edaefcbcbfafe642ecec8f15701fef4de36953bb6b1c8fbdb9b06
-  data.tar.gz: 6fea03e197c664e99f21dc59dae336c69851c1b5eb33bb518b6671c440cf57e1dc578f6d0312ef5ef9a23b035433214025dcd3d509c5ccdd662f78667aec01dc
+  metadata.gz: 2e23efda6d1a2fbf658e5889d47b230f969d9009c01cf3441ffa95087e389e7f8ccc7208f7c2adf746409914f214fe5c1c66160a6c829842491b446a82f4fa00
+  data.tar.gz: 757f9688506a85930b7c36cc07ee7f55246810908f6742069079613eb66eafed3c179eda9f80c8167354d1cc9844366a16465088d61b3f7e88c743241af57e4a

data/README.md

@@ -16,6 +16,7 @@ Several generators are available for you to quickly start your work:
 * tao:view
 * tao:controller
 * tao:locale
+* tao:icons
 * tao:channel
 * tao:scaffold
 

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

@@ -68,4 +68,4 @@ class TaoApplication extends TaoModule
       @_initPage $page
       @trigger 'page-load', [@currentPage]
 
-window.TaoApplication = TaoApplication
+Tao.Application = window.TaoApplication = TaoApplication

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

@@ -0,0 +1,101 @@
+#= require ./module
+
+parser = null
+
+class TaoAttributeParser extends TaoModule
+
+  @defaultOptions =
+    type: 'string'
+
+  @getParser: ->
+    parser ||= new TaoAttributeParser()
+
+  @parse: (value, options = {}) ->
+    parser = @getParser()
+    options = _.extend {}, @defaultOptions, options
+    if parse = parser["_#{_.camelCase "parse_#{options.type}"}"]
+      parse.call parser, value, options
+    else
+      value
+
+  @stringify: (value, options = {}) ->
+    parser = @getParser()
+    options = _.extend {}, @defaultOptions, options
+    if stringify = parser["_#{_.camelCase "stringify_#{options.type}"}"]
+      stringify.call parser, value, options
+    else
+      value
+
+  _parseString: (value, options) ->
+    value || options.default || ''
+
+  _parseBoolean: (value, options) ->
+    if _.isNil value
+      options.default || false
+    else if value == 'true'
+      true
+    else if value == 'false'
+      false
+    else
+      !!value
+
+  @aliasMethod '_parseBool', '_parseBoolean'
+
+  _parseHash: (value, options) ->
+    if _.isString value
+      try
+        JSON.parse value
+      catch e
+        options.default || {}
+    else
+      options.default || {}
+
+  @aliasMethod '_parseObject', '_parseHash'
+
+  _parseArray: (value, options) ->
+    if _.isString value
+      try
+        JSON.parse value
+      catch e
+        options.default || []
+    else
+      options.default || []
+
+  _stringifyString: (value, options) ->
+    value.toString()
+
+  _stringifyBoolean: (value, options) ->
+    console.log @
+    unless _.isBoolean value
+      value = options.default || false
+
+    if value == true
+      'true'
+    else if value == false
+      'false'
+    else
+      null
+
+  @aliasMethod '_stringifyBool', '_stringifyBoolean'
+
+  _stringifyHash: (value, options) ->
+    unless _.isObject value
+      value = options.default || {}
+
+    try
+      JSON.stringify value
+    catch e
+      '{}'
+
+  @aliasMethod '_stringifyObject', '_stringifyHash'
+
+  _stringifyArray: (value, options) ->
+    unless _.isObject value
+      value = options.default || []
+
+    try
+      JSON.stringify value
+    catch e
+      '[]'
+
+Tao.AttributeParser = window.TaoAttributeParser = TaoAttributeParser

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

@@ -1,5 +1,6 @@
 #= require lodash
 #= require polyfills/polyfills
+#= require ./attribute_parser
 
 components = {}
 
@@ -63,23 +64,21 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
 
       names.forEach (name) =>
         attrName = _.kebabCase(name)
+
         @get name, ->
-          if @hasAttribute attrName
-            val = @getAttribute(attrName)
-            if val == 'false' then false else (val || true)
-          else if options.default
-            options.default
+          val = if @hasAttribute attrName
+             @getAttribute(attrName)
           else
-            false
+            null
+          TaoAttributeParser.parse val, options
+
         @set name, (val) ->
-          if val == true
-            @setAttribute attrName, ''
-          else if val != false
+          val = TaoAttributeParser.stringify val, options
+          if _.isString val
             @setAttribute attrName, val
-          else if options.default == true
-            @setAttribute attrName, 'false'
           else
             @removeAttribute attrName
+
         @observedAttributes.push(attrName) if options.observe
 
     @tag: '' # to be set by child class
@@ -149,5 +148,5 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
 
   components[superClassName] = ComponentClass
 
-window.TaoComponentBasedOn = TaoComponentBasedOn
-window.TaoComponent = TaoComponentBasedOn 'HTMLElement'
+Tao.TaoComponentBasedOn = window.TaoComponentBasedOn = TaoComponentBasedOn
+Tao.Component = window.TaoComponent = TaoComponentBasedOn 'HTMLElement'

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

@@ -1,2 +1,2 @@
-# generate this file by exec command in project:
-#   rake tao:generate_icons
+# generate this file by generator:
+#   rails g tao:icons

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

@@ -22,32 +22,41 @@ class TaoModule
     obj.included?.call(@)
     @
 
-  @get: (attributeName, getMethod) ->
-    Object.defineProperty @prototype, attributeName,
-      get: getMethod
+  @get: (name, method) ->
+    Object.defineProperty @prototype, name,
+      get: method
       configurable: true
 
-  @set: (attributeName, setMethod) ->
-    Object.defineProperty @prototype, attributeName,
-      set: setMethod
+  @set: (name, method) ->
+    Object.defineProperty @prototype, name,
+      set: method
       configurable: true
 
-  @attribute: (names..., options = {}) ->
+  @property: (names..., options = {}) ->
     unless typeof options == 'object'
       names.push(options)
       options = {}
 
     names.forEach (name) =>
       @get name, ->
-        @_attributes[name] ? options.default
+        unless _.isUndefined @_proterties[name]
+          @_proterties[name]
+        else if _.isFunction options.default
+          options.default.call @
+        else
+          options.default
       @set name, (val) ->
-        return if @_attributes[name] == val
-        @_attributes[name] = val
+        return if @_proterties[name] == val
+        @_proterties[name] = val
         @["_#{name}Changed"]?()
 
+  @aliasMethod: (newMethod, oldMethod) ->
+    @::[newMethod] = ->
+      @[oldMethod]?.apply(@, arguments)
+
   constructor: (options = {}) ->
     @id = ++id
-    @_attributes = {}
+    @_proterties = {}
 
     if typeof options == 'object'
       @[key] = val for key, val of options
@@ -69,4 +78,4 @@ class TaoModule
   one: (args...) ->
     $(@).one args...
 
-window.TaoModule = TaoModule
+Tao.Module = window.TaoModule = TaoModule

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

@@ -9,4 +9,4 @@ class TaoPage extends TaoComponent
       el.beforeCache?()
       null
 
-window.TaoPage = TaoPage
+Tao.Page = window.TaoPage = TaoPage

data/lib/generators/tao/icons/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generate coffee file containing all svg icons.
+
+Example:
+    `rails generate tao:icons`
+
+    Create coffee file:
+        lib/assets/javascripts/tao/icons.coffee

data/lib/generators/tao/icons/icons_generator.rb

@@ -0,0 +1,44 @@
+module Tao
+  module Generators
+    class IconsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      class_option :svg_path, type: :string, default: 'app/assets/icons', desc: "Directory path containing svg source files."
+
+      attr_reader :icons_html
+
+      def create_icons_file
+        @icons_html = svg_files.map {|file| "  #{symbol(file)}\n"}.join
+        template 'icons.coffee.erb', 'lib/assets/javascripts/tao/icons.coffee'
+      end
+
+      private
+
+      def svg_files
+        Dir.glob(File.expand_path(File.join(options[:svg_path], '*.svg'), destination_root)).uniq
+      end
+
+      def symbol(path)
+        name = File.basename(path, ".*").underscore().dasherize()
+        content = File.read(path)
+        content.gsub(/<?.+\?>/,'')
+          .gsub(/<!.+?>/,'')
+          .gsub(/<title>.*<\/title>/, '')
+          .gsub(/<desc>.*<\/desc>/, '')
+          .gsub(/id=/,'class=')
+          .gsub(/<svg.+?>/, %Q{<svg id="icon-#{name}" #{dimensions(content)}>})
+          .gsub(/svg/,'symbol')
+          .gsub(/\sfill=".+?"/,'')
+          .gsub(/\n/, '') # Remove endlines
+          .gsub(/\s{2,}/, ' ') # Remove whitespace
+          .gsub(/>\s+</, '><') # Remove whitespace between tags
+      end
+
+      def dimensions(content)
+        dimension = content.scan(/<svg.+(viewBox=["'](.+?)["'])/).flatten
+        %Q{#{dimension.first} width="100%" height="100%"}
+      end
+
+    end
+  end
+end

data/lib/generators/tao/icons/templates/icons.coffee.erb

@@ -0,0 +1,5 @@
+Tao.iconsHtml = '''
+<svg id="tao-icons" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">
+<%= icons_html %>
+</svg>
+'''

data/lib/tao_on_rails/version.rb

@@ -1,3 +1,3 @@
 module TaoOnRails
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tao_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Siyuan Liu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turbolinks
@@ -73,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: blade
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ files:
 - lib/assets/javascripts/i18n.js
 - lib/assets/javascripts/tao.coffee
 - lib/assets/javascripts/tao/application.coffee
+- lib/assets/javascripts/tao/attribute_parser.coffee
 - lib/assets/javascripts/tao/component.coffee
 - lib/assets/javascripts/tao/helpers.coffee
 - lib/assets/javascripts/tao/icons.coffee
@@ -136,6 +151,9 @@ files:
 - lib/generators/tao/controller/USAGE
 - lib/generators/tao/controller/controller_generator.rb
 - lib/generators/tao/controller/templates/controller.rb.erb
+- lib/generators/tao/icons/USAGE
+- lib/generators/tao/icons/icons_generator.rb
+- lib/generators/tao/icons/templates/icons.coffee.erb
 - lib/generators/tao/locale/USAGE
 - lib/generators/tao/locale/locale_generator.rb
 - lib/generators/tao/locale/templates/model.yml.erb
@@ -156,7 +174,6 @@ files:
 - lib/tao_on_rails.rb
 - lib/tao_on_rails/engine.rb
 - lib/tao_on_rails/version.rb
-- lib/tasks/icons.rake
 - lib/templates/app/app_template.rb
 - lib/templates/app/templates/app/assets/javascripts/application.coffee
 - lib/templates/app/templates/app/assets/javascripts/home/index_page.coffee

data/lib/tasks/icons.rake

@@ -1,48 +0,0 @@
-namespace :tao do
-
-  desc 'generate svg icons.'
-  task :icons => :environment do
-    dir_name = "#{Rails.root}/vendor/assets/javascripts/tao"
-    Dir.mkdir(dir_name) unless File.exists?(dir_name)
-
-    File.open "#{dir_name}/icons.coffee", 'w' do |f|
-      f.puts %{Tao.iconsHtml = '''#{svg_html}'''}
-    end
-  end
-
-  private
-
-  def svg_html
-    %{<svg id="tao-icons" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">\n#{symbols}</svg>}
-  end
-
-  def svg_files
-    @svg_files ||= Dir.glob(File.expand_path("#{::Rails.root}/app/assets/icons/*.svg")).uniq
-  end
-
-  def symbols
-    svg_files.map {|file| "  #{symbol(file)}\n"}.join
-  end
-
-  def symbol(path)
-    name = File.basename(path, ".*").underscore().dasherize()
-    content = File.read(path)
-    content.gsub(/<?.+\?>/,'')
-      .gsub(/<!.+?>/,'')
-      .gsub(/<title>.*<\/title>/, '')
-      .gsub(/<desc>.*<\/desc>/, '')
-      .gsub(/id=/,'class=')
-      .gsub(/<svg.+?>/, %Q{<svg id="icon-#{name}" #{dimensions(content)}>})
-      .gsub(/svg/,'symbol')
-      .gsub(/\sfill=".+?"/,'')
-      .gsub(/\n/, '') # Remove endlines
-      .gsub(/\s{2,}/, ' ') # Remove whitespace
-      .gsub(/>\s+</, '><') # Remove whitespace between tags
-  end
-
-  def dimensions(content)
-    dimension = content.scan(/<svg.+(viewBox=["'](.+?)["'])/).flatten
-    %Q{#{dimension.first} width="100%" height="100%"}
-  end
-
-end