ultimate-base 0.2.3.2 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ultimate-base (0.2.3.2)
+    ultimate-base (0.2.4)
 
 GEM
   remote: http://rubygems.org/

data/LICENSE

@@ -1,5 +1,19 @@
-Dual licensed under the MIT and GPL licenses:
-  http://www.opensource.org/licenses/mit-license.php
-  http://www.gnu.org/licenses/gpl.html
+Copyright (c) 2011-2012 Dmitry Karpunin (aka KODer) koderfunk@gmail.com
 
-Copyright (c) 2010-2012 Dmitry KODer Karpunun / Evrone.com
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1 +1,25 @@
 Ultimate UI core, base helpers and improves for Ruby on Rails Front-end
+
+## Licence ##
+
+The MIT License
+
+Copyright (c) 2010-2012 Dmitry Karpunin (aka KODer) koderfunk@gmail.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/app/assets/javascripts/ultimate/backbone/extra/jquery-ext.js.coffee

@@ -20,10 +20,11 @@ do ($ = jQuery) ->
 
   $.fn.getView = (viewClass, inheritance = false) ->
     if _.isString(viewClass)
-      for o in @
-        views = $(o).data("views") or []
-        for view in views
-          return view  if view.constructor.className is viewClass
+      deprecate "getView() with viewClass as string", "viewClass as Backbone.View inheritor"
+#      for o in @
+#        views = $(o).data("views") or []
+#        for view in views
+#          return view  if view.constructor.className is viewClass
     else if Ultimate.Backbone.isViewClass(viewClass)
       for o in @
         views = $(o).data("views") or []
@@ -37,8 +38,9 @@ do ($ = jQuery) ->
 
   $.fn.hasView = (viewClass) ->
     if _.isString(viewClass)
-      for o in @
-        return true  if _.any $(o).data("views") or [], (w) -> w.constructor.className is viewClass
+      deprecate "hasView() with viewClass as string", "viewClass as Backbone.View inheritor"
+#      for o in @
+#        return true  if _.any $(o).data("views") or [], (w) -> w.constructor.className is viewClass
     else if Ultimate.Backbone.isViewClass(viewClass)
       for o in @
         return true  if _.any $(o).data("views") or [], (w) -> w.constructor is viewClass

data/app/assets/javascripts/ultimate/backbone/extra/jquery-plugin-adapter.js.coffee

@@ -25,7 +25,7 @@ do ($ = jQuery) ->
       else
         return view  if _returnView
         return jContainer  unless argsLength
-        command = "updateSettings"
+        command = "_configure"
       if view[command]
         return getValue(view, command)
       else
@@ -39,28 +39,22 @@ do ($ = jQuery) ->
     if _returnView then view else jContainer
 
 
-# TODO rewrite docs
-###
- * Invoke Ultimate Flash functionality for the first element in the set of matched elements.
+###*
+ * Make $.fn.pluginName() as wrapper under Backbone.View.
+ * First call on jQuery object invoke View functionality for the first element in the set of matched elements.
+ * Subsequent calls forwarding on view methods or return view property.
  * If last argument {Boolean} true, then returns {View}.
  * @usage
- *** standart actions ***
- * construction    .ultimateFlash([Object options = {}])                  ~ {jQuery} jContainer
- * show            .ultimateFlash("show", String type, String text)       ~ {jQuery} jFlash | {Boolean} false
- * notice          .ultimateFlash("notice", String text)                  ~ {jQuery} jFlash | {Boolean} false
- * alert           .ultimateFlash("alert", String text)                   ~ {jQuery} jFlash | {Boolean} false
- *** extended actions ***
- * getSettings     .ultimateFlash("getSettings")                          ~ {Object} settings
- * setSettings     .ultimateFlash("setSettings", {Object} settings)       ~ {jQuery} jContainer
- * updateSettings  .ultimateFlash({Object} options)                       ~ {Object} settings
- * auto            .ultimateFlash("auto", {ArrayOrObject} obj)            ~ {Array} ajFlashes | {Boolean} false
- * ajaxSuccess     .ultimateFlash("ajaxSuccess"[, Arguments successArgs = []])
- * ajaxError       .ultimateFlash("ajaxError"[, String text = settings.translations.defaultErrorText][, Arguments errorArgs = []])
+ *   construction    .pluginName([Object options = {}])           : {jQuery} jContainer
+ *   updateOptions   .pluginName({Object} options)                : {Object} view options
+ *   get options     .pluginName("options")                       : {Object} view options
+ *   some method     .pluginName("methodName", *methodArguments)  : {jQuery} chanin object || {AnotherType} method result
 ###
 
 Ultimate.Backbone.createJQueryPlugin = (pluginName, viewClass) ->
