social_stream 0.1.6 → 0.1.7

data/Gemfile

@@ -1,17 +1,4 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.0"
-gem "capybara", ">= 0.3.9"
-gem "sqlite3-ruby", :require => "sqlite3"
-
-if RUBY_VERSION < '1.9'
-  gem "ruby-debug", ">= 0.10.3"
-end
-
 gemspec
 
-gem 'cancan'
-
-gem "rspec-rails", ">= 2.0.0.beta"
-gem "factory_girl"
-

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    social_stream (0.1.4)
+    social_stream (0.1.6)
       atd-ancestry
+      cancan (~> 1.4.0)
       devise (~> 1.1.3)
       foreigner (~> 0.9.1)
       inherited_resources (~> 1.1.2)
-      jquery-rails (~> 0.2.4)
+      jquery-rails (~> 0.2.5)
+      nested_set (~> 1.5.3)
       paperclip (~> 2.3.4)
       stringex (~> 1.2.0)
 
@@ -14,12 +16,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -27,19 +29,19 @@ GEM
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     atd-ancestry (1.3.0)
@@ -53,9 +55,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
-    childprocess (0.1.3)
+    childprocess (0.1.4)
       ffi (~> 0.6.3)
-    columnize (0.3.1)
+    columnize (0.3.2)
     culerity (0.2.12)
     devise (1.1.3)
       bcrypt-ruby (~> 2.1.2)
@@ -68,19 +70,24 @@ GEM
       rake (>= 0.8.7)
     foreigner (0.9.1)
     has_scope (0.5.0)
-    i18n (0.4.1)
+    i18n (0.4.2)
     inherited_resources (1.1.2)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    jquery-rails (0.2.4)
+    jquery-rails (0.2.5)
       rails (~> 3.0)
+      thor (~> 0.14.4)
     json_pure (1.4.6)
     linecache (0.43)
-    mail (2.2.7)
+    mail (2.2.9)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
+    nested_set (1.5.3)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
     nokogiri (1.4.3.1)
     paperclip (2.3.5)
       activerecord
@@ -91,17 +98,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
@@ -118,20 +125,20 @@ GEM
       rspec-expectations (~> 2.0.1)
     rspec-rails (2.0.1)
       rspec (~> 2.0.0)
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     rubyzip (0.9.4)
-    selenium-webdriver (0.0.29)
-      childprocess (>= 0.0.7)
+    selenium-webdriver (0.1.0)
+      childprocess (= 0.1.4)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
-    sqlite3-ruby (1.3.1)
+    sqlite3-ruby (1.3.2)
     stringex (1.2.0)
