droom 0.4.3 → 0.5.3

data/spec/factories/documents.rb

@@ -7,10 +7,5 @@ FactoryGirl.define do
     factory :grouped do
       name "Grouped Document"
     end
-
-    factory :public_document do
-      name "Public Document"
-      public true
-    end
   end
 end

data/spec/factories/events.rb

@@ -14,15 +14,6 @@ FactoryGirl.define do
       finish "2009-11-03 18:30:00"
     end
     
-    factory :repeating_event do
-      name "Repeating Event"
-      start "2009-11-03 18:30:00"
-      finish "2009-11-03 20:00:00"
-      after(:create) { |event|
-        event.recurrence_rules.create(:period => "weekly", :interval => "1", :basis => 'count', :limiting_count => "4")
-      }
-    end
-
     factory :spanning_event do
       name "Simple Event"
       start "2009-11-03 09:00:00"

data/spec/factories/user.rb

@@ -1,6 +1,8 @@
 FactoryGirl.define do
   factory :user, :class => Droom::User do
-    name "Will"
-    email "will@spanner.org"
+    sequence(:name) {|n|  "User#{n} Smith"}
+    password "Passw0rd"
+    password_confirmation "Passw0rd"
+    sequence(:email) {|n| "user#{n}.smith@spanner.org" }
   end
 end

data/spec/lib/droom/folders_spec.rb

@@ -4,13 +4,13 @@ describe Droom::Folders do
   context "model with has_folder" do
     before :each do
       build_model :cabinet do
-        attr_accessible :slug
-        has_many :draws
+        #attr_accessible :slug
+        has_many :drawers
         string :slug
         has_folder
       end
-      build_model :draw do
-        attr_accessible :slug
+      build_model :drawer do
+        #attr_accessible :slug
         belongs_to :cabinet
         integer :cabinet_id
         string :slug
@@ -36,10 +36,10 @@ describe Droom::Folders do
       @cabinet.documents.first.folder_id.should eq @cabinet.folder.id
     end
     it "adding document to child model should create a subfolder of the parent model's folder" do
-      @draw = @cabinet.draws.create(:slug => "draw")
-      @draw.receive_document(@document)
-      @draw.folder.parent_id.should_not be_nil
-      @draw.folder.parent_id.should eq @cabinet.folder.id
+      @drawer = @cabinet.drawers.create(:slug => "drawer")
+      @drawer.receive_document(@document)
+      @drawer.folder.parent_id.should_not be_nil
+      @drawer.folder.parent_id.should eq @cabinet.folder.id
     end
   end
 

data/spec/models/droom/document_spec.rb

@@ -2,73 +2,36 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Droom::Document, :solr => true do
 
-  context "Housekeeping:" do
-    before :each do
-      @document = FactoryGirl.create(:document)
-    end
-
-    describe "on creation" do
-      it "should get a version number of 1" do
-        @document.version.should == 1
-      end
-    end
-
-    describe "on update" do
-      describe "if its file has changed" do
-        it "should trigger a version update" do
-          @document.file = Rack::Test::UploadedFile.new(Droom::Engine.root() + 'spec/fixtures/images/frog.png', 'image/png')
-          @document.save
-          @document.version.should == 2
-        end
-      end
-
-      describe "if its file has not changed" do
-        it "should not trigger a version update" do
-          @document.name = "something else"
-          @document.save
-          @document.version.should == 1
-        end
-      end
-    end
-  end
-
   context "Visibility:" do
     before :each do
       @document = FactoryGirl.create(:document)
-      @public_document = FactoryGirl.create(:public_document)
-      @person = FactoryGirl.create(:person)
+      @user = FactoryGirl.create(:user)
       @event = FactoryGirl.create(:simple_event)
     end
 
     it "should not be visible to unlinked people" do
-      Droom::Document.visible_to(@person).should_not include(@document)
-    end
-
-    describe "when public" do
-      it "should be visible to unlinked people" do
-        Droom::Document.visible_to(@person).should include(@public_document)
-      end
+      Droom::Document.visible_to(@user).should_not include(@document)
     end
 
     describe "when linked" do
       before do
         @document.attach_to(@event)
-        @invitation = @person.invite_to(@event)
+        @invitation = @user.invite_to(@event)
       end
 
       it "should be visible to linked people" do
         pending "change to rules on who can see what"
-        Droom::Document.visible_to(@person).should include(@document)
+        Droom::Document.visible_to(@user).should include(@document)
       end
 
       it "should become invisible when people are deinvited" do
         @invitation.destroy
-        Droom::Document.visible_to(@person).should_not include(@document)
+        Droom::Document.visible_to(@user).should_not include(@document)
       end
 
       it "should become invisible when detached" do
         @document.detach_from(@event)
-        Droom::Document.visible_to(@person).should_not include(@document)
+        Droom::Document.visible_to(@user).should_not include(@document)
       end
     end
 

data/spec/models/droom/event_spec.rb

@@ -78,40 +78,6 @@ describe Droom::Event, :solr => true do
     it "should not be marked as all day" do
       @event.all_day?.should be_false
     end