-  cout "info", "Ultimate.Backbone.createJQueryPlugin", pluginName, viewClass
+  Ultimate.Backbone.debug ".createJQueryPlugin()", pluginName, viewClass
   if Ultimate.Backbone.isViewClass(viewClass)
+    viewClass.pluginName = pluginName
     jQuery.fn[pluginName] = -> @ultimateBackboneViewPluginAdapter pluginName, viewClass, arguments
   else
     jQuery.error "Second argument of Ultimate.Backbone.createJQueryPlugin() must be View class inherited from Backbone.View"

data/app/assets/javascripts/ultimate/backbone/view.js.coffee

@@ -2,7 +2,12 @@
 
 class Ultimate.Backbone.View extends Backbone.View
 
-  viewOptions: []
+  @defaultLocales:
+    en: {}
+    ru: {}
+
+  locale: "en"
+  translations: {}
 
   loadingState: null
   loadingWidthMethodName: "innerWidth"
@@ -10,6 +15,8 @@ class Ultimate.Backbone.View extends Backbone.View
   loadingStateClass: "loading"
   loadingOverlayClass: "loading-overlay"
 
+  viewOptions: -> []
+
   constructor: ->
     Ultimate.Backbone.debug ".View.constructor()", @
     super
@@ -77,12 +84,41 @@ class Ultimate.Backbone.View extends Backbone.View
   # Overload parent method Backbone.View._configure() as hook for reflectOptions().
   _configure: (options) ->
     super
+    @initTranslations()
     @reflectOptions()
 
-  reflectOptions: (viewOptions, options = @options) ->
-    viewOptions = getValue(@, "viewOptions")  unless viewOptions
-    @[attr] = options[attr]  for attr in viewOptions  when options[attr]
+  reflectOptions: (viewOptions = getValue(@, "viewOptions"), options = @options) ->
+    @[attr] = options[attr]  for attr in viewOptions  when typeof options[attr] isnt "undefined"
+    @[attr] = value  for attr, value of options  when typeof @[attr] isnt "undefined"
+    @
 
+  updateOptions: (options) ->
+    @_configure(options)
+    @options
+
+  # use I18n, and modify locale and translations in options
+  # modify and return merged data
+  initTranslations: (options = @options) ->
+    # if global compatible I18n
+    if I18n? and I18n.locale and I18n.t
+      options["locale"] ||= I18n.locale
+      if options["locale"] is I18n.locale
+        # pointing to defaults locales of language specified in I18n
+        _defaultLocales = @constructor.defaultLocales?[I18n.locale] ||= {}
+        unless _defaultLocales["loaded"]
+          _defaultLocales["loaded"] = true
+          # try read localized strings
+          if _localesFromI18n = I18n.t(options["i18nKey"] or _.underscored(@constructor.pluginName or @constructor.name))
+            # fill it from I18n
+            _.extend _defaultLocales, _localesFromI18n
+    @locale = options["locale"] if options["locale"]
+    translations = if @locale then @constructor.defaultLocales?[@locale] or {} else {}
+    $.extend true, options, translations: translations, options
+    options
+
+  t: (key) ->
+    # TODO maybe use I18n there
+    @translations[key]
 
 
   # Overloadable getter for jQuery-container that will be blocked.

data/app/assets/javascripts/ultimate/backbone/views/slider.js.coffee

@@ -14,7 +14,7 @@ class Ultimate.Backbone.Views.Slider extends Ultimate.Backbone.View
   events: ->
     "click   .nav.enabled" : "navClick"
 
-  viewOptions: ["vertical", "cycling", "interval", "durationPerPixel", "prevItems"]
+  viewOptions: -> _.union super, ["vertical", "cycling", "interval", "durationPerPixel", "prevItems"]
 
   vertical: false
   cycling: false

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

@@ -1,8 +1,9 @@
+#= require ../view
 #= require ultimate/improves/typed-fields
 
-Ultimate.Backbone.Views ||= {}
+Ultimate.Backbone.Observers ||= {}
 
-class Ultimate.Backbone.Views.TypedFields extends Ultimate.Backbone.View
+class Ultimate.Backbone.Observers.TypedFields extends Ultimate.Backbone.View
 
   selector: "input:text[data-data-type], input:text[data-regexp-mask]"
 
@@ -37,4 +38,4 @@ class Ultimate.Backbone.Views.TypedFields extends Ultimate.Backbone.View
 
 
 
