ultimate-base 0.3.2.1 → 0.3.3.0

data/Gemfile.lock

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

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

@@ -4,13 +4,6 @@
 
 class Ultimate.Backbone.View extends Backbone.View
 
-  @defaultLocales:
-    en: {}
-    ru: {}
-
-  locale: "en"
-  translations: {}
-
   loadingState: null
   loadingWidthMethodName: "innerWidth"
   loadingHeightMethodName: "innerHeight"
@@ -86,7 +79,6 @@ class Ultimate.Backbone.View extends Backbone.View
   # Overload parent method Backbone.View._configure() as hook for reflectOptions().
   _configure: (options) ->
     super
-    @initTranslations()
     @reflectOptions()
 
   reflectOptions: (viewOptions = _.result(@, "viewOptions"), options = @options) ->
@@ -94,35 +86,6 @@ class Ultimate.Backbone.View extends Backbone.View
     @[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.
   getJLoadingContainer: -> @$el
 

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

@@ -18,7 +18,7 @@
     ).join("\n")
 
   options_from_collection_for_select: (collection, value_method, text_method, selected = null) ->
-    options = _.map collection, (element) ->
+    options = @__mapCollection collection, (element) ->
       [@_value_for_collection(element, text_method), @_value_for_collection(element, value_method)]
     [selected, disabled] = @_extract_selected_and_disabled(selected)
     select_deselect =
@@ -26,6 +26,27 @@
       disabled: @_extract_values_from_collection(collection, value_method, disabled)
     @options_for_select(options, select_deselect)
 
+  option_groups_from_collection_for_select: (collection, group_method, group_label_method, option_key_method, option_value_method, selected_key = null) ->
+    @__mapCollection(collection, (group) ->
+      option_tags = @options_from_collection_for_select(_.result(group, group_method), option_key_method, option_value_method, selected_key)
+      Ultimate.Helpers.Tag.content_tag_string 'optgroup', option_tags, label: _.result(group, group_label_method), true, false
+    ).join('')
+
+  grouped_options_for_select: (grouped_options, selected_key = null, options = {}) ->
+    prompt  = options['prompt']
+    divider = options['divider']
+    body = ""
+    if prompt
+      body += Ultimate.Helpers.Tag.content_tag_string('option', @_prompt_text(prompt), value: '')
+    grouped_options = _.outcasts.sortHash(grouped_options)  if $.isPlainObject(grouped_options)
+    _.each grouped_options, (container) ->
+      if divider
+        label = divider
+      else
+        [label, container] = container
+      body += Ultimate.Helpers.Tag.content_tag_string('optgroup', @options_for_select(container, selected_key), label: label, true, false)
+    body
+
 
 
   _option_html_attributes: (element) ->
@@ -56,10 +77,30 @@
 
   _extract_values_from_collection: (collection, value_method, selected) ->
     if _.isFunction(selected)
-      _.compact _.map collection, (element) ->
-        _.result(element, value_method)  if selected(element)
+      _.compact @__mapCollection collection, (element) ->
+        @__getValueFromElement(element, value_method)  if selected(element)
     else
       selected
 
   _value_for_collection: (item, value) ->
-    if _.isFunction(value) then value(item) else _.result(item, value)
+    if _.isFunction(value)
+      value(item)
+    else
+      @__getValueFromElement(item, value)
+
+  _prompt_text: (prompt) ->
+    prompt = if _.isString(prompt) then prompt else I18n?.translate('helpers.select.prompt', default: 'Please select') ? 'Please select'
+
+
+
+  __getValueFromElement: (element, property) ->
+    if _.isFunction(element.get)
+      element.get(property)
+    else
+      _.result(element, property)
+
+  __mapCollection: (collection, iterator) ->
+    if _.isFunction(collection.map)
+      collection.map(iterator)
+    else
+      _.map(collection, iterator)

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

@@ -8,7 +8,7 @@
 
   content_tag_for: (tag_name, single_or_multiple_records, prefix = null, options = null, block = null) ->
     block = _.outcasts.blockGiven(arguments)
-    if _.isFunction(single_or_multiple_records.map)
+    if _.isFunction(single_or_multiple_records?.map)
       single_or_multiple_records.map( (single_record) =>
         @content_tag_for_single_record(tag_name, single_record, prefix, options, block)
       ).join("\n")
