spaghetti 0.5.1 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0f8230177b8ac7b534ab47c1548491203e1d7afc
+  data.tar.gz: d908acc7a15bbcfc40ca150b6969e5defb6edec7
+SHA512:
+  metadata.gz: d8dfc0e6b31ff4a286782fdf5e3f8cfdd9391a9e2e00fd38b22e9b1998fc2b26cba3bebc5c621da81420a281a8091ad23854b9a7edcf02157b96baac1074ddfa
+  data.tar.gz: 0da44dbf3a4741022fadeb026d10ed28352121ff7ce9a1608d541140eb76b393b9d9df44404067b1684926cf0e6b3bcfd2f8098643cd54b7e07005d925c32aab

data/app/assets/javascripts/spaghetti.js

@@ -1,5 +1,4 @@
 //= require jquery
-//= require jquery.ui.core
 //= require jquery.ui.widget
 //= require spaghetti/jquery.sausage
 //= require spaghetti/init

data/app/assets/javascripts/spaghetti/init.js

@@ -1,60 +1,67 @@
-$(function() {
-  function nearBottomOfPage() {
-    return $(window).scrollTop() > $(document).height() - $(window).height() - 200;
-  }
-  
-  function triggerHooks(hook) {
-    fn = hook + '_spaghetti';
-    if (typeof window[fn] != 'undefined') {
-      fireHook(fn);
-    }
-  }
-  
-  function fireHook(func){
-    this[func].apply(this, Array.prototype.slice.call(arguments, 1));
-  }
-
-  $('.spaghetti-empty').each(function() {
-    $(this).data('spaghetti-enabled', 0);
-    $(this).removeClass('spaghetti-empty');
-    $(this).addClass('spaghetti-loading');
-    if($(this).data('spaghetti-url').indexOf("?") === -1){
-        pageParameter = '?page=';
-    }else{
-        pageParameter = '&page=';
-    }
-    $.ajax({
-      url: $(this).data('spaghetti-url') + pageParameter + $(this).data('spaghetti-next-page'),
-      type: 'get',
-      dataType: 'script',
-      success: function() {
-        triggerHooks('post');
+(function() {
+  jQuery(function() {
+    $(window).scroll(function() {
+      var pageParameter;
+      if ($('.spaghetti').data('spaghetti-enabled') === 1) {
+        if ($(window).scrollTop() > ($(document).height() - $(window).height() - 200)) {
+          triggerHooks('pre');
+          $('.spaghetti').data('spaghetti-enabled', 0);
+          $('.spaghetti').addClass('spaghetti-loading');
+          if ($('.spaghetti').data('spaghetti-url').indexOf("?") === -1) {
+            pageParameter = '?page=';
+          }
+        } else {
+          pageParameter = '&page=';
+        }
+        return window.spaghetti.load($('.spaghetti'));
       }
     });
+    $(window).sausage();
+    return $('.spaghetti-empty').each(function() {
+      return window.spaghetti.load($(this));
+    });
   });
-  
-  $(window).scroll(function(){
-    if ($('.spaghetti').data('spaghetti-enabled') == 1) {
-      if(nearBottomOfPage()) {
-        triggerHooks('pre');
-        $('.spaghetti').data('spaghetti-enabled', 0);
-        $('.spaghetti').addClass('spaghetti-loading');
-        if($('.spaghetti').data('spaghetti-url').indexOf("?") === -1){
-        	pageParameter = '?page=';
-    	}else{
-        	pageParameter = '&page=';
-    	}
-        $.ajax({
-          url: $('.spaghetti').data('spaghetti-url') + pageParameter + $('.spaghetti').data('spaghetti-next-page'),
-          type: 'get',
-          dataType: 'script',
-          success: function() {
-            $(window).sausage('draw');
-            triggerHooks('post');
-          }
-        });
+
+  window.spaghetti = {
+    triggerHooks: function(hook) {
+      var fn;
+      fn = hook + '_spaghetti';
+      if (typeof window[fn] !== 'undefined') {
+        this.fireHooks(fn);
       }
+      return this;
+    },
+    fireHooks: function(func) {
+      return window[func].apply(this, Array.prototype.slice.call(arguments, 1));
+    },
+    load: function(elm) {
+      var pageParameter;
+      elm.data('spaghetti-enabled', 0);
+      elm.addClass('spaghetti-loading');
+      elm.removeClass('spaghetti-empty');
+      if (elm.data('spaghetti-url').indexOf("?") === -1) {
+        pageParameter = '?page=';
+      } else {
+        pageParameter = '&page=';
+      }
+      $.ajax({
+        type: 'get',
+        url: elm.data('spaghetti-url') + pageParameter + elm.data('spaghetti-next-page'),
+        dataType: 'script',
+        success: function() {
+          $(window).sausage('draw');
+          window.spaghetti.triggerHooks('post');
+          return true;
+        }
+      });
+      return this;
+    },
+    reset: function(elm) {
+      elm.find('.spaghetti-items').html('');
+      elm.data('spaghetti-enabled', 1);
+      elm.data('spaghetti-next-page', 0);
+      return this.load(elm);
     }
-  });
-  $(window).sausage();
-});
+  };
+
+}).call(this);

data/app/helpers/spaghetti_helpers.rb

@@ -2,7 +2,7 @@ module SpaghettiHelpers
   def spaghetti name, path_or_items, options = {}
     output = ''.html_safe
     if path_or_items.class.name == 'String'
-      output << "<div class=\"#{ name } spaghetti spaghetti-empty\" data-spaghetti-enabled=\"1\" data-spaghetti-url=\"#{ path_or_items }\" data-spaghetti-next-page=\"1\"><div class=\"#{ name }-items\"></div><div class=\"throbber\">#{ image_tag 'throbber.gif' }</div></div>".html_safe
+      output << "<div class=\"#{ name } spaghetti spaghetti-empty\" data-spaghetti-enabled=\"1\" data-spaghetti-url=\"#{ path_or_items }\" data-spaghetti-next-page=\"1\"><div class=\"#{ name }-items spaghetti-items\"></div><div class=\"throbber\">#{ image_tag 'throbber.gif' }</div></div>".html_safe
     else
       if path_or_items.any?
         if options[:partial]

data/lib/spaghetti.rb

@@ -1,2 +1,3 @@
+require "jquery-ui-rails"
 require "spaghetti/version"
-require "spaghetti/engine"
+require "spaghetti/engine"

data/lib/spaghetti/version.rb

@@ -1,3 +1,3 @@
 module Spaghetti
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spaghetti.gemspec

@@ -12,10 +12,12 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Spaghetti - Rails Endless Page}
   gem.summary       = %q{Spaghetti - Rails Endless Page}
   gem.homepage      = "http://github.com/rayasocialmedia/spaghetti"
-  gem.add_dependency 'jquery-rails', '>= 2.1'
-  gem.add_dependency 'jquery-ui-rails', '4.0.1'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_dependency 'rails', '>= 3.1', '< 4.1'
+  gem.add_dependency 'jquery-rails'
+  gem.add_dependency 'jquery-ui-rails'
 end

metadata

@@ -1,48 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: spaghetti
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 description: Spaghetti - Rails Endless Page
 email:
 - owahab@gmail.com
@@ -68,26 +83,25 @@ files:
 - spaghetti.gemspec
 homepage: http://github.com/rayasocialmedia/spaghetti
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Spaghetti - Rails Endless Page
 test_files: []