-Ultimate.Backbone.createJQueryPlugin? "typedFields", Ultimate.Backbone.Views.TypedFields
+Ultimate.Backbone.createJQueryPlugin? "typedFields", Ultimate.Backbone.Observers.TypedFields

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

@@ -1,7 +1,7 @@
 ###
  *  front-end ui-components routines
  *
- *   @version 0.5.5.alpha / 2010-2011
+ *   @version 0.5.5.alpha / 2010-2012
  *   @author Karpunin Dmitry / Evrone.com
  *   @email koderfunk_at_gmail_dot_com
  *
@@ -10,53 +10,48 @@
  *
 ###
 
-# TODO do ($ = jQuery) =>
-( ($) =>
+do ($ = jQuery) =>
 
   $.regexp ||= {}
 
   $.regexp.rorId ||= /(\w+)_(\d+)$/
 
   @ror_id = (jObjOrString) ->
-    if isJQ jObjOrString
-      id = jObjOrString.data 'rorId'
+    if jObjOrString instanceof jQuery
+      id = jObjOrString.data('rorId') # Maybe use "id"
       unless id
-        id = jObjOrString.attr 'id'
+        id = jObjOrString.attr('id')
         if id
-          matchResult = id.match $.regexp.rorId
-          id = if matchResult then matchResult[2] else ''
+          matchResult = id.match($.regexp.rorId)
+          id = if matchResult then matchResult[2] else null
           jObjOrString.data 'rorId', id
+          id
         else 
-          id = ''
+          null
     else
-      matchResult = jObjOrString.match $.regexp.rorId
-      id = if matchResult then matchResult[2] else ''
-    id
+      matchResult = jObjOrString.match($.regexp.rorId)
+      if matchResult then matchResult[2] else null
 
   $.fn.rorId = ->
     if arguments.length
       id = arguments[0]
       word = 'ror_id'
-      thisId = @attr 'id'
+      thisId = @attr('id')
       if thisId
-        word = matchResult[1]  if matchResult = thisId.match $.regexp.rorId
-      @data('rorId', id).attr 'id', word + '_' + id
+        word = matchResult[1]  if matchResult = thisId.match($.regexp.rorId)
+      @data('rorId', id).attr 'id', "${word}_#{id}"
       @
     else
       ror_id @
 
   $.fn.getClasses = ->
-    return []  unless @length
-    classAttr = $.trim @attr 'class'
-    if classAttr then classAttr.split(/\s+/) else []
+    _.words @attr("class")
 
   # Get hash of html-dom attributes from first matched element or false, if no elements
   $.fn.getAttributes = ->
     if @length
       attrs = {}
-      #TRY attrs[attr.nodeName] = attr.nodeValue for attr in this[0].attributes
-      $.each this[0].attributes, (index, attr) ->
-        attrs[attr.nodeName] = attr.nodeValue
+      attrs[attr.nodeName] = attr.nodeValue for attr in this[0].attributes
       attrs
     else
       false
@@ -65,7 +60,7 @@
   $.fn.slideToggleByState = ->
     if @length
       if arguments.length > 0
-        a = args arguments
+        a = args(arguments)
         if a.shift()
           @slideDown.apply @, a
         else
@@ -74,6 +69,13 @@
         @slideToggle()
     @
 
+  unless $.isHTML
+    $.regexp.HTML = /^\s*<(\w+)[\S\s]*<\/(\w+)>\s*$/
+    $.isHTML = (content, strong = false) ->
+      return false  unless _.isString(content)
+      matches = content.match($.regexp.HTML)
+      matches and not strong or matches[1] is matches[2]
+
   # TODO replace usages to underscore methods and using distribution
   unless $.isRegExp
     $.isRegExp = (candidate) ->
@@ -90,14 +92,7 @@
       deprecate '$.isString', '_.isString'
       typeof v is "string"
 
-  unless $.isHTML
-    $.regexp.HTML = new RegExp "^\\s*<(\\w+)[\\S\\s]*</(\\w+)>\\s*$"
-    $.isHTML = (v) ->
-      matches = $.regexp.HTML.exec v
-      matches and matches[1] is matches[2]
-
   if typeof $.isEmptyString is "undefined"
     $.isEmptyString = (v) ->
+      deprecate '$.isEmptyString', '_.isBlank'
       regexpSpace.test v
-
-)( jQuery )

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

@@ -10,39 +10,39 @@
 @WARNINGS ?= true
 
 @cout = =>
-  args = @args arguments
+  args = @args(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]
     if method.apply?
-      method.apply console, args
+      method.apply(console, args)
     else
