ultimate-base 0.5.0.0 → 0.6.0

data/app/assets/javascripts/ultimate/underscore/underscore.string.js

@@ -41,12 +41,13 @@
     lt: '<',
     gt: '>',
     quot: '"',
-    apos: "'",
-    amp: '&'
+    amp: '&',
+    apos: "'"
   };
 
   var reversedEscapeChars = {};
-  for(var key in escapeChars){ reversedEscapeChars[escapeChars[key]] = key; }
+  for(var key in escapeChars) reversedEscapeChars[escapeChars[key]] = key;
+  reversedEscapeChars["'"] = '#39';
 
   // sprintf() for JavaScript 0.7-beta1
   // http://www.diveintojavascript.com/projects/javascript-sprintf
@@ -206,7 +207,22 @@
 
     count: function(str, substr){
       if (str == null || substr == null) return 0;
-      return String(str).split(substr).length - 1;
+
+      str = String(str);
+      substr = String(substr);
+
+      var count = 0,
+        pos = 0,
+        length = substr.length;
+
+      while (true) {
+        pos = str.indexOf(substr, pos);
+        if (pos === -1) break;
+        count++;
+        pos += length;
+      }
+
+      return count;
     },
 
     chars: function(str) {
@@ -320,7 +336,7 @@
     },
 
     classify: function(str){
-      return _s.titleize(String(str).replace(/_/g, ' ')).replace(/\s/g, '');
+      return _s.titleize(String(str).replace(/[\W_]/g, ' ')).replace(/\s/g, '');
     },
 
     humanize: function(str){
@@ -429,17 +445,17 @@
     },
 
     toNumber: function(str, decimals) {
-      if (str == null || str == '') return 0;
-      str = String(str);
-      var num = parseNumber(parseNumber(str).toFixed(~~decimals));
-      return num === 0 && !str.match(/^0+$/) ? Number.NaN : num;
+      if (!str) return 0;
+      str = _s.trim(str);
+      if (!str.match(/^-?\d+(?:\.\d+)?$/)) return NaN;
+      return parseNumber(parseNumber(str).toFixed(~~decimals));
     },
 
     numberFormat : function(number, dec, dsep, tsep) {
       if (isNaN(number) || number == null) return '';
 
       number = number.toFixed(~~dec);
-      tsep = tsep || ',';
+      tsep = typeof tsep == 'string' ? tsep : ',';
 
       var parts = number.split('.'), fnums = parts[0],
         decimals = parts[1] ? (dsep || '.') + parts[1] : '';
@@ -494,8 +510,8 @@
     slugify: function(str) {
       if (str == null) return '';
 
-      var from  = "ąàáäâãåæćęèéëêìíïîłńòóöôõøùúüûñçżź",
-          to    = "aaaaaaaaceeeeeiiiilnoooooouuuunczz",
+      var from  = "ąàáäâãåæćęèéëêìíïîłńòóöôõøśùúüûñçżź",
+          to    = "aaaaaaaaceeeeeiiiilnoooooosuuuunczz",
           regex = new RegExp(defaultToWhiteSpace(from), 'g');
 
       str = String(str).toLowerCase().replace(regex, function(c){
@@ -538,6 +554,36 @@
       return repeat.join(separator);
     },
 
+    naturalCmp: function(str1, str2){
+      if (str1 == str2) return 0;
+      if (!str1) return -1;
+      if (!str2) return 1;
+
+      var cmpRegex = /(\.\d+)|(\d+)|(\D+)/g,
+        tokens1 = String(str1).toLowerCase().match(cmpRegex),
+        tokens2 = String(str2).toLowerCase().match(cmpRegex),
+        count = Math.min(tokens1.length, tokens2.length);
+
+      for(var i = 0; i < count; i++) {
+        var a = tokens1[i], b = tokens2[i];
+
+        if (a !== b){
+          var num1 = parseInt(a, 10);
+          if (!isNaN(num1)){
+            var num2 = parseInt(b, 10);
+            if (!isNaN(num2) && num1 - num2)
+              return num1 - num2;
+          }
+          return a < b ? -1 : 1;
+        }
+      }
+
+      if (tokens1.length === tokens2.length)
+        return tokens1.length - tokens2.length;
+
+      return str1 < str2 ? -1 : 1;
+    },
+
     levenshtein: function(str1, str2) {
       if (str1 == null && str2 == null) return 0;
       if (str1 == null) return String(str2).length;
@@ -576,25 +622,23 @@
   _s.contains = _s.include;
   _s.q        = _s.quote;
 
+  // Exporting
+
   // CommonJS module is defined
   if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      // Export module
+    if (typeof module !== 'undefined' && module.exports)
       module.exports = _s;
-    }
-    exports._s = _s;
 
-  } else if (typeof define === 'function' && define.amd) {
-    // Register as a named module with AMD.
-    define('underscore.string', [], function() {
-      return _s;
-    });
-
-  } else {
-    // Integrate with Underscore.js if defined
-    // or create our own underscore object.
-    root._ = root._ || {};
-    root._.string = root._.str = _s;
+    exports._s = _s;
   }
 
+  // Register as a named module with AMD.
+  if (typeof define === 'function' && define.amd)
+    define('underscore.string', [], function(){ return _s; });
+
+
+  // Integrate with Underscore.js if defined
+  // or create our own underscore object.
+  root._ = root._ || {};
+  root._.string = root._.str = _s;
 }(this, String);

data/lib/ultimate/base.rb

@@ -1,6 +1,5 @@
 require "ultimate/base/version"
 require "ultimate/base/engine"
-require "ultimate/extensions/directive_processor"
 
 module Ultimate
   module Base

data/lib/ultimate/base/version.rb

@@ -1,5 +1,5 @@
 module Ultimate
   module Base
-    VERSION = '0.5.0.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-base
 version: !ruby/object:Gem::Version
-  version: 0.5.0.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,10 +75,10 @@ files:
 - app/assets/javascripts/ultimate/backbone/app.js.coffee
 - app/assets/javascripts/ultimate/backbone/base.js.coffee
 - app/assets/javascripts/ultimate/backbone/collection.js.coffee
-- app/assets/javascripts/ultimate/backbone/extra/jquery-ext.js.coffee
 - app/assets/javascripts/ultimate/backbone/lib/backbone.js
 - app/assets/javascripts/ultimate/backbone/model.js.coffee
 - app/assets/javascripts/ultimate/backbone/router.js.coffee
+- app/assets/javascripts/ultimate/backbone/view-mixins/nodes.js.coffee
 - app/assets/javascripts/ultimate/backbone/view.js.coffee
 - app/assets/javascripts/ultimate/backbone/views/slider.js.coffee
 - app/assets/javascripts/ultimate/backbone/views/typed-fields.js.coffee
@@ -87,13 +87,9 @@ files:
 - app/assets/javascripts/ultimate/experimental/_inflections/plur.js
 - app/assets/javascripts/ultimate/experimental/fuzzy-json-generator.js.coffee
 - app/assets/javascripts/ultimate/helpers.js.coffee
-- app/assets/javascripts/ultimate/improves/datepicker.js.coffee
-- app/assets/javascripts/ultimate/improves/devise.js.coffee
-- app/assets/javascripts/ultimate/improves/form-errors.js.coffee
 - app/assets/javascripts/ultimate/improves/form.js.coffee
 - app/assets/javascripts/ultimate/improves/i18n-lite.js.coffee
 - app/assets/javascripts/ultimate/improves/magic-radios.js.coffee
-- app/assets/javascripts/ultimate/improves/tablesorter.js
 - app/assets/javascripts/ultimate/improves/typed-fields.js.coffee
 - app/assets/javascripts/ultimate/jquery-plugin-adapter.js.coffee
 - app/assets/javascripts/ultimate/jquery-plugin-class.js.coffee
@@ -106,7 +102,6 @@ files:
 - lib/ultimate/base.rb
 - lib/ultimate/base/engine.rb
 - lib/ultimate/base/version.rb
-- lib/ultimate/extensions/directive_processor.rb
 - scripts/rails
 - test/dummy/Rakefile
 - test/dummy/_emfile

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

@@ -1,96 +0,0 @@
-#= require ../base
-
-do ($ = jQuery) ->
-
-  # TODO arguments
-  $.fn.getViews = (viewClass = null, inheritance = false, domDeep = false) ->
-    if not @length
-      return []
-    else if @length is 1
-      views = @data("views") or []
-    else
-      # TODO check work and perf tests
-      views = _.flatten($(o).data("views") or []  for o in @, true)
-      #2: @map -> $(@).data("views") or []
-      #3: _.flatten ( @map -> $(@).data("views") or [] ), true
-    if viewClass?
-      _.filter views, if inheritance then (w) -> w instanceof viewClass else (w) -> w.costructor is viewClass
-    else
-      views
-
-  $.fn.getView = (viewClass, inheritance = false) ->
-    if _.isString(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 []
-        if inheritance
-          for view in views
-            return view  if view instanceof viewClass
-        else
-          for view in views
-            return view  if view.constructor is viewClass
-    false
-
-  $.fn.hasView = (viewClass) ->
-    if _.isString(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
-    false
-
-#  $.fn.bindOneView = (viewClass, options = {}) ->
-#    Ultimate.gcViews()
-#    bindedView = null
-#    if @length
-#      selector = "#{viewClass.selector}:not(.prevent-binding)"
-#      jContainer = if @is(selector) then @filter(selector) else @find(selector)
-#      if (l = jContainer.length)
-#        if l is 1
-#          bindedView = Ultimate.createView viewClass, jContainer, options
-#        else
-#          warning "$.fn.bindOneView() found #{l} elements by #{selector}, when need only 1"
-#      else
-#        warning "$.fn.bindOneView() not found elements by #{selector}"
-#    else
-#      warning "$.fn.bindOneView() call from empty jQuery()"
-#    bindedView
-#
-#  $.fn.bindView = (viewClass, options = {}) ->
-#    Ultimate.gcViews()
-#    bindedViews = []
-#    if @length
-#      ( if @is(viewClass.selector) then @ else @find(viewClass.selector) ).filter(":not(.prevent-binding)").each ->
-#        if viewClass.canCreateInstance()
-#          jContainer = $ @
-#          if view = Ultimate.createView viewClass, jContainer, options
-#            bindedViews.push view
-#        else
-#          false
-#    bindedViews
-#
-#  $.fn.bindViews = (viewClasses = Ultimate.LazyViews, options = {}) ->
-#    cout "info", "bindViews begin"
-#    bindedViews = []
-#    if @length
-#      bindedViews = for viewName, viewClass of viewClasses when viewClass.canCreateInstance()
-#        viewClass.constructor.className ||= viewName
-#        @bindView viewClass, options
-#    _.flatten bindedViews, true
-
-
-
-#  # TODO filtering by viewClass
-#  # TODO enother algorithm with enother projection
-#  $.fn.closestViews = (viewClass = null) ->
-#    views = []
-#    jTry = @
-#    jTry = jTry.parent()  while jTry.length and not (views = jTry.getViews()).length
-#    views

data/app/assets/javascripts/ultimate/improves/datepicker.js.coffee

@@ -1,34 +0,0 @@
-
-@unlazy_datepickers = (jRoot) ->
-  jRoot.find('input.datepicker.lazy').removeClass('lazy').length
-
-@bind_datepickers = (jRoot) ->
-  jRoot.find('input.datepicker:not(.lazy, .hasDatepicker)').each( ->
-    jThis = $ @
-    opts =
-      'showAnim'       : ''
-      'showOn'         : 'both'
-      'buttonImage'    : '/images/forms/datepicker__icon.png'  # TODO forwarding assets path
-      'buttonImageOnly': true
-      'changeMonth'    : true
-      'changeYear'     : true
-      'onClose'        : (dateText, inst) -> $(inst.input).change().focusout()
-    opts[_.camelize(k)] = d  for k, d of jThis.data()
-    jThis.datepicker opts
-  ).length
-
-$.fn.orig_datepicker = $.fn.datepicker
-
-$.fn.datepicker = ->
-  return @  unless @length
-  @data('changed', true)  if arguments.length and arguments[0] is 'setDate'
-  $.fn.orig_datepicker.apply @, arguments
-
-
-
-$ ->
-
-  $('body').on 'keyup keydown', 'input.datepicker.hasDatepicker', ->
-    $(@).datepicker 'hide'
-
-  bind_datepickers $('body')

data/app/assets/javascripts/ultimate/improves/devise.js.coffee

@@ -1,18 +0,0 @@
-$ ->
-
-  jBody = $ 'body'
-
-  # fixes on sessions/new form, because devise don't return errors on fields
-  jBody.on 'ajax:error', 'form.sessions-new', ->
-    $(@).find(':input:visible').filter(-> not @value).closestEdge().setErrors()
-    false
-
-  # if devise form success, then open root path
-  jBody.on 'ajax:success', 'form.user[data-remote="true"]', (event, data, textStatus, jqXHR) ->
-    jForm = $ @
-    if jForm.hasClass('users-new')
-      getWidget('AccountPanel').showConfirmationInfo(jForm, data)
-    else if jForm.hasClass('password-recovery')
-      getWidget('AccountPanel').showConfirmationInfo(jForm, data)
-    else unless jForm.hasClass('status')
-      window.location = jqXHR.getResponseHeader('Location') or '/'

data/app/assets/javascripts/ultimate/improves/form-errors.js.coffee

@@ -1,146 +0,0 @@
-# TODO this is part of custom forms
-# TODO registrable
-# TODO may be, replace "clear immune" technique with something more effective, ex. additional class
-
-( ( $ ) ->
-
-  $.errorableFields = {}
-  $.errorableFieldsSelector = ''
-  
-  $.registerErrorableField = (selector, events, errorCleaner) ->
-    $.errorableFields[selector.split(/\s+/)[0]] = arguments
-    $.errorableFieldsSelector = _.keys($.errorableFields).join(', ')
-    true
-
-  $.fieldWithErrorsWrapperClass = 'field_with_errors'
-  $.fieldWithClearImmuneWrapperClass = 'immune'
-  $.labelForFieldWithErrorClass = 'with-error'
-
-  #  [ selector: String = '.g-select, .g-text-field, .g-text-area' ]
-  #  [ [, ]errors: Array = [] ]
-  #  [ [, ]clearImmune: Boolean = false ]
-  $.fn.setFormErrors = ->
-    # dafault parameters
-    selector = $.errorableFieldsSelector # '.g-select, .g-text-field, .g-text-area'
-    errors = []
-    clearImmune = false
-    # parsing arguments
-    # TODO liquid arguments parser ( by arguments info, ex: {selector: String, errors: Array, clearImmune: Boolean} )
-    a = args arguments
-    if a.length
-      first = a.shift()
-      if _.isString first
-        selector = first
-        if a.length
-          first = a.shift()
-          if _.isString first
-            first = [first]
-      if _.isArray first
-        errors = _.uniq first
-      if a.length
-        first = a.shift()
-        if _.isBoolean first
-          clearImmune = first
-    # ui process
-    @clearFormErrors selector, clearImmune
-    wrapperSelector = ".#{$.fieldWithErrorsWrapperClass}"
-    if clearImmune
-      wrapperSelector += ".#{$.fieldWithClearImmuneWrapperClass}"
-    jErrorWrappers = @find(selector).wrap(selectorToHtml wrapperSelector).parent()
-    jErrorWrappers.append (for err in errors  then  content_tag('div', err, class: 'error')).join("\n")
-    jErrorWrappers.closestLabel().addClass($.labelForFieldWithErrorClass)
-
-  $.fn.setErrors = ->
-    deprecate('jQ.setErrors(...)', 'jQ.setFormErrors(...)')
-    @setFormErrors.apply(@, arguments)
-
-  # [selector]
-  # [clearImmune]
-  $.fn.clearFormErrors = ->
-    selector = $.errorableFieldsSelector # '.g-select, .g-text-field, .g-text-area'
-    clearImmune = false
-    # parsing arguments
-    # TODO liquid arguments parser ( by arguments info, ex: {selector: String, clearImmune: Boolean} )
-    a = args arguments
-    if a.length
-      first = a.shift()
-      if _.isString first
-        selector = first
-        if a.length
-          first = a.shift()
-      if _.isBoolean(first)
-        clearImmune = first
-    wrapperSelector = ".#{$.fieldWithErrorsWrapperClass}"
-    if clearImmune
-      wrapperSelector += ".#{$.fieldWithClearImmuneWrapperClass}"
-    else
-      wrapperSelector += ":not(.#{$.fieldWithClearImmuneWrapperClass})"
-    fullSelector = "#{wrapperSelector}:has(#{selector})"
-    jErrorWrappers = @find fullSelector
-    jErrorWrappers = @closest fullSelector  unless jErrorWrappers.length
-    if jErrorWrappers.length
-      jErrorWrappers.closestLabel().removeClass($.labelForFieldWithErrorClass)
-      jErrorWrappers.children('.error').remove()
-      jErrorWrappers.children(selector).unwrap()
-    @
-
-  $.fn.clearFromErrors = ->
-    deprecate('jQ.clearFromErrors(...)', 'jQ.clearFormErrors(...)')
-    @clearFormErrors.apply(@, arguments)
-
-  $.ujsAjaxError = (event, jqXHR) ->
-    jForm = $(@).clearFormErrors()
-    try
-      responseJSON = $.parseJSON jqXHR.responseText
-      errors = responseJSON['errors'] or responseJSON
-      if errors
-        jFields = jForm.find '[name*="["]:input:visible' # TODO research without :visible, because has custom elements
-        if jFields.length
-          for fieldErrors, fieldName of errors
-            jField = jFields.filter "[name$=\"[#{fieldName}]\"]"
-            if jField.length
-              jField.closestEdge().setErrors fieldErrors
-    catch e
-      # nop
-    true
-
-
-  $.fn.customErrorsHandler = (suspend = true, eventName = 'ajax:error', selector = 'form[data-remote="true"]') ->
-    if @length
-      if @is 'form'
-        jForms = @filter selector
-        jForms.off eventName, $.ujsAjaxError
-        jForms.on eventName, $.ujsAjaxError  if suspend
-      else  
-        @off eventName, selector, $.ujsAjaxError
-        @on eventName, selector, $.ujsAjaxError  if suspend
-    @
-
-
-
-    
-  $.fn.errorCleaners = (suspend = true) ->
-    if @length
-      jDocks = if @is ':input' then @closestEdge() else @
-      for fieldWrapperSelector, [selector, events, errorCleaner] of $.errorableFields
-        fullSelector = ".#{$.fieldWithErrorsWrapperClass} > #{selector}"
-        jDocks.off events, fullSelector
-        jDocks.on events, fullSelector, errorCleaner  if suspend
-    @
-
-
-
-  $.registerErrorableField '.g-text-field input:visible', 'change keyup', ->
-    # text-fields error cleaner
-    jTextField = $ @
-    unless jTextField.val() is '' # TODO may be use isEmptyString()
-      jTextField.clearFormErrors('.g-text-field').clearFormErrors('.g-text-field', true)
-      jTextField.change().focus() # unwraping break change, and there changing continue
-
-  $.registerErrorableField '.g-select select', 'change', ->
-    # selects error cleaner
-    jSelect = $ @
-    unless jSelect.val() is '' # TODO may be use isEmptyString() 
-      jSelect.clearFormErrors('.g-select').clearFormErrors('.g-select', true)
-
-)( jQuery )