Fixes Spanish translations and scopes. Support scss in generators.

Gemfile

@@ -1,13 +1,4 @@
-source 'https://rubygems.org'
-
-gem 'spree', github: 'spree/spree', branch: '3-0-stable'
+source :rubygems
 
 gemspec
 
-group :test do
-  if RUBY_PLATFORM.downcase.include? "darwin"
-    gem 'guard-rspec'
-    gem 'rb-fsevent'
-    gem 'growl'
-  end
-end

Versionfile

@@ -8,4 +8,5 @@
 "2.2.x" => { :branch => "2-2-stable" }
 "2.3.x" => { :branch => "2-3-stable" }
 "3.0.x" => { :branch => "3-0-stable" }
-"3.1.x" => { :branch => "master" }
+"3.1.x" => { :branch => "3-1-stable" }
+"4.0.x" => { :branch => "master" }

app/assets/stylesheets/spree/frontend/spree_digital.scss

@@ -0,0 +1,14 @@
+div.download-links {
+  margin-top: 1em;
+  ul {
+    list-style: none;
+    margin-top: 0.5em;
+    padding-left: 0em;
+    li a {
+      color: #27aae2;
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -1,8 +1,18 @@
-Spree::Admin::OrdersController.class_eval do
-  def reset_digitals
-    load_order
-    @order.reset_digital_links!
-    flash[:notice] = Spree.t(:downloads_reset, scope: 'digitals')
-    redirect_to spree.admin_order_path(@order)
+module Spree
+  module Admin
+    module OrdersControllerDecorator
+      def self.prepended(base)
+        base.before_action :load_data, only: :reset_digitals
+      end
+
+      def reset_digitals
+        # load_order
+        @order.reset_digital_links!
+        flash[:notice] = Spree.t(:downloads_reset, scope: 'digitals')
+        redirect_to spree.admin_order_path(@order)
+      end
+    end
   end
 end
+
+::Spree::Admin::OrdersController.prepend Spree::Admin::OrdersControllerDecorator if ::Spree::Admin::OrdersController.included_modules.exclude?(Spree::Admin::OrdersControllerDecorator)

app/controllers/spree/digitals_controller.rb

@@ -1,31 +1,31 @@
 module Spree
   class DigitalsController < Spree::StoreController
-    force_ssl only: :show, if: :ssl_configured?
+    #force_ssl only: :show, if: :ssl_configured?
     rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
+    skip_before_filter :require_no_authentication, if: Proc.new { SpreeDigital::Config[:authentication_required] }
 
     def show
-      if attachment.present?
-        # don't authorize the link unless the file exists
-        # the logger error will help track down customer issues easier
-        if attachment_is_file?
-          if digital_link.authorize!
-            if Paperclip::Attachment.default_options[:storage] == :s3
-              redirect_to attachment.expiring_url(Spree::DigitalConfiguration[:s3_expiration_seconds]) and return
-            else
-              send_file attachment.path, :filename => attachment.original_filename, :type => attachment.content_type and return
-            end
-          end
+      if attachment.present? 
+        if attachment_file_present?
+          authorize_and_send_file!
         else
-          Rails.logger.error "Missing Digital Item: #{attachment.path}"
+          if digital_link.regenerate_attachment_file = true and digital_link.save
+            Rails.logger.info "Digital link #{attachment.path} regenerated"
+            authorize_and_send_file!
+          else
+            Rails.logger.error "Error generating file: #{attachment.path} #{digital_link.inspect}"
+            redirect_to :back, error: Spree.t('error_in_attachment', scope: 'digitals') and return
+          end
         end
+      else
+        Rails.logger.error "Missing Digital Item: #{attachment.path}"
+        redirect_to :back, error: Spree.t('error_in_attachment', scope: 'digitals') and return
       end
-
-      render :unauthorized
     end
 
     private
 
-      def attachment_is_file?
+      def attachment_file_present?
         if Paperclip::Attachment.default_options[:storage] == :s3
           attachment.exists?
         else
@@ -38,7 +38,7 @@ def digital_link
       end
 
       def attachment
-        @attachment ||= digital_link.digital.try(:attachment) if digital_link.present?
+        @attachment ||= digital_link.try(:attachment) if digital_link.present?
       end
 
       def resource_not_found
@@ -48,5 +48,22 @@ def resource_not_found
       def ssl_configured?
         Rails.env.production?
       end
+
+      def authorize_download!
+        !SpreeDigital::Config[:authentication_required] || !SpreeDigital::Config[:authorization_required] || authorize!(:download, digital_link)
+      end
+
+      def authorize_and_send_file!
+        if authorize_download! && digital_link.downloadable? 
+          if Paperclip::Attachment.default_options[:storage] == :s3
+            redirect_to attachment.expiring_url(Spree::DigitalConfiguration[:s3_expiration_seconds]) and return
+          else
+	    response.headers['Content-Length'] = attachment.size.to_s
+            send_file attachment.path, :filename => attachment.original_filename, :type => attachment.content_type and return
+          end
+        else
+          render :unauthorized
+        end
+      end
   end
 end

app/models/spree/calculator/shipping/digital_delivery.rb

@@ -8,7 +8,7 @@ class DigitalDelivery < ShippingCalculator
       preference :currency, :string, default: ->{ Spree::Config[:currency] }
 
       def self.description
-        Spree.t(:digital_delivery, scope: 'digital')
+        Spree.t(:digital_delivery, scope: 'digitals')
       end
 
       def compute_package(package=nil)

app/models/spree/digital.rb

@@ -2,14 +2,27 @@ module Spree
   class Digital < ActiveRecord::Base
     belongs_to :variant
     has_many :digital_links, dependent: :destroy
+    after_save :delete_digital_links_attachments, if: :attachment_changed?
 
     has_attached_file :attachment, path: ":rails_root/private/digitals/:id/:basename.:extension"
+    before_post_process :strip_strange_characters_from_attachments
     do_not_validate_attachment_file_type :attachment
     validates_attachment_presence :attachment
 
     if Paperclip::Attachment.default_options[:storage] == :s3
       attachment_definitions[:attachment][:s3_permissions] = :private
       attachment_definitions[:attachment][:s3_headers] = { :content_disposition => 'attachment' }
     end
+
+    def attachment_changed?
+      self.attachment_file_name_changed? || self.attachment_content_type_changed? || self.attachment_file_size_changed?
+    end 
+
+    private
+    def delete_digital_links_attachments
+      self.digital_links.each do |dl| 
+        dl.remove_attachment_file = 1 and dl.save
+      end
+    end
   end
 end

app/models/spree/digital_ability.rb

@@ -0,0 +1,13 @@
+module Spree
+  class DigitalAbility
+    include CanCan::Ability
+
+    def initialize(user)
+      user ||= Spree.user_class.new
+      alias_action :create, :update, :destroy, :read, to: :download
+      can :download, Spree::DigitalLink do |digital_link|
+        digital_link.user_id == user.id
+      end 
+    end
+  end
+end  

app/models/spree/digital_link.rb

@@ -1,45 +1,143 @@
+require 'fileutils'
+
 module Spree
   class DigitalLink < ActiveRecord::Base
-
     belongs_to :digital
     validates :digital, :presence => true
-
-    belongs_to :line_item
+    # delegate :variant, to: :digital
 
+    belongs_to :line_item
+    belongs_to :user
+
     validates_length_of :secret, :is => 30
+    validates_uniqueness_of :secret
 
+    has_attached_file :attachment, path: ":rails_root/private/digitals/:digital_id/:basename.:extension"
+    do_not_validate_attachment_file_type :attachment
+    # validates_attachment_presence :attachment
+    attr_accessor :remove_attachment_file
+    attr_accessor :regenerate_attachment_file
+
     before_validation :set_defaults, :on => :create
+    before_save :copy_attachment_file!, if: :should_regenerate_attachment_file
+    before_save :check_remove_attachment_file
 
+    def should_regenerate_attachment_file
+      self.new_record? || self.regenerate_attachment_file
+    end
+
+    def regenerate_attachment_file
+      @regenerate_attachment_file || false
+    end
+
+    def regenerate_attachment_file=(value)
+      @regenerate_attachment_file = value
+    end
+
     # Can this link stil be used? It is valid if it's less than 24 hours old and was not accessed more than 3 times
-    def authorizable?
+    def downloadable?
       !(expired? || access_limit_exceeded?)
     end
 
     def expired?
-      self.created_at <= Spree::DigitalConfiguration[:authorized_days].day.ago
+      SpreeDigital::Config[:expirable_links] && (self.created_at <= SpreeDigital::Config[:authorized_days].day.ago)
     end
 
     def access_limit_exceeded?
-      self.access_counter >= Spree::DigitalConfiguration[:authorized_clicks]
+      SpreeDigital::Config[:expirable_links] && (self.access_counter >= SpreeDigital::Config[:authorized_clicks])
     end
 
     # This method should be called when a download is initiated.
     # It returns +true+ or +false+ depending on whether the authorization is granted.
-    def authorize!
-      authorizable? && increment!(:access_counter) ? true : false
+    def download!
+      downloadable? && increment!(:access_counter) ? true : false
     end
 
     def reset!
       update_column :access_counter, 0
       update_column :created_at, Time.now
     end
 
+    def original_attachment
+      self.digital.present? and self.digital.attachment
+    end
+
+    def attachment_file_name
+      file_name, file_ext = self.original_attachment.original_filename.split('.')
+      super || (SpreeDigital::Config[:per_user_attachment] ? [[file_name, self.secret].join('_'), file_ext].join('.') : self.original_attachment.original_filename)
+    end
+
+    def attachment_dir
+      self.original_attachment.path.gsub(self.original_attachment.original_filename, '')
+    end
+
+    def attachment_alias
+      SpreeDigital::Config[:per_user_attachment] ? self.attachment : self.original_attachment
+    end
+
+    # include deleted ones
+    def variant
+      self.digital.try(:variant) || Spree::Variant.unscoped.find(self.digital.try(:variant_id))
+    end
+
     private
-
+    # def copy_digital
+    #   if SpreeDigital::Config[:per_user_attachment]
+    #     begin
+    #       new_copy = File.join(self.attachment_dir, self.attachment_file_name)
+    #       if SpreeDigital::Config.per_user_attachment_process.present?
+    #         puts "Executing Spree::Digital per_user_attachment_process..."
+    #         SpreeDigital::Config.per_user_attachment_process.call(self.original_attachment.path, new_copy, self)
+    #       else
+    #         FileUtils.cp(self.original_attachment.path, new_copy)
+    #       end
+    #       self.attachment = File.open(new_copy)
+    #     rescue => e
+    #       logger.error "There was a problem copying file #{self.attachment_file_name} #{e}"
+    #       return false
+    #     end
+    #   else
+    #     return true
+    #   end
+    # end
+
+    def copy_attachment_file!
+      if SpreeDigital::Config[:per_user_attachment]
+        begin
+          new_copy = File.join(self.attachment_dir, self.attachment_file_name)
+          if SpreeDigital::Config.per_user_attachment_process.present?
+            puts "Executing Spree::Digital per_user_attachment_process..."
+            SpreeDigital::Config.per_user_attachment_process.call(self.original_attachment.path, new_copy, self)
+          else
+            FileUtils.cp(self.original_attachment.path, new_copy)
+          end
+          self.attachment = File.open(new_copy)
+        rescue => e
+          logger.error "There was a problem copying file #{self.attachment_file_name} #{e}"
+          return false
+        end
+      else
+        return true
+      end
+    end
+
     # Populating the secret automatically and zero'ing the access_counter (otherwise it might turn out to be NULL)
     def set_defaults
       self.secret = SecureRandom.hex(15)
       self.access_counter ||= 0
     end
+
+    def check_remove_attachment_file
+      if !SpreeDigital::Config[:keep_digitals] && self.remove_attachment_file.eql?(1)
+        begin
+          FileUtils.rm(self.attachment.path) 
+        rescue => e
+          logger.error "There was a problem deleting file #{self.attachment_file_name} #{e}"
+          return false
+        end
+        return true
+      end
+    end
+
   end
 end