-    
-    it "should have a recurrence rule" do
-      @event.recurrence_rules.should_not be_empty
-      @event.recurrence_rules.first.period.should == 'weekly'
-      @event.recurrence_rules.first.interval.should == 1
-      @event.recurrence_rules.first.limiting_count.should == 4
-    end
-    
-    it "should have occurrences" do
-      @event.occurrences.should_not be_empty
-    end
-    
-    describe "recurring" do
-      before do
-        @occurrence = @event.occurrences.last
-      end
-      
-      it "should have the right master" do
-        @occurrence.master.should == @event
-      end
-      
-      it "should resemble its master in most ways" do
-        [:name, :description, :venue, :url, :duration].each do |att|
-          @occurrence.send(att).should == @event.send(att)
-        end
-      end
-      
-      it "should have a different date and uuid" do
-        [:start, :finish, :uuid].each do |att|
-          @occurrence.send(att).should_not == @event.send(att)
-        end
-      end
-
-    end
   end
 
   describe "retrieval" do

data/spec/models/droom/mailing_list_membership_spec.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Droom::MailingListMembership do
   before :each do
-    @person = FactoryGirl.create(:person)
+    @user = FactoryGirl.create(:user)
     @group = FactoryGirl.create(:group)
-    @membership = FactoryGirl.create(:membership, :person => @person, :group => @group)
+    @membership = FactoryGirl.create(:membership, :user => @user, :group => @group)
     @mlm = @membership.mailing_list_membership
   end
   
@@ -18,9 +18,9 @@ describe Droom::MailingListMembership do
       @mlm.membership.should_not be_nil
       @mlm.membership.should eq @membership
     end
-    it "should get an address from the membership's person" do
+    it "should get an address from the membership's user" do
       @mlm.address.should_not be_nil
-      @mlm.address.should eq @person.email
+      @mlm.address.should eq @user.email
     end
     it "should get a listname from the membership's group" do
       @mlm.listname.should_not be_nil

data/spec/models/droom/membership_spec.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Droom::Membership do
   before :each do
-    @person = FactoryGirl.create(:person)
+    @user = FactoryGirl.create(:user)
     @group = FactoryGirl.create(:group)
-    @membership = FactoryGirl.create(:membership, :person => @person, :group => @group)
+    @membership = FactoryGirl.create(:membership, :user => @user, :group => @group)
   end
   
   context "on creation" do

data/spec/spec_helper.rb

@@ -15,7 +15,6 @@ Spork.prefork do
   require 'factory_girl_rails'
   require 'database_cleaner'
   require 'awesome_print'
-  require 'sunspot-rails-tester'
   require 'shoulda-matchers'
   require 'acts_as_fu'
 
@@ -25,7 +24,6 @@ Spork.prefork do
   # in spec/support/ and its subdirectories.
 
   Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
-  $original_sunspot_session = Sunspot.session
   
   RSpec.configure do |config|
     # config.include Paperclip::Shoulda::Matchers
@@ -38,14 +36,6 @@ Spork.prefork do
     # config.mock_with :mocha
     # config.mock_with :flexmock
     # config.mock_with :rr
-    config.before do
-      Sunspot::Rails::Tester.start_original_sunspot_session
-      Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
-    end
-    config.before :each, :solr => true do
-      Sunspot.session = $original_sunspot_session
-      Sunspot.remove_all!
-    end
 
     # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
     config.fixture_path = "#{::Rails.root}/spec/fixtures"
@@ -78,6 +68,7 @@ Spork.prefork do
     config.order = "random"
   end
 
+  ActiveSupport::Dependencies.clear
 end
 
 Spork.each_run do

metadata

@@ -1,494 +1,503 @@
 --- !ruby/object:Gem::Specification
 name: droom
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.3
 platform: ruby
 authors:
 - William Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: msg
+  name: api-pagination
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_tree
+  name: settingslogic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: enumerize
+  name: request_store
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: geocoder
+  name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: devise-encryptable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cancancan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: msg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_tree
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: time_of_day
+  name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: date_validator
+  name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dav4rack
+  name: geocoder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ri_cal
+  name: icalendar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: snail
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcard
+  name: tod
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: date_validator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dynamic_form
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_list
+  name: signed_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: snail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: vcard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise-encryptable
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yomu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: youtube_it
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dropbox-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Droom is nice and clean.
@@ -500,8 +509,10 @@ extra_rdoc_files: []
 files:
 - app/assets/images/droom/acceptance.png
 - app/assets/images/droom/add.png
+- app/assets/images/droom/admin_menu.png
+- app/assets/images/droom/applications_menu.png
 - app/assets/images/droom/arrows.png
-- app/assets/images/droom/asterisk.png
+- app/assets/images/droom/arrows_small.png
 - app/assets/images/droom/asterisk_up.png
 - app/assets/images/droom/big_icons.png
 - app/assets/images/droom/blueblob.png
@@ -509,6 +520,7 @@ files:
 - app/assets/images/droom/clear.png
 - app/assets/images/droom/close.png
 - app/assets/images/droom/cog.png
+- app/assets/images/droom/config_menu.png
 - app/assets/images/droom/copy.png
 - app/assets/images/droom/copy_to_dropbox.png
 - app/assets/images/droom/cross.png
