droom 0.2.1 → 0.4.1

data/app/models/droom/document.rb

@@ -11,19 +11,11 @@ module Droom
     has_many :dropbox_documents
     has_attached_file :file
 
-    after_create :read_and_reindex
-
     after_save :update_dropbox_documents
     after_destroy :mark_dropbox_documents_deleted
 
     validates :file, :presence => true
 
-    searchable :auto_index => false, :auto_remove => true do
-      text :name, :boost => 10, :stored => true
-      text :description, :stored => true
-      text :extracted_text, :stored => true
-    end
-
     scope :all_private, where("private = 1")
     scope :not_private, where("private <> 1 OR private IS NULL")
     scope :all_public, where("public = 1 AND private <> 1 OR private IS NULL")
@@ -53,9 +45,9 @@ module Droom
 
     scope :by_date, order("droom_documents.updated_at DESC, droom_documents.created_at DESC")
 
-    def self.highlight_fields
-      [:name, :description, :extracted_text]
-    end
+    scope :latest, lambda {|limit|
+      order("droom_documents.updated_at DESC, droom_documents.created_at DESC").limit(limit)
+    }
 
     def attach_to(holder)
       self.folder = holder.folder
@@ -111,22 +103,6 @@ module Droom
       dropbox_documents.create(:person_id => user.person.id)
     end
 
-    def read_and_reindex
-      temp = Paperclip.io_adapters.for(self.file)
-      data = File.read(temp.path)
-      begin
-        self.extracted_text = Yomu.read :text, data
-        self.extracted_metadata = Yomu.read :metadata, data
-      rescue Exception => e
-        Rails.logger.warn "Failed to parse document text or metadata from #{file_file_name}: #{e}"
-      end
-      if self.extracted_text or self.extracted_metadata
-        solr_index
-      end
-      save
-    end
-    handle_asynchronously :read_and_reindex, :priority => 20
-
     def mark_dropbox_documents_deleted
       dropbox_documents.each do |dd|
         dd.mark_deleted(true)

data/app/models/droom/event.rb

@@ -43,22 +43,10 @@ module Droom
     before_validation :set_uuid
     before_save :ensure_slug
     after_save :update_occurrences
-    after_save :index
 
     scope :primary, where("master_id IS NULL")
     scope :recurrent, where(:conditions => "master_id IS NOT NULL")
 
-    searchable do
-      text :name, :boost => 10, :stored => true
-      text :description, :stored => true
-    end
-
-    handle_asynchronously :solr_index
-
-    def self.highlight_fields
-      [:name, :description]
-    end
-
     ## Event retrieval in various ways
     #
     # Events differ from other models in that they are visible to all unless marked 'private'.

data/app/models/droom/folder.rb

@@ -24,22 +24,21 @@ module Droom
     scope :not_public, where("#{table_name}.public <> 1 OR #{table_name}.private = 1)")
     scope :by_name, order("#{table_name}.name ASC")
     scope :visible_to, lambda { |person|
-      # if person
-      #   select('droom_folders.*')
-      #     .joins('LEFT OUTER JOIN droom_personal_folders AS dpf ON droom_folders.id = dpf.folder_id')
-      #     .where(["(droom_folders.public = 1 OR dpf.person_id = ?)", person.id])
-      #     .group('droom_folders.id')
-      # else
-      #   all_public
-      # end
-      not_private
+      if person
+        select('droom_folders.*')
+          .joins('LEFT OUTER JOIN droom_personal_folders AS dpf ON droom_folders.id = dpf.folder_id')
+          .where(["(droom_folders.public = 1 OR dpf.person_id = ?)", person.id])
+          .group('droom_folders.id')
+      else
+        all_public
+      end
     }
     
     def visible_to?(person)
       true
     end
 
-    # A root folders is created automatically for each class that has_folder, 
+    # A root folder is created automatically for each class that has_folders,
     # the first time something in that class asks for its folder.
     # scope :roots, where('droom_folders.holder_type IS NULL AND droom_folders.parent_id IS NULL')
 

data/app/models/droom/group.rb

@@ -19,13 +19,6 @@ module Droom
     validates :slug, :uniqueness => true, :presence => true
     validates :mailing_list_name, :uniqueness => true, :presence => true
 
