droom 0.4.3 → 0.5.3

data/config/routes.rb

@@ -1,35 +1,44 @@
 Droom::Engine.routes.draw do 
-  
-  match '/' => DAV4Rack::Handler.new(
-    :root => Rails.root.to_s, 
-    :root_uri_path => '/',
-    :resource_class => Droom::DavResource,
-    :log_to => [(Rails.root + 'log/dav.log').to_s, Logger::DEBUG]
-  ), :anchor => false, :constraints => { :subdomain => Droom.dav_subdomain }
+  root to: "dashboard#index", as: :dashboard
+
+  get '/help/:slug' => 'pages#show', as: 'help_page'
+  get '/help' => 'pages#index', as: 'help'
+  get '/videos.:format' => 'youtube#index', as: "videos"
+  get '/videos/:yt_id.:format' => 'youtube#show', as: "video"
 
-  devise_for :users, :class_name => 'Droom::User', :module => :devise, :controllers => {:confirmations => 'droom/confirmations'}
+  match '/suggestions'  => 'suggestions#index', as: "suggestions", via: [:get, :options]
+  match '/suggestions/:type'  => 'suggestions#index', via: [:get, :options]
 
+  namespace :api, defaults: {format: 'json'}, constraints: {format: /(json|xml)/} do
+    get '/authenticate/:tok' => 'users#authenticate', as: 'authenticate'
+    get '/deauthenticate/:tok' => 'users#deauthenticate', as: 'deauthenticate'
+    resources :users
+    resources :events
+    resources :venues
+  end
+
+  devise_for :users, class_name: 'Droom::User', module: :devise, controllers: {confirmations: 'droom/users/confirmations', sessions: 'droom/users/sessions', passwords: 'droom/users/passwords'}
+  
   # intermediate confirmation step to allow invitation without setting a password
   devise_scope :user do
-    get "/users/:id/welcome/:confirmation_token" => "user_confirmations#show", :as => :welcome
-    put "/users/:id/confirm" => "user_confirmations#update", :as => :confirm_password
+    get "/users/:id/welcome/:confirmation_token" => "users/confirmations#show", as: :welcome
+    patch "/users/:id/confirm" => "users/confirmations#update", as: :confirm_password
+    get "/users/passwords/show" => "users/passwords#show", as: :show_confirmation
+    get "/users/passwords/completed" => "users/passwords#completed", as: :complete_confirmation
+  end
+
+  resources :services do
+    resources :permissions
   end
-  
 
-  resources :users
   resources :documents
   resources :preferences
-  resources :calendars
   resources :invitations
   resources :memberships
-
-  resources :scraps do
-    collection do
-      match "feed/:auth_token.:format" => "scraps#index", :as => :feed
-    end
-  end
+  resources :scraps
 
   resources :events do
+    get "calendar", on: :collection
     resources :invitations do
       member do
         put :accept
@@ -40,52 +49,35 @@ Droom::Engine.routes.draw do
     resources :group_invitations
     resources :documents
     resources :agenda_categories
-    collection do
-      get "calendar"
-      match "feed/:auth_token.:format" => "events#feed", :as => :feed
-    end
   end
   
-  resources :documents#, :only => [:index, :show]
+  resources :documents#, only: [:index, :show]
   resources :folders do
-    get "dropbox", :on => :member, :as => :dropbox
+    get "dropbox", on: :member, as: :dropbox
     resources :documents
     resources :folders
   end
   
   resources :organisations do
-    resources :people
+    resources :users
   end
   
-  resources :people do
-    get "invite", :on => :member, :as => :invite
-    resources :events do
-      collection do
-        match "feed/:auth_token.:format" => "events#index", :as => :feed
-      end
-    end
+  resources :users do
+    get "preferences", on: :member, as: :preferences
+    get "admin", on: :collection
+    resources :events
   end
   
   resources :groups do
     resources :memberships
-    resources :people
+    resources :group_permissions
   end
   
   resources :venues
   resources :pages
 
   resources :dropbox_tokens do
-    get "/register", :on => :collection, :action => :create
+    get "/register", on: :collection, action: :create
   end
-  
-
-  match '/help/:slug', :to => 'pages#show', :as => 'help_page'
-  match '/help', :to => 'pages#index', :as => 'help'
-  
-  match '/videos.:format', :to => 'youtube#index', :as => "videos"
-  match '/videos/:yt_id.:format', :to => 'youtube#show', :as => "video"
-  match '/suggestions.:format', :to => 'suggestions#index', :as => "suggestions", :defaults => {:format => 'json'}
-  match '/suggestions/:type.:format', :to => 'suggestions#index', :defaults => {:format => 'json'}
 
-  root :to => "dashboard#index", :as => :dashboard
 end

data/db/migrate/20130207123614_stream.rb

@@ -3,7 +3,11 @@ class Stream < ActiveRecord::Migration
     create_table :droom_scraps do |t|
       t.string :name
       t.text :body
-      t.cropped_attachment :image
+      t.attachment :image
+      t.integer :image_offset_top
+      t.integer :image_offset_left
+      t.integer :image_scale_width
+      t.integer :image_scale_height
       t.integer :created_by_id
       t.string :scraptype
       t.string :note

data/db/migrate/20130225095328_create_droom_calendars.rb

@@ -1,7 +1,6 @@
 class CreateDroomCalendars < ActiveRecord::Migration
   def change
     create_table :droom_calendars do |t|
-      t.integer :id
       t.string  :name
       t.string  :slug
       t.boolean :events_private, :default => false

data/db/migrate/20130627065459_permissions.rb

@@ -0,0 +1,34 @@
+class Permissions < ActiveRecord::Migration
+  
+  def change
+    create_table :droom_services do |t|
+      t.string :name
+      t.string :slug
+      t.string :url
+      t.text :description
+    end
+    
+    create_table :droom_permissions do |t|
+      t.integer :service_id
+      t.string  :name
+      t.string :slug
+      t.text :description
+      t.integer :position
+      t.timestamps
+    end
+
+    create_table :droom_group_permissions do |t|
+      t.integer :group_id
+      t.integer :permission_id
+      t.timestamps
+    end
+
+    create_table :droom_user_permissions do |t|
+      t.integer :user_id
+      t.integer :group_permission_id
+      t.integer :permission_id
+      t.timestamps
+    end
+
+  end
+end

data/db/migrate/20130627071938_users_take_over.rb

@@ -0,0 +1,38 @@
+class UsersTakeOver < ActiveRecord::Migration
+  def change
+    add_column :droom_invitations, :user_id, :integer
+    add_column :droom_memberships, :user_id, :integer
+    add_column :droom_personal_folders, :user_id, :integer
+    add_column :droom_dropbox_documents, :user_id, :integer
+
+    add_index :droom_invitations, :user_id
+    add_index :droom_memberships, :user_id
+    add_index :droom_personal_folders, :user_id
+    add_index :droom_dropbox_documents, :user_id
+
+    user_ids_by_person = Droom::Person.all.each_with_object({}) do |person, carrier|
+      carrier[person.id] = person.user.id if person.user
+    end
+
+    Droom::Invitation.reset_column_information
+    Droom::Invitation.all.each do |inv|
+      inv.update_column :user_id, user_ids_by_person[inv.person_id]
+    end
+
+    Droom::Membership.reset_column_information
+    Droom::Membership.all.each do |mem|
+      mem.update_column :user_id, user_ids_by_person[mem.person_id]
+    end
+
+    Droom::PersonalFolder.reset_column_information
+    Droom::PersonalFolder.all.each do |pf|
+      pf.update_column :user_id, user_ids_by_person[pf.person_id]
+    end
+
+    Droom::DropboxDocument.reset_column_information
+    Droom::DropboxDocument.all.each do |dd|
+      dd.update_column :user_id, user_ids_by_person[dd.person_id]
+    end
+
+  end
+end

data/db/migrate/20130627073759_user_properties.rb