@@ -521,6 +533,7 @@ files:
 - app/assets/images/droom/dropbox_button.png
 - app/assets/images/droom/dropbox_button_small.png
 - app/assets/images/droom/dropbox_small.png
+- app/assets/images/droom/dropdown.png
 - app/assets/images/droom/edit.png
 - app/assets/images/droom/expand.png
 - app/assets/images/droom/expander.png
@@ -537,36 +550,53 @@ files:
 - app/assets/images/droom/manage.png
 - app/assets/images/droom/medium_icons.png
 - app/assets/images/droom/medium_object_icons.png
+- app/assets/images/droom/menu/asterisk.png
+- app/assets/images/droom/menu/smalladd.png
+- app/assets/images/droom/menu/smallasterisk.png
+- app/assets/images/droom/menu/smalldelete.png
+- app/assets/images/droom/menu/smalldownload.png
+- app/assets/images/droom/menu/smalledit.png
+- app/assets/images/droom/message.png
 - app/assets/images/droom/minimonth.png
 - app/assets/images/droom/minisymbols.png
+- app/assets/images/droom/missing/scrap.jpg
+- app/assets/images/droom/missing/scrap.png
+- app/assets/images/droom/missing/thumb.png
+- app/assets/images/droom/missing/user.png
 - app/assets/images/droom/object_icons.png
+- app/assets/images/droom/panel/add.png
+- app/assets/images/droom/panel/edit.png
+- app/assets/images/droom/panel/manage.png
 - app/assets/images/droom/pinkblob.png
 - app/assets/images/droom/place_busy.png
 - app/assets/images/droom/place_quiet.png
 - app/assets/images/droom/playable.png
 - app/assets/images/droom/plus_bullet.png
+- app/assets/images/droom/pointer_upwards.png
 - app/assets/images/droom/revoke.png
 - app/assets/images/droom/revoke_small.png
 - app/assets/images/droom/scrap_icons.png
 - app/assets/images/droom/search.png
+- app/assets/images/droom/search_menu.png
+- app/assets/images/droom/setter.png
 - app/assets/images/droom/setup.png
-- app/assets/images/droom/small_asterisk.png
 - app/assets/images/droom/small_cog.png
 - app/assets/images/droom/small_download.png
 - app/assets/images/droom/small_go.png
+- app/assets/images/droom/small_icons.png
 - app/assets/images/droom/small_image_box.png
-- app/assets/images/droom/smalladd.png
 - app/assets/images/droom/smallarrows.png
 - app/assets/images/droom/smallbullet.png
 - app/assets/images/droom/smallcopy.png
-- app/assets/images/droom/smalldelete.png
-- app/assets/images/droom/smalldownload.png
-- app/assets/images/droom/smalledit.png
-- app/assets/images/droom/smallmanage.png
 - app/assets/images/droom/smallspinner.gif
 - app/assets/images/droom/spinner.gif
 - app/assets/images/droom/spr_toolbar_icons_r2.png
 - app/assets/images/droom/star.png
+- app/assets/images/droom/stream/closer.png
+- app/assets/images/droom/stream/next.png
+- app/assets/images/droom/stream/prev.png
+- app/assets/images/droom/stream/previous.png
+- app/assets/images/droom/subscribe.png
 - app/assets/images/droom/symbols.png
 - app/assets/images/droom/tablesort.png
 - app/assets/images/droom/tick.png
@@ -576,7 +606,6 @@ files:
 - app/assets/images/droom/toggle.png
 - app/assets/images/droom/twister.png
 - app/assets/images/droom/twisty.png
-- app/assets/images/droom/Untitled-1.png
 - app/assets/images/droom/vcard.png
 - app/assets/images/droom/venue_bullet.png
 - app/assets/images/droom/youtube_icon.png
@@ -585,11 +614,15 @@ files:
 - app/assets/javascripts/droom/extensions.js.coffee
 - app/assets/javascripts/droom/lib/jquery.animate-colors.js
 - app/assets/javascripts/droom/lib/jquery.cookie.js
+- app/assets/javascripts/droom/lib/jquery.datepicker.js
+- app/assets/javascripts/droom/lib/jquery.deserialize.js
 - app/assets/javascripts/droom/lib/jquery.sortable.js
-- app/assets/javascripts/droom/lib/kalendae.js
+- app/assets/javascripts/droom/lib/jquery_ujs.js
 - app/assets/javascripts/droom/lib/modernizr.js
 - app/assets/javascripts/droom/lib/parser_rules/advanced.js
 - app/assets/javascripts/droom/lib/parser_rules/simple.js
+- app/assets/javascripts/droom/lib/swipe.js
+- app/assets/javascripts/droom/lib/underscore.js
 - app/assets/javascripts/droom/lib/wysihtml5.js
 - app/assets/javascripts/droom/lib/ZeroClipboard.js
 - app/assets/javascripts/droom/lib/ZeroClipboard.swf
@@ -602,12 +635,17 @@ files:
 - app/assets/javascripts/droom.js.coffee
 - app/assets/stylesheets/droom/_mixins.css.sass
 - app/assets/stylesheets/droom/_popups.css.sass