-    searchable do
-      text :name, :boost => 10, :stored => true
-      text :description, :stored => true
-    end
-
-    handle_asynchronously :solr_index
-
     def self.highlight_fields
       [:name, :description]
     end

data/app/models/droom/person.rb

@@ -117,8 +117,8 @@ module Droom
                :geometry => "520x520#",
                :styles => {
                  :icon => "32x32#",
-                 :thumb => "120x120#",
-                 :precrop => "1200x1200^"
+                 :thumb => "130x130#",
+                 :precrop => "1200x1200<"
                }
 
     ## Scopes
@@ -130,18 +130,6 @@ module Droom
     scope :all_public, where("public = 1 AND private <> 1 OR private IS NULL")
     scope :not_public, where("public <> 1 OR private = 1)")
 
-    searchable do
-      text :name, :boost => 10, :stored => true
-      text :forename, :boost => 10, :stored => true
-      text :description, :stored => true
-    end
-
-    handle_asynchronously :solr_index
-
-    def self.highlight_fields
-      [:name, :forename, :description]
-    end
-
     scope :matching, lambda { |fragment| 
       fragment = "%#{fragment}%"
       where('droom_people.name LIKE :f OR droom_people.forename LIKE :f OR droom_people.email LIKE :f OR droom_people.phone LIKE :f OR CONCAT(droom_people.forename, " ", droom_people.name) LIKE :f', :f => fragment)
@@ -281,7 +269,7 @@ module Droom
   protected
 
     def invite_if_instructed
-      invite_user if invite_on_creation
+      invite_user if invite_on_creation?
     end
     
     # ### Administration & callbacks
@@ -289,12 +277,17 @@ module Droom
     # At some point we may want to create a user to log in and look after this person. 
     # This usually has the side effect of sending out a confirmation message.
     #
+    
+    def invite_on_creation?
+      !!invite_on_creation && invite_on_creation != 0 && invite_on_creation != "0"
+    end
+    
     def invite_user
-      unless self.user
-        if invitable?
-          user = self.create_user(:forename => forename, :name => name, :email => email)
-          self.save
-        end
+      if self.user
+        self.user.send_confirmation_instructions
+      elsif invitable?
+        user = self.create_user(:forename => forename, :name => name, :email => email)
+        self.save
       end
       self.user
     end

data/app/models/droom/scrap.rb

@@ -15,16 +15,6 @@ module Droom
                  :precrop => "1200x1200^"
                }
 
-    searchable do
-      text :name, :boost => 10, :stored => true
-      text :body, :stored => true
-      text :note
-    end
-
-    def self.highlight_fields
-      [:name, :body]
-    end
-
     attr_accessible :name, :body, :image, :description, :scraptype, :note, :created_by, :event, :event_attributes, :document, :document_attributes
     before_save :get_youtube_thumbnail
 
@@ -100,9 +90,9 @@ module Droom
   protected
   
     def get_youtube_thumbnail
-      # youtube id is held in the 'note' column.
+      # youtube id is held in the 'body' column.
       if scraptype == "video" && body?
-        self.image = URI.parse("http://img.youtube.com/vi/#{body}/0.jpg")
+        self.image = URI("http://img.youtube.com/vi/#{body}/0.jpg")
       end
     end
     

data/app/models/droom/user.rb

@@ -7,6 +7,11 @@ module Droom
     has_many :preferences, :foreign_key => "created_by_id"
     accepts_nested_attributes_for :preferences, :allow_destroy => true
 
+    validates :email, :uniqueness => true, :presence => true
+    validates_format_of :email, :with => /@/
+    validates :name, :presence => true
+    # validates :password, :presence => true, :length => { :minimum => 6 }, :confirmation => true, :if => :password_required?
+
     receives_messages# :groups => [:unconfirmed, :personed, :administrative]
   
     devise :database_authenticatable,
@@ -18,11 +23,10 @@ module Droom
            :token_authenticatable,
            :encryptor => :sha512
   
-    before_create :ensure_authentication_token
+    before_create :ensure_authentication_token  # provided by devise
 
     attr_accessor :newly_activated, :update_person_email, :confirm, :remove_person
   