-    thor (0.14.3)
+    thor (0.14.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -143,17 +150,18 @@ PLATFORMS
 
 DEPENDENCIES
   atd-ancestry
-  cancan
-  capybara (>= 0.3.9)
+  cancan (~> 1.4.0)
+  capybara (~> 0.3.9)
   devise (~> 1.1.3)
-  factory_girl
+  factory_girl (~> 1.3.2)
   foreigner (~> 0.9.1)
   inherited_resources (~> 1.1.2)
-  jquery-rails (~> 0.2.4)
+  jquery-rails (~> 0.2.5)
+  nested_set (~> 1.5.3)
   paperclip (~> 2.3.4)
-  rails (= 3.0.0)
-  rspec-rails (>= 2.0.0.beta)
-  ruby-debug (>= 0.10.3)
+  rails (~> 3.0.1)
+  rspec-rails (~> 2.0.0)
+  ruby-debug (~> 0.10.3)
   social_stream!
   sqlite3-ruby
   stringex (~> 1.2.0)

data/app/controllers/ties_controller.rb

@@ -1,3 +1,9 @@
 class TiesController < InheritedResources::Base
   respond_to :html, :xml, :js
+
+  before_filter :authenticate_user!, :only => :suggestion
+
+  def suggestion
+    @tie = current_user.suggestion
+  end
 end

data/app/models/actor.rb

@@ -7,7 +7,9 @@ class Actor < ActiveRecord::Base
   acts_as_url :name, :url_attribute => :permalink
 
   has_attached_file :logo,
-                    :styles => { :small => "30x30" },
+                    :styles => { :tie => "30x30>",
+                                 :actor => '35x35>',
+                                 :profile => '94x65' },
                     :default_url => "/images/:attachment/:style/:subtype_class.png"
 
   has_many :sent_ties,

data/app/models/relation.rb

@@ -31,7 +31,7 @@
 # or requests.
 #
 class Relation < ActiveRecord::Base
-  has_ancestry
+  acts_as_nested_set
 
   scope :mode, lambda { |st, rt|
     where(:sender_type => st, :receiver_type => rt)
@@ -54,7 +54,7 @@ class Relation < ActiveRecord::Base
   class << self
     # A relation in the top of a strength hierarchy
     def strongest
-      roots.first
+      root
     end
   end
 
@@ -65,7 +65,7 @@ class Relation < ActiveRecord::Base
 
   # Relations below or at the same level of this relation
   def weaker_or_equal
-    Array(self) + descendants
+    self_and_descendants
   end
 
   # Other relations above in the same hierarchy that this relation
@@ -75,7 +75,7 @@ class Relation < ActiveRecord::Base
 
   # Relations above or at the same level of this relation
   def stronger_or_equal
-    ancestors + Array(self)
+    self_and_ancestors
   end
 
   # Relation class scoped in the same mode that this relation

data/app/models/tie.rb

@@ -159,7 +159,7 @@ class Tie < ActiveRecord::Base
     def weak_set_conditions(t)
       arel_table[:sender_id].eq(t.sender_id).and(
         arel_table[:receiver_id].eq(t.receiver_id)).and(
-        arel_table[:relation_id].in(t.relation.stronger_or_equal)).and(
+        arel_table[:relation_id].in(t.relation.stronger_or_equal.all)).and(
         Permission.arel_table[:parameter].eq('weak_set'))
     end
 
@@ -171,7 +171,7 @@ class Tie < ActiveRecord::Base
 
     def weak_group_set_conditions(t)
       arel_table[:receiver_id].eq(t.receiver_id).and(
-        arel_table[:relation_id].in(t.relation.stronger_or_equal)).and(
+        arel_table[:relation_id].in(t.relation.stronger_or_equal.all)).and(
         Permission.arel_table[:parameter].eq('weak_group_set'))
     end
   end

data/app/views/activities/_child.html.erb

@@ -1,6 +1,6 @@
 <%= div_for activity, :class => "subactivity" do %>
   <div class="actor_logo_subactivity">
-    <%= link_to image_tag(activity.sender_subject.logo.url,
+    <%= link_to image_tag(activity.sender_subject.logo.url(),
                           :size => "30x30",
                           :alt => activity.sender_subject.name),
                  activity.sender_subject %>

data/app/views/activities/_jquery.html.erb

@@ -99,11 +99,3 @@ $('#left_scroll img').livequery("click",function(){
 
 });
 
-
-
-
-$("#security").dropdownchecklist( { closeRadioOnClick: true } );
-$("#security_image").parent().width(28);
-$("#security_image").parent().parent().width(28);
-
-

data/app/views/activities/_new.html.erb

@@ -1,20 +1,22 @@
-<div id="activities_header" class="content_size">
-  <%= form_for Post.new(:text => t('activity.input'),
-                        :_activity_tie_id => current_user.active_ties_to(receiver).first.id),
-                        :remote => true  do |f| %>
-    <%= f.hidden_field :_activity_tie_id %>
-    <%= f.text_field :text, :id => "input_activities", :size => 85 %>
-    <div id="activities_share_btn">
-      <div id="securities">
-        <select id="security" >
-          <option>Todos</option>
-          <option>Amigos de amigos</option>
-          <option>Amigos</option>          
-          <option>Trabajo</option>
-        </select>
-      </div>
-      <%= image_submit_tag "btn/btn_share.png" %>
-    </div>
-  <% end -%>
-</div>
+<% if current_user.active_ties_to(receiver).any? %>
+  <% content_for :javascript do %>
+    $("#security").dropdownchecklist( { closeRadioOnClick: true } );
+    $("#security_image").parent().width(28);
+    $("#security_image").parent().parent().width(28);
+  <% end %>
 
+  <div id="activities_header" class="content_size">
+    <%= form_for Post.new(:text => t('activity.input'),
+                          :_activity_tie_id => current_user.active_ties_to(receiver).first.id),
+                          :remote => true  do |f| %>
+      <%= f.hidden_field :_activity_tie_id %>
+      <%= f.text_field :text, :id => "input_activities", :size => 85 %>
+      <div id="activities_share_btn">
+        <div id="securities">
+          <%= f.select :_activity_tie_id, current_user.active_ties_to(receiver).map{ |t| [ t(t.relation_name, :count => :other), t.id ] }, {}, :id => 'security' %>
+        </div>
+        <%= image_submit_tag "btn/btn_share.png" %>
+      </div>
+    <% end -%>
+  </div>
+<% end %>

data/app/views/ties/_new.html.erb

@@ -1,7 +1,7 @@
 <div class="dialog_add_tie" id="new_tie">
     <div class="content_add_user" >
       <div class="tie_logo">
-        <%= link_to image_tag(@tie.receiver_subject.logo.url,
+        <%= link_to image_tag(@tie.receiver_subject.logo.url(tie),
                               :size => "100x100",
                               :alt => @tie.receiver_subject.name),
                      @tie.receiver_subject %>

data/app/views/ties/_tie.html.erb

@@ -1,6 +1,6 @@
 <div id="tie_<%=dom_id(tie.receiver_subject)%>" class="tie">
   <div class="tie_actor_logo">
-    <%= link_to(image_tag(tie.receiver_subject.logo.url, :size =>"30x30"),
+    <%= link_to(image_tag(tie.receiver_subject.logo.url(:tie), :size =>"30x30"),
                 tie.receiver_subject) %>
   </div>
   <div class="tie_content">

data/app/views/ties/create.js.erb

@@ -8,7 +8,7 @@
       if ($('#carousel_ul').length) { // element found
         $("#carousel_ul").prepend("<%= escape_javascript(render @tie.receiver_subject) %>");
       }else{ // no element found
-        $("#my_groups").html("<%= escape_javascript(render "groups/groups" )%>");
+        $("#my_groups").html("<%= escape_javascript(render 'users/groups' )%>");
       }
       $("#group_count").html("<%=current_user.recent_groups.count%>");
       link_tie.replaceWith("<%= escape_javascript(link_follow_state) %>");

data/app/views/ties/suggestion.html.erb

@@ -0,0 +1 @@
+<%= render @tie %>

data/app/views/ties/suggestion.js.erb

@@ -0,0 +1 @@
+<%= render(@tie) %>

data/config/locales/en.yml

@@ -77,6 +77,8 @@ en:
     confirm_delete: "Delete post?"
   profile:
     one: "Profile"
+  public:
+    other: "Everybody"
   sign_in: "Sign in"
   sign_up: "Sign up"
   sign_out_user: "Sign out (%{user})"

data/config/routes.rb

@@ -7,7 +7,11 @@ Rails.application.routes.draw do
 
   resources :groups
 
-  resources :ties
+  resources :ties do
+    collection do
+      get 'suggestion'
+    end
+  end
   resources :activities do
     resource :like
   end

data/lib/generators/social_stream/templates/migration.rb

@@ -125,13 +125,15 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "updated_at"
       t.string   "sender_type"
       t.string   "receiver_type"
-      t.string   "ancestry"
+      t.integer  "parent_id"
+      t.integer  "lft"
+      t.integer  "rgt"
       t.integer  "inverse_id"
       t.integer  "granted_id"
       t.boolean  "reflexive", :default => false
     end
 
-    add_index "relations", "ancestry"
+    add_index "relations", "parent_id"
 
     create_table "tags", :force => true do |t|
       t.string   "name",       :limit => 45

data/lib/social_stream/rails.rb

@@ -4,7 +4,9 @@ require 'foreigner'
 require 'jquery-rails'
 # Permalinks:
 require 'stringex'
-# Hierchical relationships in Relation and Activity:
+# Hierarchical relationships in Relation:
+require 'nested_set'
+# Hierarchical relationships in Activity:
 require 'ancestry'
 # User authentication
 require 'devise'

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 end

data/social_stream.gemspec

@@ -7,11 +7,22 @@ Gem::Specification.new do |s|
   s.description = "Ruby on Rails engine supporting social networking features and activity streams."
   s.authors = ['Antonio Tapiador', 'Diego Carrera']
   s.files = `git ls-files`.split("\n")
-  s.add_dependency('atd-ancestry')
-  s.add_dependency('foreigner', '~> 0.9.1')
-  s.add_dependency('devise', '~> 1.1.3')
-  s.add_dependency('inherited_resources', '~> 1.1.2')
-  s.add_dependency('stringex', '~> 1.2.0')
-  s.add_dependency('paperclip', '~> 2.3.4')
-  s.add_dependency('jquery-rails', '~> 0.2.5')
+  s.add_runtime_dependency('atd-ancestry', '1.3.0')
+  s.add_runtime_dependency('nested_set', '~> 1.5.3')
+  s.add_runtime_dependency('foreigner', '~> 0.9.1')
+  s.add_runtime_dependency('devise', '~> 1.1.3')
+  s.add_runtime_dependency('inherited_resources', '~> 1.1.2')
+  s.add_runtime_dependency('stringex', '~> 1.2.0')
+  s.add_runtime_dependency('paperclip', '~> 2.3.4')
+  s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
+  s.add_runtime_dependency('cancan', '~> 1.4.0')
+  s.add_development_dependency('rails', '~> 3.0.1')
+  s.add_development_dependency('capybara', '~> 0.3.9')
+  s.add_development_dependency('sqlite3-ruby')
+  if RUBY_VERSION < '1.9'
+    s.add_development_dependency('ruby-debug', '~> 0.10.3')
+  end
+  s.add_development_dependency('rspec-rails', '~> 2.0.0')
+  s.add_development_dependency('factory_girl', '~> 1.3.2')
+  s.add_development_dependency('forgery', '~> 0.3.6')
 end

data/spec/spec_helper.rb

@@ -32,6 +32,7 @@ ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load Factories
+require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each {|f| require f}
 
 Rspec.configure do |config|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Antonio Tapiador
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2010-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,18 +25,36 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: foreigner
+  name: nested_set
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: foreigner
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +66,11 @@ dependencies:
         - 1
         version: 0.9.1
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +82,11 @@ dependencies:
         - 3
         version: 1.1.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: inherited_resources
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +98,11 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: stringex
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +114,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: paperclip
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +130,11 @@ dependencies:
         - 4
         version: 2.3.4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jquery-rails
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,7 +146,133 @@ dependencies:
         - 5
         version: 0.2.5
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: cancan
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 3
+        - 9
+        version: 0.3.9
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: forgery
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 3
+        - 6
+        version: 0.3.6
+  type: :development
+  version_requirements: *id016
 description: Ruby on Rails engine supporting social networking features and activity streams.
 email: 
 executables: []
@@ -224,6 +368,8 @@ files:
 - app/views/ties/create.js.erb
 - app/views/ties/new.html.erb
 - app/views/ties/new.js.erb
+- app/views/ties/suggestion.html.erb
+- app/views/ties/suggestion.js.erb
 - app/views/users/_contacts.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
@@ -342,7 +488,6 @@ files:
 - lib/generators/social_stream/templates/public/images/frontpage/yellow_sq.png
 - lib/generators/social_stream/templates/public/images/left.png
 - lib/generators/social_stream/templates/public/images/logo.png
-- lib/generators/social_stream/templates/public/images/logo/dit.png
 - lib/generators/social_stream/templates/public/images/logos/original/group.png
 - lib/generators/social_stream/templates/public/images/logos/original/user.png
 - lib/generators/social_stream/templates/public/images/right.png
@@ -361,12 +506,9 @@ files:
 - lib/generators/social_stream/templates/public/images/ui-icons_cd0a0a_256x240.png
 - lib/generators/social_stream/templates/public/javascripts/hoverIntent.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui-1.8.4.custom.min.js
-- lib/generators/social_stream/templates/public/javascripts/jquery-ui-personalized-1.5.2.packed.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.boxy.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.livequery.js
-- lib/generators/social_stream/templates/public/javascripts/main.js
 - lib/generators/social_stream/templates/public/javascripts/menu.js
-- lib/generators/social_stream/templates/public/javascripts/superfish.js
 - lib/generators/social_stream/templates/public/javascripts/ui.dropdownchecklist.js
 - lib/generators/social_stream/templates/public/stylesheets/activities.css
 - lib/generators/social_stream/templates/public/stylesheets/base.css

data/lib/generators/social_stream/templates/public/javascripts/jquery-ui-personalized-1.5.2.packed.js

@@ -1 +0,0 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(3(C){C.8={3o:{19:3(E,F,H){6 G=C.8[E].1h;21(6 D 3p H){G.1I[D]=G.1I[D]||[];G.1I[D].28([F,H[D]])}},2P:3(D,F,E){6 H=D.1I[F];5(!H){7}21(6 G=0;G<H.k;G++){5(D.b[H[G][0]]){H[G][1].1H(D.c,E)}}}},1l:{},n:3(D){5(C.8.1l[D]){7 C.8.1l[D]}6 E=C(\'<2a 3s="8-3r">\').j(D).n({3q:"3i",2g:"-2A",3g:"-2A",1r:"1w"}).22("2C");C.8.1l[D]=!!((!(/3I|3P/).12(E.n("3z"))||(/^[1-9]/).12(E.n("2T"))||(/^[1-9]/).12(E.n("2E"))||!(/2v/).12(E.n("3w"))||!(/3S|3C\\(0, 0, 0, 0\\)/).12(E.n("3D"))));3E{C("2C").2w(0).3B(E.2w(0))}3x(F){}7 C.8.1l[D]},3y:3(D){C(D).v("1p","2I").n("2q","2v")},3H:3(D){C(D).v("1p","3O").n("2q","")},3Q:3(G,E){6 D=/2g/.12(E||"2g")?"3N":"3M",F=e;5(G[D]>0){7 t}G[D]=1;F=G[D]>0?t:e;G[D]=0;7 F}};6 B=C.2e.W;C.2e.W=3(){C("*",2).19(2).z("W");7 B.1H(2,2M)};3 A(E,F,G){6 D=C[E][F].35||[];D=(1F D=="1E"?D.2h(/,?\\s+/):D);7(C.1j(G,D)!=-1)}C.1i=3(E,D){6 F=E.2h(".")[0];E=E.2h(".")[1];C.2e[E]=3(J){6 H=(1F J=="1E"),I=2D.1h.3J.2P(2M,1);5(H&&A(F,E,J)){6 G=C.i(2[0],E);7(G?G[J].1H(G,I):1n)}7 2.14(3(){6 K=C.i(2,E);5(H&&K&&C.3v(K[J])){K[J].1H(K,I)}o{5(!H){C.i(2,E,3e C[F][E](2,J))}}})};C[F][E]=3(I,H){6 G=2;2.15=E;2.2H=F+"-"+E;2.b=C.1A({},C.1i.1k,C[F][E].1k,H);2.c=C(I).u("1e."+E,3(L,J,K){7 G.1e(J,K)}).u("2j."+E,3(K,J){7 G.2j(J)}).u("W",3(){7 G.1b()});2.23()};C[F][E].1h=C.1A({},C.1i.1h,D)};C.1i.1h={23:3(){},1b:3(){2.c.1q(2.15)},2j:3(D){7 2.b[D]},1e:3(D,E){2.b[D]=E;5(D=="f"){2.c[E?"j":"r"](2.2H+"-f")}},1X:3(){2.1e("f",e)},1P:3(){2.1e("f",t)}};C.1i.1k={f:e};C.8.2J={3h:3(){6 D=2;2.c.u("3d."+2.15,3(E){7 D.2G(E)});5(C.x.13){2.2K=2.c.v("1p");2.c.v("1p","2I")}2.3c=e},38:3(){2.c.16("."+2.15);(C.x.13&&2.c.v("1p",2.2K))},2G:3(F){(2.V&&2.1o(F));2.1C=F;6 E=2,G=(F.39==1),D=(1F 2.b.25=="1E"?C(F.2f).2x().19(F.2f).y(2.b.25).k:e);5(!G||D||!2.2S(F)){7 t}2.1D=!2.b.26;5(!2.1D){2.3a=1x(3(){E.1D=t},2.b.26)}5(2.2m(F)&&2.1T(F)){2.V=(2.1U(F)!==e);5(!2.V){F.3b();7 t}}2.2n=3(H){7 E.2r(H)};2.2l=3(H){7 E.1o(H)};C(2N).u("2O."+2.15,2.2n).u("2t."+2.15,2.2l);7 e},2r:3(D){5(C.x.13&&!D.3j){7 2.1o(D)}5(2.V){2.1V(D);7 e}5(2.2m(D)&&2.1T(D)){2.V=(2.1U(2.1C,D)!==e);(2.V?2.1V(D):2.1o(D))}7!2.V},1o:3(D){C(2N).16("2O."+2.15,2.2n).16("2t."+2.15,2.2l);5(2.V){2.V=e;2.2u(D)}7 e},2m:3(D){7(29.3m(29.2z(2.1C.2L-D.2L),29.2z(2.1C.2s-D.2s))>=2.b.2F)},1T:3(D){7 2.1D},1U:3(D){},1V:3(D){},2u:3(D){},2S:3(D){7 t}};C.8.2J.1k={25:U,2F:1,26:0}})(27);(3(A){A.1i("8.4",{23:3(){2.b.Z+=".4";2.1m(t)},1e:3(B,C){5((/^d/).12(B)){2.1v(C)}o{2.b[B]=C;2.1m()}},k:3(){7 2.$4.k},1Q:3(B){7 B.2R&&B.2R.1g(/\\s/g,"2Q").1g(/[^A-4o-4x-9\\-2Q:\\.]/g,"")||2.b.2X+A.i(B)},8:3(C,B){7{b:2.b,4u:C,30:B,11:2.$4.11(C)}},1m:3(O){2.$l=A("1O:4p(a[p])",2.c);2.$4=2.$l.1G(3(){7 A("a",2)[0]});2.$h=A([]);6 P=2,D=2.b;2.$4.14(3(R,Q){5(Q.X&&Q.X.1g("#","")){P.$h=P.$h.19(Q.X)}o{5(A(Q).v("p")!="#"){A.i(Q,"p.4",Q.p);A.i(Q,"q.4",Q.p);6 T=P.1Q(Q);Q.p="#"+T;6 S=A("#"+T);5(!S.k){S=A(D.2d).v("1s",T).j(D.1u).4l(P.$h[R-1]||P.c);S.i("1b.4",t)}P.$h=P.$h.19(S)}o{D.f.28(R+1)}}});5(O){2.c.j(D.2b);2.$h.14(3(){6 Q=A(2);Q.j(D.1u)});5(D.d===1n){5(20.X){2.$4.14(3(S,Q){5(Q.X==20.X){D.d=S;5(A.x.13||A.x.43){6 R=A(20.X),T=R.v("1s");R.v("1s","");1x(3(){R.v("1s",T)},44)}4m(0,0);7 e}})}o{5(D.1c){6 J=46(A.1c("8-4"+A.i(P.c)),10);5(J&&P.$4[J]){D.d=J}}o{5(P.$l.y("."+D.m).k){D.d=P.$l.11(P.$l.y("."+D.m)[0])}}}}D.d=D.d===U||D.d!==1n?D.d:0;D.f=A.41(D.f.40(A.1G(2.$l.y("."+D.1a),3(R,Q){7 P.$l.11(R)}))).31();5(A.1j(D.d,D.f)!=-1){D.f.3V(A.1j(D.d,D.f),1)}2.$h.j(D.18);2.$l.r(D.m);5(D.d!==U){2.$h.w(D.d).1S().r(D.18);2.$l.w(D.d).j(D.m);6 K=3(){A(P.c).z("1K",[P.Y("1K"),P.8(P.$4[D.d],P.$h[D.d])],D.1S)};5(A.i(2.$4[D.d],"q.4")){2.q(D.d,K)}o{K()}}A(3U).u("3W",3(){P.$4.16(".4");P.$l=P.$4=P.$h=U})}21(6 G=0,N;N=2.$l[G];G++){A(N)[A.1j(G,D.f)!=-1&&!A(N).1f(D.m)?"j":"r"](D.1a)}5(D.17===e){2.$4.1q("17.4")}6 C,I,B={"3X-2E":0,1R:1},E="3Z";5(D.1d&&D.1d.3Y==2D){C=D.1d[0]||B,I=D.1d[1]||B}o{C=I=D.1d||B}6 H={1r:"",47:"",2T:""};5(!A.x.13){H.1W=""}3 M(R,Q,S){Q.2p(C,C.1R||E,3(){Q.j(D.18).n(H);5(A.x.13&&C.1W){Q[0].2B.y=""}5(S){L(R,S,Q)}})}3 L(R,S,Q){5(I===B){S.n("1r","1w")}S.2p(I,I.1R||E,3(){S.r(D.18).n(H);5(A.x.13&&I.1W){S[0].2B.y=""}A(P.c).z("1K",[P.Y("1K"),P.8(R,S[0])],D.1S)})}3 F(R,T,Q,S){T.j(D.m).4k().r(D.m);M(R,Q,S)}2.$4.16(".4").u(D.Z,3(){6 T=A(2).2x("1O:w(0)"),Q=P.$h.y(":4e"),S=A(2.X);5((T.1f(D.m)&&!D.1z)||T.1f(D.1a)||A(2).1f(D.1t)||A(P.c).z("2y",[P.Y("2y"),P.8(2,S[0])],D.1v)===e){2.1M();7 e}P.b.d=P.$4.11(2);5(D.1z){5(T.1f(D.m)){P.b.d=U;T.r(D.m);P.$h.1Y();M(2,Q);2.1M();7 e}o{5(!Q.k){P.$h.1Y();6 R=2;P.q(P.$4.11(2),3(){T.j(D.m).j(D.2c);L(R,S)});2.1M();7 e}}}5(D.1c){A.1c("8-4"+A.i(P.c),P.b.d,D.1c)}P.$h.1Y();5(S.k){6 R=2;P.q(P.$4.11(2),Q.k?3(){F(R,T,Q,S)}:3(){T.j(D.m);L(R,S)})}o{4b"27 4c 4d: 3n 49 4a."}5(A.x.13){2.1M()}7 e});5(!(/^24/).12(D.Z)){2.$4.u("24.4",3(){7 e})}},19:3(E,D,C){5(C==1n){C=2.$4.k}6 G=2.b;6 I=A(G.37.1g(/#\\{p\\}/g,E).1g(/#\\{1L\\}/g,D));I.i("1b.4",t);6 H=E.4i("#")==0?E.1g("#",""):2.1Q(A("a:4g-4h",I)[0]);6 F=A("#"+H);5(!F.k){F=A(G.2d).v("1s",H).j(G.18).i("1b.4",t)}F.j(G.1u);5(C>=2.$l.k){I.22(2.c);F.22(2.c[0].48)}o{I.36(2.$l[C]);F.36(2.$h[C])}G.f=A.1G(G.f,3(K,J){7 K>=C?++K:K});2.1m();5(2.$4.k==1){I.j(G.m);F.r(G.18);6 B=A.i(2.$4[0],"q.4");5(B){2.q(C,B)}}2.c.z("2Y",[2.Y("2Y"),2.8(2.$4[C],2.$h[C])],G.19)},W:3(B){6 D=2.b,E=2.$l.w(B).W(),C=2.$h.w(B).W();5(E.1f(D.m)&&2.$4.k>1){2.1v(B+(B+1<2.$4.k?1:-1))}D.f=A.1G(A.34(D.f,3(G,F){7 G!=B}),3(G,F){7 G>=B?--G:G});2.1m();2.c.z("2V",[2.Y("2V"),2.8(E.2k("a")[0],C[0])],D.W)},1X:3(B){6 C=2.b;5(A.1j(B,C.f)==-1){7}6 D=2.$l.w(B).r(C.1a);5(A.x.4n){D.n("1r","4t-1w");1x(3(){D.n("1r","1w")},0)}C.f=A.34(C.f,3(F,E){7 F!=B});2.c.z("33",[2.Y("33"),2.8(2.$4[B],2.$h[B])],C.1X)},1P:3(C){6 B=2,D=2.b;5(C!=D.d){2.$l.w(C).j(D.1a);D.f.28(C);D.f.31();2.c.z("32",[2.Y("32"),2.8(2.$4[C],2.$h[C])],D.1P)}},1v:3(B){5(1F B=="1E"){B=2.$4.11(2.$4.y("[p$="+B+"]")[0])}2.$4.w(B).4q(2.b.Z)},q:3(G,K){6 L=2,D=2.b,E=2.$4.w(G),J=E[0],H=K==1n||K===e,B=E.i("q.4");K=K||3(){};5(!B||!H&&A.i(J,"17.4")){K();7}6 M=3(N){6 O=A(N),P=O.2k("*:4s");7 P.k&&P.4v(":45(3R)")&&P||O};6 C=3(){L.$4.y("."+D.1t).r(D.1t).14(3(){5(D.1N){M(2).3l().1B(M(2).i("1L.4"))}});L.1y=U};5(D.1N){6 I=M(J).1B();M(J).3k("<2o></2o>").2k("2o").i("1L.4",I).1B(D.1N)}6 F=A.1A({},D.1J,{2U:B,2i:3(O,N){A(J.X).1B(O);C();5(D.17){A.i(J,"17.4",t)}A(L.c).z("2Z",[L.Y("2Z"),L.8(L.$4[G],L.$h[G])],D.q);D.1J.2i&&D.1J.2i(O,N);K()}});5(2.1y){2.1y.3f();C()}E.j(D.1t);1x(3(){L.1y=A.3u(F)},0)},2U:3(C,B){2.$4.w(C).1q("17.4").i("q.4",B)},1b:3(){6 B=2.b;2.c.16(".4").r(B.2b).1q("4");2.$4.14(3(){6 C=A.i(2,"p.4");5(C){2.p=C}6 D=A(2).16(".4");A.14(["p","q","17"],3(E,F){D.1q(F+".4")})});2.$l.19(2.$h).14(3(){5(A.i(2,"1b.4")){A(2).W()}o{A(2).r([B.m,B.2c,B.1a,B.1u,B.18].3G(" "))}})},Y:3(B){7 A.Z.3L({3t:B,2f:2.c[0]})}});A.8.4.1k={1z:e,Z:"24",f:[],1c:U,1N:"3F&#3A;",17:e,2X:"8-4-",1J:{},1d:U,37:\'<1O><a p="#{p}"><2W>#{1L}</2W></a></1O>\',2d:"<2a></2a>",2b:"8-4-3K",m:"8-4-d",2c:"8-4-1z",1a:"8-4-f",1u:"8-4-30",18:"8-4-3T",1t:"8-4-4w"};A.8.4.35="k";A.1A(A.8.4.1h,{1Z:U,4r:3(C,F){F=F||e;6 B=2,E=2.b.d;3 G(){B.1Z=42(3(){E=++E<B.$4.k?E:0;B.1v(E)},C)}3 D(H){5(!H||H.4j){4f(B.1Z)}}5(C){G();5(!F){2.$4.u(2.b.Z,D)}o{2.$4.u(2.b.Z,3(){D();E=B.b.d;G()})}}o{D();2.$4.16(2.b.Z,D)}}})})(27);',62,282,'||this|function|tabs|if|var|return|ui|||options|element|selected|false|disabled||panels|data|addClass|length|lis|selectedClass|css|else|href|load|removeClass||true|bind|attr|eq|browser|filter|triggerHandler|||||||||||||||||||||null|_mouseStarted|remove|hash|fakeEvent|event||index|test|msie|each|widgetName|unbind|cache|hideClass|add|disabledClass|destroy|cookie|fx|setData|hasClass|replace|prototype|widget|inArray|defaults|cssCache|tabify|undefined|mouseUp|unselectable|removeData|display|id|loadingClass|panelClass|select|block|setTimeout|xhr|unselect|extend|html|_mouseDownEvent|_mouseDelayMet|string|typeof|map|apply|plugins|ajaxOptions|tabsshow|label|blur|spinner|li|disable|tabId|duration|show|mouseDelayMet|mouseStart|mouseDrag|opacity|enable|stop|rotation|location|for|appendTo|init|click|cancel|delay|jQuery|push|Math|div|navClass|unselectClass|panelTemplate|fn|target|top|split|success|getData|find|_mouseUpDelegate|mouseDistanceMet|_mouseMoveDelegate|em|animate|MozUserSelect|mouseMove|pageY|mouseup|mouseStop|none|get|parents|tabsselect|abs|5000px|style|body|Array|width|distance|mouseDown|widgetBaseClass|on|mouse|_mouseUnselectable|pageX|arguments|document|mousemove|call|_|title|mouseCapture|height|url|tabsremove|span|idPrefix|tabsadd|tabsload|panel|sort|tabsdisable|tabsenable|grep|getter|insertBefore|tabTemplate|mouseDestroy|which|_mouseDelayTimer|preventDefault|started|mousedown|new|abort|left|mouseInit|absolute|button|wrapInner|parent|max|Mismatching|plugin|in|position|gen|class|type|ajax|isFunction|backgroundImage|catch|disableSelection|cursor|8230|removeChild|rgba|backgroundColor|try|Loading|join|enableSelection|auto|slice|nav|fix|scrollLeft|scrollTop|off|default|hasScroll|img|transparent|hide|window|splice|unload|min|constructor|normal|concat|unique|setInterval|opera|500|not|parseInt|overflow|parentNode|fragment|identifier|throw|UI|Tabs|visible|clearInterval|first|child|indexOf|clientX|siblings|insertAfter|scrollTo|safari|Za|has|trigger|rotate|last|inline|tab|is|loading|z0'.split('|'),0,{}))

data/lib/generators/social_stream/templates/public/javascripts/main.js

@@ -1,82 +0,0 @@
-// initialise plugins
-jQuery(function(){
-	jQuery('ul.sf-menu').superfish();
-});	
-
-$(document).ready(function() {
-	  $('#tabvanilla > ul').tabs({ fx: { height: 'toggle', opacity: 'toggle' } });
-	  
-	});
-$(document).ready(function() {
-	  $('#tabright> ul').tabs({ fx: { height: 'toggle', opacity: 'toggle' } });
-	  
-	});
-
-$(document).ready(function() {
-	  $('#tabconferences> ul').tabs({ fx: { height: 'toggle', opacity: 'toggle' } });
-	  
-	});
-
-$(document).ready(function() {
-	  $('#tabconference_browse> ul').tabs({ fx: { height: 'toggle', opacity: 'toggle' } });
-	  
-	});
-
-$(document).ready(function() {
-		
-	
-	$("#info_evento").hide();
-	$("#dia_1").hide();
-	
-	
-	
-$("#hiddenMiddle").hide();
-$("#hiddenRight").hide();
-
-
-$(".menu > li").click(function(e){
-    var a = e.target.id;
-    //desactivamos seccion y activamos elemento de menu
-    $(".menu li.active").removeClass("active");
-    $(".menu #"+a).addClass("active");
-    //ocultamos divisiones, mostramos la seleccionada
-    $(".content_chat").css("display", "none");
-    $("."+a).fadeIn();
-});
-
-$('#wideViewMiddle').toggle(
-	function(){
-		$("#middleContent").hide();
-		$('#content').addClass("wideA");
-		$('#middle').addClass("wideA");
-		$('#right').addClass("wideA");
-		$('#chat').addClass("wideA");
-		$("#hiddenMiddle").show();
-		
-	},
-	function(){
-		$("#rightContent").hide();
-		$('#content').addClass("wideB");
-		$('#middle').addClass("wideB");
-		$('#right').addClass("wideB");
-		$('#chat').addClass("wideB");
-		$("#hiddenRight").show();
-	},
-	function(){
-		$("#hiddenRight").hide();
-		$('#content').removeClass("wideB");
-		$('#middle').removeClass("wideB");
-		$('#right').removeClass("wideB");
-		$('#chat').removeClass("wideB");
-		$("#rightContent").show();
-		
-	},	
-	function(){
-		$("#hiddenMiddle").hide();
-		$('#content').removeClass("wideA");
-		$('#middle').removeClass("wideA");
-		$('#right').removeClass("wideA");
-		$('#chat').removeClass("wideA");
-		$("#middleContent").show();
-	});
-});

data/lib/generators/social_stream/templates/public/javascripts/superfish.js

@@ -1,121 +0,0 @@
-
-/*
- * Superfish v1.4.8 - jQuery menu widget
- * Copyright (c) 2008 Joel Birch
- *
- * Dual licensed under the MIT and GPL licenses:
- * 	http://www.opensource.org/licenses/mit-license.php
- * 	http://www.gnu.org/licenses/gpl.html
- *
- * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
- */
-
-;(function($){
-	$.fn.superfish = function(op){
-
-		var sf = $.fn.superfish,
-			c = sf.c,
-			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
-			over = function(){
-				var $$ = $(this), menu = getMenu($$);
-				clearTimeout(menu.sfTimer);
-				$$.showSuperfishUl().siblings().hideSuperfishUl();
-			},
-			out = function(){
-				var $$ = $(this), menu = getMenu($$), o = sf.op;
-				clearTimeout(menu.sfTimer);
-				menu.sfTimer=setTimeout(function(){
-					o.retainPath=($.inArray($$[0],o.$path)>-1);
-					$$.hideSuperfishUl();
-					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
-				},o.delay);	
-			},
-			getMenu = function($menu){
-				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
-				sf.op = sf.o[menu.serial];
-				return menu;
-			},
-			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
-			
-		return this.each(function() {
-			var s = this.serial = sf.o.length;
-			var o = $.extend({},sf.defaults,op);
-			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
-				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
-					.filter('li:has(ul)').removeClass(o.pathClass);
-			});
-			sf.o[s] = sf.op = o;
-			
-			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
-				if (o.autoArrows) addArrow( $('>a:first-child',this) );
-			})
-			.not('.'+c.bcClass)
-				.hideSuperfishUl();
-			
-			var $a = $('a',this);
-			$a.each(function(i){
-				var $li = $a.eq(i).parents('li');
-				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
-			});
-			o.onInit.call(this);
-			
-		}).each(function() {
-			var menuClasses = [c.menuClass];
-			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
-			$(this).addClass(menuClasses.join(' '));
-		});
-	};
-
-	var sf = $.fn.superfish;
-	sf.o = [];
-	sf.op = {};
-	sf.IE7fix = function(){
-		var o = sf.op;
-		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
-			this.toggleClass(sf.c.shadowClass+'-off');
-		};
-	sf.c = {
-		bcClass     : 'sf-breadcrumb',
-		menuClass   : 'sf-js-enabled',
-		anchorClass : 'sf-with-ul',
-		arrowClass  : 'sf-sub-indicator',
-		shadowClass : 'sf-shadow'
-	};
-	sf.defaults = {
-		hoverClass	: 'sfHover',
-		pathClass	: 'overideThisToUse',
-		pathLevels	: 1,
-		delay		: 800,
-		animation	: {opacity:'show'},
-		speed		: 'normal',
-		autoArrows	: true,
-		dropShadows : true,
-		disableHI	: false,		// true disables hoverIntent detection
-		onInit		: function(){}, // callback functions
-		onBeforeShow: function(){},
-		onShow		: function(){},
-		onHide		: function(){}
-	};
-	$.fn.extend({
-		hideSuperfishUl : function(){
-			var o = sf.op,
-				not = (o.retainPath===true) ? o.$path : '';
-			o.retainPath = false;
-			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
-					.find('>ul').hide().css('visibility','hidden');
-			o.onHide.call($ul);
-			return this;
-		},
-		showSuperfishUl : function(){
-			var o = sf.op,
-				sh = sf.c.shadowClass+'-off',
-				$ul = this.addClass(o.hoverClass)
-					.find('>ul:hidden').css('visibility','visible');
-			sf.IE7fix.call($ul);
-			o.onBeforeShow.call($ul);
-			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
-			return this;
-		}
-	});
-
-})(jQuery);