@@ -16,6 +16,7 @@
       @content_tag_for_single_record(tag_name, single_or_multiple_records, prefix, options, block)
 
   content_tag_for_single_record: (tag_name, record, prefix, options, block = null) ->
+    return ''  unless record?
     [options, prefix] = [prefix, null]  if _.isObject(prefix)
     block = _.outcasts.blockGiven(arguments)
     options = if  _.isObject(options) then _.clone(options) else {}
@@ -29,7 +30,7 @@
 
   # from ActionView::ModelNaming
   model_name_from_record_or_class: (record_or_class) ->
-    modelClass = record_or_class.constructor ? record_or_class
+    modelClass = record_or_class?.constructor ? record_or_class
     if modelClass?
       modelClass.modelName or modelClass.className or modelClass.name or 'Model'
     else
@@ -77,4 +78,4 @@
   # protected
 
   _record_key_for_dom_id: (record) ->
-    record.id
+    record?.id

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

@@ -24,8 +24,8 @@
     splitted = content.replace(/\]\]>/g, ']]]]><![CDATA[>')
     "<![CDATA[#{splitted}]]>"
 
-  content_tag_string: (name, content = '', options = {}, escape = true) ->
-    content = _.string.escapeHTML(content)  if escape
+  content_tag_string: (name, content = '', options = {}, escape = true, _escapeContent = escape) ->
+    content = _.string.escapeHTML(content)  if _escapeContent
     "<#{name}#{@tag_options(options, escape)}>#{@PRE_CONTENT_STRINGS[name] ? ''}#{content}</#{name}>"
 
   html_options_to_s: (html_options, escape = false, prefix = "") ->
@@ -58,24 +58,34 @@
     value = _.string.escapeHTML(value)  if escape
     "#{key}=\"#{value}\""
 