-    # validates :password, :length => { :minimum => 6 }, :if => :password_required?
   
     scope :unconfirmed, where("confirmed_at IS NULL")
     scope :administrative, where(:admin => true)
@@ -79,7 +83,6 @@ module Droom
     end
 
     def password_match?
-      Rails.logger.warn ">>> password_match? '#{password}' == '#{password_confirmation}'"
       self.errors[:password] << "can't be blank" if password.blank?
       self.errors[:password_confirmation] << "can't be blank" if password_confirmation.blank?
       self.errors[:password_confirmation] << "does not match password" if password != password_confirmation
@@ -194,18 +197,39 @@ module Droom
     # If using `msg`, this defines the variables available in message templates.
     #
     def for_email
+      self.ensure_confirmation_token!
       {
         :informal_name => informal_name,
         :formal_name => formal_name,
         :forename => forename,
         :name => name,
         :email => email,
-        :confirmation_url => Droom::Engine.routes.url_helpers.new_user_confirmation_url(self, :confirmation_token => self.confirmation_token, :host => ActionMailer::Base.default_url_options[:host]),
+        :confirmation_url => Droom::Engine.routes.url_helpers.welcome_url(:id => self.id, :confirmation_token => self.confirmation_token, :host => ActionMailer::Base.default_url_options[:host]),
         :sign_in_url => Droom::Engine.routes.url_helpers.new_user_session_path(:host => ActionMailer::Base.default_url_options[:host]),
-        :password_reset_url => Droom::Engine.routes.url_helpers.new_user_password_path(self, :host => ActionMailer::Base.default_url_options[:host])
+        :password_reset_url => Droom::Engine.routes.url_helpers.edit_user_password_url(:reset_password_token => self.reset_password_token, :host => ActionMailer::Base.default_url_options[:host])
+      }
+    end
+    
+    ## Omniauth package
+    #
+    # This is returned to the client application in the final stage of oauth authentication, and may be used to create
+    # a new local account.
+    
+    def credentials(options={})
+      {
+        id: id,
+        title: title,
+        name: name,
+        forename: forename,
+        email: email,
+        admin: admin?,
+        image: thumbnail
       }
     end
     
+    def thumbnail
+      person.image.url(:icon) if person
+    end
 
   end
 end

data/app/models/droom/venue.rb

@@ -14,23 +14,6 @@ module Droom
     before_validation :geocode
     # reverse_geocoded_by :lat, :lng
 
