ultimate-base 0.3.3.0 → 0.3.4.0

data/Gemfile.lock

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

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

@@ -1,18 +1,35 @@
 #= require ./base
 
-# TODO ready options
-
 class Ultimate.Backbone.Collection extends Backbone.Collection
 
-  constructor: ->
+  readyDeferred: null
+  loaded: false
+  loadedTimeStamp: null
+  expireTime: Infinity
+
+  constructor: (models, options = {}) ->
     Ultimate.Backbone.debug ".Collection.constructor()", @
+    @expireTime = options.expireTime  if options.expireTime?
     super
 
-  ready: (callback, context = @) ->
-    unless @length
-      @readyDeferred ||= $.Deferred()
+  reset: (models, options) ->
+    @loadedTimeStamp = new Date()
+    @loaded = true
+    super
+
+  ready: (callback, fetchOptions) ->
+    lifeTime = if @loadedTimeStamp then (new Date() - @loadedTimeStamp) else 0
+    if expired = lifeTime > @expireTime
+      @readyDeferred = null
+    if not @loaded or expired
+      @readyDeferred ||= @fetch(fetchOptions)
       @readyDeferred.done =>
-        callback.apply context, [@]
-      @fetch success: (=> @readyDeferred.resolve()), silent: true
+        callback.apply @
     else
-      callback.apply context, [@]
+      callback.apply @
+
+  abort: ->
+    if @readyDeferred?
+      if @readyDeferred.state() is 'pending'
+        @readyDeferred.abort()
+        @readyDeferred = null

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

@@ -4,18 +4,35 @@
 
 class Ultimate.Backbone.Model extends Backbone.Model
 
-  constructor: ->
+  readyDeferred: null
+  loaded: false
+  loadedTimeStamp: null
+  expireTime: Infinity
+
+  constructor: (attributes, options = {}) ->
     Ultimate.Backbone.debug ".Model.constructor()", @
+    @expireTime = options.expireTime  if options.expireTime?
+    @on 'sync', =>
+      @loadedTimeStamp = new Date()
+      @loaded = true
     super
 
-  ready: (callback, context = @) ->
-    if _.isEmpty(@attributes)
-      @readyDeferred ||= $.Deferred()
+  ready: (callback, fetchOptions) ->
+    lifeTime = if @loadedTimeStamp then (new Date() - @loadedTimeStamp) else 0
+    if expired = lifeTime > @expireTime
+      @readyDeferred = null
+    if @id and (not @loaded or expired)
+      @readyDeferred ||= @fetch(fetchOptions)
       @readyDeferred.done =>
-        callback.apply context, [@]
-      @fetch success: (=> @readyDeferred.resolve()), silent: true
+        callback.apply @
     else
-      callback.apply context, [@]
+      callback.apply @
+
+  abort: ->
+    if @readyDeferred?
+      if @readyDeferred.state() is 'pending'
+        @readyDeferred.abort()
+        @readyDeferred = null
 
   singular: ->
     modelName = @constructor.modelName or @modelName or @className or @constructor.name or 'Model'

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

@@ -89,19 +89,22 @@ class Ultimate.Backbone.View extends Backbone.View
   # Overloadable getter for jQuery-container that will be blocked.
   getJLoadingContainer: -> @$el
 
-  loading: (state, text = "", circle = true) ->
+  loading: (state, text = "", circle = false) ->
     jLoadingContainer = @getJLoadingContainer()
-    if jLoadingContainer and jLoadingContainer.length
+    if jLoadingContainer?.length
       jLoadingContainer.removeClass @loadingStateClass
       jLoadingContainer.children(".#{@loadingOverlayClass}").remove()
       if @loadingState = state
         jLoadingContainer.addClass @loadingStateClass
-        width = jLoadingContainer[@loadingWidthMethodName]()
-        height = jLoadingContainer[@loadingHeightMethodName]()
-        text = "<span class=\"text\">#{text}</span>"  if text
-        circle = "<span class=\"circle\"></span>"  if circle
-        style = "width: #{width}px; height: #{height}px; line-height: #{height}px;"
-        jLoadingContainer.append "<div class=\"#{@loadingOverlayClass}\" style=\"#{style}\">#{circle}#{text}</div>"
+        style = []
+        if @loadingWidthMethodName
+          style.push "width: #{jLoadingContainer[@loadingWidthMethodName]()}px;"
+        if @loadingHeightMethodName
+          height = jLoadingContainer[@loadingHeightMethodName]()
+          style.push "height: #{height}px; line-height: #{height}px;"
+        text = if text then "<span class=\"text\">#{text}</span>" else ''
+        circle = if circle then "<span class=\"circle\"></span>" else ''
+        jLoadingContainer.append "<div class=\"#{@loadingOverlayClass}\" style=\"#{style.join(' ')}\">#{circle}#{text}</div>"
 
 
 

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

@@ -1,10 +1,10 @@
-( ( $ ) ->
+do ( $ = jQuery ) ->
 
   # TODO try optimize, excepting Edge and search in siblings for next cycle
   $.fn.nearestFind = (selector, extremeEdgeSelector = 'form, body') ->
     jEdge = @
-    jResult = jEdge.find selector
-    until jResult.length or jEdge.is extremeEdgeSelector
+    jResult = jEdge.find(selector)
+    until jResult.length or jEdge.is(extremeEdgeSelector)
       jEdge = jEdge.parent()
       jResult = jEdge.find selector
     jResult
@@ -21,31 +21,30 @@
   # @param strongById: Boolean = false
   $.fn.closestLabel = ( strongById = false, passCache = false ) ->
     (if @is(':input') then @ else @find(':input')).filter(':not(input[type="hidden"])').map ->
-      jInput = $ @
-      jLabel = jInput.data 'closestLabel'  unless passCache
+      jInput = $(@)
+      jLabel = jInput.data('closestLabel')  unless passCache
       unless jLabel
         if jLabel is false
           return null
         else
           jLabel = {length: 0}
-          jEdge = jInput.closestEdge()   # TODO may be need params
-          inputId = jInput.attr 'id'
+          inputId = jInput.attr('id')
           if inputId
             # try search label by id linkage
-            labelSelectorByFor = "label[for=\"#{inputId}\"]"
-            # at first search in the edge area
-            jLabel = jEdge.find labelSelectorByFor
-            unless jLabel.length
-              # try search in the closest form
-              jLabel = jInput.closest('form').find labelSelectorByFor
-              # trust only unique label on the form
-              jLabel = {length: 0}  if jLabel.length > 1
+            jLabel = jInput.nearestFind("label[for=\"#{inputId}\"]:first")
           # try get first labet in the edge area
-          jLabel = jEdge.find('label:first')  unless jLabel.length
+          unless jLabel.length
+            jLabel = jInput.nearestFind('label')
+            if jLabel.length is 1
+              jReverseInput = jLabel.nearestFind(':input')
+              unless jReverseInput.length is 1 and jReverseInput[0] is jInput[0]
+                jLabel = {length: 0}
+            else if jLabel.length > 1
+              jLabel = {length: 0}
           # taken!
           if jLabel.length
             # oh, this label already linked
-            if jLabel.data 'closestInput'
+            if jLabel.data('closestInput')
               jLabel = {length: 0}
             else
               jLabel.data 'closestInput', jInput
@@ -151,5 +150,3 @@
       @find("input:not([readonly])#{if onlyVisible then ':visible' else ''}").each ->
         $(@).attr 'tabindex', ++$.fillTabIndexesCounter
     @
-
-)( jQuery )

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

@@ -14,8 +14,23 @@
   @return $i > $l;
 }
 
+@function list-rtrim($list, $count: 1) {
+  $r: ();
+  $l: length($list) - $count;
+  $i: 1;
+  @while $i <= $l {
+    $r: append($r, nth($list, $i));
+    $i: $i + 1;
+  }
+  @return $r;
+}
+
 @function complex-list($params) {
   $l: length($params);
+  @if $l > 1 and nth($params, $l) == !important {
+    $params: list-rtrim($params);
+    $l: $l - 1;
+  }
   @if $l < 4 {
     @if $l < 3 {
       $params: join($params, nth($params, 1));
@@ -50,10 +65,6 @@
   }
 }
 
-@function max($a, $b) {
-  @return if($a > $b, $a, $b);
-}
-
 @function strip-px($v) {
   @return if(unit($v) == "px", $v / 1px, $v);
 }
@@ -93,3 +104,8 @@
 @function hack-ie8($params) {
   @return unquote("#{$params}\0/");
 }
+
+@function contains($list, $var) {
+  @each $item in $list { @if $item == $var { @return true; } }
+  @return false;
+}

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

@@ -256,12 +256,16 @@ $boxsizing-url: asset-url("polyfills/boxsizing.htc", '') !default;
 //      @include ellipsis;
 //    produce:
 //      overflow: hidden;           // need to work text-overflow
+//      white-space: nowrap;        // need to work text-overflow
 //      -o-text-overflow: ellipsis; // Opera Mini and Opera Mobile
 //         text-overflow: ellipsis; // all
-@mixin ellipsis($overflow: hidden) {
+@mixin ellipsis($overflow: hidden, $nowrap: true) {
   @if $overflow != false {
     overflow: $overflow;
   }
+  @if $nowrap {
+    white-space: nowrap;
+  }
   @include vendors(o, text-overflow, ellipsis);
 }
 
@@ -326,6 +330,11 @@ $boxsizing-url: asset-url("polyfills/boxsizing.htc", '') !default;
   }
 }
 
