openproject-meeting 3.0.2 → 3.0.3

data/spec/factories/meeting_minutes_factory.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 FactoryGirl.define do

data/spec/factories/meeting_participant_factory.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 FactoryGirl.define do

data/spec/mailers/meeting_mailer_spec.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 require File.dirname(__FILE__) + '/../spec_helper'

data/spec/models/meeting_agenda_spec.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 require File.dirname(__FILE__) + '/../spec_helper'
@@ -15,7 +23,7 @@ describe "MeetingAgenda" do
   before(:each) do
     @a = FactoryGirl.build :meeting_agenda, :text => "Some content...\n\nMore content!\n\nExtraordinary content!!"
   end
-  
+
   # TODO: Test the right user and messages are set in the history
   describe "#lock!" do
     it "locks the agenda" do
@@ -26,7 +34,7 @@ describe "MeetingAgenda" do
       @a.locked.should be_true
     end
   end
-  
+
   describe "#unlock!" do
     it "unlocks the agenda" do
       @a.locked = true
@@ -37,7 +45,7 @@ describe "MeetingAgenda" do
       @a.locked.should be_false
     end
   end
-  
+
   # a meeting agenda is editable when it is not locked
   describe "#editable?" do
     it "is editable when not locked" do

data/spec/models/meeting_content_journal_spec.rb

@@ -0,0 +1,30 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
+#++
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'journal/meeting_content_journal'
+
+describe Journal do
+  include PluginSpecHelper
+
+  let(:journal) { FactoryGirl.build(:meeting_content_journal) }
+
+  it_should_behave_like "customized journal class"
+end

data/spec/models/meeting_minutes_spec.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 require File.dirname(__FILE__) + '/../spec_helper'

data/spec/models/meeting_spec.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 require File.dirname(__FILE__) + '/../spec_helper'

data/spec/models/user_deletion_spec.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 require File.dirname(__FILE__) + '/../spec_helper'
@@ -17,12 +25,6 @@ describe User, "#destroy" do
   let(:substitute_user) { DeletedUser.first }
   let(:project) do
     project = FactoryGirl.create(:valid_project)
-#    FactoryGirl.create(:member, :project => project,
-#                            :user => user,
-#                            :roles => [FactoryGirl.build(:role)])
-#    FactoryGirl.create(:member, :project => project,
-#                            :user => user2,
-#                            :roles => [FactoryGirl.build(:role)])
     project
   end
 
@@ -66,13 +68,13 @@ describe User, "#destroy" do
     it { associated_instance.journals.first.user.should == user2 }
     it "should update first journal changes" do
       associations.each do |association|
-        associated_instance.journals.first.changed_data[association.to_s + "_id"].last.should == user2.id
+        associated_instance.journals.first.changed_data[(association.to_s + "_id").to_sym].last.should == user2.id
       end
     end
     it { associated_instance.journals.last.user.should == substitute_user }
     it "should update second journal changes" do
       associations.each do |association|
-        associated_instance.journals.last.changed_data[association.to_s + "_id"].last.should == substitute_user.id
+        associated_instance.journals.last.changed_data[(association.to_s + "_id").to_sym].last.should == substitute_user.id
       end
     end
   end
@@ -105,14 +107,14 @@ describe User, "#destroy" do
     it { associated_instance.journals.first.user.should == substitute_user }
     it "should update the first journal" do
       associations.each do |association|
-        associated_instance.journals.first.changed_data[association.to_s + "_id"].last.should == substitute_user.id
+        associated_instance.journals.first.changed_data[(association.to_s + "_id").to_sym].last.should == substitute_user.id
       end
     end
     it { associated_instance.journals.last.user.should == user2 }
     it "should update the last journal" do
       associations.each do |association|
-        associated_instance.journals.last.changed_data[association.to_s + "_id"].first.should == substitute_user.id
-        associated_instance.journals.last.changed_data[association.to_s + "_id"].last.should == user2.id
+        associated_instance.journals.last.changed_data[(association.to_s + "_id").to_sym].first.should == substitute_user.id
+        associated_instance.journals.last.changed_data[(association.to_s + "_id").to_sym].last.should == user2.id
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 # -- load spec_helper from OpenProject core

data/spec/support/plugin_spec_helper.rb

@@ -1,47 +1,39 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 module PluginSpecHelper
   shared_examples_for "customized journal class" do
     describe :save do
       let(:text) { "Lorem ipsum" }
-      let(:changed_data) { { "text" => [text] } }
+      let(:changed_data) { { :text => [nil, text] } }
 
       describe "WITHOUT compression" do
         before do
-          journal.changed_data = changed_data
+          #we have to save here because changed_data will update (and save) attributes and miss an ID
           journal.save!
-
-          journal.reload
-        end
-
-        it { journal.changed_data["data"].should == text }
-        it { journal.changed_data["compression"].should be_blank }
-      end
-
-      describe "WITH gzip compression" do
-        before do
-          Setting.stub(:wiki_compression).and_return("gzip")
-
           journal.changed_data = changed_data