+- app/assets/stylesheets/droom/_stream.css.sass
 - app/assets/stylesheets/droom/_toolbar.css.sass
 - app/assets/stylesheets/droom/_variables.css.sass
 - app/assets/stylesheets/droom.css.sass
-- app/assets/stylesheets/lib/_kalendae.css.sass
 - app/controllers/droom/agenda_categories_controller.rb
+- app/controllers/droom/api/api_controller.rb
+- app/controllers/droom/api/events_controller.rb
+- app/controllers/droom/api/users_controller.rb
+- app/controllers/droom/api/venues_controller.rb
 - app/controllers/droom/calendars_controller.rb
+- app/controllers/droom/confirmations_controller.rb
 - app/controllers/droom/dashboard_controller.rb
 - app/controllers/droom/documents_controller.rb
 - app/controllers/droom/dropbox_tokens_controller.rb
@@ -615,59 +653,61 @@ files:
 - app/controllers/droom/events_controller.rb
 - app/controllers/droom/folders_controller.rb
 - app/controllers/droom/group_invitations_controller.rb
+- app/controllers/droom/group_permissions_controller.rb
 - app/controllers/droom/groups_controller.rb
 - app/controllers/droom/invitations_controller.rb
 - app/controllers/droom/memberships_controller.rb
 - app/controllers/droom/organisations_controller.rb
-- app/controllers/droom/pages_controller.rb
-- app/controllers/droom/people_controller.rb
+- app/controllers/droom/permissions_controller.rb
 - app/controllers/droom/preferences_controller.rb
 - app/controllers/droom/scraps_controller.rb
+- app/controllers/droom/services_controller.rb
 - app/controllers/droom/suggestions_controller.rb
-- app/controllers/droom/user_confirmations_controller.rb
+- app/controllers/droom/users/confirmations_controller.rb
+- app/controllers/droom/users/passwords_controller.rb
+- app/controllers/droom/users/sessions_controller.rb
 - app/controllers/droom/users_controller.rb
 - app/controllers/droom/venues_controller.rb
 - app/controllers/droom/youtube_controller.rb
 - app/helpers/droom/droom_helper.rb
+- app/models/droom/ability.rb
 - app/models/droom/agenda_category.rb
 - app/models/droom/calendar.rb
 - app/models/droom/category.rb
+- app/models/droom/concerns/slugged.rb
 - app/models/droom/document.rb
-- app/models/droom/document_attachment.rb
 - app/models/droom/dropbox_document.rb
 - app/models/droom/dropbox_token.rb
 - app/models/droom/event.rb
 - app/models/droom/event_set.rb
+- app/models/droom/event_type.rb
 - app/models/droom/folder.rb
 - app/models/droom/group.rb
 - app/models/droom/group_invitation.rb
+- app/models/droom/group_permission.rb
 - app/models/droom/invitation.rb
 - app/models/droom/mailing_list_membership.rb
 - app/models/droom/membership.rb
 - app/models/droom/organisation.rb
-- app/models/droom/page.rb
-- app/models/droom/person.rb
+- app/models/droom/permission.rb
 - app/models/droom/personal_folder.rb
 - app/models/droom/preference.rb
-- app/models/droom/recurrence_rule.rb
 - app/models/droom/scrap.rb
+- app/models/droom/service.rb
 - app/models/droom/tag.rb
 - app/models/droom/tagging.rb
 - app/models/droom/user.rb
-- app/models/droom/user_action_observer.rb
+- app/models/droom/user_permission.rb
 - app/models/droom/venue.rb
-- app/views/devise/confirmations/failure.en.html.haml
+- app/serializers/droom/user_serializer.rb
+- app/serializers/droom/venue_serializer.rb
 - app/views/devise/confirmations/new.html.haml
-- app/views/devise/confirmations/show.html.haml
-- app/views/devise/passwords/edit.html.haml
-- app/views/devise/passwords/new.html.haml
 - app/views/devise/sessions/new.html.haml
 - app/views/droom/agenda_categories/_form.html.haml
 - app/views/droom/agenda_categories/new.html.haml
 - app/views/droom/calendars/_action_menu.html.haml
 - app/views/droom/calendars/index.html.haml
 - app/views/droom/calendars/show.rss.builder
-- app/views/droom/confirmations/show.html.haml
 - app/views/droom/dashboard/_calendar.html.haml
 - app/views/droom/dashboard/_documents.html.haml
 - app/views/droom/dashboard/_folders.html.haml
@@ -677,11 +717,11 @@ files:
 - app/views/droom/dashboard/_past_events.haml
 - app/views/droom/dashboard/_quicksearch.html.haml
 - app/views/droom/dashboard/_stream.html.haml
+- app/views/droom/dashboard/_welcome.html.haml
 - app/views/droom/dashboard/index.html.haml
 - app/views/droom/documents/_action_menu.html.haml
 - app/views/droom/documents/_created.html.haml
 - app/views/droom/documents/_document.html.haml
-- app/views/droom/documents/_document_line.html.haml
 - app/views/droom/documents/_documents.html.haml
 - app/views/droom/documents/_documents_list.html.haml
 - app/views/droom/documents/_documents_table.html.haml