@@ -0,0 +1,34 @@
+class UserProperties < ActiveRecord::Migration
+  def change
+    add_column :droom_users, :uid, :string
+    add_column :droom_users, :organisation_id, :integer
+    add_column :droom_users, :phone, :string
+    add_column :droom_users, :description, :text
+    add_column :droom_users, :post_line1, :string
+    add_column :droom_users, :post_line2, :string
+    add_column :droom_users, :post_city, :string
+    add_column :droom_users, :post_region, :string
+    add_column :droom_users, :post_country, :string
+    add_column :droom_users, :post_code, :string
+    add_column :droom_users, :mobile, :string
+    add_column :droom_users, :dob, :datetime
+    add_column :droom_users, :private, :boolean
+    add_column :droom_users, :public, :boolean
+    add_column :droom_users, :female, :boolean
+    add_attachment :droom_users, :image
+    add_column :droom_users, :image_offset_top, :integer
+    add_column :droom_users, :image_offset_left, :integer
+    add_column :droom_users, :image_scale_width, :integer
+    add_column :droom_users, :image_scale_height, :integer
+
+    Droom::User.reset_column_information
+    Droom::Person.all.each do |p|
+      if u = Droom::User.find(p.user_id)
+        u.update_attributes p.attributes.slice(*%w{organisation_id phone description description post_line1 post_line2 post_city post_region post_country post_code mobile image})
+      end
+    end
+
+  end
+end
+
+

data/db/migrate/20130627080021_no_more_people.rb

@@ -0,0 +1,11 @@
+class NoMorePeople < ActiveRecord::Migration
+  def change
+    remove_column :droom_invitations, :person_id
+    remove_column :droom_memberships, :person_id
+    remove_column :droom_personal_folders, :person_id
+    remove_column :droom_dropbox_documents, :person_id
+    
+    drop_table :droom_people
+    drop_table :droom_personal_documents
+  end
+end

data/db/migrate/20130701122935_directory_groups.rb

@@ -0,0 +1,8 @@
+class DirectoryGroups < ActiveRecord::Migration
+  def change
+    add_column :droom_groups, :directory, :boolean
+    add_column :droom_events, :confidential, :boolean
+    add_index :droom_groups, :directory
+    add_index :droom_events, :confidential
+  end
+end

data/db/migrate/20130701123152_remove_old_access_control.rb

@@ -0,0 +1,16 @@
+class RemoveOldAccessControl < ActiveRecord::Migration
+  def change
+    remove_column :droom_groups, :private
+    remove_column :droom_groups, :public
+    remove_column :droom_groups, :privileged
+
+    remove_column :droom_events, :private
+    remove_column :droom_events, :public
+
+    remove_column :droom_users, :private
+    remove_column :droom_users, :public
+
+    remove_column :droom_documents, :private
+    remove_column :droom_documents, :public
+  end
+end

data/db/migrate/20130729102857_more_scrap_data.rb

@@ -0,0 +1,12 @@
+class MoreScrapData < ActiveRecord::Migration
+  def change
+    add_column :droom_scraps, :youtube_id, :string
+    add_column :droom_scraps, :url, :string
+    
+    Droom::Scrap.reset_column_information
+    Droom::Scrap.videos.each do |scrap|
+      scrap.update_column(:youtube_id, scrap.body)
+      scrap.update_column(:body, "")
+    end
+  end
+end

data/db/migrate/20130904080340_international_names.rb

@@ -0,0 +1,17 @@
+class InternationalNames < ActiveRecord::Migration
+  def change
+    rename_column :droom_users, :name, :family_name
+    rename_column :droom_users, :forename, :given_name
+    add_column :droom_users, :chinese_name, :string
+    add_column :droom_users, :gender, :string, limit: 1
+    
+    Droom::User.reset_column_information
+    Droom::User.all.each do |u|
+      unless u.given_name?
+        names = u.family_name.split(/\s+/)
+        surname = names.pop
+        u.update_attributes(family_name: surname, given_name: names.join(' '))
+      end
+    end
+  end
+end

data/db/migrate/20130904080341_honours.rb

