droom 0.4.3 → 0.5.3

data/lib/droom/auth_cookie.rb

@@ -0,0 +1,82 @@
+require 'signed_json'
+require "active_support/core_ext/hash/slice"
+
+module Droom
+  class AuthCookie
+
+    def initialize(cookies)
+      @cookies = cookies
+    end
+
+    # Sets the cookie, referencing the given resource.id (e.g. User)
+    def set(resource, opts={})
+      cookie_values = cookie_options.merge(opts).merge(:value => set_auth_values(resource))
+      @cookies[cookie_name] = cookie_values
+    end
+
+    # Unsets the cookie via the HTTP response.
+    def unset
+      @cookies.delete cookie_name, cookie_options
+    end
+
+    def token
+      values[0]
+    end
+
+    # The Time at which the cookie was created.
+    def created_at
+      valid? ? DateTime.parse(values[1]) : nil
+    end
+
+    # Whether the cookie appears valid.
+    def valid?
+      present? && values.all?
+    end
+
+    def present?
+      @cookies[cookie_name].present?
+    end
+
+    # Whether the cookie was set since the given Time
+    def set_since?(time)
+      created_at && created_at >= time
+    end
+    
+    def store?
+      false
+    end
+
+  private
+    
+    # cookie value format is [uid, auth_token, time]
+    #
+    def values
+      begin
+        @values = signer.decode(@cookies[cookie_name])
+      rescue SignedJson::Error
+        [nil, nil]
+      end
+    end
+
+    def cookie_name
+      Settings.auth.cookie_name
+    end
+
+    # Note that this is destructive to all previous authentication tokens even if the cookie is not eventually set.
+    def set_auth_values(resource)
+      signer.encode [ resource.reset_authentication_token!, Time.now ]
+    end
+
+    def cookie_options
+      @session_options ||= Rails.configuration.session_options
+      @session_options[:domain] = Settings.auth.cookie_domain
+      @session_options.slice(:path, :domain, :secure, :httponly)
+    end
+
+    def signer
+      secret = Settings.auth.secret
+      @signer ||= SignedJson::Signer.new(secret)
+    end
+
+  end
+end

data/lib/droom/cropper.rb

@@ -0,0 +1,24 @@
+require "paperclip"
+require "paperclip/validators/attachment_height_validator"
+require "paperclip/validators/attachment_width_validator"
+require "paperclip/geometry_transformation"
+require "paperclip_processors/offset_thumbnail"
+
+# For inclusion into any model class with a croppable image. Turns crop values into Imagemagick `convert` paramaters.
+#
+module Paperclip::Croppable
+  # Offset+crop geometry is taken from model attributes at runtime
+  # and scaled up by the resolution_multiplier to produce the larger images required by high resolution screens on mobile devices.
+  #
+  def scale_geometry
+    "#{image_scale_width}x"
+  end
+
+  def crop_geometry
+    p ">>> crop_geometry: self is #{self.inspect}"
+    properties = [image_scale_width, image_scale_height, image_offset_left, image_offset_top]
+    p ">>> crop_geometry: #{properties.inspect}"
+    "%dx%d%+-d%+-d" % properties
+  end
+  
+end

data/lib/droom/engine.rb

@@ -1,15 +1,33 @@
-require 'msg'
+require 'rubygems'
+require 'paperclip'
+require 'fog'
+require 'devise'
+require 'devise-encryptable' #TODO only until passwords have migrated to bcrypt
+require 'cancan'
+require 'kaminari'
+require 'icalendar'
+require 'haml'
 
 module Droom
   class Engine < ::Rails::Engine
     isolate_namespace Droom
+
     initializer "droom.integration" do
-      ActiveRecord::Base.send :include, Droom::ModelHelpers
+      Devise.parent_controller = "Droom::EngineController"
       ActiveRecord::Base.send :include, Droom::Taggability
       ActiveRecord::Base.send :include, Droom::Folders
       ActiveSupport.on_load :action_controller do
         helper Droom::DroomHelper
       end
     end
+    
+    config.to_prepare do
+      Devise::SessionsController.layout Droom.devise_layout
+      Devise::RegistrationsController.layout Droom.devise_layout
+      Devise::ConfirmationsController.layout Droom.devise_layout
+      Devise::UnlocksController.layout Droom.devise_layout
+      Devise::PasswordsController.layout Droom.devise_layout
+    end
+    
   end
 end

data/lib/droom/folders.rb

