ultimate-base 0.2.4 → 0.3.0.alpha

data/app/assets/javascripts/ultimate/helpers/tag.js.coffee

@@ -0,0 +1,77 @@
+#= require ./base
+
+@Ultimate.Helpers.Tag =
+
+  BOOLEAN_ATTRIBUTES: "disabled readonly multiple checked autobuffer
+                       autoplay controls loop selected hidden scoped async
+                       defer reversed ismap seemless muted required
+                       autofocus novalidate formnovalidate open pubdate itemscope".split(/\s+/)
+
+  PRE_CONTENT_STRINGS:
+    textarea: "\n"
+
+  tag: (tag_name, options = {}, open = false, escape = true) ->
+    "<#{tag_name}#{@tag_options(options)}#{if open then '>' else ' />'}"
+
+  content_tag: (name, content_or_options_with_block = null, options = null, escape = true, block = null) ->
+    if block = _.outcasts.blockGiven(arguments)
+      options = content_or_options_with_block
+      @content_tag_string(name, block(), options, escape)
+    else
+      @content_tag_string(name, content_or_options_with_block, options, escape)
+
+  content_tag_string: (name, content = '', options = {}, escape = true) ->
+    content = _.escape(content)  if escape
+    "<#{name}#{@tag_options(options, escape)}>#{@PRE_CONTENT_STRINGS[name] ? ''}#{content}</#{name}>"
+
+  html_options_to_s: (html_options, escape = false, prefix = "") ->
+    deprecate 'html_options_to_s()', "tag_options()"
+    @tag_options.apply(@, arguments)
+
+  tag_options: (options, escape = true) ->
+    return ""  if _.isEmpty(options)
+    attrs = []
+    for key, value of options
+      if key is "data" and _.isObject(value)
+        for k, v of value
+          attrs.push @data_tag_option(k, v, escape)
+      else if _.include(@BOOLEAN_ATTRIBUTES, key)
+        attrs.push @boolean_tag_option(key)  if value
+      else if value?
+        attrs.push @tag_option(key, value, escape)
+    if _.isEmpty(attrs) then "" else " #{attrs.sort().join(' ')}"
+
+  data_tag_option: (key, value, escape) ->
+    key = "data-#{_.string.dasherize(key)}"
+    value = JSON.stringify(value)  if JSON? and _.isObject(value)
+    @tag_option(key, value, escape)
+
+  boolean_tag_option: (key) ->
+    "#{key}=\"#{key}\""
+
+  tag_option: (key, value, escape) ->
+    value = value.join(" ")  if _.isArray(value)
+    value = _.string.escapeHTML(value)  if escape
+    "#{key}=\"#{value}\""
+
+
+
+#  # TODO more zen features: +, *x, {content}
+#  # TODO cache
+#  selectorToHtml: (selector) ->
+#    if matches = selector.match(/^[\s>]*([\w\.]+)(.*)$/)
+#      selector = matches[1]
+#      continuation = matches[2]#{(if open then ">" else " />")}
+#      classes = selector.split(".")
+#      tag_name = classes.shift() or "div"
+#      html_options = {}
+#      html_options["class"] = classes.join(" ")  if classes.length
+#      if continuation
+#        @content_tag(tag_name, @selectorToHtml(continuation), html_options)
+#      else
+#        @tag(tag_name, html_options)
+#    else
+#      ""
+#
+  concat_class: ->
+    _.uniq(_.compact(arguments).join(' ').split(/\s+/)).join(' ')

data/app/assets/javascripts/ultimate/helpers/url.js.coffee

