uki 1.1.1 → 1.1.2

data/frameworks/uki/src/uki-view/view/table/render.js

@@ -1,5 +1,9 @@
 include('../list/render.js');
 
+/**
+ * @class
+ * @extends uki.view.list.Render
+ */
 uki.view.table.Render = uki.newClass(uki.view.list.Render, new function() {
     this.init = function(table) {
         this._table = table;

data/frameworks/uki/src/uki-view/view/textField.js

@@ -1,40 +1,60 @@
+/**
+* Editable Text Field
+*
+* @author voloko
+* @name uki.view.TextField
+* @class
+* @extends uki.view.Base
+* @implements uki.view.Focusable
+*/
 uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, function(Base, Focusable) {
     var emptyInputHeight = {};
 
-    function getEmptyInputHeight (fontSize) {
-        if (!emptyInputHeight[fontSize]) {
-            var node = uki.createElement('input', Base.defaultCss + "border:none;padding:0;border:0;overflow:hidden;font-size:"+fontSize+";left:-999em;top:0");
+    function getEmptyInputHeight (css) {
+        if (!emptyInputHeight[css]) {
+            var node = uki.createElement('input', Base.defaultCss + "border:none;padding:0;border:0;margin:0;overflow:hidden;left:-999em;top:0;line-height:1;" + css);
             uki.dom.probe(
                 node,
                 function(probe) {
-                    emptyInputHeight[fontSize] = probe.offsetHeight;
+                    emptyInputHeight[css] = probe.offsetHeight;
                 }
             );
         }
-        return emptyInputHeight[fontSize];
+        return emptyInputHeight[css];
     }
 
     function nativePlaceholder (node) {
         return typeof node.placeholder == 'string';
     }
+    
+    this._backgroundPrefix = '';
+    this._tagName = 'input';
+    this._type = 'text';
 
     this._setup = function() {
         Base._setup.apply(this, arguments);
         uki.extend(this, {
             _value: '',
             _multiline: false,
-            _placeholder: '',
-            _backgroundPrefix: '',
-            _tagName: 'input',
-            _type: 'text'
+            _placeholder: ''
         });
-        this.defaultCss += "margin:0;border:none;outline:none;padding:0;left:2px;top:0;z-index:100;resize:none;background: url(" + uki.theme.imageSrc('x') + ");" + uki.theme.style('input');
+        this.defaultCss += "margin:0;border:none;outline:none;padding:0;left:2px;top:0;z-index:100;-moz-resize:none;resize:none;background: url(" + uki.theme.imageSrc('x') + ");" + uki.theme.style('input');
     };
     
     this._updateBg = function() {
         this._input.style.color = this._disabled ? '#999' : '#000';
     };
     
+    /**
+    * @function
+    * @name uki.view.TextField#name
+    */
+    uki.delegateProp(this, 'name', '_input');
+    
+    /**
+    * @function
+    * @name uki.view.TextField#value
+    */
     this.value = function(value) {
         if (value === undefined) return this._input.value;
 
@@ -43,6 +63,11 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
         return this;
     };
     
+    /**
+    * Cross browser placeholder implementation
+    * @function
+    * @name uki.view.TextField#placeholder
+    */
     this.placeholder = uki.newProp('_placeholder', function(v) {
         this._placeholder = v;
         if (!this._multiline && nativePlaceholder(this._input)) {
@@ -54,7 +79,7 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
                 this._dom.appendChild(this._placeholderDom);
                 this._updatePlaceholderVis();
                 uki.each(['fontSize', 'fontFamily', 'fontWeight'], function(i, name) {
-                    this._placeholderDom.style[name] = this.style(name);
+                    this._placeholderDom.style[name] = this._input.style[name];
                 }, this);
                 
                 uki.dom.bind(this._placeholderDom, 'mousedown', uki.proxy(function(e) { 
@@ -68,20 +93,31 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
     });
 
     this._style = function(name, value) {
-        if (value === undefined) return this._input.style[name];
-        this._input.style[name] = value;
-        if (this._placeholderDom) this._placeholderDom.style[name] = value;
-        return this;
+        if (uki.inArray(name, uki.browser.textStyles) != -1) {
+            if (value === undefined) return this._input.style[name];
+            this._input.style[name] = value;
+            if (this._placeholderDom) this._placeholderDom.style[name] = value;
+        }
+        return Base._style.call(this, name, value);
     };
 
+    /**
+    * @function
+    * @name uki.view.TextField#backgroundPrefix
+    */
     uki.addProps(this, ['backgroundPrefix']);
     
+    /**
+    * @function
+    * @name uki.view.TextField#defaultBackground
+    */
     this.defaultBackground = function() {
         return uki.theme.background(this._backgroundPrefix + 'input');
     };
     
     this._createDom = function() {
-        this._dom = uki.createElement('div', Base.defaultCss + ';cursor:text;overflow:visible');
+        this._dom = uki.createElement('div', Base.defaultCss + ';cursor:text;overflow:visible;');
+        this._initClassName();
         this._input = uki.createElement(this._tagName, this.defaultCss + (this._multiline ? '' : ';overflow:hidden;'));
         
         this._input.value = this._value;
@@ -108,11 +144,11 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
             this._input.style.top = 2 + PX;
             margin = '2px 0';
         } else {
-            var o = (this._rect.height - getEmptyInputHeight(this.style('fontSize'))) / 2;
+            var o = (this._rect.height - getEmptyInputHeight( 'font-size:' + this.style('fontSize') + ';font-family:' + this.style('fontFamily') )) / 2;
             margin = CEIL(o) + 'px 0 ' + FLOOR(o) + 'px 0';
-            this._input.style.margin = margin;
+            this._input.style.padding = margin;
         }
-        if (this._placeholderDom) this._placeholderDom.style.margin = margin;
+        if (this._placeholderDom) this._placeholderDom.style.padding = margin;
     };
     
     this._updatePlaceholderVis = function() {
@@ -137,15 +173,32 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
     };
 });
 
+/**
+* Multiline Editable Text Field (textarea)
+*
+* @author voloko
+* @name uki.view.MultilineTextField
+* @class
+* @extends uki.view.TextField
+*/
 uki.view.declare('uki.view.MultilineTextField', uki.view.TextField, function(Base) {
+    this._tagName = 'textarea';
+    this._type = '';
+    
     this._setup = function() {
         Base._setup.call(this);
-        this._tagName = 'textarea';
-        this._type = '';
         this._multiline = true;
     };
 });
 
+/**
+* Password Field
+*
+* @author voloko
+* @name uki.view.PasswordTextField
+* @class
+* @extends uki.view.TextField
+*/
 uki.view.declare('uki.view.PasswordTextField', uki.view.TextField, function(Base) {
     this._setup = function() {
         Base._setup.call(this);
@@ -153,3 +206,4 @@ uki.view.declare('uki.view.PasswordTextField', uki.view.TextField, function(Base
     };
 });
 
+uki.Collection.addAttrs(['placeholder']);

data/frameworks/uki/src/uki-view/view/toolbar.js

@@ -3,6 +3,14 @@ include('flow.js');
 
 uki.view.toolbar = {};
 
+/**
+* Toolbar
+*
+* @author voloko
+* @name uki.view.Toolbar
+* @class
+* @extends uki.view.Container
+*/
 uki.view.declare('uki.view.Toolbar', uki.view.Container, function(Base) {
 
     this.typeName = function() { return 'uki.view.Toolbar'; };
@@ -15,6 +23,10 @@ uki.view.declare('uki.view.Toolbar', uki.view.Container, function(Base) {
         this._widths = [];
     };
     
+    /**
+    * @function
+    * @name uki.view.Toolbar#buttons
+    */
     this.buttons = uki.newProp('_buttons', function(b) {
         this._buttons = b;
         var buttons = uki.build(uki.map(this._buttons, this._createButton, this)).resizeToContents('width');
@@ -22,6 +34,10 @@ uki.view.declare('uki.view.Toolbar', uki.view.Container, function(Base) {
         this._totalWidth = uki.reduce(0, this._flow.childViews(), function(s, v) { return s + v.rect().width; });
     });
     
+    /**
+    * @function
+    * @name uki.view.Toolbar#moreWidth
+    */
     uki.moreWidth = uki.newProp('_moreWidth', function(v) {
         this._moreWidth = v;
         this._updateMoreVisible();

data/lib/uki/builder.rb

@@ -22,7 +22,7 @@ module Uki
     def compressed_code
       unless @compressed_code
         code = Uki.include_js(path) do |path|
-          if path.match(/.css$/)
+          if path.match(/\.css$/)
             compiled_css path
           else
             File.read(path)

data/lib/uki/include_js.rb

@@ -24,7 +24,7 @@ module Uki
       else
         include_path = File.expand_path File.join(base, $2)
         unless included[include_path]
-          $1 + include_js(include_path, included, stack + [include_path]) + $3
+          $1 + include_js(include_path, included, stack + [include_path], &block) + $3
         else
           $1 + $3
         end
@@ -40,7 +40,7 @@ module Uki
     else 
       File.read(path) 
     end
-    JSON.dump code
+    (code || '').to_json
   end
   
   def self.extract_includes path

data/lib/uki/project.rb

@@ -15,10 +15,14 @@ class Uki::Project
     @dest = dest
   end
   
+  # def name
+  #   File.basename File.expand_path(dest)
+  # end
+  
   def name
-    File.basename File.expand_path(dest)
+    File.basename(File.expand_path(dest)).sub(/[^a-z0-9_$]+/, '_')
   end
-  
+
   def create options
     verify_empty
     init_dest
@@ -161,9 +165,9 @@ class Uki::Project
     end
     
     def init_dest
-      FileUtils.mkdir_p File.join(dest, project_name)
-      ['view', 'model', 'layout', 'controller'].each do |name| 
-        FileUtils.mkdir_p File.join(dest, project_name, name)
+      FileUtils.mkdir_p File.join(dest, name)
+      ['view', 'model', 'layout', 'controller'].each do |n| 
+        FileUtils.mkdir_p File.join(dest, name, n)
       end
     end
     
@@ -171,25 +175,21 @@ class Uki::Project
       File.open(File.join(dest, 'index.html'), 'w') do |f|
         f.write template('index.html').result(binding)
       end
-      File.open(File.join(dest, "#{project_name}.js"), 'w') do |f|
+      File.open(File.join(dest, "#{name}.js"), 'w') do |f|
         f.write template('myapp.js').result(binding)
       end
       
-      create_function 'layout.js', "#{project_name}.layout.main"
+      create_function 'layout.js', "#{name}.layout.main"
       
-      ['view', 'model', 'layout', 'controller'].each do |name|
-        File.open(File.join(dest, project_name, "#{name}.js"), 'w') do |f|
-          package_name = "#{project_name}.#{name}"
+      ['view', 'model', 'layout', 'controller'].each do |n|
+        File.open(File.join(dest, name, "#{n}.js"), 'w') do |f|
+          package_name = "#{name}.#{n}"
           f.write template('package.js').result(binding)
         end
       end
       
     end
     
-    def project_name
-      File.basename dest
-    end
-  
     def copy_frameworks
       FileUtils.mkdir_p File.join(dest, 'frameworks')
       frameworks_dest = File.join(dest, 'frameworks', 'uki')

data/templates/index.html.erb

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><%= project_name.capitalize %></title>
+    <title><%= name.capitalize %></title>
     <style>body, html { margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden };</style>
 </head>
 <body>
-    <script src="<%= project_name %>.cjs"></script>
+    <script src="<%= name %>.cjs"></script>
 </body>
 </html>

data/templates/myapp.js.erb

@@ -1,6 +1,6 @@
 (function() {
 // define namespace
-<%= project_name %> = {};
+<%= name %> = {};
 
 // all core modules
 include('frameworks/uki/uki-core.js');
@@ -34,7 +34,7 @@ uki.theme.airport.imagePath = 'i/';
 // skip interface creation if we're testing
 if (window.TESTING) return;
 
-<%= project_name %>.layout.main().attachTo(window, '300 62');
+<%= name %>.layout.main().attachTo(window, '300 62');
 
 uki('Button').click(function() {
     alert(this.text());

data/uki.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{uki}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-10-18}
   s.default_executable = %q{uki}
   s.description = %q{Project creation, dev server, testing, building for uki apps}
   s.email = %q{voloko@gmail.com}
@@ -44,6 +44,8 @@ Gem::Specification.new do |s|
      "frameworks/uki/examples/core-examples/controls/controls.js",
      "frameworks/uki/examples/core-examples/dnd/dnd.js",
      "frameworks/uki/examples/core-examples/flow/flow.js",
+     "frameworks/uki/examples/core-examples/linearGradient/gradient.svg",
+     "frameworks/uki/examples/core-examples/linearGradient/linearGradient.js",
      "frameworks/uki/examples/core-examples/list/list.js",
      "frameworks/uki/examples/core-examples/popup/popup.js",
      "frameworks/uki/examples/core-examples/resizeToContents/resizeToContents.js",
@@ -168,12 +170,14 @@ Gem::Specification.new do |s|
      "frameworks/uki/examples/css/index.css",
      "frameworks/uki/examples/css/reset.css",
      "frameworks/uki/examples/more-examples/radioButton/radioButton.js",
+     "frameworks/uki/examples/more-examples/select/select.js",
      "frameworks/uki/examples/more-examples/splitTable/library.js",
      "frameworks/uki/examples/more-examples/splitTable/searchable.js",
      "frameworks/uki/examples/more-examples/splitTable/splitTable.js",
      "frameworks/uki/examples/more-examples/toggleButton/toggleButton.js",
      "frameworks/uki/examples/more-examples/treeList/i/arrows.png",
      "frameworks/uki/examples/more-examples/treeList/treeList.js",
+     "frameworks/uki/examples/touch-examples/scrollPane/scrollPane.js",
      "frameworks/uki/examples/views/example.haml",
      "frameworks/uki/examples/views/exampleList.haml",
      "frameworks/uki/server.rb",
@@ -204,10 +208,12 @@ Gem::Specification.new do |s|
      "frameworks/uki/spec/unit/view/container.spec.js",
      "frameworks/uki/src/airport.js",
      "frameworks/uki/src/uki-core.js",
+     "frameworks/uki/src/uki-core/after.js",
      "frameworks/uki/src/uki-core/attachment.js",
      "frameworks/uki/src/uki-core/background.js",
      "frameworks/uki/src/uki-core/background/css.js",
      "frameworks/uki/src/uki-core/background/cssBox.js",
+     "frameworks/uki/src/uki-core/background/linearGradient.js",
      "frameworks/uki/src/uki-core/background/multi.js",
      "frameworks/uki/src/uki-core/background/null.js",
      "frameworks/uki/src/uki-core/background/rows.js",
@@ -216,9 +222,9 @@ Gem::Specification.new do |s|
      "frameworks/uki/src/uki-core/collection.js",
      "frameworks/uki/src/uki-core/const.js",
      "frameworks/uki/src/uki-core/dom.js",
+     "frameworks/uki/src/uki-core/dom/browser.js",
      "frameworks/uki/src/uki-core/dom/dnd.js",
      "frameworks/uki/src/uki-core/dom/event.js",
-     "frameworks/uki/src/uki-core/dom/nativeLayout.js",
      "frameworks/uki/src/uki-core/dom/offset.js",
      "frameworks/uki/src/uki-core/dom/w3cdnd.js",
      "frameworks/uki/src/uki-core/geometry.js",
@@ -239,14 +245,27 @@ Gem::Specification.new do |s|
      "frameworks/uki/src/uki-data.js",
      "frameworks/uki/src/uki-data/ajax.js",
      "frameworks/uki/src/uki-data/data.js",
+     "frameworks/uki/src/uki-data/json.js",
+     "frameworks/uki/src/uki-data/localStore.js",
      "frameworks/uki/src/uki-data/model.js",
      "frameworks/uki/src/uki-data/observable.js",
      "frameworks/uki/src/uki-more.js",
      "frameworks/uki/src/uki-more/more.js",
+     "frameworks/uki/src/uki-more/more/background.js",
+     "frameworks/uki/src/uki-more/more/color.js",
      "frameworks/uki/src/uki-more/more/utils.js",
      "frameworks/uki/src/uki-more/more/view.js",
+     "frameworks/uki/src/uki-more/more/view/form.js",
+     "frameworks/uki/src/uki-more/more/view/hTile.js",
      "frameworks/uki/src/uki-more/more/view/listContainer.js",
+     "frameworks/uki/src/uki-more/more/view/nativeButton.js",
+     "frameworks/uki/src/uki-more/more/view/nativeCheckbox.js",
+     "frameworks/uki/src/uki-more/more/view/nativeControl.js",
+     "frameworks/uki/src/uki-more/more/view/nativeInput.js",
+     "frameworks/uki/src/uki-more/more/view/nativeSelect.js",
      "frameworks/uki/src/uki-more/more/view/radioButton.js",
+     "frameworks/uki/src/uki-more/more/view/select-theme.js",
+     "frameworks/uki/src/uki-more/more/view/select.js",
      "frameworks/uki/src/uki-more/more/view/splitTable.js",
      "frameworks/uki/src/uki-more/more/view/splitTable/render.js",
      "frameworks/uki/src/uki-more/more/view/toggleButton.js",
@@ -254,59 +273,19 @@ Gem::Specification.new do |s|
      "frameworks/uki/src/uki-more/more/view/treeList/render.js",
      "frameworks/uki/src/uki-theamless.js",
      "frameworks/uki/src/uki-theme/airport.js",
-     "frameworks/uki/src/uki-theme/airport/i/button/down-c.gif",
-     "frameworks/uki/src/uki-theme/airport/i/button/down-c.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/down-h.gif",
-     "frameworks/uki/src/uki-theme/airport/i/button/down-h.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/down-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/down-v.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/focusRing-c.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/focusRing-h.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/focusRing-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/focusRing-v.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/focusRing.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover-c.gif",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover-c.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover-h.gif",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover-h.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover-v.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/hover.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal-c.gif",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal-c.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal-h.gif",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal-h.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal-v.png",
-     "frameworks/uki/src/uki-theme/airport/i/button/normal.png",
      "frameworks/uki/src/uki-theme/airport/i/checkbox/checkbox.png",
      "frameworks/uki/src/uki-theme/airport/i/checkbox/focus.png",
      "frameworks/uki/src/uki-theme/airport/i/checkbox/normal.gif",
      "frameworks/uki/src/uki-theme/airport/i/checkbox/normal.png",
-     "frameworks/uki/src/uki-theme/airport/i/panel/dark-h.gif",
-     "frameworks/uki/src/uki-theme/airport/i/panel/dark-h.png",
-     "frameworks/uki/src/uki-theme/airport/i/panel/dark-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/panel/dark.png",
-     "frameworks/uki/src/uki-theme/airport/i/popup/normal.png",
      "frameworks/uki/src/uki-theme/airport/i/radio/focus.png",
      "frameworks/uki/src/uki-theme/airport/i/radio/normal.gif",
      "frameworks/uki/src/uki-theme/airport/i/radio/normal.png",
      "frameworks/uki/src/uki-theme/airport/i/radio/radio.png",
-     "frameworks/uki/src/uki-theme/airport/i/shadow/large-c.png",
-     "frameworks/uki/src/uki-theme/airport/i/shadow/large-h.png",
-     "frameworks/uki/src/uki-theme/airport/i/shadow/large-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/shadow/large-v.png",
-     "frameworks/uki/src/uki-theme/airport/i/shadow/large.png",
-     "frameworks/uki/src/uki-theme/airport/i/slider/bar-m.gif",
-     "frameworks/uki/src/uki-theme/airport/i/slider/bar-m.png",
-     "frameworks/uki/src/uki-theme/airport/i/slider/bar-v.gif",
-     "frameworks/uki/src/uki-theme/airport/i/slider/bar-v.png",
-     "frameworks/uki/src/uki-theme/airport/i/slider/bar.png",
-     "frameworks/uki/src/uki-theme/airport/i/slider/focus.png",
-     "frameworks/uki/src/uki-theme/airport/i/slider/handle.gif",
      "frameworks/uki/src/uki-theme/airport/i/splitPane/horizontal.gif",
      "frameworks/uki/src/uki-theme/airport/i/splitPane/horizontal.png",
      "frameworks/uki/src/uki-theme/airport/i/splitPane/vertical.gif",
+     "frameworks/uki/src/uki-theme/airport/i/table/a-down.png",
+     "frameworks/uki/src/uki-theme/airport/i/table/a-up.png",
      "frameworks/uki/src/uki-theme/airport/i/x.gif",
      "frameworks/uki/src/uki-theme/aristo.js",
      "frameworks/uki/src/uki-theme/aristo/i/button/down-c.gif",
@@ -352,6 +331,13 @@ Gem::Specification.new do |s|
      "frameworks/uki/src/uki-theme/aristo/i/splitPane/horizontal.png",
      "frameworks/uki/src/uki-theme/aristo/i/splitPane/vertical.gif",
      "frameworks/uki/src/uki-theme/aristo/i/x.gif",
+     "frameworks/uki/src/uki-touch.js",
+     "frameworks/uki/src/uki-touch/touch.js",
+     "frameworks/uki/src/uki-touch/touch/const.js",
+     "frameworks/uki/src/uki-touch/touch/setup.js",
+     "frameworks/uki/src/uki-touch/touch/view.js",
+     "frameworks/uki/src/uki-touch/touch/view/scrollPane.js",
+     "frameworks/uki/src/uki-touch/touch/view/scrollableList.js",
      "frameworks/uki/src/uki-view.js",
      "frameworks/uki/src/uki-view/view/box.js",
      "frameworks/uki/src/uki-view/view/button.js",
@@ -395,14 +381,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/voloko/uki}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{uki development tools}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<commander>, [">= 4.0.1"])
       s.add_runtime_dependency(%q<jspec>, [">= 3.3.2"])