@@ -0,0 +1,5 @@
+class Honours < ActiveRecord::Migration
+  def change
+    add_column :droom_users, :honours, :string
+  end
+end

data/db/migrate/20131124082222_simple_addresses.rb

@@ -0,0 +1,25 @@
+class SimpleAddresses < ActiveRecord::Migration
+  def change
+    add_column :droom_venues, :address, :text
+    add_column :droom_venues, :slug, :string
+    add_column :droom_users, :address, :text
+    add_column :droom_venues, :country_code, :string
+    add_column :droom_users, :country_code, :string
+    
+    remove_column :droom_users, :post_line1
+    remove_column :droom_users, :post_line2
+    remove_column :droom_users, :post_city
+    remove_column :droom_users, :post_region
+    remove_column :droom_users, :post_country
+    
+    Droom::Venue.reset_column_information
+    Droom::Venue.each do |venue|
+      if venue.respond_to?(:postal_address)
+        venue.address = venue.postal_address.to_s
+      end
+      # also sets slug
+      venue.save
+    end
+
+  end
+end

data/db/migrate/20131201093351_event_time_zone.rb

@@ -0,0 +1,5 @@
+class EventTimeZone < ActiveRecord::Migration
+  def change
+    add_column :droom_events, :timezone, :string
+  end
+end

data/db/migrate/20131217060311_session_revocable.rb

@@ -0,0 +1,5 @@
+class SessionRevocable < ActiveRecord::Migration
+  def change
+    add_column :droom_users, :session_id, :string
+  end
+end

data/db/migrate/20131219180311_event_types.rb

@@ -0,0 +1,15 @@
+class EventTypes < ActiveRecord::Migration
+  def change
+
+    create_table :droom_event_types do |t|
+      t.string :name
+      t.string :slug
+      t.text :description
+      t.timestamps
+    end
+    
+    add_column :droom_events, :event_type_id, :integer
+    add_index :droom_events, :event_type_id
+
+  end
+end

data/lib/devise/strategies/cookie_authenticatable.rb

@@ -0,0 +1,46 @@
+require 'devise'
+
+module Devise
+  module Strategies
+    class CookieAuthenticatable < ::Devise::Strategies::Authenticatable
+
+      def valid?
+        cookie.valid?
+      end
+
+      def authenticate!
+        if fresh? && resource && validate(resource)
+          success!(resource)
+        else
+          pass
+        end
+      end
+
+      private
+
+      def cookie
+        @cookie ||= Droom::AuthCookie.new(cookies)
+      end
+
+      def fresh?
+        cookie.set_since?(Time.now - Settings.auth.cookie_period.hours)
+      end
+
+      def resource
+        # returns nil when user is missing.
+        @resource ||= mapping.to.where(:authentication_token => cookie.token).first
+      end
+
+      def pass
+        cookie.unset
+        super
+      end
+    end
+  end
+
+  module Models
+    module CookieAuthenticatable
+      # I'm sure this is configurable away, but who can find that sort of thing in devise?
+    end
+  end
+end

data/lib/droom.rb

@@ -1,18 +1,17 @@
-require 'dav4rack'
-require 'dav4rack/resources/file_resource'
 require "droom/monkeys"
+require "droom/cropper"
 require "droom/lazy_hash"
-require "droom/model_helpers"
 require "droom/renderers"
 require "droom/engine"
+require "droom/auth_cookie"
 require "droom/validators"
-require "droom/dav_resource"
 require "droom/searchability"
 require "droom/taggability"
 require "droom/folders"
 require "snail"
+require "youtube_it"
 
-module Droom
+module Droom  
   # Droom configuration is handled by accessors on the Droom base module.
   # Boolean items also offer the interrogative form.
   
@@ -22,6 +21,7 @@ module Droom
                  :searchable_classes,
                  :yt_client,
                  :layout,
+                 :devise_layout,
                  :email_layout,
                  :email_host,
                  :email_from,
@@ -31,20 +31,18 @@ module Droom
                  :margin_dashboard_modules,
                  :panels,
                  :scrap_types,
-                 :dav_root,
-                 :dav_subdomain,
-                 :use_forenames,
+                 :default_scrap_type,
+                 :use_chinese_names,
                  :use_biogs,
                  :use_separate_mobile_number,
                  :use_titles,
+                 :use_honours,
                  :use_organisations,
                  :enable_mailing_lists,
                  :mailman_table_name,
                  :mailing_lists_active_by_default,
                  :mailing_lists_digest_by_default,
                  :show_venue_map,
-                 :default_document_private,
-                 :default_event_private,
                  :dropbox_app_key,
                  :dropbox_app_secret,
                  :dropbox_app_name,
@@ -53,10 +51,14 @@ module Droom
                  :required_calendar_names,
                  :stream_shared,
                  :aws_bucket_name,
-                 :calendar_closed,
-                 :password_pattern
+                 :all_events_public,
+                 :all_documents_public,
+                 :password_pattern,
+                 :separate_calendars,
+                 :second_time_zone
   
   class DroomError < StandardError; end
+  class AuthRequired < DroomError; end
   class PermissionDenied < DroomError; end
 
   class << self
@@ -65,7 +67,11 @@ module Droom
     end
     
     def layout
-      @@layout ||= "droom/application"
+      @@layout ||= "application"
+    end
+
+    def devise_layout
+      @@devise_layout ||= "application"
     end
 
     def email_host
@@ -73,7 +79,7 @@ module Droom
     end
 
     def email_layout
-      @@email_layout ||= "droom/email"
+      @@email_layout ||= "email"
     end
 
     def email_from
@@ -113,31 +119,29 @@ module Droom
     end
     
     def panels
-      @@panels ||= %w{dropbox email rss devices readers account suggestions admin}
+      @@panels ||= %w{configuration search admin}
     end
     
     def scrap_types
       @@scrap_types ||= %w{image video text quote link event document}
     end
-
-    # base path of DAV directory tree, relative to rails root.
-    def dav_root
-      @@dav_root ||= "webdav"
-    end
-
-    # subdomain constraint applied when routing to dav.
-    def dav_subdomain
-      @@dav_subdomain ||= /dav/
+    
+    def default_scrap_type
+      @@default_scrap_type ||= 'text'
     end
 
-    def use_forenames?
-      !!@@use_forenames
+    def use_chinese_names?
+      !!@@use_chinese_names
     end
 
     def use_titles?
       !!@@use_titles
     end
     
+    def use_honours?
+      !!@@use_honours
+    end
+    
     def use_biogs?
       !!@@use_biogs
     end
@@ -161,6 +165,14 @@ module Droom
     def calendar_closed?
       !!@@calendar_closed
     end
+    
+    def all_events_public?
+      !!@@all_events_public
+    end
+    
+    def all_documents_public?
+      !!@@all_documents_public
+    end
 
     def dropbox_app_name
       @@dropbox_app_name ||= 'droom'
@@ -185,7 +197,7 @@ module Droom
     def suggestible_classes
       @@suggestible_classes ||= {
         "event" => "Droom::Event", 
-        "person" => "Droom::Person", 
+        "user" => "Droom::User", 
         "document" => "Droom::Document",
         "group" => "Droom::Group",
         "venue" => "Droom::Venue"
@@ -193,7 +205,7 @@ module Droom
     end
 
     def add_suggestible_class(label, klass=nil)
-      klass ||= label.titlecase
+      klass ||= label.camelize
       suggestible_classes[label] = klass.to_s
     end
 
@@ -213,6 +225,14 @@ module Droom
       @@required_calendar_names ||= %w{main stream}
     end
     
+    def separate_calendars?
+      !!@@separate_calendars
+    end
+    
+    def second_time_zone?
+      !!@@second_time_zone
+    end
+    
     def password_pattern
       @@password_pattern ||= ".{6,}"
     end
@@ -232,11 +252,6 @@ module Droom
         :dropbox => {
           :strategy => "clicked",
           :events? => true,
-        },
-        :dav => {
-          :enabled? => false,
-          :strategy => "clicked",
-          :everything? => false,
         }
       })
     end