@@ -0,0 +1,49 @@
+#= require ./base
+#= require ./tag
+
+@Ultimate.Helpers.Url =
+
+  url_for: (options = null) ->
+    if _.isString(options)
+      if options is "back"
+        'javascript:history.back();'
+      else
+        options
+    else unless _.isEmpty(options)
+      url = _.result(options, 'url') ? ''
+      if _.isObject(options)
+        options = _.clone(options)
+        delete options['url']
+        anchor = _.outcasts.delete(options, 'anchor')
+        url += "?#{_.map(options, (value, key) -> "#{key}=#{value}").sort().join('&')}"  unless _.isEmpty(options)
+        url += "##{anchor}"  if anchor
+      url
+    else
+      'javascript:;'
+
+  link_to: (name = null, options = null, html_options = null, block = null) ->
+    [html_options, options] = [options, name]  if block = _.outcasts.blockGiven(arguments)
+    options ||= {}
+    url = @url_for(options)
+    html_options = @_convert_options_to_data_attributes(options, html_options)
+    html_options["href"] ||= url
+    Ultimate.Helpers.Tag.content_tag("a", name or url, html_options, false, block)
+
+
+
+  _convert_options_to_data_attributes: (options, html_options) ->
+    if html_options
+      html_options['data-remote'] = 'true'  if @_link_to_remote_options(options) or @_link_to_remote_options(html_options)
+      method = _.outcasts.delete(html_options, 'method')
+      @_add_method_to_attributes(html_options, method)  if method
+      html_options
+    else
+      if @_link_to_remote_options(options) then {'data-remote': 'true'} else {}
+
+  _link_to_remote_options: (options) ->
+    _.isObject(options) and _.outcasts.delete(options, 'remote')
+
+  _add_method_to_attributes: (html_options, method) ->
+    if _.isString(method) and method.toLowerCase() isnt "get" and not /nofollow/.test(html_options["rel"])
+      html_options["rel"] = _.string.lstrip("#{html_options["rel"]} nofollow")
+    html_options["data-method"] = method

data/app/assets/javascripts/ultimate/helpers.js.coffee

@@ -7,10 +7,10 @@
 
 @DEBUG_MODE ?= false
 @TEST_MODE ?= false
-@WARNINGS ?= true
+@LOG_TODO ?= true
 
 @cout = =>
-  args = @args(arguments)
+  args = _.toArray(arguments)
   method = if args[0] in ['log', 'info', 'warn', 'error', 'assert', 'clear'] then args.shift() else 'log'
   if @DEBUG_MODE and console?
     method = console[method]
@@ -25,34 +25,53 @@
   arguments[0]
 
 @deprecate = (subject, instead = null) =>
-  @cout 'warn', "\"#{subject}\" DEPRECATED!#{if instead then " Use instead: \"#{instead}\"" else ''}"
-  return
+  @cout 'error', "`#{subject}` DEPRECATED!#{if instead then " Use instead `#{instead}`" else ''}"
 
-@warning = (subject, instead = null) =>
-  if @WARNINGS
-    @cout 'warn', "\"#{subject}\" WARNING!#{if instead then " Use instead: \"#{instead}\"" else ''}"
-  return
+@todo = (subject, location = null, numberOrString = null) =>
+  if @LOG_TODO
+    @cout 'warn', "TODO: #{subject}#{if location then " ### #{location}" else ''}#{if numberOrString then (if _.isNumber(numberOrString) then ":#{numberOrString}" else " > #{numberOrString}") else ''}"
 
 @args = (a) ->
+  @deprecate 'arg()', '_.toArray()'
   r = []
   Array::push.apply(r, a)  if a.length > 0
   r
 
-@blockGiven = (args) =>
-  l = args.length
-  if l
-    l = args[l - 1]
-    if _.isFunction(l) then l else false
-  else
-    false
+@logicalXOR = (a, b) ->
+  ( a and not b ) or ( not a and b )
+
+@bound = (number, min, max) ->
+  Math.max(min, Math.min(max, number))
+
 
