rsence-pre 2.3.0.14 → 2.3.0.15

data/VERSION

@@ -1 +1 @@
-2.3.0.14.pre
+2.3.0.15.pre

data/js/datetime/timesheet/timesheet.js

@@ -608,31 +608,6 @@ HTimeSheet = HControl.extend({
     }
   },
 
-  // checks if i overlaps j
-  // todo: refactor, it's a bit messy
-  _doesOverlap: function( i, j, _overlaps, _rectSelf, _items ){
-    if( _rectSelf === undefined ) {
-      _rectSelf = this.timeSheetItems[i].rect;
-    }
-    if( _items === undefined ){
-      _items = this.timeSheetItems;
-    }
-    var
-    _isntSame = (i !== j),
-    _isntListedSelf = (!~_overlaps.indexOf(i)),
-    _isntListedOther = (!~_overlaps.indexOf(j)),
-    _rectOther = _items[j].rect;
-    if( !_isntSame ){ return false; }
-    if( !_isntListedSelf ){ return false; }
-    if( _isntListedOther ){
-      if( _rectOther.intersects( _rectSelf, 1, 1 ) || _rectSelf.intersects( _rectOther, 1, 1 ) ){
-        return true;
-      }
-    }
-    return false;
-  },
-
-
   // finds the index in the array which contains most sequential items
   _findLargestSequence: function( _arr ){
     var
@@ -660,30 +635,34 @@ HTimeSheet = HControl.extend({
   },
 
   // find the amount of overlapping time sheet items
-  _findOverlapCount: function(){
+  _findOverlapCount: function( _items ){
     var
-    _overlapCount,
-    _items = this._sortedTimeSheetItems(),
     _overlaps = [],
-    _maxOverlapCount = 0,
-    i = 0,
-    j;
-    for( ; i < _items.length; i++ ){
-      _overlapCount = 0;
-      for( j = 0; j < _items.length; j++ ){
-        if( this._doesOverlap( i, j, _overlaps, _items[i].rect, _items ) ){
-          _overlapCount++;
-          _overlaps.push( j );
-        }
-      }
-      if( _overlapCount !== 0 ){
-        _overlaps.push( i );
-        if( _overlapCount > _maxOverlapCount ){
-          _maxOverlapCount = _overlapCount;
+    _testRects = this._getTestRects( _items ),
+    i,j;
+    
+    for( i = 0; i < _items.length; i++){
+      _overlaps[i] = 0;
+    }
+    
+    for( i = 0; i < _items.length - 1; i++ ){
+      for( j = i + 1; j < _items.length; j++ ){
+        if( _items[i].rect.intersects( _testRects[j] ) ){
+          _overlaps[i] += 1;
+          _overlaps[j] += 1;
         }
       }
     }
-    return _maxOverlapCount;
+    return Math.max.apply( Math, _overlaps );
+  },
+  
+  _getTestRects: function( _items ){
+    var _rects = [];
+    for( var i = 0; i < _items.length; i++){
+      _rects[i] = HRect.nu( _items[i].rect );
+      _rects[i].insetBy( 1, 1 );
+    }
+    return _rects;
   },
 
   // returns a sorted copy of the timeSheetItems array
@@ -710,16 +689,16 @@ HTimeSheet = HControl.extend({
     var
     // loop indexes:
     i, j, k, l,
-    // amount of items ovelapping (max, actual number might be smaller after optimization)
     _options = this.options,
     _rect = this.rect,
-    _overlapCount = this._findOverlapCount(),
     _availWidth = ( _rect.width - _options.itemOffsetRight - _options.itemOffsetLeft ),
     _left = _options.itemOffsetLeft,
-    _width = Math.floor( _availWidth / (_overlapCount+1) ),
     // get a list of timesheet items sorted by height (larger to smaller order)
     _items = this._sortedTimeSheetItems(),
     _itemCount = _items.length,
+    // amount of items ovelapping (max, actual number might be smaller after optimization)
+    _overlapCount = this._findOverlapCount( _items ),
+    _width = Math.floor( _availWidth / (_overlapCount+1) ),
     _itemRect,
     _testRect,
     _leftPos,
@@ -732,10 +711,11 @@ HTimeSheet = HControl.extend({
     _optimalColAndLength,
     _col,
     _colWidth,
-    _overlaps;
+    _overlaps,
+    _testRects;
     
     // No overlapping; nothing to do
-    if(_overlapCount === 0 ){
+    if( _overlapCount === 0 ){
       return false;
     }
 
@@ -763,19 +743,17 @@ HTimeSheet = HControl.extend({
           _itemRect.setRight( _leftPos + _width );
           continue;
         }
-        _testRect = HRect.nu( _itemRect );
-        
         _overlapCols = [];
         _vacantCols = [];
-
+        _testRects = this._getTestRects( _items );
+        _testRect = HRect.nu( _itemRect );
         // test each column position (modes 0 and 2)
         for( k = 0; k < _overlapCount+1; k++ ){
           _leftPos = _left + (k*_width);
           _testRect.setLeft( _leftPos );
           _testRect.setRight( _leftPos + _width );
-          _overlaps = [];
           for( j = 0; j < _itemCount; j++){
-            if( this._doesOverlap( i, j, _overlaps, _testRect, _items ) ){
+            if( i !==j && _testRect.intersects( _testRects[j] ) ){
               if( !~_overlapCols.indexOf( k ) ){
                 _overlapCols.push( k );
               }

data/js/foundation/geom/rect/rect.js

@@ -447,14 +447,8 @@ HRect = HClass.extend({
       }
       _rect.insetBy( _insetByX, _insetByY );
     }
-    return (
-      ( ( _rect.left >= this.left && _rect.left <= this.right ) ||
-        ( _rect.right >= this.left && _rect.right <= this.right )
-      ) &&
-      ( ( _rect.top >= this.top && _rect.top <= this.bottom) ||
-        ( _rect.bottom >= this.top && _rect.bottom <= this.bottom)
-      )
-    );
+    return ! ( this.left > _rect.right || this.right < _rect.left ||
+               this.top > _rect.bottom || this.bottom < _rect.top );
   },
 
   overlaps: function( _rect, _insetbyX, _insetByY ){

data/lib/rsence/pluginmanager.rb

@@ -55,6 +55,8 @@ module RSence
       elsif @parent_manager
         return @parent_manager.method_missing( sym, *args, &block )
       end
+      warn "method or plugin #{sym.inspect} not found!"
+      nil
     end
     
     # Registers alias name for a plugin bundle.

data/lib/rsence/plugins/plugin.rb

@@ -212,6 +212,57 @@ module RSence
         return ses[key] if key
         return ses
       end
+
+      # Returns an array of type (:js/:coffee/:none), path (string)
+      def guess_js_path( js_name )
+        has_slash = js_name.include?('/')
+        is_coffee = false
+        is_js = false
+        if has_slash
+          js_fn = js_name.split('/')[-1]
+        else
+          js_fn = js_name
+        end
+        if js_fn.include?('.')
+          js_ext = js_fn.split('.')[-1]
+          if js_ext == 'coffee'
+            is_coffee = true
+          elsif js_ext == 'js'
+            is_js = true
+          end
+        end
+        if has_slash
+          sub_ptah = false
+        else
+          sub_path = 'js'
+        end
+        if is_coffee or is_js
+          path = bundle_path( js_name, sub_path, '.'+js_ext )
+          found = file_exist?( path )
+        else
+          path = bundle_path( js_name, sub_path, '.coffee' )
+          found = file_exist?( path )
+          if found
+            is_coffee = true
+          else
+            is_js = true
+            path = bundle_path( js_name, sub_path, '.js' )
+            found = file_exist?( path )
+          end
+        end
+        foundtype = found ? ( is_coffee ? :coffee : ( is_js ? :js : :none ) ) : :none
+        path = false if foundtype == :none
+        [ foundtype, path ]
+      end
+
+      # Returns coffee compiled to js
+      def brew_coffee( path )
+        client_pkg.coffee( file_read( path ) )
+      end
+
+      def squeezed_js( path )
+        client_pkg.squeeze( file_read( path ) )
+      end
   
       # Returns the source code of the javascript file +js_name+ in the 'js' subdirectory of the plugin bundle. Use it to send raw javascript command code to the client. Use {#read_js_once} for libraries.
       #
@@ -220,7 +271,15 @@ module RSence
       # @return [String] The source of the file.
       # @return [false] Returns false, when file was not found.
       def read_js( js_name )
-        file_read( bundle_path( js_name, 'js', '.js' ) )
+        ( type, path ) = guess_js_path( js_name )
+        if type == :none
+          warn "File not found: #{js_name}"
+          return ''
+        end
+        return brew_coffee( path ) if type == :coffee
+        # return squeezed_js( path ) if type == :js
+        return file_read( path ) if type == :js
+        warn "read_js: unknown type #{type.inspect}"
       end
       
       # Like {#read_js}, but reads the file only once per session. Use for inclusion of custom library code.
@@ -235,10 +294,11 @@ module RSence
         if not ses.has_key?(:deps)
           ses[:deps] = []
         end
-        path = bundle_path( js_name, 'js', '.js' )
+        ( found, path ) = guess_js_path( js_name )
+        return false unless found == :none
         unless ses[:deps].include?( path )
           ses[:deps].push( path )
-          return file_read( path )
+          return read_js( path )
         else
           return ''
         end

data/lib/rsence/plugins/plugin_base.rb

@@ -76,6 +76,17 @@ module RSence
       # @return [nil]
       def close
       end
+
+      # File existence checker
+      #
+      # Just a wrapper for File.exist, except it handles the +path+ via #bundle_path
+      #
+      # @return [false] if the file does not exist.
+      # @return [true] if the file exists.
+      def file_exist?( path )
+        path = bundle_path( path )
+        File.exist?( path )
+      end
       
       # File reader utility
       #
@@ -118,7 +129,31 @@ module RSence
         end
       end
       
-      # Flie writer utility.
+      # JSON reader utility
+      #
+      # Reads the contents of the JSON file given in the +path+ and returns as a parsed structure of the contents of the file.
+      #
+      # @param [String] path The +path+ is relative to the bundle path by default, unless it starts with '/' or '..'; it's simply processed by {#bundle_path} before reading the file.
+      #
+      # @return [false] If the is no file, returns +false+
+      # @return [Object] Any valid structure defined by the YAML file, parsed to a Ruby object.
+      def json_read( path )
+        file_data = file_read( path )
+        if not file_data
+          return false
+        else
+          begin
+            return JSON.parse( file_data )
+          rescue => e
+            warn "An exception occurred while parsing JSON file: #{path}"
+            warn e.message
+            warn "  #{e.backtrace.join("\n  ")}"
+            return false
+          end
+        end
+      end
+      
+      # File writer utility.
       #
       # Writes the contents of the +data+ into the file given in the +path+.
       # @param [String] path The +path+ is relative to the bundle path by default, unless it starts with '/' or '..'; it's simply processed by {#bundle_path} before writing the file.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.14
+  version: 2.3.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps