droom 0.2.1 → 0.4.1

data/app/controllers/droom/confirmations_controller.rb

@@ -1,38 +0,0 @@
-module Droom
-  class ConfirmationsController < Devise::ConfirmationsController
-
-    # If user not yet confirmed, show password form (rather than just confirming, as it normal)
-    # If already confirmed, allow devise to do whatever devise does.
-    #
-    def show
-      self.resource = resource_class.find_by_confirmation_token(params[:confirmation_token])
-      super if resource.confirmed?
-    end
-
-    # the purpose of this is to add another step between user creation and user confirmation, such that
-    # we perform the confirmation only if a password is supplied and validates.
-    #
-    # NB. in the tortured RESTfulness of devise, that means turning confirmation#show into a password form
-    # and using confirmations#update to update the user object accordingly.
-    #
-    def update
-      self.resource = resource_class.find_by_confirmation_token(params[resource_name][:confirmation_token])
-      
-      result = resource.update_attributes(params[resource_name].except(:confirmation_token))
-      
-      Rails.logger.warn ">>> update_attributes gave us #{result.inspect} and password #{resource.password} / #{resource.password_confirmation}"
-      Rails.logger.warn ">>> errors: #{resource.errors.full_messages}"
-      
-      if result && resource.password_match?
-        self.resource = resource_class.confirm_by_token(params[resource_name][:confirmation_token])
-        set_flash_message :notice, :confirmed
-        sign_in_and_redirect(resource_name, resource)
-      else
-        # back to the password form
-        set_flash_message :error, :password_error
-        render :action => "show"
-      end
-    end
-    
-  end
-end

data/app/controllers/droom/search_controller.rb

@@ -1,66 +0,0 @@
-module Droom
-  class SearchController < Droom::EngineController
-    respond_to :json, :js, :html
-    before_filter :authenticate_user!
-    before_filter :get_classes
-    before_filter :get_fields
-
-    def index
-      @results = []
-      if @fragment = params[:term]
-        @page = params[:page] || 1
-        frag = @fragment.force_encoding("US-ASCII")
-        # if term isn't empty
-        unless frag == ""
-          classes = Droom.searchable_classes.values.collect {|klass| klass.constantize}
-          highlights = @highlights.collect {|field| field.to_sym}
-          # search the searchable classes
-          # highlight matching words from highlightable fields
-          search = Sunspot.search classes do
-            fulltext frag do
-              highlights.each do |hl|
-                highlight hl
-              end
-              with visible_to?(current_person)
-            end
-            paginate :page => @page, :per_page => 10
-          end
-          # push the hits (for retrieving highlights) into the search results
-          search.each_hit_with_result do |hit, result|
-            if @requested_types.include? result.class.to_s
-              result[:hit] = if hit.highlights.length > 0 then hit else nil end
-              @results.push result
-            end
-          end
-        end
-      end
-      respond_with @results do |format|
-        format.html { render "droom/shared/search" }
-        format.json { render :json => @results.map(&:as_search_result).to_json }
-        format.js { render :partial => "droom/shared/search_results" }
-      end
-    end
-
-  protected
-
-    def get_fields
-      @highlights = []
-      @requested_types.each do |klass|
-        klass.constantize.highlight_fields.each do |hlf|
-          @highlights.push hlf unless @highlights.include? hlf
-        end
-      end
-    end
-
-    def get_classes
-      searchable_classes = Droom.searchable_classes
-      @types = [params[:type]].flatten.compact.uniq
-      @types = searchable_classes.keys if @types.empty?
-
-      logger.warn ">>> requested_types is #{@types.inspect}"
-
-      @requested_types = searchable_classes.values_at(*@types)
-    end
-
-  end
-end

data/app/views/cropper/uploads/_crop.html.haml