-      method args
+      method(args)
   return args[0]
 
 @_cout = =>
-  console.log arguments  if console?
+  console.log(arguments)  if console?
   arguments[0]
 
 @deprecate = (subject, instead = null) =>
-  @cout 'warn', "\"#{subject}\" DEPRECATED!" + if instead then " Use instead: \"#{instead}\"" else ''
+  @cout 'warn', "\"#{subject}\" DEPRECATED!#{if instead then " Use instead: \"#{instead}\"" else ''}"
   return
 
 @warning = (subject, instead = null) =>
   if @WARNINGS
-    @cout 'warn', "\"#{subject}\" WARNING!" + if instead then " Use instead: \"#{instead}\"" else ''
+    @cout 'warn', "\"#{subject}\" WARNING!#{if instead then " Use instead: \"#{instead}\"" else ''}"
   return
 
 @args = (a) ->
   r = []
-  Array::push.apply r, a  if a.length > 0
+  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
+    if _.isFunction(l) then l else false
   else
     false
 
@@ -57,53 +57,53 @@
   return if _.isFunction(object[prop]) then object[prop]() else object[prop]
 
 @isset = (obj) =>
-  @deprecate 'isset(obj)', 'obj isnt undefined" OR "obj?'
+  @deprecate 'isset(obj)', '_.isUndefined(obj) OR "obj isnt undefined" OR "obj?'
   obj isnt undefined
 
 @isString = (v) =>
-  @deprecate 'isString(v)', '_.isString v'
+  @deprecate 'isString(v)', '_.isString(v)'
   _.isString v
 
 @isNumber = (v) =>
-  @deprecate 'isNumber(v)', '_.isNumber v'
-  not isNaN parseInt v
+  @deprecate 'isNumber(v)', '_.isNumber(v)'
+  not isNaN(parseInt(v))
 
 @isJQ = (obj) ->
   @deprecate 'isJQ(obj)', 'obj instanceof jQuery'
-  _.isObject(obj) and _.isString obj.jquery
+  _.isObject(obj) and _.isString(obj.jquery)
 
 @uniq = (arrOrString) ->
-  @deprecate 'uniq(a)', '_.uniq a'
-  isStr = _.isString arrOrString
-  return arrOrString  unless isStr or _.isArray arrOrString
+  @deprecate 'uniq(a)', '_.uniq(a)'
+  isStr = _.isString(arrOrString)
+  return arrOrString  unless isStr or _.isArray(arrOrString)
   r = []
-  r.push e  for e in arrOrString  when not _.include r, e
-  if isStr then r.join '' else r
+  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 number, max
+  Math.max(min, Math.min(max, number))
 
 @roundWithPrecision = (number, precision = 2) ->
-  precision = Math.pow 10, precision
+  precision = Math.pow(10, precision)
   Math.round(number * precision) / precision
 
-@regexpSpace = new RegExp '^\\s*$'
-@regexpTrim = new RegExp '^\\s*(.*?)\\s*$'
+@regexpSpace = /^\s*$/
+@regexpTrim = /^\s*(.*?)\s*$/
 
 @strTrim = (s) =>
-  @deprecate "strTrim(s)", "$.trim(s)"
+  @deprecate "strTrim(s)", "_.trim(s)"
   s.match(@regexpTrim)[1]
 
 # !!!!!!!!!!! tags !!!!!!!!!!!!
 
 @number_to_currency = (number, units) ->
   precision = 2
-  s = parseFloat(number).toFixed precision
+  s = parseFloat(number).toFixed(precision)
   b = s.length - 1 - precision
-  r = s.substring b
+  r = s.substring(b)
   while b > 0
     a = b - 3
     r = ' ' + s.substring(a, b) + r
@@ -113,24 +113,24 @@
 
 
 @getParams = ->
-  q = location.search.substring(1).split '&'
+  q = location.search.substring(1).split('&')
   r = {}
   for e in q
-    t = e.split '='
+    t = e.split('=')
     r[t[0]] = t[1]
   r
 
 @respondFormat = (url, format = null) ->
-  aq = url.split '?'
-  ah = aq[0].split '#'
-  ad = ah[0].split '.'
+  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 '?'
+  ah[0] = ad.join('.')
+  aq[0] = ah.join('#')
+  aq.join('?')
 
 
 
@@ -139,7 +139,7 @@
 @rails_scope = (controller_name, action_name, scopedCloasure = null, scopedCloasureArguments...) =>
   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
+  if _.isFunction(scopedCloasure)
     arguments[2] scopedCloasureArguments...
   true