-@_delete = (object, key) ->
-  value = object[key]
-  delete object[key]
-  value
+
+@getParams = ->
+  q = location.search.substring(1).split('&')
+  r = {}
+  for e in q
+    t = e.split('=')
+    r[t[0]] = t[1]
+  r
+
+@respondFormat = (url, format = null) ->
+  aq = url.split('?')
+  ah = aq[0].split('#')
+  ad = ah[0].split('.')
+  currentFormat = if ad.length > 1 and not /\//.test(ad[ad.length - 1]) then ad.pop() else ''
+  return currentFormat  unless format?
+  return url  if format is currentFormat
+  ad.push format  if format
+  ah[0] = ad.join('.')
+  aq[0] = ah.join('#')
+  aq.join('?')
+
+
+
+###########   Deprecated   ###########
 
 # Helper function to get a value from a object as a property or as a function.
 @getValue = (object, prop) ->
+  @deprecate "getValue()", "_.result()"
   return null  unless object and object[prop]
   return if _.isFunction(object[prop]) then object[prop]() else object[prop]
 
@@ -80,16 +99,6 @@
   r.push(e)  for e in arrOrString  when not _.include(r, e)
   if isStr then r.join('') else r
 
-@logicalXOR = (a, b) ->
-  ( a and not b ) or ( not a and b )
-
-@bound = (number, min, max) ->
-  Math.max(min, Math.min(max, number))
-
-@roundWithPrecision = (number, precision = 2) ->
-  precision = Math.pow(10, precision)
-  Math.round(number * precision) / precision
-
 @regexpSpace = /^\s*$/
 @regexpTrim = /^\s*(.*?)\s*$/
 
@@ -97,53 +106,17 @@
   @deprecate "strTrim(s)", "_.trim(s)"
   s.match(@regexpTrim)[1]
 
-# !!!!!!!!!!! tags !!!!!!!!!!!!
-
-@number_to_currency = (number, units) ->
-  precision = 2
-  s = parseFloat(number).toFixed(precision)
-  b = s.length - 1 - precision
-  r = s.substring(b)
-  while b > 0
-    a = b - 3
-    r = ' ' + s.substring(a, b) + r
-    b = a
-  "#{r.substring(1)} #{units}"
-
-
-
-@getParams = ->
-  q = location.search.substring(1).split('&')
-  r = {}
-  for e in q
-    t = e.split('=')
-    r[t[0]] = t[1]
-  r
-
-@respondFormat = (url, format = null) ->
-  aq = url.split('?')
-  ah = aq[0].split('#')
-  ad = ah[0].split('.')
-  currentFormat = if ad.length > 1 and not /\//.test(ad[ad.length - 1]) then ad.pop() else ''
-  return currentFormat  unless format?
-  return url  if format is currentFormat
-  ad.push format  if format
-  ah[0] = ad.join('.')
-  aq[0] = ah.join('#')
-  aq.join('?')
-
 
 
 @rails_data = {}
 
 @rails_scope = (controller_name, action_name, scopedCloasure = null, scopedCloasureArguments...) =>
+  @deprecate 'rails_scope'
   return false if _.isString(controller_name) and controller_name isnt @rails_data['controller_name']
   return false if _.isString(action_name)     and action_name     isnt @rails_data['action_name']
   if _.isFunction(scopedCloasure)
     arguments[2] scopedCloasureArguments...
   true
 
-
-
 $ =>
   @rails_data = $('body').data()

data/app/assets/javascripts/ultimate/improves/i18n-lite.js.coffee

@@ -1,14 +1,20 @@
-# TODO list
+# TODO list:
 #       * load all locales
+#       * pluralize
 
-@I18n ||=
-  locale: "en"
-  translations: {}
-
-  t: (path) ->
-    path = path.split('.')  if _.isString(path)
-    scope = @translations
-    for step in path
-      scope = scope[step]
-      return path.join('.')  unless scope
-    scope
+@I18n = $.extend true,
+  {
+    locale: "en"
+    translations: {}
+
+    translate: (path, options = {}) ->
+      path = path.split('.')  if _.isString(path)
+      scope = @translations
+      for step in path
+        scope = scope[step]
+        return options['default'] ? path.join('.')  unless scope?
+      scope
+
+    t: -> @translate arguments...
+
+  }, @I18n

data/app/assets/javascripts/ultimate/improves/magic-radios.js.coffee