@@ -74,17 +74,17 @@ module Droom
         Droom::Document.in_folders(folder.family)
       end
 
-      #
       # Here we refer to the class variable defined during `has_folder` configuration. If it exists, we will put our folder 
       # inside that of the named associate. The containing folder might be created as a side effect.
+      # if it looks like an association name, we ask the associate for a folder. Otherwise we'll just use it as a name.
       #
       def get_parent_folder
-        pfh = self.class.class_variable_get(:"@@parent_folder_holder")
-        if pfh && holder = send(pfh.to_sym)
-          holder.folder
+        parent_folder_option = self.class.class_variable_get(:"@@parent_folder_holder")
+        if parent_folder_option && respond_to?(parent_folder_option.to_sym) && folder_holder = send(parent_folder_option.to_sym)
+          folder_holder.folder
         else
-          # otherwise we want a root folder like /Events
-          Droom::Folder.find_or_create_by_slug_and_parent_id(self.class.to_s.titlecase.split('/').last.pluralize, nil)
+          slug = parent_folder_option || self.class.to_s.titlecase.split('/').last.pluralize
+          Droom::Folder.where(:slug => slug, :parent_id => nil).first_or_create
         end
       end
 

data/lib/droom/lazy_hash.rb

@@ -49,6 +49,16 @@ module Droom
       end
     end
     
+    def get_or_set(path, default_value)
+      key, subkeys = split_path(path)
+      if subkeys.any?
+        self[key] ||= Droom::LazyHash.new
+        self[key].get_or_set(subkeys, default_value)
+      else
+        self[key] ||= default_value
+      end
+    end
+    
     # *set* will set the value at the named bucket. Note that you should only ever do this from an 
     # initializer or some other thread-global event that can be relied upon always to have run. Never call
     # LazyHash#set at runtime unless what you want is a local, non-thread-global nested hash construction.
@@ -65,7 +75,7 @@ module Droom
     
     #
     def split_path(key)
-      keys = key.is_a?(Array) ? key : key.to_s.split('.')
+      keys = key.is_a?(Array) ? key.dup : key.to_s.split('.')
       keys.any? ? [keys.shift.to_sym, keys] : [nil, []]
     end
 

data/lib/droom/monkeys.rb

@@ -1,14 +1,14 @@
 class Array
   def to_ics
-    to_rical.to_s
+    to_icalendar.to_ical
   end
   
-  def to_rical
-    RiCal.Calendar do |cal|
-      self.flatten.each do |item|
-        cal.add_subcomponent(item.to_rical) if item.respond_to?(:to_rical)
-      end
+  def to_icalendar
+    cal = Icalendar::Calendar.new
+    self.flatten.each do |item|
+      cal.add_event(item.icalendar_event) if item.respond_to? :icalendar_event
     end
+    cal
   end
 end
 

data/lib/droom/taggability.rb

@@ -34,7 +34,7 @@ module Droom
       end
 
       def remove_tag(word=nil)
-        tag = Tag.find_by_title(word) if word && !word.blank?
+        tag = Tag.find_by(title: word) if word && !word.blank?
         self.tags.delete(tag) if tag
       end
     

data/lib/droom/validators.rb

@@ -6,6 +6,6 @@ end
 
 class UniquenessAmongSiblingsValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add(attribute, :taken) if record.siblings.send(:"find_by_#{attribute}", value)
+    record.errors.add(attribute, :taken) if record.siblings.send(:"find_by", {attribute: value})
   end
 end

data/lib/droom/version.rb

@@ -1,3 +1,3 @@
 module Droom
-  VERSION = "0.4.3"
+  VERSION = "0.5.3"
 end

data/lib/generators/droom/install/templates/droom_initializer.rb

@@ -1,5 +1,13 @@
-#Droom.dav_subdomain = "dav"
-#Droom.dav_root = "webdav"
+#Droom.layout = "application"
+#Droom.email_layout = "email"
 #Droom.use_forenames = false
 #Droom.show_venue_map = false
 #Droom.home_country = 'gb'
+#Droom.main_dashboard_modules = %w{welcome future_events past_events documents}
+#Droom.margin_dashboard_modules = %w{calendar invitations stream}
+#Droom.home_url = Settings.host
+#Droom.email_from = Settings.email.address
+#Droom.email_from_name = Settings.email.name
+#Droom.dropbox_app_key = Settings.dropbox.key
+#Droom.dropbox_app_secret = Settings.dropbox.secret
+#Droom.dropbox_app_name = Settings.dropbox.name