@@ -1,46 +0,0 @@
-// default state of precrop upload
-
-- upload ||= @upload
-- recipient = (params[:for] || "scrap").to_sym
-
-- if recipient == :scrap
-  - object = Droom::Scrap.new
-  - w = 580
-  - h = 326
-  - multiplier = 1
-
-- elsif recipient == :person
-  - object = Droom::Person.new
-  - w = 130
-  - h = 130
-  - multiplier = 4
-
-- prefix = 'image'
-
-- max_w = upload.width(:precrop)
-- max_h = upload.height(:precrop)
-- image_w = max_w * 3 / 4
-- image_h = max_h * 3 / 4
-- image_l = (w - image_w)/2
-- image_t = (h - image_h)/2
-
-// scale_* will already be defined when editing an existing crop
-- scale_w = params[:scale_w] || image_w
-- scale_h = params[:scale_h] || image_h
-- offset_l = params[:offset_l] || image_l
-- offset_t = params[:offset_t] || image_t
-
-.cropper
-  .preview{:style => "width: #{scale_w}px; height: #{scale_h}px; top: #{offset_t}px; left: #{offset_l}px"}
-    %img{:src => upload.file.url(:precrop)}
-
-  = fields_for recipient, object do |sf|
-    %fieldset.crop
-      = hidden_field_tag :multiplier, multiplier
-      = sf.hidden_field :"#{prefix}_offset_left", :value => offset_l, :class => 'ol'
-      = sf.hidden_field :"#{prefix}_offset_top", :value => offset_t, :class => 'ot'
-      = sf.hidden_field :"#{prefix}_upload_id", :value => upload.id
-      .scaler
-        %p.range
-          = sf.range_field :"#{prefix}_scale_width", :min => w, :max => max_w, :value => scale_w, :class => 'sw'
-          = sf.hidden_field :"#{prefix}_scale_height", :value => scale_h, :class => 'sh'

data/app/views/devise/mailer/confirmation_instructions.en.html.haml

@@ -1,24 +0,0 @@
-%p
-  Dear 
-  = @resource.name + ','
-  
-%p
-  You are cordially invited to visit our new Data Room.
-
-%p
-  The data room is a private space for the dissemination of useful information.
-
-%p
-  An account has been created for you; all that remains is to activate it and choose a password.
-  
-%h2
-  = link_to "Please click here to begin", confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
-  
-%p
-  As always your comments and suggestions will be very welcome.
-
-%p
-  With best wishes,
-
-%p
-  = Droom.email_from_name

data/app/views/devise/mailer/reset_password_instructions.en.html.haml

@@ -1,21 +0,0 @@
-%p
-  Hello 
-  = @user.best_name + ','
-  
-%p
-  Someone, perhaps you, has entered your email address into the 'forgotten password' form in the data room.
-
-%p
-  If that person was not you, please don't be concerned: you are receiving this message and they are not. 
-  Please ignore it and carry on as usual.
-  
-%p
-  If you would like to change your password, please click on the link below:
-  
-%h2
-  = link_to "Change your password here", edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
-  
-%p
-  Your password will not change until you complete this process, so if you have just remembered it you can still 
-  = link_to "log in", new_user_session_url
-  as usual.

data/app/views/droom/shared/_search_results.html.haml

@@ -1,9 +0,0 @@
-.search_results
-  - if @results && @results.any?
-    - @results.each do |result|
-      = render :partial => "#{result.class.to_s.pluralize.underscore}/search_result", :object => result
-  
-  - elsif @fragment
-    %li.error
-      = t :no_results
-      - with_info ||= false

data/app/views/droom/shared/search.html.haml

@@ -1,18 +0,0 @@
-%h1.pagetitle
-  Search
-
-%form.search_form{:action => droom.search_url}
-  = text_field_tag :term, params[:term], :placeholder => t(:advanced_search), :autocomplete => "off", :class => "search_box"
-  = submit_tag "search"
-
-= render :partial => 'droom/shared/search_results'
-
-%p.note
-  This search works in a fairly google-like way. It is designed more for strength than sophistication,
-  but your query can include modifiers like 
-  %strong +term
-  and 
-  %strong -term
-  to insist on the presence or absence of a word, and "phrases enclosed in double quotes" must occur intact.
-  The index includes uploaded documents as well as our events and people.
-