@@ -1,5 +1,7 @@
 #
 # Magic Radios
+# TODO refactoring
+# TODO checkboxes
 #
 #  @example
 #    = f.radio_button :main_addr_same_as_jur, true, data: {disable: ".main-addr"}

data/app/assets/javascripts/ultimate/improves/typed-fields.js.coffee

@@ -1,15 +1,16 @@
-( ( $ ) ->
+do ($ = jQuery) ->
 
   # ========= max & min  =========
   $('input:text[data-gte], input:text[data-lte]').live 'change focusout blur', ->
-    jField = $ @
+    jField = $(@)
     realValue = jField.val()
     if realValue isnt ''
-      min = parseFloat jField.data('gte')
-      max = parseFloat jField.data('lte')
-      oldValue = parseFloat realValue
+      # TODO refactor this
+      min = parseFloat(jField.data('gte'))
+      max = parseFloat(jField.data('lte'))
+      oldValue = parseFloat(realValue)
       v = oldValue
-      v = 0  if isNaN v
+      v = 0  if isNaN(v)
       v = min  if not isNaN(min) and v < min
       v = max  if not isNaN(max) and v > max
       jField.val(v).change()  unless v is oldValue
@@ -33,15 +34,15 @@
     'text'      : /^.*$/
 
   $.fn.getRegExpMask = ->
-    mask = @data 'regexpMask'
+    mask = @data('regexpMask')
     if _.isString(mask)
       try
-        mask = new RegExp mask
+        mask = new RegExp(mask)
         @data 'regexpMask', mask
       catch e
         # nop
     else
-      dataType = @data 'dataType'
+      dataType = @data('dataType')
       mask = $.regexp.typedField[dataType]  if dataType
     unless mask
       @val 'unknown dataType'
@@ -56,18 +57,16 @@
 
   $.fn.setRegExpMask = (mask) ->
     stringMask = 'true'
-    if _.isString mask
+    if _.isString(mask)
       stringMask = mask
       try
-        mask = new RegExp mask
+        mask = new RegExp(mask)
       catch e
         # nop
-    if _.isRegExp mask
+    if _.isRegExp(mask)
       @
         .dropRegExpMask()
         .attr('data-regexp-mask', stringMask)
         .data('regexpMask', mask)
         .change()
     @
-
-)( jQuery )

data/app/assets/javascripts/ultimate/{base.js.coffee → jquery.base.js.coffee}

@@ -1,14 +1,4 @@
-###
- *  front-end ui-components routines
- *
- *   @version 0.5.5.alpha / 2010-2012
- *   @author Karpunin Dmitry / Evrone.com
- *   @email koderfunk_at_gmail_dot_com
- *
- *   TODO register components
- *   TODO using underscore.js
- *
-###
+# TODO: register components
 
 do ($ = jQuery) =>
 
@@ -18,43 +8,39 @@ do ($ = jQuery) =>
 
   @ror_id = (jObjOrString) ->
     if jObjOrString instanceof jQuery
-      id = jObjOrString.data('rorId') # Maybe use "id"
-      unless id
-        id = jObjOrString.attr('id')
-        if id
-          matchResult = id.match($.regexp.rorId)
-          id = if matchResult then matchResult[2] else null
-          jObjOrString.data 'rorId', id
-          id
-        else 
-          null
-    else
+      id = jObjOrString.data("rorId") # Maybe use "id"
+      unless id?
+        id = ror_id(jObjOrString.attr("id"))
+        jObjOrString.data("rorId", id)  if id?
+      id
+    else if _.isString(jObjOrString)
       matchResult = jObjOrString.match($.regexp.rorId)
       if matchResult then matchResult[2] else null
+    else
+      null
 
-  $.fn.rorId = ->
+  $.fn.rorId = (id = null, prefix = null) ->
     if arguments.length