+  concat_class: ->
+    flatten_classes = _.filter( _.flatten(arguments), (e) -> _.isString(e) ).join(' ')
+    _.uniq( _.string.words(flatten_classes) ).join(' ')
 
 
-#  # 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(' ')
+
+  selfClosedTags: _.string.words('area base br col command embed hr img input keygen link meta param source track wbr')
+
+  # Generate html from zen-selector. Ninja tool.
+  # TODO more zen features: +, *x, {content}
+  # TODO cache
+  selectorToHtml: (selector) ->
+    if matches = selector.match(/^[\s>]*([\w\.#]+)(.*)$/)
+      selector = matches[1]
+      continuation = matches[2]   # in v1 {(if continuation then ">" + content else " />")}
+      tag_name = selector.match(/^\w+/)?[0] or 'div'
+      id = selector.match(/#(\w+)/)?[1]
+      classes = _.map( selector.match(/\.\w+/g), (c) -> _.string.ltrim(c, '.') )
+      html_options = {}
+      html_options['id'] = id  if id
+      html_options['class'] = classes.join(' ')  if classes.length
+      if _.contains(@selfClosedTags, tag_name)
+        @tag(tag_name, html_options)
+      else
+        continuation = @selectorToHtml(continuation)  if continuation
+        @content_tag(tag_name, continuation, html_options)
+#    else if matches = selector.match(/^\s*\+\s*(.*)$/)       # /^\s*\+\s*([\w\.#]+)(.*)$/)
+#      continuation = matches[1]
+#      if continuation then @selectorToHtml(continuation) else continuation
+    else
+      ''

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

@@ -3,7 +3,7 @@
 #= require ./javascript
 
 __char_encode = (char) -> "%#{char.charCodeAt(0).toString(16)}"
-escape_path = (str) -> str.replace(/[^*\-.0-9A-Z_a-z]/g, __char_encode).replace(/\+/g, '%20')
+__escape_path = (str) -> str.replace(/[^*\-.0-9A-Z_a-z]/g, __char_encode).replace(/\+/g, '%20')
 __string_encode = (str) -> _.map(str, (char) -> "&##{char.charCodeAt(0)};" ).join('')
 
 @Ultimate.Helpers.Url =
@@ -41,7 +41,38 @@ __string_encode = (str) -> _.map(str, (char) -> "&##{char.charCodeAt(0)};" ).joi
     [options, name] = [name, null]  if block = _.outcasts.blockGiven(arguments)
     @link_to [name, options, html_options, block]...
 
+  # TODO tests
+  link_to_unless_current_span: (name, options = null, html_options = null, block = null) ->
+    [html_options, options] = [options, name]  if block = _.outcasts.blockGiven(arguments)
+    url = @url_for(options)
+    if @current_page_(url)
+      if block
+        Ultimate.Helpers.Tag.content_tag('span', html_options, null, false, block)
+      else
+        Ultimate.Helpers.Tag.content_tag('span', name ? url, html_options, false)
+    else
+      if block
+        @link_to options, html_options, block
+      else
+        @link_to name, options, html_options
+
+  # TODO tests
+  link_to_unless_current: (name, options = {}, html_options = {}, block = null) ->
+    @link_to_unless @current_page_(options), name, options, html_options, block
+
+  # TODO tests
+  link_to_unless: (condition, name, options = {}, html_options = {}, block = null) ->
+    if condition
+      if block = _.outcasts.blockGiven(arguments)
+        block(name, options, html_options)
+      else
+        name
+    else
+      @link_to name, options, html_options, block
 
+  # TODO tests
+  link_to_if: (condition, name, options = {}, html_options = {}, block = null) ->
+    @link_to_unless not condition, name, options, html_options, block
 
   mail_to: (email_address, name = null, html_options = {}) ->
     email_address = _.string.escapeHTML(email_address)
@@ -49,7 +80,7 @@ __string_encode = (str) -> _.map(str, (char) -> "&##{char.charCodeAt(0)};" ).joi
     extras = _.compact _.map _.string.words('cc bcc body subject'), (item) ->
       option = _.outcasts.delete(html_options, item)
       if option?
-        "#{item}=#{escape_path(option)}"
+        "#{item}=#{__escape_path(option)}"
     extras = if _.isEmpty(extras) then '' else '?' + _.string.escapeHTML(extras.join('&'))
     email_address_obfuscated = email_address
     email_address_obfuscated = email_address_obfuscated.replace('@', _.outcasts.delete(html_options, 'replace_at'))   if 'replace_at' of html_options
@@ -67,6 +98,15 @@ __string_encode = (str) -> _.map(str, (char) -> "&##{char.charCodeAt(0)};" ).joi
       else
         @link_to name or email_address_obfuscated, "mailto:#{email_address}#{extras}", html_options
 
+  # TODO tests
+  current_page_: (options) ->
+    url_string = @url_for(options)
+    request_uri = location.pathname
+    if /^\w+:\/\//.test(url_string)
+      url_string == "#{location.protocol}#{location.host}#{request_uri}"
+    else
+      url_string == request_uri
+
 
 
   _convert_options_to_data_attributes: (options, html_options) ->
@@ -91,8 +131,16 @@ __string_encode = (str) -> _.map(str, (char) -> "&##{char.charCodeAt(0)};" ).joi
     html_options
 
   __protect_against_forgery: false
-  __form_authenticity_token: 'secret'
   __request_forgery_protection_token: 'form_token'
+  __form_authenticity_token: 'secret'
+
+  __init_request_forgery_protection: ->
+    param = $('head meta[name="csrf-param"]').attr('content')
+    token = $('head meta[name="csrf-token"]').attr('content')
+    if param and token
+      @__protect_against_forgery = true
+      @__request_forgery_protection_token = param
+      @__form_authenticity_token = token
 
   _token_tag: (token = @__form_authenticity_token) ->
     if token isnt false and @__protect_against_forgery

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

@@ -1,5 +1,13 @@
 #= require ./base
 
+# TODO minimize requirements
+# requirements stats:
+# 1 _.extend
+# 1 _.isString
+# 1 _.isBoolean
+# 1 _.toArray
+# 1 _.last
+
 ###*
  * Make $.fn.pluginName() as adapter to plugin object (instance of Ultimate.Plugin or Backbone.View).
  * First call on jQuery object invoke View functionality for the first element in the set of matched elements.
@@ -13,7 +21,7 @@
 ###
 
 Ultimate.createJQueryPlugin = (pluginName, pluginClass) ->
-  Ultimate.debug(".createJQueryPlugin()", pluginName, pluginClass)  if _.isFunction(Ultimate.debug)
+  Ultimate.debug(".createJQueryPlugin()", pluginName, pluginClass)  if $.isFunction(Ultimate.debug)
   pluginClass.pluginName ||= pluginName
   jQuery.fn[pluginName] = -> @ultimatePluginAdapter pluginName, pluginClass, arguments
 
@@ -46,7 +54,7 @@ do ($ = jQuery) ->
           return if _returnPlugin then plugin else jContainer
       if command of plugin
         value = plugin[command]
-        return if _.isFunction(value)
+        return if $.isFunction(value)
             plugin.$el.removeData(pluginName)  if command is "destroy"
             result = value.apply(plugin, args)
             if command is "_configure" then plugin.options else result

data/app/assets/javascripts/ultimate/jquery-plugin-class.js.coffee

@@ -25,26 +25,24 @@ class Ultimate.Plugin
 
   options: {}
 
-  locale: "en"
+  # @defaultLocales: { en: {} }
+  locale: 'en'
   translations: {}
 
   constructor: (options) ->
-    @_configure(options || {});
+    throw new Error('Property `el` must be specified at first argument of Ultimate.Plugin.constructor')  unless options?.el
+    @cid = _.uniqueId('ultimatePlugin_')
+    @_configure options
     @$el = $(@el)
     @findNodes()
-    @initialize arguments...
+    @initialize? arguments...
     @delegateEvents()
 
-
   # jQuery delegate for element lookup, scoped to DOM elements within the
   # current plugin. This should be prefered to global lookups where possible.
   $: (selector) ->
     @$el.find(selector)
 
-  # Initialize is an empty function by default. Override it with your own
-  # initialization logic.
-  initialize: ->
-
   findNodes: (jRoot = @$el, nodes = @nodes) ->
     jNodes = {}
     nodes = if _.isFunction(nodes) then @nodes.call(@) else _.clone(nodes)
@@ -53,18 +51,24 @@ class Ultimate.Plugin
         _isObject = _.isObject(selector)
         if _isObject
           nestedNodes = selector
-          selector = _.outcasts.delete(nestedNodes, "selector")
+          selector = _.outcasts.delete(nestedNodes, 'selector')
         jNodes[nodeName] = @[nodeName] = jRoot.find(selector)
         if _isObject
           _.extend jNodes, @findNodes(jNodes[nodeName], nestedNodes)
     jNodes
 
   undelegateEvents: ->
-    @$el.unbind ".delegateEvents#{@cid}"
+    @$el.unbind ".delegateEvents_#{@cid}"
 
   # Cached regex to split keys for `delegate`, from backbone.js.
   delegateEventSplitter = /^(\S+)\s*(.*)$/
 
+  # Overload and proxy parent method Backbone.View.delegateEvents() as hook for normalizeEvents().
+  delegateEvents: (events) ->
+    args = _.toArray(arguments)
+    args[0] = @_normalizeEvents(events)
+    @_delegateEvents args...
+
   # delegateEvents() from backbone.js
   _delegateEvents: (events = _.result(@, "events")) ->
     return  unless events
@@ -74,20 +78,13 @@ class Ultimate.Plugin
       throw new Error("Method \"#{events[key]}\" does not exist")  unless method
       [[], eventName, selector] = key.match(delegateEventSplitter)
       method = _.bind(method, @)
-      eventName += ".delegateEvents#{@cid}"
+      eventName += ".delegateEvents_#{@cid}"
       if selector is ''
         @$el.bind(eventName, method)
       else
         @$el.delegate(selector, eventName, method)
 
-  # Overload and proxy parent method Backbone.View.delegateEvents() as hook for normalizeEvents().
-  delegateEvents: (events) ->
-    args = []
-    Array::push.apply args, arguments  if arguments.length > 0
-    args[0] = @normalizeEvents(events)
-    @_delegateEvents args...
-
-  normalizeEvents: (events) ->
+  _normalizeEvents: (events) ->
     events = _.result(@, "events")  unless events
     if events
       normalizedEvents = {}
@@ -104,31 +101,24 @@ class Ultimate.Plugin
 
   _configure: (options) ->
     _.extend @options, options
-    @initTranslations()
-    @reflectOptions()
+    #cout '@options', @options
+    @_reflectOptions()
+    @_initTranslations()
 
-  reflectOptions: (reflectableOptions = _.result(@, "reflectableOptions"), options = @options) ->
+  _reflectOptions: (reflectableOptions = _.result(@, "reflectableOptions"), options = @options) ->
     if _.isArray(reflectableOptions)
-      @[attr] = options[attr]  for attr in reflectableOptions  when typeof options[attr] isnt "undefined"
-    @[attr] = value  for attr, value of options  when typeof @[attr] isnt "undefined"
-    @
-
-  # 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 _.string.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
+      @[attr] = options[attr]  for attr in reflectableOptions  when not _.isUndefined(options[attr])
+    @[attr] = value  for attr, value of options  when not _.isUndefined(@[attr])
+
+  # use I18n, and modify locale and translations
+  _initTranslations: ->
+    if @constructor.defaultLocales?
+      if not @options["locale"] and I18n?.locale of @constructor.defaultLocales
+        @locale = I18n.locale
+        #cout '!!!Set LOCALE FROM I18N ', @locale
+      defaultTranslations = if @locale then @constructor.defaultLocales[@locale] or {} else {}
+      #cout '!!!defaultTranslations', @locale, defaultTranslations
+      _.defaults @translations, defaultTranslations
+
+  t: (key) ->
+    @translations[key] or _.string.humanize(key)

data/app/assets/javascripts/ultimate/underscore/underscore.outcasts.js.coffee

@@ -4,7 +4,7 @@
   Underscore.outcasts is freely distributable under the terms of the MIT license.
   Documentation: https://github.com/KODerFunk/underscore.outcasts
   Some code is borrowed from outcasts pull requests to Underscore.
-  Version '0.1.3'
+  Version '0.1.4'
 ###
 
 'use strict'
@@ -15,7 +15,7 @@
 
 UnderscoreOutcasts =
 
-  VERSION: '0.1.3'
+  VERSION: '0.1.4'
 
   delete: (object, key) ->
     value = object[key]
@@ -73,6 +73,16 @@ UnderscoreOutcasts =
     else
       [object]
 
+  # http://coderwall.com/p/krcdig
+  deepBindAll: (obj) ->
+    target = _.last(arguments)
+    for key, value of obj
+      if _.isFunction(value)
+        obj[key] = _.bind(value, target)
+      else if _.isObject(value)
+        obj[key] = _.deepBindAll(value, target)
+    obj
+
   ###
    Split array into slices of <number> elements.
    Map result by iterator if last given.

data/app/assets/stylesheets/ultimate/mixins/_vendors.scss

@@ -33,6 +33,7 @@
   }
 }
 
+// TODO docs
 @mixin vendors-full($vendors, $property, $params, $origin: true) {
   @each $vendor in $vendors {
     -#{$vendor}-#{$property}: -#{$vendor}-#{$params};

data/app/assets/stylesheets/ultimate/mixins/css3/_text-shadow.scss

@@ -1,3 +1,6 @@
+
+$support-ie: true !default;
+
 //  Provide cross-browser CSS text-shadow with hardcore ie-hack.
 //    example:
 //      @include text-shadow(#3b3b3b 1px 1px 1px);

data/app/assets/stylesheets/ultimate/mixins/css3.scss

@@ -1,12 +1,11 @@
 // Use compatibility tables from http://caniuse.com/
-// http://css3pie.com/documentation/supported-css3-features/#pie-watch-ancestors
 // http://css3pie.com/documentation/supported-css3-features/#pie-lazy-init
-// TODO use !default http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variable_defaults_
 
 $support-ie: true !default;
 $pie-url: asset-url("polyfills/PIE.htc", '') !default;
 $boxsizing-url: asset-url("polyfills/boxsizing.htc", '') !default;
 
+
 @mixin pie($poll: none, $watch-ancestors: 0) {
   @if $support-ie and $pie-url {
     behavior: $pie-url;

data/app/assets/stylesheets/ultimate/mixins/microstructures.scss

@@ -65,6 +65,21 @@ $support-ie: true !default;
   }
 }
 
+@mixin position($top: false, $right: false, $bottom: false, $left: false, $position: absolute) {
+  @if length($top) == 4 {
+    $left   : nth($top, 4);
+    $bottom : nth($top, 3);
+    $right  : nth($top, 2);
+    $top    : nth($top, 1);
+    @if isset($right) { $position: $right; }
+  }
+  @if isset($position) { position: $position; }
+  @if isset($top)    { top:     $top; }
+  @if isset($right)  { right:   $right; }
+  @if isset($bottom) { botttom: $bottom; }
+  @if isset($left)   { left:    $left; }
+}
+
 @mixin before($display: block, $content: '') {
   &:before {
     display: $display;

data/lib/ultimate/base/version.rb

@@ -1,5 +1,5 @@
 module Ultimate
   module Base
-    VERSION = "0.3.2.1"
+    VERSION = "0.3.3.0"
   end
 end

data/test/javascripts/tests/helpers/form_options_test.js.coffee

@@ -1,6 +1,7 @@
 #= require ultimate/underscore/underscore
 #= require ultimate/underscore/underscore.string
 #= require ultimate/underscore/underscore.outcasts
+#= require ultimate/backbone/lib/backbone
 #= require ultimate/helpers/form_options
 
 module "Ultimate.Helpers.FormOptions"
@@ -53,31 +54,24 @@ test "options_for_select", ->
 
 
 
-class Post
-  title           : null
-  author_name     : null
-  body            : null
-  secret          : null
-  written_on      : null
-  category        : null
-  origin          : null
-  allow_comments  : null
-
+class Struct
   constructor: ->
-    keys = ['title', 'author_name', 'body', 'secret', 'written_on', 'category', 'origin', 'allow_comments']
-    for a, i in arguments
-      @[keys[i]] = a
+    for key, index in @constructor.keys
+      @[key] = arguments[index] ? null
+
+class Post extends Struct
+  @keys = ['title', 'author_name', 'body', 'secret', 'written_on', 'category', 'origin', 'allow_comments']
 
 dummy_posts =
   [ new Post("<Abe> went home", "<Abe>", "To a little house", "shh!"),
     new Post("Babe went home", "Babe", "To a little house", "shh!"),
-    new Post("Cabe went home", "Cabe", "To a little house", "shh!") ]
+    new Post("Cabe went home", "Cabe", (-> "To a little house"), (-> "shh!")) ]
 
 test "options_from_collection_for_select", ->
   equal options_from_collection_for_select(dummy_posts, "author_name", "title"),
         "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
   equal options_from_collection_for_select(dummy_posts, "author_name", "title", "Babe"),
-  "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option selected=\"selected\" value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option selected=\"selected\" value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
   equal options_from_collection_for_select(dummy_posts, "author_name", "title", [ "Babe", "Cabe" ]),
         "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option selected=\"selected\" value=\"Babe\">Babe went home</option>\n<option selected=\"selected\" value=\"Cabe\">Cabe went home</option>"
   equal options_from_collection_for_select(dummy_posts, "author_name", "title", (p) -> p.author_name is 'Babe'),
@@ -94,3 +88,83 @@ test "options_from_collection_for_select", ->
         "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
   equal options_from_collection_for_select(dummy_posts, "author_name", (p) -> p.title),
         "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
+
+
+
+_objectsArrayToHashesArray = (objectsArray) ->
+  _.map objectsArray, (element) ->
+    hash = {}
+    for key in element.constructor.keys
+      hash[key] = element[key]
+    hash
+
+test "options_from_collection_for_select with array of hashes", ->
+  equal options_from_collection_for_select(_objectsArrayToHashesArray(dummy_posts), "author_name", "title", "Babe"),
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option selected=\"selected\" value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
+
+
+
+class BBPost extends Backbone.Model
+
+class BBPosts extends Backbone.Collection
+  model: BBPost
+
+test "options_from_collection_for_select with Backbone.Collection", ->
+  bbPosts = new BBPosts(_objectsArrayToHashesArray(dummy_posts))
+  equal options_from_collection_for_select(bbPosts, "author_name", "title", "Babe"),
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option selected=\"selected\" value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
+  equal options_from_collection_for_select(bbPosts, "author_name", "title", disabled: (p) -> p.get('author_name') in ['Babe', 'Cabe']),
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option disabled=\"disabled\" value=\"Babe\">Babe went home</option>\n<option disabled=\"disabled\" value=\"Cabe\">Cabe went home</option>"
+  equal options_from_collection_for_select(bbPosts, ((p) -> p.get('author_name')), "title"),
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
+  equal options_from_collection_for_select(bbPosts, "author_name", (p) -> p.get('title')),
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>"
+
+
+
+class Continent extends Struct
+  @keys = ['continent_name', 'countries']
+
+class Country extends Struct
+  @keys = ['country_id', 'country_name']
+
+dummy_continents =
+  [ new Continent("<Africa>", [new Country("<sa>", "<South Africa>"), new Country("so", "Somalia")]),
+    new Continent("Europe", [new Country("dk", "Denmark"), new Country("ie", "Ireland")]) ]
+
+test "option_groups_from_collection_for_select", ->
+  equal option_groups_from_collection_for_select(dummy_continents, "countries", "continent_name", "country_id", "country_name", "dk"),
+        "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option selected=\"selected\" value=\"dk\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>"
+
+
+
+class BBContinent extends Backbone.Model
+
+class BBContinents extends Backbone.Collection
+  model: BBContinent
+
+test "option_groups_from_collection_for_select with Backbone.Collection", ->
+  BBContinents = new BBContinents(_objectsArrayToHashesArray(dummy_continents))
+  equal option_groups_from_collection_for_select(dummy_continents, "countries", "continent_name", "country_id", "country_name", "dk"),
+        "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option selected=\"selected\" value=\"dk\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>"
+
+
+
+test "grouped_options_for_select", ->
+  equal grouped_options_for_select([
+          ["North America",
+            [['United States','US'],"Canada"]],
+          ["Europe",
+            [["Great Britain","GB"], "Germany"]]
+          ]),
+        "<optgroup label=\"North America\"><option value=\"US\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"GB\">Great Britain</option>\n<option value=\"Germany\">Germany</option></optgroup>"
+  equal grouped_options_for_select([['US',"Canada"] , ["GB", "Germany"]], null, divider: "----------"),
+        "<optgroup label=\"----------\"><option value=\"US\">US</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"----------\"><option value=\"GB\">GB</option>\n<option value=\"Germany\">Germany</option></optgroup>"
+  equal grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", prompt: "Choose a product..."),
+        "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>"
+  equal grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", prompt: true),
+        "<option value=\"\">Please select</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>"
+  equal grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], null, prompt: '<Choose One>'),
+        "<option value=\"\">&lt;Choose One&gt;</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>"
+  equal grouped_options_for_select({'North America': ['United States','Canada'], 'Europe': ['Denmark','Germany']}),
+        "<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>"

data/test/javascripts/tests/helpers/record_tag_test.js.coffee

@@ -47,6 +47,8 @@ test "content_tag_for", ->
   options = class: 'important'
   content_tag_for('li', record, options)
   deepEqual options, class: 'important'
+  strictEqual content_tag_for('tr', null), ""
+  strictEqual content_tag_for('tr', [null, null]), "\n"
 
 test "div_for", ->
   record.id = 36

data/test/javascripts/tests/helpers/tag_test.js.coffee

@@ -36,3 +36,22 @@ test "cdata_section", ->
   equal cdata_section("<hello world>"), "<![CDATA[<hello world>]]>"
   equal cdata_section("hello]]>world"), "<![CDATA[hello]]]]><![CDATA[>world]]>"
   equal cdata_section("hello]]>world]]>again"), "<![CDATA[hello]]]]><![CDATA[>world]]]]><![CDATA[>again]]>"
+
+test "concat_class", ->
+  strictEqual concat_class(), ''
+  strictEqual concat_class(null), ''
+  strictEqual concat_class([]), ''
+  equal concat_class('lol', 0), 'lol'
+  equal concat_class(' lol ', false, ' wow '), 'lol wow'
+  equal concat_class('lol', null, 'rofl  lol     wow   ', ' wow '), 'lol rofl wow'
+  equal concat_class([['lol', [null]], 'rofl  lol     wow   '], ' wow '), 'lol rofl wow'
+
+test "selectorToHtml", ->
+  equal selectorToHtml(''), ''
+  equal selectorToHtml('.lol'), '<div class="lol"></div>'
+  equal selectorToHtml('tr.lol'), '<tr class="lol"></tr>'
+  equal selectorToHtml('tr.lol#rofl'), '<tr class="lol" id="rofl"></tr>'
+  equal selectorToHtml('#rofl.lol'), '<div class="lol" id="rofl"></div>'
+  equal selectorToHtml('.lol.wow'), '<div class="lol wow"></div>'
+  equal selectorToHtml('.wow#rofl.lol'), '<div class="wow lol" id="rofl"></div>'
+#  equal selectorToHtml('h1.one+p.two'), '<h1 class="one"></h1><p class="two"></p>'

data/test/javascripts/tests/jquery-plugin-class_test.js.coffee

@@ -0,0 +1,66 @@
+#= require ultimate/jquery-plugin-class
+
+module "Ultimate.Plugin"
+
+class EmptyPlugin extends Ultimate.Plugin
+
+test "EmptyPlugin", ->
+  cout 'EmptyPlugin'
+  $('#qunit-fixture').html '<div class="test-plugin"><div class="test-plugin__inner"></div></div>'
+  plugin = new EmptyPlugin(el: '.test-plugin')
+
+  throws (-> new EmptyPlugin), "plugin can't build without `el` as option"
+  ok /^ultimatePlugin_\d+$/.test(plugin.cid)
+  ok plugin.$el.length is 1
+  jDiv = plugin.$('div')
+  ok jDiv.length is 1
+  ok jDiv.hasClass('test-plugin__inner')
+  strictEqual plugin.locale, 'en'
+  strictEqual plugin.t('smokeString'), 'Smoke string'
+
+
+
+class TestPlugin extends Ultimate.Plugin
+  someOption: null
+  reflectableOptions: -> ['thirdOption']
+  @defaultLocales =
+    en:
+      someMessage: 'English message.'
+    ru:
+      someMessage: 'Сообщение на русском.'
+
+
+test "TestPlugin", ->
+  cout 'warn', 'TestPlugin'
+  $('#qunit-fixture').html '<div class="test-plugin"><a class="action one" href="javascript:;">action one</a><div class="test-plugin__inner"></div></div>'
+  plugin = new TestPlugin
+    el: '.test-plugin'
+    someOption: 'bingo!'
+    otherOption: 'ringo!'
+    thirdOption: 'dingo!'
+    locale: 'de'
+
+  equal plugin.someOption, 'bingo!'
+  ok typeof plugin.otherOption is 'undefined'
+  equal plugin.thirdOption, 'dingo!'
+  equal plugin.locale, 'de'
+  deepEqual plugin.translations, {}
+#  equal plugin.t('someMessage'), 'Some message'
+#  plugin._configure locale: 'ru'
+#  deepEqual plugin.translations, {someMessage: 'Сообщение на русском.'}
+#  equal plugin.t('someMessage'), 'Сообщение на русском.'
+
+#test "TestPlugin locale from I18n", ->
+#  cout 'warn', 'TestPlugin locale from I18n'
+#  window.I18n ||= {}
+#  _storedI18nLocale = I18n.locale
+#  cout '_storeI18nLocale', _storedI18nLocale
+#  I18n.locale = 'de'
+#  plugin = new TestPlugin el: '.test-plugin'
+#  strictEqual plugin.locale, 'en'
+#  equal plugin.t('someMessage'), 'English message.'
+##  I18n.locale = 'ru'
+##  plugin = new TestPlugin el: '.test-plugin'
+##  strictEqual plugin.locale, 'ru'
+##  equal plugin.t('someMessage'), 'Сообщение на русском.'
+#  I18n.locale = _storedI18nLocale

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-base
 version: !ruby/object:Gem::Version
-  version: 0.3.2.1
+  version: 0.3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21675360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 3.2.8
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
+  version_requirements: *21675360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21672200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21672200
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21669100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,12 +43,7 @@ dependencies:
         version: 3.2.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.1
+  version_requirements: *21669100
 description: Ultimate UI core, base helpers and improves for Ruby on Rails Front-end
 email:
 - koderfunk@gmail.com
@@ -194,6 +179,7 @@ files:
 - test/javascripts/tests/helpers_test.js.coffee
 - test/javascripts/tests/improves/i18n-lite_test.js.coffee
 - test/javascripts/tests/jquery-plugin-adapter_test.js.coffee
+- test/javascripts/tests/jquery-plugin-class_test.js.coffee
 - test/javascripts/tests/underscore/underscore.outcasts.test.js.coffee
 - test/stylesheets/test_helper.css
 - ultimate-base.gemspec
@@ -217,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ultimate-base
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ultimate UI core, base helpers and improves for Ruby on Rails Front-end