@@ -2,6 +2,7 @@ Edge ---- * Replaced own sharing code by acts_as_shareable plugin. Please, install acts_as_shareable and it's migration before running plugins migrations. +* Acts_as_state_machine code replaced by AASM gem 0.5.4 ---- CHANGELOG.md @@ -14,7 +14,7 @@ class Member::GroupsController < Member::BaseController @group.save @group.join(current_user, true) - @group.activate_membership(current_user) +# @group.activate_membership(current_user) if @group.errors.empty? if current_user.admin == true || Tog::Config['plugins.tog_social.group.moderation.creation'] != true app/controllers/member/groups_controller.rb @@ -43,10 +43,12 @@ class Group < ActiveRecord::Base acts_as_taggable seo_urls - acts_as_state_machine :initial => :pending - state :pending, :enter => :make_activation_code - state :active, :enter => :do_activate - event :activate do + include AASM + aasm_column :state + aasm_initial_state :pending + aasm_state :pending, :enter => :make_activation_code + aasm_state :active, :enter => :do_activate + aasm_event :activate do transitions :from => :pending, :to => :active end @@ -143,7 +145,7 @@ class Group < ActiveRecord::Base def do_activate self.activated_at = Time.now.utc self.activation_code = nil - self.moderator_memberships.each{|mod| mod.activate!} + self.moderator_memberships.each{|mod| mod.activate! unless mod.active?} end def set_default_image app/models/group.rb @@ -5,17 +5,20 @@ class Membership < ActiveRecord::Base record_activity_of :user - acts_as_state_machine :initial => :pending - state :pending, :enter => :make_activation_code - state :active, :enter => :do_activate - state :invited - event :activate do + include AASM + aasm_column :state + aasm_initial_state :pending + aasm_state :pending, :enter => :make_activation_code + aasm_state :active, :enter => :do_activate + aasm_state :invited + + aasm_event :activate do transitions :from => :pending, :to => :active end - event :invite do + aasm_event :invite do transitions :from => :pending, :to => :invited end - event :accept_invitation do + aasm_event :accept_invitation do transitions :from => :invited, :to => :active end app/models/membership.rb @@ -3,7 +3,7 @@ resources :profiles -resources :streams, :only => [:index, :show] +resources :streams, :only => [:index, :show], :member => {:network => :get} with_options(:controller => 'groups') do |group| group.tag_groups '/groups/tag/:tag', :action => 'tag' @@ -27,10 +27,10 @@ namespace(:member) do |member| friendship.unfollow_user '/unfollow/:friend_id', :action => 'unfollow' end member.with_options(:controller => 'sharings') do |sharing| - sharing.share '/sharings/share/:group_id/:shareable_type/:shareable_id', :action => 'create', :method => :post + sharing.share '/sharings/share/:group_id/:shareable_type/:shareable_id', :action => 'create', :conditions => { :method => :post } sharing.new_sharing '/sharings/:shareable_type/:shareable_id/new', :action => 'new' sharing.sharings '/sharings', :action => 'index' - sharing.destroy_sharing '/sharings/:group_id/:id', :action => 'destroy', :method => :delete + sharing.destroy_sharing '/sharings/:group_id/:id', :action => 'destroy', :conditions => { :method => :delete } # sharing.destroy_sharing '/group/:id/remove/:shareable_type/:shareable_id', :action => 'destroy', :method => :delete end end config/desert_routes.rb @@ -1,5 +1,5 @@ require_plugin 'tog_core' -require_plugin 'acts_as_state_machine' +#require_plugin 'acts_as_state_machine' require_plugin 'seo_urls' require_plugin 'paperclip' require_plugin 'acts_as_shareable' init.rb @@ -17,6 +17,20 @@ class Member::SharingsControllerTest < ActionController::TestCase @pornfans = Factory(:group, :name => 'Porn without frontiers', :moderated => false, :author => @berlusconi) end + + context "can GET his sharings" do + setup do + @pornfans.join(@berlusconi, true) + @sharing = @pornfans.share(@berlusconi, @berlusconi.profile.class.to_s, @berlusconi.profile.id) + get :index + end + + should_assign_to :sharings + + should "include all his sharings" do + assert assigns(:sharings).include?(@sharing) + end + end context "member of a group" do setup do test/functional/member/sharings_controller_test.rb 71db775a72fdd00d2101a70d9667f87a61f7c57a molpe alberto.molpeceres@gmail.com http://github.com/tog/tog_social/commit/baf89720352517842dafb66fb8bc2e4182930cbb baf89720352517842dafb66fb8bc2e4182930cbb 2009-10-21T06:41:45-07:00 2009-10-21T06:41:45-07:00 upgrading to AASM d2d779434bcc62b09f6e8e7f8a0190f743c5d73b molpe alberto.molpeceres@gmail.com