-      id = arguments[0]
-      word = 'ror_id'
-      thisId = @attr('id')
-      if thisId
-        word = matchResult[1]  if matchResult = thisId.match($.regexp.rorId)
-      @data('rorId', id).attr 'id', "${word}_#{id}"
-      @
+      jThis = @first()
+      thisId = @attr("id")
+      if not prefix? and _.isString(thisId)
+        prefix = matchResult[1]  if matchResult = thisId.match($.regexp.rorId)
+      @data("rorId", id)
+      if prefix?
+        jThis.attr "id", "#{prefix}_#{id}"
+      jThis
     else
       ror_id @
 
   $.fn.getClasses = ->
-    _.words @attr("class")
+    _.string.words @attr("class")
 
   # Get hash of html-dom attributes from first matched element or false, if no elements
   $.fn.getAttributes = ->
+    attrs = {}
     if @length
-      attrs = {}
-      attrs[attr.nodeName] = attr.nodeValue for attr in this[0].attributes
-      attrs
-    else
-      false
+      attrs[attr.nodeName] = attr.nodeValue  for attr in this[0].attributes
+    attrs
 
   # [showOrHide[, duration[, callback]]]
   $.fn.slideToggleByState = ->
@@ -74,7 +60,8 @@ do ($ = jQuery) =>
     $.isHTML = (content, strong = false) ->
       return false  unless _.isString(content)
       matches = content.match($.regexp.HTML)
-      matches and not strong or matches[1] is matches[2]
+      return false  unless matches?
+      not strong or matches[1] is matches[2]
 
   # TODO replace usages to underscore methods and using distribution
   unless $.isRegExp

data/app/assets/javascripts/ultimate/{experimental/_inflections → underscore}/underscore.inflection.js

@@ -6,16 +6,17 @@
 
 ( function( _, undefined )
 {
+  var
+    plurals = [ ],
+
+    singulars = [ ],
+
+    uncountables = [ ];
+
   /**
    * Inflector
    */
   var inflector = {
-    
-    plurals : [ ],
-
-    singulars : [ ],
-
-    uncountables : [ ],
 
     gsub : function( word, rule, replacement )
     {
@@ -26,7 +27,7 @@
 
     plural : function( rule, replacement )
     {
-      this.plurals.unshift( [ rule, replacement ] );
+      plurals.unshift( [ rule, replacement ] );
     },
 
     pluralize : function( word, count, includeNumber )
@@ -40,14 +41,14 @@
       }
       else
       {
-        if( _( this.uncountables ).include( word ) )
+        if( _( uncountables ).include( word ) )
         {
           return word;
         }
 
         result = word;
 
-        _( this.plurals ).detect( function( rule )
+        _( plurals ).detect( function( rule )
         {
           var gsub = this.gsub( word, rule[ 0 ], rule[ 1 ] );
 
@@ -61,19 +62,19 @@
 
     singular : function( rule, replacement )
     {
-      this.singulars.unshift( [ rule, replacement ] );
+      singulars.unshift( [ rule, replacement ] );
     },
 
     singularize : function( word )
     {
-      if( _( this.uncountables ).include( word ) )
+      if( _( uncountables ).include( word ) )
       {
         return word;
       }
 
       var result = word;
 
-      _( this.singulars ).detect( function( rule )
+      _( singulars ).detect( function( rule )
       {
         var gsub = this.gsub( word, rule[ 0 ], rule[ 1 ] );
 
@@ -86,20 +87,20 @@
 
     irregular : function( singular, plural )
     {
-      this.plural( singular, plural );
-      this.singular( plural, singular );
+      this.plural( '\\b' + singular + '\\b', plural );
+      this.singular( '\\b' + plural + '\\b', singular );
     },
 
     uncountable : function( word )
     {
-      this.uncountables.unshift( word );
+      uncountables.unshift( word );
     },
 
     resetInflections : function( )
     {
-      this.plurals      = [ ];
-      this.singulars    = [ ];
-      this.uncountables = [ ];
+      plurals      = [ ];
+      singulars    = [ ];
+      uncountables = [ ];
 
       this.plural( /$/,                         's'       );
       this.plural( /s$/,                        's'       );