+@mixin rotate($angle) {
+  @include transform(rotate($angle));
+  //filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); === -90deg
+}
+
 //  Style the html5 input placeholder in browsers that support it.
 //  The styles for the input placeholder are passed as mixin content.
 //  Mostly supported properties: color, font-*, letter-spacing.

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

@@ -28,7 +28,6 @@ $support-ie: true !default;
 //      padding-left: 20px;
 //      margin: 0 auto;
 //      width: 360px;
-//  TODO border as 2px solid black
 @mixin box($width,
            $height          : false,
            $padding         : false,
@@ -37,10 +36,14 @@ $support-ie: true !default;
            $include-padding : true,
            $include-margin  : false,
            $include-border  : true) {
-  $properties: $padding $margin $border;
+  @if length($width) == 2 {
+    $height: nth($width, 2);
+    $width:  nth($width, 1);
+  }
+  $properties: $padding $margin nth($border, 1);
   $include-properties: $include-padding $include-margin $include-border;
   $i: 0;
-  @each $property-name in padding, margin, border {
+  @each $property-name in padding, margin, border-width {
     $i: $i + 1;
     $property: nth($properties, $i);
     @if $property {
@@ -54,7 +57,15 @@ $support-ie: true !default;
           $height: $height - nth($complex, 1) - nth($complex, 3);
         }
       }
-      @include complex-property($property-name, $property, $complex);
+      @if $property-name == border-width and length($property) == 1 {
+        border: $border;
+      } @else {
+        @include complex-property($property-name, $property, $complex);
+        @if $property-name == border-width {
+          border-style: nth($border, 2);
+          border-color: nth($border, 3);
+        }
+      }
     }
   }
   @if isset($width) {
@@ -71,12 +82,11 @@ $support-ie: true !default;
     $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($bottom) { bottom:  $bottom; }
   @if isset($left)   { left:    $left; }
 }
 

data/lib/ultimate/base/version.rb

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

data/test/dummy/app/views/layouts/application.html.haml

@@ -3,7 +3,7 @@
   %head
     %meta{charset: "UTF-8"}
     %title Ultimate Base — #{@page_title ? @page_title.gsub("\n", "") : "Testing App"}
-    = favicon_link_tag "/favicon.png", type: "image/png"
+    =# favicon_link_tag "/favicon.png", type: "image/png"
     - if Rails.env.development?
       :javascript
         var DEBUG_MODE = true;

data/test/dummy/app/views/main/styles.html.haml

@@ -0,0 +1,6 @@
+- @page_title = "Styles test"
+- content_for :head do
+  = stylesheet_link_tag "styles-test"
+
+.box
+  This is amazing box!

data/test/stylesheets/styles_test.css.scss

@@ -0,0 +1,6 @@
+@import "ultimate/mixins/microstructures";
+@import "ultimate/mixins/css3";
+
+.box {
+  @include box(400px, none, 10px 20px none, 0 auto, (2px 4px none) solid blue);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-base
 version: !ruby/object:Gem::Version
-  version: 0.3.3.0
+  version: 0.3.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &21675360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.8
   type: :development
   prerelease: false
-  version_requirements: *21675360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &21672200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21672200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &21669100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: 3.2.1
   type: :development
   prerelease: false
-  version_requirements: *21669100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 description: Ultimate UI core, base helpers and improves for Ruby on Rails Front-end
 email:
 - koderfunk@gmail.com
@@ -142,6 +157,7 @@ files:
 - test/dummy/app/views/layouts/application.html.haml
 - test/dummy/app/views/main/index.html.haml
 - test/dummy/app/views/main/qunit.html.haml
+- test/dummy/app/views/main/styles.html.haml
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -181,6 +197,7 @@ files:
 - 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/styles_test.css.scss
 - test/stylesheets/test_helper.css
 - ultimate-base.gemspec
 homepage: http://github.com/KODerFunk/ultimate-base
@@ -203,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ultimate-base
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ultimate UI core, base helpers and improves for Ruby on Rails Front-end