@@ -696,8 +736,8 @@ files:
 - app/views/droom/documents/new.html.haml
 - app/views/droom/dropbox_tokens/new.html.haml
 - app/views/droom/events/_action_menu.html.haml
+- app/views/droom/events/_attachments.html.haml
 - app/views/droom/events/_calendar.html.haml
-- app/views/droom/events/_created.html.haml
 - app/views/droom/events/_event.html.haml
 - app/views/droom/events/_event_line.html.haml
 - app/views/droom/events/_events.html.haml
@@ -705,16 +745,17 @@ files:
 - app/views/droom/events/_invitations.html.haml
 - app/views/droom/events/_other_page_parts.html.haml
 - app/views/droom/events/_popup_event.html.haml
+- app/views/droom/events/_scrap_events.html.haml
 - app/views/droom/events/_search_result.html.haml
 - app/views/droom/events/_suggested.html.haml
 - app/views/droom/events/_views.html.haml
+- app/views/droom/events/calendar.html.haml
 - app/views/droom/events/edit.html.haml
 - app/views/droom/events/index.html.haml
 - app/views/droom/events/index.rss.builder
 - app/views/droom/events/new.html.haml
 - app/views/droom/events/show.html.haml
 - app/views/droom/folders/_action_menu.html.haml
-- app/views/droom/folders/_attachments.html.haml
 - app/views/droom/folders/_contents.html.haml
 - app/views/droom/folders/_folder.html.haml
 - app/views/droom/folders/_folders.html.haml
@@ -727,6 +768,7 @@ files:
 - app/views/droom/group_invitations/_created.html.haml
 - app/views/droom/group_invitations/_form.html.haml
 - app/views/droom/group_invitations/new.html.haml
+- app/views/droom/group_permissions/_toggle.html.haml
 - app/views/droom/groups/_action_menu.haml
 - app/views/droom/groups/_created.html.haml
 - app/views/droom/groups/_form.html.haml
@@ -747,8 +789,9 @@ files:
 - app/views/droom/memberships/_created.html.haml
 - app/views/droom/memberships/_form.html.haml
 - app/views/droom/memberships/_member.html.haml
-- app/views/droom/memberships/_membership_toggle.html.haml
 - app/views/droom/memberships/_memberships.html.haml
+- app/views/droom/memberships/_toggle.html.haml
+- app/views/droom/memberships/index.html.haml
 - app/views/droom/memberships/new.html.haml
 - app/views/droom/organisations/_action_menu.html.haml
 - app/views/droom/organisations/_form.html.haml
@@ -759,47 +802,29 @@ files:
 - app/views/droom/organisations/index.html.haml
 - app/views/droom/organisations/new.html.haml
 - app/views/droom/organisations/show.html.haml
-- app/views/droom/pages/_contents.html.haml
-- app/views/droom/pages/_form.html.haml
-- app/views/droom/pages/_full_page.html.haml
-- app/views/droom/pages/_page.html.haml
-- app/views/droom/pages/_pages.html.haml
-- app/views/droom/pages/admin.html.haml
-- app/views/droom/pages/edit.html.haml
-- app/views/droom/pages/index.html.haml
-- app/views/droom/pages/new.html.haml
-- app/views/droom/pages/show.html.haml
-- app/views/droom/panels/_account.html.haml
 - app/views/droom/panels/_admin.html.haml
+- app/views/droom/panels/_configuration.html.haml
 - app/views/droom/panels/_devices.html.haml
 - app/views/droom/panels/_dropbox.html.haml
 - app/views/droom/panels/_email.html.haml
 - app/views/droom/panels/_keywords.html.haml
 - app/views/droom/panels/_networks.html.haml
-- app/views/droom/panels/_readers.html.haml
 - app/views/droom/panels/_rss.html.haml
-- app/views/droom/panels/_suggestions.html.haml
+- app/views/droom/panels/_search.html.haml
 - app/views/droom/panels/_vcal.html.haml
-- app/views/droom/people/_action_menu.html.haml
-- app/views/droom/people/_created.html.haml
-- app/views/droom/people/_form.html.haml
-- app/views/droom/people/_listing.html.haml
-- app/views/droom/people/_memberships.html.haml
-- app/views/droom/people/_people.html.haml
-- app/views/droom/people/_person.html.haml
-- app/views/droom/people/_search_result.html.haml
-- app/views/droom/people/_suggested.html.haml
-- app/views/droom/people/edit.html.haml
-- app/views/droom/people/index.html.haml
-- app/views/droom/people/new.html.haml
-- app/views/droom/people/show.html.haml
+- app/views/droom/permissions/_action_menu.html.haml
+- app/views/droom/permissions/_created.html.haml
+- app/views/droom/permissions/_form.html.haml
+- app/views/droom/permissions/edit.html.haml
+- app/views/droom/permissions/new.html.haml
+- app/views/droom/permissions/show.html.haml
 - app/views/droom/preferences/_checkbox.html.haml
 - app/views/droom/preferences/_radio_set.html.haml
 - app/views/droom/scraps/_action_menu.html.haml
 - app/views/droom/scraps/_caption.html.haml
 - app/views/droom/scraps/_credit.html.haml
 - app/views/droom/scraps/_form.html.haml