-          journal.save!
 
           journal.reload
         end
 
-        it { journal.changed_data["data"].should == Zlib::Deflate.deflate(text, Zlib::BEST_COMPRESSION) }
-        it { journal.changed_data["compression"].should == Setting.wiki_compression }
+        it { journal.changed_data[:text][1].should == text }
       end
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openproject-meeting
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Finn GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,7 +60,7 @@ files:
 - app/controllers/meeting_agendas_controller.rb
 - app/controllers/meeting_minutes_controller.rb
 - app/views/shared/_meeting_header.html.erb
-- app/views/hooks/_activity_index_head.html.erb
+- app/views/hooks/meetings/_activity_index_head.html.erb
 - app/views/meeting_contents/_show.html.erb
 - app/views/meeting_contents/show.html.erb
 - app/views/meeting_contents/history.html.erb
@@ -75,19 +75,25 @@ files:
 - app/views/meetings/_form.html.erb
 - app/models/meeting_content.rb
 - app/models/meeting_participant.rb
+- app/models/journal/meeting_journal.rb
+- app/models/journal/meeting_content_journal.rb
 - app/models/meeting_minutes.rb
 - app/models/meeting.rb
 - app/models/meeting_agenda.rb
 - config/routes.rb
 - config/locales/de.yml
 - config/locales/en.yml
+- db/migrate/20130822113942_create_meeting_journals.rb
 - db/migrate/20110819162852_create_initial_meeting_journals.rb
 - db/migrate/20130731151542_remove_meeting_role_id_from_meeting_participants.rb
+- db/migrate/20130924091342_legacy_meeting_journal_data.rb
 - db/migrate/20110106221946_create_meeting_content_versions.rb
 - db/migrate/20110224180804_add_lock_to_meeting_content.rb
 - db/migrate/20110106210555_create_meetings.rb
 - db/migrate/20111605171815_merge_meeting_content_versions_with_journals.rb
+- db/migrate/20130924093842_legacy_meeting_agenda_journal_data.rb
 - db/migrate/20110108230721_create_meeting_participants.rb
+- db/migrate/20130924114042_legacy_meeting_minutes_journal_data.rb
 - db/migrate/20110106221214_create_meeting_contents.rb
 - lib/openproject-meeting.rb
 - lib/open_project/meeting/version.rb
@@ -95,7 +101,8 @@ files:
 - lib/open_project/meeting/hooks.rb
 - lib/open_project/meeting/patches/project_patch.rb
 - lib/open_project/meeting.rb
-- doc/COPYRIGHT.rdoc
+- doc/COPYRIGHT.md
+- doc/COPYRIGHT_short.md
 - doc/GPL.txt
 - CHANGELOG.md
 - README.md
@@ -103,18 +110,17 @@ files:
 - spec/support/plugin_spec_helper.rb
 - spec/mailers/meeting_mailer_spec.rb
 - spec/controllers/meetings_controller_spec.rb
-- spec/models/meeting_minutes_journal_spec.rb
 - spec/models/user_deletion_spec.rb
-- spec/models/meeting_agenda_journal_spec.rb
 - spec/models/meeting_minutes_spec.rb
 - spec/models/meeting_agenda_spec.rb
+- spec/models/meeting_content_journal_spec.rb
 - spec/models/meeting_spec.rb
 - spec/factories/meeting_participant_factory.rb
-- spec/factories/meeting_agenda_journal_factory.rb
-- spec/factories/meeting_minutes_journal_factory.rb
 - spec/factories/meeting_agenda_factory.rb
 - spec/factories/meeting_factory.rb
 - spec/factories/meeting_minutes_factory.rb
+- spec/factories/meeting_journal_factory.rb
+- spec/factories/meeting_content_journal_factory.rb
 homepage: https://www.openproject.org/projects/plugin-meetings
 licenses:
 - GPLv3
@@ -135,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: This OpenProject plugin adds a meeting module with functionality to plan
@@ -145,16 +151,15 @@ test_files:
 - spec/support/plugin_spec_helper.rb
 - spec/mailers/meeting_mailer_spec.rb
 - spec/controllers/meetings_controller_spec.rb
-- spec/models/meeting_minutes_journal_spec.rb
 - spec/models/user_deletion_spec.rb
-- spec/models/meeting_agenda_journal_spec.rb
 - spec/models/meeting_minutes_spec.rb
 - spec/models/meeting_agenda_spec.rb
+- spec/models/meeting_content_journal_spec.rb
 - spec/models/meeting_spec.rb
 - spec/factories/meeting_participant_factory.rb
-- spec/factories/meeting_agenda_journal_factory.rb
-- spec/factories/meeting_minutes_journal_factory.rb
 - spec/factories/meeting_agenda_factory.rb
 - spec/factories/meeting_factory.rb
 - spec/factories/meeting_minutes_factory.rb
+- spec/factories/meeting_journal_factory.rb
+- spec/factories/meeting_content_journal_factory.rb
 has_rdoc: