muck-services 3.1.0 → 3.1.1

data/README.rdoc

@@ -18,11 +18,11 @@ Add routes
 Depending on which features you use from muck raker you may need to add additional routes to your application.  For example, 
 a user with include MuckServices::Models::MuckFeedParent and include MuckServices::Models::MuckFeedOwner the following routes would be required:
 
-  map.resources :users, :controller => 'muck/users' do |users|
+  resources :users, :controller => 'muck/users' do
     # have to map into the muck/identity_feeds controller or rails can't find the identity_feeds
-    users.resources :identity_feeds, :controller => 'muck/identity_feeds'
-    users.resources :feeds, :controller => 'muck/feeds'
-    users.resources :aggregations, :controller => 'muck/aggregations'
+    resources :identity_feeds, :controller => 'muck/identity_feeds'
+    resources :feeds, :controller => 'muck/feeds'
+    resources :aggregations, :controller => 'muck/aggregations'
   end
   
 == Usage

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/app/helpers/muck_services_helper.rb

@@ -61,25 +61,6 @@ module MuckServicesHelper
     end
   end
   
-  def round(flt)
-    return (((flt.to_f*100).to_i.round).to_f)/100.0
-  end
-
-  def truncate_on_word(text, length = 270, end_string = ' ...')
-    if text.length > length
-      stop_index = text.rindex(' ', length)
-      stop_index = length - 10 if stop_index < length-10
-      text[0,stop_index] + (text.length > 260 ? end_string : '')
-    else
-      text
-    end
-  end
-  
-  def truncate_words(text, length = 40, end_string = ' ...')
-    words = text.split()
-    words[0..(length-1)].join(' ') + (words.length > length ? end_string : '')
-  end
-  
   def feed_query_uri(feed)
     "/search/results?terms=feed_id:" + feed.id.to_s + "&locale=en"
   end

data/app/helpers/muck_services_service_helper.rb

@@ -3,12 +3,12 @@ module MuckServicesServiceHelper
   # Render a summary of all services for the given parent.  The parent should 'include MuckServices::Models::MuckFeedOwner' 
   def services_summary(parent)
     identity_feeds = parent.identity_feeds.find(:all, :include => [{:feed => :service}])
-    render :partial => 'services/summary', :locals => { :identity_feeds => identity_feeds }
+    render(:partial => 'services/summary', :locals => { :identity_feeds => identity_feeds }).html_safe
   end
 
   # Render personal recommendations
   def personal_recommendations(user, limit = 5)
-    render :partial => 'services/personal_recommendations', :locals => { :recommendations => user.personal_recommendations.limit(5) }
+    render(:partial => 'services/personal_recommendations', :locals => { :recommendations => user.personal_recommendations.limit(5) }).html_safe
   end
   
   # Render a view with all services in categories.
@@ -17,7 +17,7 @@ module MuckServicesServiceHelper
   # title: Optional title.  Default is 'Available Services' - from I18n.t('muck.services.available_services')
   # css: Optional css to be added to the div that surrounds the categories
   def available_service_categories(service_categories, title = nil, css = '')
-    render :partial => 'identity_feeds/available_service_categories', :locals => { :service_categories => service_categories, :css => css, :title => title }
+    render(:partial => 'identity_feeds/available_service_categories', :locals => { :service_categories => service_categories, :css => css, :title => title }).html_safe
   end
   
   # Render a view with the user's registered services.
@@ -26,7 +26,7 @@ module MuckServicesServiceHelper
   # title: Optional title.  Default is 'My Services' - from I18n.t('muck.services.my_services')
   # css: Optional css to be added to the div that surrounds the categories
   def services_for_user(identity_feeds, title = nil, css = '')
-    render :partial => 'identity_feeds/services_for_user', :locals => { :identity_feeds => identity_feeds, :css => css, :title => title, :edit => false }
+    render(:partial => 'identity_feeds/services_for_user', :locals => { :identity_feeds => identity_feeds, :css => css, :title => title, :edit => false }).html_safe
   end
   
   # Render an edit view with the user's registered services.
@@ -35,12 +35,12 @@ module MuckServicesServiceHelper
   # title: Optional title.  Default is 'My Services' - from I18n.t('muck.services.my_services')
   # css: Optional css to be added to the div that surrounds the categories
   def services_for_user_edit(identity_feeds, title = nil, css = '')
-    render :partial => 'identity_feeds/services_for_user', :locals => { :identity_feeds => identity_feeds, :css => css, :title => title, :edit => true }
+    render(:partial => 'identity_feeds/services_for_user', :locals => { :identity_feeds => identity_feeds, :css => css, :title => title, :edit => true }).html_safe
   end
 
   # Renders name and icon for the service
   def service_title(service)
-    %Q{<div class="identity-service-title" #{service_icon_background(service)}>#{service_prompt(service)}</div>}
+    %Q{<div class="identity-service-title" #{service_icon_background(service)}>#{service_prompt(service)}</div>}.html_safe
   end
     
   # By default renders Service username e.g. Flickr username
@@ -52,9 +52,9 @@ module MuckServicesServiceHelper
   # muck.services.facebook_prompt: "%{service} Feeds"
   def service_prompt(service)
     if @service.prompt.blank?
-      I18n.t('muck.services.service_username', :service => @service.name)
+      I18n.t('muck.services.service_username', :service => @service.name).html_safe
     else
-      I18n.t("muck.services.#{@service.prompt}", :service => @service.name)
+      I18n.t("muck.services.#{@service.prompt}", :service => @service.name).html_safe
     end
   end
   
@@ -79,18 +79,18 @@ module MuckServicesServiceHelper
   
   # Renders a delete button for an identity_feed
   def service_delete(identity_feed, button_type = :button, button_text = t("muck.general.delete"))
-    render :partial => 'shared/delete', :locals => { :delete_object => identity_feed, 
+    render(:partial => 'shared/delete', :locals => { :delete_object => identity_feed, 
                                                      :button_type => button_type,
                                                      :button_text => button_text,
                                                      :form_class => 'identity-feed-delete',
-                                                     :delete_path => identity_feed_path(identity_feed, :format => 'js') }
+                                                     :delete_path => identity_feed_path(identity_feed, :format => 'js') }).html_safe
   end
   
   # Renders a service link optionally wrapping it in the specified element
   def service_link(path, service, link_css, wrapper, link_text = nil, target = nil, id = nil)
-    link = %Q{<a #{'id=' + id if id} href="#{path}" #{service_icon_background(service)} #{'target=' + target if target} class="service-link #{link_css}">#{link_text || service.name}</a>}
+    link = %Q{<a #{'id=' + id if id} href="#{path}" #{service_icon_background(service)} #{'target=' + target if target} class="service-link #{link_css}">#{link_text || service.name}</a>}.html_safe
     if wrapper
-      content_tag wrapper, link, :class => 'identity-service' 
+      content_tag(wrapper, link, :class => 'identity-service').html_safe
     else
       link
     end
@@ -98,9 +98,9 @@ module MuckServicesServiceHelper
   
   def url_by_identity_feed(owner, identity_feed, service)
     if identity_feed
-      polymorphic_url([owner, identity_feed], :service_id => service.to_param)
+      polymorphic_url([owner, identity_feed], :service_id => service.to_param).html_safe
     else
-      polymorphic_url([owner, :identity_feeds], :service_id => service.to_param)
+      polymorphic_url([owner, :identity_feeds], :service_id => service.to_param).html_safe
     end
   end
   

data/app/views/identity_feeds/_available_service_categories.html.erb

@@ -5,7 +5,7 @@
       <div id="<%= service_category.dom_id %>" class="service-category">
         <h3><%= service_category.name %></h3>
         <ul id="services-list" class="services-list">
-          <%= render :partial => 'services/new_service', :collection => service_category.identity_services %>
+          <%= render(:partial => 'services/new_service', :collection => service_category.identity_services).html_safe %>
         </ul>
       </div>
     <% end -%>

data/app/views/identity_feeds/_services_for_user.html.erb

@@ -2,9 +2,9 @@
   <h2><%= title || I18n.t('muck.services.my_services') %></h2>
   <ul id="my-services-list" class="services-list">
     <% if edit -%>
-      <%= render :partial => 'services/edit_service', :collection => identity_feeds %>
+      <%= render(:partial => 'services/edit_service', :collection => identity_feeds) %>
     <% else -%>
-      <%= render :partial => 'services/view_service', :collection => identity_feeds %>
+      <%= render(:partial => 'services/view_service', :collection => identity_feeds) %>
     <% end -%>
   </ul>
 </div>

data/app/views/services/_new_service.html.erb

@@ -1 +1 @@
-<%= service_lightbox(@parent, new_service) %>
+<%= service_lightbox(@parent, new_service).html_safe %>

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2010-11-18}
+  s.date = %q{2011-01-28}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Joel Duffin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -07:00
+date: 2011-01-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency