ultimate-base 0.3.4.0 → 0.3.5.0

data/Gemfile.lock

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

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

@@ -1,5 +1,6 @@
 # TODO timeout without cycling, maybe bouce effect
 # TODO mousewheel
+# TODO touch events
 
 Ultimate.Backbone.Views ||= {}
 
@@ -23,11 +24,11 @@ class Ultimate.Backbone.Views.Slider extends Ultimate.Backbone.View
   cycling: false
   interval: 0
   durationPerPixel: 2
+  moveItems: 0
 
   totalItems: 0
   itemSize: 0
   displayItems: 0
-  moveItems: 0
   overItems: 0
   prevItems: 0 # can as setting
 
@@ -46,7 +47,7 @@ class Ultimate.Backbone.Views.Slider extends Ultimate.Backbone.View
       needSize = @totalItems * @itemSize
       @jLine[@sizeAttr](needSize)  if @jLine[@sizeAttr]() < needSize
       @displayItems = Math.round(@jDisplay[@sizeAttr]() / @itemSize)
-      @moveItems = Math.round(@displayItems / 2)
+      @moveItems ||= Math.round(@displayItems / 2)
       @overItems = @totalItems - @displayItems
       if @overItems
         if @prevItems

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

@@ -26,17 +26,15 @@
     Ultimate.Helpers.Tag.tag 'input', _.extend({type: 'text', name: name, id: @_sanitize_to_id(name), value: value}, options)
 
   label_tag: (name = null, content_or_options = null, options = null, block = null) ->
-    if (block = _.outcasts.blockGiven(arguments)) and $.isPlainObject(content_or_options)
-      options = content_or_options
-    else
-      options ||= {}
+    if block = _.outcasts.blockGiven(arguments)
+      [options, content_or_options] = [content_or_options, block()]
+    options ||= {}
     if _.isString(name) and not _.string.isBlank(name)
       unless _.has(options, 'for')
         options = _.clone(options)
         options['for'] = @_sanitize_to_id(name)
       content_or_options ||= _.string.humanize(name)
-    content_or_options = options  if block
-    Ultimate.Helpers.Tag.content_tag 'label', content_or_options, options, block
+    Ultimate.Helpers.Tag.content_tag_string 'label', content_or_options, options, true, false
 
   hidden_field_tag: (name, value = null, options = {}) ->
     @text_field_tag name, value, _.extend(options, type: 'hidden')

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

@@ -70,12 +70,12 @@
   # TODO more zen features: +, *x, {content}
   # TODO cache
   selectorToHtml: (selector) ->
-    if matches = selector.match(/^[\s>]*([\w\.#]+)(.*)$/)
+    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, '.') )
+      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

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

@@ -123,7 +123,7 @@ __string_encode = (str) -> _.map(str, (char) -> "&##{char.charCodeAt(0)};" ).joi
 
   _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['rel'] = Ultimate.Helpers.Tag.concat_class(html_options['rel'], 'nofollow')
     html_options['data-method'] = method
 
   _convert_boolean_attributes: (html_options, bool_attrs) ->

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

@@ -18,22 +18,25 @@
 # 1 _.string.startsWith
 
 class Ultimate.Plugin
+  cid: null
   el: null
   $el: null
-  nodes: {}
-  events: {}
+  nodes: null
+  events: null
 
-  options: {}
+  options: null
 
   # @defaultLocales: { en: {} }
   locale: 'en'
-  translations: {}
+  translations: null
 
   constructor: (options) ->
+    # TODO
     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)
+    @$el = $(@el).first()
+    @el = @$el[0]
     @findNodes()
     @initialize? arguments...
     @delegateEvents()
@@ -99,7 +102,8 @@ class Ultimate.Plugin
       events = normalizedEvents
     events
 
-  _configure: (options) ->
+  _configure: (options = {}) ->
+    @options ||= {}
     _.extend @options, options
     #cout '@options', @options
     @_reflectOptions()
@@ -112,6 +116,7 @@ class Ultimate.Plugin
 
   # use I18n, and modify locale and translations
   _initTranslations: ->
+    @translations ||= {}
     if @constructor.defaultLocales?
       if not @options["locale"] and I18n?.locale of @constructor.defaultLocales
         @locale = I18n.locale

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

@@ -109,3 +109,12 @@
   @each $item in $list { @if $item == $var { @return true; } }
   @return false;
 }
+
+@function find-typed-item($list, $type, $default: false) {
+  @each $item in $list { @if type-of($item) == $type { @return $item; } }
+  @return $default;
+}
+
+@function find-color($list, $default: false) {
+  @return find-typed-item($list, color, $default);
+}

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

@@ -19,9 +19,9 @@ $support-ie: true !default;
     text-shadow: $params;
     @if $support-ie {
       $params-offset: 0;
-      @if type-of($color) != 'color' {
+      @if type-of($color) != color {
         $color: nth($params, 1);
-        @if type-of($color) == 'color' {
+        @if type-of($color) == color {
           $params-offset: 1;
         } @else {
           $color: #000;

data/lib/ultimate/base/version.rb

@@ -1,5 +1,5 @@
 module Ultimate
   module Base
-    VERSION = "0.3.4.0"
+    VERSION = "0.3.5.0"
   end
 end

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

@@ -79,6 +79,7 @@ test "label_tag", ->
   equal label_tag("title", "My Title"), '<label for="title">My Title</label>'
   equal label_tag("title", "My Title", class: "small-label"), '<label class="small-label" for="title">My Title</label>'
   equal label_tag( -> "Blocked" ), '<label>Blocked</label>'
+  equal label_tag( -> content_tag('span', "Blocked SPAN", class: 'inner') ), '<label><span class="inner">Blocked SPAN</span></label>'
   equal label_tag("clock", -> "Grandfather"), '<label for="clock">Grandfather</label>'
   equal label_tag("clock", id: "label_clock", -> "Grandfather"), '<label for="clock" id="label_clock">Grandfather</label>'
 

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

@@ -49,6 +49,7 @@ test "concat_class", ->
 test "selectorToHtml", ->
   equal selectorToHtml(''), ''
   equal selectorToHtml('.lol'), '<div class="lol"></div>'
+  equal selectorToHtml('.mega-lol'), '<div class="mega-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>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-base
 version: !ruby/object:Gem::Version
-  version: 0.3.4.0
+  version: 0.3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails