muck-activities 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/app/controllers/muck/activities_controller.rb

@@ -72,9 +72,7 @@ class Muck::ActivitiesController < ApplicationController
         redirect_back_or_default(@parent)
       end
       format.js do
-        render :update do |page|
-          page_alert(page, message)
-        end
+        render :text => message
       end
       format.json do
         render :json => { :success => false,

data/app/helpers/muck_activity_helper.rb

@@ -59,9 +59,12 @@ module MuckActivityHelper
   end
   
   # Renders an activity feed filter.  Filter items come from the name of the templates used to render the activities.
-  def activity_filter(activities_object)
+  # Pass in an array of templates to leave out as the second parameter
+  def activity_filter(activities_object, *dont_include)
+    dont_include = [dont_include] unless dont_include.is_a?(Array)
     activity_types = activities_object.activities.all(:select => "DISTINCT activities.template")
-    render :partial => 'activities/template_filter', :locals => { :activity_types => activity_types }
+    filter_types = activity_types.find_all {|activity| !dont_include.include?(activity.template)}
+    render :partial => 'activities/template_filter', :locals => { :activity_types => filter_types, :dont_include => dont_include }
   end
 
   def is_current_filter?(template)

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

@@ -1,9 +1,9 @@
 <div id="status-update">
   <%= output_errors(t('muck.users.problem_with_status'), {:class => 'help-box'}, @activity) %>
   <% remote_form_for(:activity, 
-                     :url => activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :format => 'js'), 
+                     :url => activities_path(:parent_id => activities_object, :parent_type => activities_object.class, :format => 'js'), 
                      :html => { :id => 'status_update_form', :class => 'clear',
-                                :action => activities_path(:parent_id => activities_object, :parent_type => activities_object.type) } ) do |f| -%>
+                                :action => activities_path(:parent_id => activities_object, :parent_type => activities_object.class) } ) do |f| -%>
     <div id="progress-bar" style="display:none;">
       <h3><%= t('muck.activities.updating_status_message') %></h3>
       <img src="/images/loading.gif" alt="progress bar">

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

@@ -1,6 +1,7 @@
 <ul id="activity-filter">
   <li class="all-activities <%=no_filter?%>"><a href="<%=all_activities_url%>"><%=t('muck.activities.all_activities')%></a></li>
   <% activity_types.each do |type| -%>
+    <% continue if dont_include.include?(type) %>
     <li class="<%= type.template%> <%=is_current_filter?(type.template)%>"><a href="?activity_filter=<%= type.template%>"><%= t("muck.activity_templates.#{type.template}") %></a></li>
   <% end -%>
 </ul>

data/lib/active_record/acts/muck_activity.rb

@@ -17,13 +17,13 @@ module ActiveRecord
 
           validates_presence_of :source
 
-          named_scope :since, lambda { |time| {:conditions => ["activities.created_at > ?", time] } }
-          named_scope :before, lambda {|time| {:conditions => ["activities.created_at < ?", time] } }
+          named_scope :since, lambda { |time| {:conditions => ["activities.created_at > ?", time || DateTime.now] } }
+          named_scope :before, lambda { |time| {:conditions => ["activities.created_at < ?", time || DateTime.now] } }
           named_scope :newest, :order => "activities.created_at DESC"
-          named_scope :after, lambda {|id| {:conditions => ["activities.id > ?", id] } }
+          named_scope :after, lambda { |id| {:conditions => ["activities.id > ?", id] } }
           named_scope :only_public, :conditions => ["activities.is_public = true"]
           named_scope :filter_by_template, lambda { |template| { :conditions => ["activities.template = ?", template] } unless template.blank? }
-          named_scope :created_by, lambda {|activity_object| {:conditions => ["activities.source_id = ? AND activities.source_type = ?", activity_object.id, activity_object.class.to_s] } }
+          named_scope :created_by, lambda { |activity_object| {:conditions => ["activities.source_id = ? AND activities.source_type = ?", activity_object.id, activity_object.class.to_s] } }
           named_scope :status_updates, :conditions => ["activities.is_status_update = ?", true]
           class_eval <<-EOV
             attr_protected :created_at, :updated_at

data/locales/et.yml

@@ -20,7 +20,7 @@ et:
       post: Jagama
       problem_with_status: "Probleem, muutes oma staatust"
       status_indicator: "on"
-      status_update_prompt: "Mida tehes kohe?"
+      status_update_prompt: "Mida sa teed praegu?"
       template_or_item_required: "Tegevust on vaja malli või objekti kuvada õigesti"
       time_ago: "{{time_in_words}} Tagasi"
       update_error: "Oih ... Oli probleem. {{errors}}"

data/locales/lt.yml

@@ -11,7 +11,7 @@ lt:
       invite_friends: "Pakviesti draugų"
       item_could_not_be_removed: "Punktas negali būti pašalinta iš paskutinių veiklos sąrašas."
       item_created: "Pridėta veikla"
-      item_removed: "Prekė sėkmingai pašalinta iš paskutinių veiklos sąrašas."
+      item_removed: "Prekė sėkmingai pašalintas iš paskutinių veiklos sąrašas."
       joined_status: "{{name}} joined {{application_name}}"
       make_comment: Komentaras
       paging_newer: «Naujesni

data/locales/mt.yml

@@ -24,7 +24,7 @@ mt:
       template_or_item_required: "Attività teħtieġ template jew oġġett li jintwerew b'mod korrett"
       time_ago: "{{time_in_words}} Ilu"
       update_error: "Oops ... Kien hemm problema. {{errors}}"
-      update_status_message: "update tiegħek status!"
+      update_status_message: "update-istatus tieg ¢ ek!"
       updating_status_message: "Aġġornament istat tiegħek. Jekk jogħġbok stenna."
       write_prompt: "Write kumment ..."
     activity_templates: 

data/locales/sl.yml

@@ -24,7 +24,7 @@ sl:
       template_or_item_required: "Dejavnost zahteva predlogo ali predmeta na zaslonu pravilno"
       time_ago: "{{time_in_words}} Ago"
       update_error: "Ups ... Prišlo je do težave. {{errors}}"
-      update_status_message: "posodobite svoj status!"
+      update_status_message: "Posodobite svoje stanje!"
       updating_status_message: "Posodabljanje vaše stanje. Prosim počakajte."
       write_prompt: "Napišite komentar ..."
     activity_templates: 

data/muck-activities.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activities}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]

data/test/rails_root/config/environment.rb

@@ -17,7 +17,7 @@ Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem 'mislav-will_paginate', :lib => 'will_paginate', :source => 'http://gems.github.com'
   config.gem "authlogic"
-  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com', :version => '~> 2.0.0'
+  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com'
   config.gem "bcrypt-ruby", :lib => "bcrypt"
   config.gem "collectiveidea-awesome_nested_set", :lib => 'awesome_nested_set', :source => "http://gems.github.com"
   config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"

data/test/rails_root/test/functional/activities_controller_test.rb

@@ -19,14 +19,14 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
     
       context 'on GET to index (js)' do
         setup do
-          get :index, :parent_type => @user.type, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
+          get :index, :parent_type => @user.class, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
         end
         should_respond_with :success
       end
 
       context 'on GET to index (js) no latest activity id' do
         setup do
-          get :index, :parent_type => @user.type, :parent_id => @user, :format => 'js', :latest_activity_id => nil
+          get :index, :parent_type => @user.class, :parent_id => @user, :format => 'js', :latest_activity_id => nil
         end
         should_respond_with :success
       end
@@ -34,7 +34,7 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
 
     context 'fail on POST to create (json)' do
       setup do
-        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.type, :parent_id => @user, :format => 'json'
+        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.class.to_s, :parent_id => @user, :format => 'json'
       end      
       should_respond_with :success
       should_not_set_the_flash
@@ -48,7 +48,7 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
     context 'on POST to create (json)' do
       setup do
         @activity_content = 'test content for my new activity'
-        post :create, :activity => { :content => @activity_content, :template => 'status_update' }, :parent_type => @user.type, :parent_id => @user, :format => 'json'
+        post :create, :activity => { :content => @activity_content, :template => 'status_update' }, :parent_type => @user.class, :parent_id => @user, :format => 'json'
       end      
       should_respond_with :success
       should_not_set_the_flash
@@ -63,7 +63,7 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
        
     context 'on POST to create (js)' do
       setup do
-        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.type, :parent_id => @user, :format => 'js'
+        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.class, :parent_id => @user, :format => 'js'
       end      
       should_respond_with :success
       should_not_set_the_flash
@@ -71,7 +71,7 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
      
     context 'on POST to create' do
       setup do
-        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.type, :parent_id => @user
+        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.class, :parent_id => @user
       end      
       should_redirect_to('show user page (user dashboard)') { @user }
     end

data/test/rails_root/test/functional/default_controller_test.rb

@@ -7,14 +7,15 @@ class DefaultControllerTest < ActionController::TestCase
   context "default controller" do
     setup do
       activate_authlogic
-      @user = Factory(:user)
+      @user = Factory(:user)      
       login_as @user
     end
 
     context 'on GET to index' do
-      # the default view calls some of the helpers
-      # this is a sanity check to make sure they don't blow up
+      # The default view calls the helpers.  This isn't a great test but
+      # it will make sure they don't blow up
       setup do
+        @user.activities << Factory(:activity,  :template => 'status_update')
         @user.activities << Factory(:activity,  :template => 'status_update')
         get :index
       end

data/test/rails_root/test/unit/activity_test.rb

@@ -11,15 +11,42 @@ class ActivityTest < ActiveSupport::TestCase
     should_have_many :activity_feeds
     should_have_many :comments
     
-    should_have_named_scope :since
-    should_have_named_scope :before
     should_have_named_scope :newest
     should_have_named_scope :only_public
-    should_have_named_scope :filter_by_template
     should_have_named_scope :status_updates
     
   end
 
+  context "named scopes" do
+    setup do
+      @old_activity = Factory(:activity, :created_at => 6.weeks.ago)
+      @new_activity = Factory(:activity)
+      @status_activity = Factory(:activity, :template => 'status')
+      @other_activity = Factory(:activity, :template => 'other')
+    end
+    context "before" do
+      should "only find old activity" do
+        activities = Activity.before(1.week.ago)
+        assert activities.include?(@old_activity), "since didn't find older activity"
+        assert !activities.include?(@new_activity), "since found new activity"
+      end
+    end
+    context "since" do
+      should "only find new activity" do
+        activities = Activity.since(1.week.ago)
+        assert !activities.include?(@old_activity), "since found older activity"
+        assert activities.include?(@new_activity), "since didn't find new activity"
+      end
+    end
+    context "filter_by_template" do
+      should "only find status template" do
+        activities = Activity.filter_by_template('status')
+        assert activities.include?(@status_activity), "since didn't find status activity"
+        assert !activities.include?(@other_activity), "since found other activity"
+      end
+    end
+  end
+
   should "require template or item" do
     activity = Factory.build(:activity, :template => nil, :item => nil)
     assert !activity.valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activities
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Justin Ball