data/lib/paperclip/geometry_transformation.rb

@@ -0,0 +1,80 @@
+module Paperclip
+
+  class TransformationError < RuntimeError; end
+  class StyleError < RuntimeError; end
+  
+  class Geometry
+    
+    # Returns a new Geometry object with the the same dimensions as this but with no modifier.
+    def without_modifier
+      Geometry.new(self.width, self.height)
+    end
+    
+    # Returns the dimensions that would result if a thumbnail was created by transforming this geometry into that geometry.
+    # Its purpose is to mimic imagemagick conversions. Used like so:
+    #    file_geometry.transformed_by(style_geometry)
+    # it returns the size of the thumbnail image you would get by applying that rule.
+    # This saves us having to go back to the file, which is expensive with S3.
+    # We understand all the Imagemagick geometry arguments described at http://www.imagemagick.org/script/command-line-processing.php#geometry
+    # including both '^' and paperclip's own '#' modifier.
+    #
+    def transformed_by (other)
+      other = Geometry.parse(other) unless other.is_a? Geometry
+      # if the two geometries are similar, or the destination geometry is a fixed size, the resulting dimensions are fixed
+      return other.without_modifier if self =~ other || ['#', '!', '^'].include?(other.modifier)
+      # otherwise, we apply the transformation
+      raise TransformationError, "geometry is not transformable without both width and height" if self.height == 0 or self.width == 0
+      case other.modifier
+      when '>'
+        (other.width < self.width || other.height < self.height) ? scaled_to_fit(other) : self
+      when '<'
+        (other.width > self.width && other.height > self.height) ? scaled_to_fit(other) : self
+      when '%'
+        scaled_by(other)
+      when '@'
+        scaled_by(other.width * 100 / (self.width * self.height))
+      else
+        scaled_to_fit(other)
+      end
+    end
+    alias :* :transformed_by
+    
+    # Tests whether two geometries are identical in dimensions and modifier. 
+    def == (other)
+      self.to_s == other.to_s
+    end
+    
+    # Tests whether two geometries have the same dimensions, ignoring modifier.
+    def =~ (other)
+      self.height.to_i == other.height.to_i && self.width.to_i == other.width.to_i
+    end
+    
+    # Scales this geometry to fit within that geometry.
+    def scaled_to_fit(other)
+      if (other.width > 0 && other.height == 0)
+        Geometry.new(other.width, self.height * other.width / self.width)
+      elsif (other.width == 0 && other.height > 0)
+        Geometry.new(self.width * other.height / self.height, other.height)
+      else
+        ratio = Geometry.new( other.width / self.width, other.height / self.height )
+        if ratio.square?
+          other.without_modifier
+        elsif ratio.horizontal?
+          Geometry.new(ratio.height * self.width, other.height)
+        else
+          Geometry.new(other.width, ratio.width * self.height)
+        end
+      end
+    end
+    
+    # Scales this geometry by the percentage(s) specified in that geometry.
+    def scaled_by(other)
+      other = Geometry.new("#{other}%") unless other.is_a? Geometry
+      if other.height > 0
+        Geometry.new(self.width * other.width / 100, self.height * other.height / 100)
+      else
+        Geometry.new(self.width * other.width / 100, self.height * other.width / 100)
+      end
+    end
+  end
+end

data/lib/paperclip/validators/attachment_height_validator.rb

@@ -0,0 +1,89 @@
+require 'active_model/validations/numericality'
+
+module Paperclip
+  module Validators
+    class AttachmentHeightValidator < ActiveModel::Validations::NumericalityValidator
+      AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to]
+
+      def initialize(options)
+        extract_options(options)
+        super
+      end
+
+      def validate_each(record, attr_name, value)
+        attachment = record.send(attr_name)
+        dimensions = Paperclip::Geometry.from_file(attachment.queued_for_write[:original])
+        value = dimensions.height.to_i
+        options.slice(*AVAILABLE_CHECKS).each do |option, option_value|
+          option_value = extract_option_value(option, option_value)
+          unless value.send(CHECKS[option], option_value)
+            error_message_key = options[:in] ? :in_between : option
+            record.errors.add(attr_name, error_message_key, filtered_options(value).merge(
+              :min => min_value,
+              :max => max_value
+            ))
+          end
+        end
+      end
+
+      def check_validity!
+        unless (AVAILABLE_CHECKS + [:in]).any? { |argument| options.has_key?(argument) }
+          raise ArgumentError, "You must pass either :less_than, :greater_than, or :in to the validator"
+        end
+      end
+
+    private
+
+      def extract_options(options)
+        if range = options[:in]
+          if !options[:in].respond_to?(:call)
+            options[:less_than_or_equal_to] = range.max
+            options[:greater_than_or_equal_to] = range.min
+          else
+            options[:less_than_or_equal_to] = range
+            options[:greater_than_or_equal_to] = range
+          end
+        end
+      end
+
+      def extract_option_value(option, option_value)
+        if option_value.is_a?(Range)
+          if [:less_than, :less_than_or_equal_to].include?(option)
+            option_value.max
+          else
+            option_value.min
+          end
+        else
+          option_value
+        end
+      end
+
+      def min_value
+        value = options[:greater_than_or_equal_to] || options[:greater_than]
+        value = value.min if value.respond_to?(:min)
+        value
+      end
+
+      def max_value
+        value = options[:less_than_or_equal_to] || options[:less_than]
+        value = value.max if value.respond_to?(:max)
+        value
+      end
+    end
+
+    module HelperMethods
+      # Places ActiveRecord-style validations on the pixel height of the file assigned. 
+      # The possible options are:
+      # * +in+: a Range of bytes (i.e. +1..1.megabyte+),
+      # * +less_than+: equivalent to :in => 0..options[:less_than]
+      # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
+      # * +message+: error message to display, use :min and :max as replacements
+      # * +if+: A lambda or name of an instance method. Validation will only
+      #   be run if this lambda or method returns true.
+      # * +unless+: Same as +if+ but validates if lambda or method returns false.
+      def validates_attachment_height(*attr_names)
+        validates_with AttachmentHeightValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/paperclip/validators/attachment_width_validator.rb

@@ -0,0 +1,89 @@
+require 'active_model/validations/numericality'
+
+module Paperclip
+  module Validators
+    class AttachmentWidthValidator < ActiveModel::Validations::NumericalityValidator
+      AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to]
+
+      def initialize(options)
+        extract_options(options)
+        super
+      end
+
+      def validate_each(record, attr_name, value)
+        attachment = record.send(attr_name)
+        dimensions = Paperclip::Geometry.from_file(attachment.queued_for_write[:original])
+        value = dimensions.width.to_i
+        options.slice(*AVAILABLE_CHECKS).each do |option, option_value|
+          option_value = extract_option_value(option, option_value)
+          unless value.send(CHECKS[option], option_value)
+            error_message_key = options[:in] ? :in_between : option
+            record.errors.add(attr_name, error_message_key, filtered_options(value).merge(
+              :min => min_value,
+              :max => max_value
+            ))
+          end
+        end
+      end
+
+      def check_validity!
+        unless (AVAILABLE_CHECKS + [:in]).any? { |argument| options.has_key?(argument) }
+          raise ArgumentError, "You must pass either :less_than, :greater_than, or :in to the validator"
+        end
+      end
+
+    private
+
+      def extract_options(options)
+        if range = options[:in]
+          if !options[:in].respond_to?(:call)
+            options[:less_than_or_equal_to] = range.max
+            options[:greater_than_or_equal_to] = range.min
+          else
+            options[:less_than_or_equal_to] = range
+            options[:greater_than_or_equal_to] = range
+          end
+        end
+      end
+
+      def extract_option_value(option, option_value)
+        if option_value.is_a?(Range)
+          if [:less_than, :less_than_or_equal_to].include?(option)
+            option_value.max
+          else
+            option_value.min
+          end
+        else
+          option_value
+        end
+      end
+
+      def min_value
+        value = options[:greater_than_or_equal_to] || options[:greater_than]
+        value = value.min if value.respond_to?(:min)
+        value
+      end
+
+      def max_value
+        value = options[:less_than_or_equal_to] || options[:less_than]
+        value = value.max if value.respond_to?(:max)
+        value
+      end
+    end
+
+    module HelperMethods
+      # Places ActiveRecord-style validations on the pixel width of the file assigned. 
+      # The possible options are:
+      # * +in+: a Range of bytes (i.e. +1..1.megabyte+),
+      # * +less_than+: equivalent to :in => 0..options[:less_than]
+      # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
+      # * +message+: error message to display, use :min and :max as replacements
+      # * +if+: A lambda or name of an instance method. Validation will only
+      #   be run if this lambda or method returns true.
+      # * +unless+: Same as +if+ but validates if lambda or method returns false.
+      def validates_attachment_width(*attr_names)
+        validates_with AttachmentWidthValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end