-    searchable do
-      text :name, :boost => 10, :stored => true
-      text :description, :stored => true
-      text :post_line1, :stored => true
-      text :post_line2, :stored => true
-      text :post_city, :stored => true
-      text :post_region, :stored => true
-      text :post_country, :stored => true
-      text :post_code, :stored => true
-    end
-
-    handle_asynchronously :solr_index
-
-    def self.highlight_fields
-      [:name, :description, :post_line1, :post_line2, :post_city, :post_region, :post_country, :post_code]
-    end
-
     scope :matching, lambda { |fragment| 
       fragment = "%#{fragment}%"
       where('droom_venues.name like ?', fragment)

data/app/views/{droom/users/unwelcome.en.html.haml → devise/confirmations/failure.en.html.haml}

@@ -6,12 +6,15 @@
     =t :code_unknown
 
   %p
-    This welcome address is not correct. Please check your invitation email and make sure that 
+    This confirmation url is not correct. Have you already confirmed this account? In that case
+    you only need to
+    = link_to "sign in.", "/"
+    Otherwise, please check your invitation email and make sure that 
     you are typing or pasting the right address. It may be that your email program has broken
     the address over two lines: in that case please make sure you enter the whole thing without
     any spaces.
     
   %p
-    If you are seeing this message in error, please contact the site builder on 
+    If you are seeing this message in error, please contact the chief builder on 
     = mail_to "will@spanner.org"
     and he will sort it out for you right away.

data/app/views/devise/confirmations/new.html.haml

@@ -0,0 +1,25 @@
+#account
+  %h1.pagetitle
+    =t :resend_confirmation
+
+  = form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
+    = devise_error_messages!
+    
+    %p
+      Enter the email address you signed up with and we will send you the account confirmation instructions again.
+    
+    %p
+      = f.label :email
+      %br
+      = f.email_field :email, :class => 'login'
+      %span.note
+        = t :email_note
+        
+    .controls
+      .save.button
+        %p
+          = f.submit t(:send_me_instructions), :class => "submit"
+
+    %p.note
+      If you have already confirmed your account, this won't work but you can 
+      = link_to "reset your password.", new_password_path(resource_name)

data/app/views/devise/confirmations/show.html.haml

@@ -0,0 +1,32 @@
+- content_for :title do
+  = t :welcome
+
+#account
+  %p
+    %strong
+      = t :hello_name, :name => resource.informal_name
+    = t :welcome_preamble
+  
+  = form_for resource, :url => confirm_password_path, :html => {:class => 'password'} do |f|
+    = f.hidden_field :confirmation_token
+    
+    %p
+      = f.label :password
+      %br
+      = f.password_field :password, :autocomplete => "off", :class => 'preferences password required', :required => true, :pattern => ".{6,}"
+      %br
+      %span.note
+        = t :password_requirements
+
+    %p.confirmation
+      = f.label :password_confirmation
+      %br
+      = f.password_field :password_confirmation, :class => 'preferences password_confirmation required', :required => true, :pattern => ""
+
+    %p.note.password_notice
+
+    .controls
+      .save.button
+        = f.submit t(:continue), :class => "submit"
+
+

data/app/views/droom/dashboard/_documents.html.haml

@@ -0,0 +1,9 @@
+- documents = Droom::Document.visible_to(current_user.person).latest(5)
+
+%h2.section
+  = link_to t(:latest_documents), droom.documents_url
+
+- if documents.any?
+  = render :partial => "droom/documents/document", :collection => documents, :locals => {:closed => true}
+- else
+  = t :no_documents

data/app/views/droom/dashboard/_folders.html.haml

@@ -2,4 +2,4 @@
 - if folders.any?
   %h2.quiet
     = t :my_folders
-  = render :partial => "droom/folders/folder", :collection => documents, :locals => {:closed => true}
+  = render :partial => "droom/folders/folder", :collection => folders, :locals => {:closed => true}

data/app/views/droom/dashboard/_groups.html.haml

@@ -0,0 +1,9 @@
+- groups = current_user.person.groups if current_user.person
+
+%h2.section
+  = link_to t(:your_groups), droom.documents_url
+
+- if groups.any?
+  = render :partial => "droom/groups/group", :collection => groups, :locals => {:closed => true}
+- else
+  = t :no_groups

data/app/views/droom/documents/_document.html.haml

@@ -4,7 +4,7 @@
 
 %div.document.holder
   %h2.name<
-    = link_to truncate(document.name, :length => 33), document_url(document), :class => cssclasses, :title => t(:click_to_download, :name => document.file_file_name)
+    = link_to truncate(document.name, :length => 33), droom.folder_document_url(document.folder, document), :class => cssclasses, :title => t(:click_to_download, :name => document.file_file_name)
     - if admin?
       = link_to t(:edit_document), edit_document_url(document), :class => 'admin edit minimal', :remote => true, :data => {:action => "overlay", :type => "html"}
 

data/app/views/droom/documents/_table_document.html.haml

@@ -5,7 +5,7 @@
 
 %tr.document.holder{:id => "document_#{document.id}"}
   %th.name
-    = link_to truncate(document.name, :length => 24), document_url(document), :class => cssclasses.join(' '), :title => t(:click_to_download, :name => document.file_file_name)
+    = link_to truncate(document.name, :length => 24), droom.folder_document_url(document.folder, document), :class => cssclasses.join(' '), :title => t(:click_to_download, :name => document.file_file_name)
   %td.filename.minor
     %span.note
       = truncate(document.file_file_name, :length => 18)

data/app/views/droom/events/_event.html.haml

@@ -21,7 +21,6 @@
 - cssclasses << 'closed' if closed
 - cssclasses << 'invited' if event.attended_by?(current_person)
 
-
 - if show_header 
   - header = month_header_for(event.start_date)
   - if header != @event_header