-- app/views/droom/scraps/_heading.html.haml
+- app/views/droom/scraps/_preload.html.haml
 - app/views/droom/scraps/_scrap.html.haml
 - app/views/droom/scraps/_search_result.html.haml
 - app/views/droom/scraps/_stream.html.haml
@@ -817,13 +842,14 @@ files:
 - app/views/droom/scraps/index.html.haml
 - app/views/droom/scraps/new.html.haml
 - app/views/droom/scraps/show.html.haml
-- app/views/droom/scraps/thumbs/_document.html.haml
-- app/views/droom/scraps/thumbs/_event.html.haml
-- app/views/droom/scraps/thumbs/_image.html.haml
-- app/views/droom/scraps/thumbs/_link.html.haml
-- app/views/droom/scraps/thumbs/_quote.html.haml
-- app/views/droom/scraps/thumbs/_text.html.haml
-- app/views/droom/scraps/thumbs/_video.html.haml
+- app/views/droom/services/_action_menu.html.haml
+- app/views/droom/services/_created.html.haml
+- app/views/droom/services/_form.html.haml
+- app/views/droom/services/_services.html.haml
+- app/views/droom/services/edit.html.haml
+- app/views/droom/services/index.html.haml
+- app/views/droom/services/new.html.haml
+- app/views/droom/services/show.html.haml
 - app/views/droom/shared/_calendar_and_search.html.haml
 - app/views/droom/shared/_calendar_holder.haml
 - app/views/droom/shared/_controls.html.haml
@@ -835,27 +861,45 @@ files:
 - app/views/droom/shared/_suggestions.html.haml
 - app/views/droom/shared/_title_excerpt.haml
 - app/views/droom/shared/_toolbar.html.haml
+- app/views/droom/suggestions/index.html.haml
+- app/views/droom/users/_action_menu.html.haml
 - app/views/droom/users/_confirmation.html.haml
 - app/views/droom/users/_dropbox_status.html.haml
-- app/views/droom/users/_extra_columns.html.haml
-- app/views/droom/users/_extra_columns_header.html.haml
-- app/views/droom/users/_extra_columns_note.html.haml
-- app/views/droom/users/_form.html.haml
-- app/views/droom/users/_password_fields.html.haml
+- app/views/droom/users/_suggested.html.haml
 - app/views/droom/users/_user.html.haml
-- app/views/droom/users/_user_or_person.html.haml
+- app/views/droom/users/_users.html.haml
 - app/views/droom/users/_users_table.html.haml
+- app/views/droom/users/admin.html.haml
+- app/views/droom/users/confirmations/_after_confirmation.html.haml
+- app/views/droom/users/confirmations/_password_required.html.haml
+- app/views/droom/users/confirmations/failure.en.html.haml
+- app/views/droom/users/confirmations/show.html.haml
+- app/views/droom/users/edit/_details.html.haml
+- app/views/droom/users/edit/_memberships.html.haml
+- app/views/droom/users/edit/_password_fields.html.haml
+- app/views/droom/users/edit/_preferences.html.haml
+- app/views/droom/users/edit/_profile.html.haml
+- app/views/droom/users/edit/_user_fields.html.haml
 - app/views/droom/users/edit.html.haml
 - app/views/droom/users/index.html.haml
+- app/views/droom/users/new.html.haml
+- app/views/droom/users/passwords/completed.html.haml
+- app/views/droom/users/passwords/edit.html.haml
+- app/views/droom/users/passwords/new.html.haml
+- app/views/droom/users/passwords/show.html.haml
+- app/views/droom/users/show/_listed.html.haml
+- app/views/droom/users/show/_profile.html.haml
+- app/views/droom/users/show/_tabled.html.haml
+- app/views/droom/users/show.html.haml
 - app/views/droom/venues/_search_result.html.haml
 - app/views/droom/venues/_suggested.html.haml
 - app/views/droom/venues/index.html.haml
 - app/views/droom/venues/show.html.haml
 - app/views/droom/youtube/show.html.haml
-- app/views/kaminari/_paginator.html.haml
 - app/views/layouts/droom/application.html.haml
 - app/views/layouts/droom/email.html.haml
 - config/cucumber.yml
+- config/initializers/chronic.rb
 - config/initializers/devise.rb
 - config/initializers/paperclip.rb
 - config/initializers/snail.rb
@@ -899,14 +943,27 @@ files:
 - db/migrate/20130308103807_create_droom_dropbox_documents.rb
 - db/migrate/20130308154552_dropbox_documents_changed.rb
 - db/migrate/20130326135738_user_titles.rb
-- lib/droom/dav_resource.rb
+- db/migrate/20130627065459_permissions.rb
+- db/migrate/20130627071938_users_take_over.rb
+- db/migrate/20130627073759_user_properties.rb
+- db/migrate/20130627080021_no_more_people.rb
+- db/migrate/20130701122935_directory_groups.rb
+- db/migrate/20130701123152_remove_old_access_control.rb
+- db/migrate/20130729102857_more_scrap_data.rb
+- db/migrate/20130904080340_international_names.rb
+- db/migrate/20130904080341_honours.rb
+- db/migrate/20131124082222_simple_addresses.rb
+- db/migrate/20131201093351_event_time_zone.rb
+- db/migrate/20131217060311_session_revocable.rb
+- db/migrate/20131219180311_event_types.rb
+- lib/devise/strategies/cookie_authenticatable.rb
+- lib/droom/auth_cookie.rb
+- lib/droom/cropper.rb
 - lib/droom/engine.rb
 - lib/droom/folders.rb
 - lib/droom/lazy_hash.rb
-- lib/droom/model_helpers.rb
 - lib/droom/monkeys.rb
 - lib/droom/renderers.rb
-- lib/droom/routing.rb
 - lib/droom/searchability.rb
 - lib/droom/taggability.rb
 - lib/droom/title_case.rb
@@ -919,17 +976,15 @@ files:
 - lib/generators/droom/install/templates/droom_initializer.rb
 - lib/generators/droom/install/USAGE
 - lib/generators/droom/views/views_generator.rb
+- lib/paperclip/geometry_transformation.rb
+- lib/paperclip/validators/attachment_height_validator.rb
+- lib/paperclip/validators/attachment_width_validator.rb
+- lib/paperclip_processors/offset_thumbnail.rb
 - lib/tasks/cucumber.rake
 - lib/tasks/droom_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.md
-- spec/datasets/calendar_events_dataset.rb
-- spec/datasets/calendar_pages_dataset.rb
-- spec/datasets/calendar_sites_dataset.rb
-- spec/datasets/calendars_dataset.rb
-- spec/datasets/documents_dataset.rb
-- spec/datasets/recurrence_dataset.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -950,7 +1005,6 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config/sunspot.yml
 - spec/dummy/config.ru
 - spec/dummy/db/migrate/20120911070124_create_droom_data.droom.rb
 - spec/dummy/db/migrate/20120921094604_agenda_sections.droom.rb
@@ -976,11 +1030,29 @@ files:
 - spec/dummy/db/migrate/20130130120631_folder_ancestry_to_parents.droom.rb
 - spec/dummy/db/migrate/20130201103737_mobile_phones.droom.rb
 - spec/dummy/db/migrate/20130201103738_mailing_lists.droom.rb
+- spec/dummy/db/migrate/20130724124758_dropbox_tokens.droom.rb
+- spec/dummy/db/migrate/20130724124759_preference_uuids.droom.rb
+- spec/dummy/db/migrate/20130724124760_stream.droom.rb
+- spec/dummy/db/migrate/20130724124761_access_token_secret.droom.rb
+- spec/dummy/db/migrate/20130724124762_person_image.droom.rb
+- spec/dummy/db/migrate/20130724124763_devise_confirmable.droom.rb
+- spec/dummy/db/migrate/20130724124764_create_droom_calendars.droom.rb
+- spec/dummy/db/migrate/20130724124765_give_scraps_document.droom.rb
+- spec/dummy/db/migrate/20130724124766_privateness.droom.rb
+- spec/dummy/db/migrate/20130724124767_store_metadata.droom.rb
+- spec/dummy/db/migrate/20130724124768_folders_nicely.droom.rb
+- spec/dummy/db/migrate/20130724124769_niceties.droom.rb
+- spec/dummy/db/migrate/20130724124770_create_droom_dropbox_documents.droom.rb
+- spec/dummy/db/migrate/20130724124771_dropbox_documents_changed.droom.rb
+- spec/dummy/db/migrate/20130724124772_user_titles.droom.rb
+- spec/dummy/db/migrate/20130724124773_permissions.droom.rb
+- spec/dummy/db/migrate/20130724124774_users_take_over.droom.rb
+- spec/dummy/db/migrate/20130724124775_user_properties.droom.rb
+- spec/dummy/db/migrate/20130724124776_no_more_people.droom.rb
+- spec/dummy/db/migrate/20130724124777_directory_groups.droom.rb
+- spec/dummy/db/migrate/20130724124778_remove_old_access_control.droom.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/log/dav.log
-- spec/dummy/log/development.log
 - spec/dummy/log/sunspot-solr-test.log.1
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -990,24 +1062,6 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
-- spec/dummy/solr/conf/admin-extra.html
-- spec/dummy/solr/conf/elevate.xml
-- spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
-- spec/dummy/solr/conf/protwords.txt
-- spec/dummy/solr/conf/schema.xml
-- spec/dummy/solr/conf/scripts.conf
-- spec/dummy/solr/conf/solrconfig.xml
-- spec/dummy/solr/conf/spellings.txt
-- spec/dummy/solr/conf/stopwords.txt
-- spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/development/index/segments.gen
-- spec/dummy/solr/data/development/index/segments_1
-- spec/dummy/solr/data/development/spellchecker/segments.gen
-- spec/dummy/solr/data/development/spellchecker/segments_1
-- spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_3nu
-- spec/dummy/solr/data/test/spellchecker/segments.gen
-- spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/webdav/1/group/rat.png
 - spec/dummy/webdav/1/unattached/rat.png
 - spec/dummy/webdav/group/rat.png
@@ -1021,7 +1075,6 @@ files:
 - spec/factories/groups.rb
 - spec/factories/memberships.rb
 - spec/factories/people.rb
-- spec/factories/recurrence_rules.rb
 - spec/factories/user.rb
 - spec/fixtures/dummy.ics
 - spec/fixtures/images/frog.png
@@ -1036,43 +1089,34 @@ files:
 - spec/models/droom/ical_spec.rb
 - spec/models/droom/mailing_list_membership_spec.rb
 - spec/models/droom/membership_spec.rb
-- spec/models/droom/person_spec.rb
-- spec/models/droom/recurrence_rule_spec.rb
 - spec/models/droom/user_spec.rb
 - spec/models/droom/visibility_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/content_type_matcher.rb
 homepage: http://droom.spanner.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Droom is your new data room.
 test_files:
-- spec/datasets/calendar_events_dataset.rb
-- spec/datasets/calendar_pages_dataset.rb
-- spec/datasets/calendar_sites_dataset.rb
-- spec/datasets/calendars_dataset.rb
-- spec/datasets/documents_dataset.rb
-- spec/datasets/recurrence_dataset.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -1093,7 +1137,6 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config/sunspot.yml
 - spec/dummy/config.ru
 - spec/dummy/db/migrate/20120911070124_create_droom_data.droom.rb
 - spec/dummy/db/migrate/20120921094604_agenda_sections.droom.rb
@@ -1119,11 +1162,29 @@ test_files:
 - spec/dummy/db/migrate/20130130120631_folder_ancestry_to_parents.droom.rb
 - spec/dummy/db/migrate/20130201103737_mobile_phones.droom.rb
 - spec/dummy/db/migrate/20130201103738_mailing_lists.droom.rb
+- spec/dummy/db/migrate/20130724124758_dropbox_tokens.droom.rb
+- spec/dummy/db/migrate/20130724124759_preference_uuids.droom.rb
+- spec/dummy/db/migrate/20130724124760_stream.droom.rb
+- spec/dummy/db/migrate/20130724124761_access_token_secret.droom.rb
+- spec/dummy/db/migrate/20130724124762_person_image.droom.rb
+- spec/dummy/db/migrate/20130724124763_devise_confirmable.droom.rb
+- spec/dummy/db/migrate/20130724124764_create_droom_calendars.droom.rb
+- spec/dummy/db/migrate/20130724124765_give_scraps_document.droom.rb
+- spec/dummy/db/migrate/20130724124766_privateness.droom.rb
+- spec/dummy/db/migrate/20130724124767_store_metadata.droom.rb
+- spec/dummy/db/migrate/20130724124768_folders_nicely.droom.rb
+- spec/dummy/db/migrate/20130724124769_niceties.droom.rb
+- spec/dummy/db/migrate/20130724124770_create_droom_dropbox_documents.droom.rb
+- spec/dummy/db/migrate/20130724124771_dropbox_documents_changed.droom.rb
+- spec/dummy/db/migrate/20130724124772_user_titles.droom.rb
+- spec/dummy/db/migrate/20130724124773_permissions.droom.rb
+- spec/dummy/db/migrate/20130724124774_users_take_over.droom.rb
+- spec/dummy/db/migrate/20130724124775_user_properties.droom.rb
+- spec/dummy/db/migrate/20130724124776_no_more_people.droom.rb
+- spec/dummy/db/migrate/20130724124777_directory_groups.droom.rb
+- spec/dummy/db/migrate/20130724124778_remove_old_access_control.droom.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/log/dav.log
-- spec/dummy/log/development.log
 - spec/dummy/log/sunspot-solr-test.log.1
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -1133,24 +1194,6 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
-- spec/dummy/solr/conf/admin-extra.html
-- spec/dummy/solr/conf/elevate.xml
-- spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
-- spec/dummy/solr/conf/protwords.txt
-- spec/dummy/solr/conf/schema.xml
-- spec/dummy/solr/conf/scripts.conf
-- spec/dummy/solr/conf/solrconfig.xml
-- spec/dummy/solr/conf/spellings.txt
-- spec/dummy/solr/conf/stopwords.txt
-- spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/development/index/segments.gen
-- spec/dummy/solr/data/development/index/segments_1
-- spec/dummy/solr/data/development/spellchecker/segments.gen
-- spec/dummy/solr/data/development/spellchecker/segments_1
-- spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_3nu
-- spec/dummy/solr/data/test/spellchecker/segments.gen
-- spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/webdav/1/group/rat.png
 - spec/dummy/webdav/1/unattached/rat.png
 - spec/dummy/webdav/group/rat.png
@@ -1164,7 +1207,6 @@ test_files:
 - spec/factories/groups.rb
 - spec/factories/memberships.rb
 - spec/factories/people.rb
-- spec/factories/recurrence_rules.rb
 - spec/factories/user.rb
 - spec/fixtures/dummy.ics
 - spec/fixtures/images/frog.png
@@ -1179,8 +1221,6 @@ test_files:
 - spec/models/droom/ical_spec.rb
 - spec/models/droom/mailing_list_membership_spec.rb
 - spec/models/droom/membership_spec.rb
-- spec/models/droom/person_spec.rb
-- spec/models/droom/recurrence_rule_spec.rb
 - spec/models/droom/user_spec.rb
 - spec/models/droom/visibility_spec.rb
 - spec/spec_helper.rb