el_finder_s3 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da39c62708b7a593b641c04c5faf89b538a5c3d0
-  data.tar.gz: 064b8666cefc4d58d674d6686f550673dc777718
+  metadata.gz: 95d6d7d38463b1f822c03d848b501737e2bafe27
+  data.tar.gz: 5c51a060e1600965bfca37ab7f2a3a9db657dbc6
 SHA512:
-  metadata.gz: fefb3d47003af89571909ff973534f80a0016c517c534a1a5a81624ce62fc2af24af8ed0a981e4526fb9d688ed799c24327209db8e019835a5c78dde0cc91fde
-  data.tar.gz: 27aa78745a92d4e40251a26e18b5999b023c58d639a59cd51636e9d23c9e6ca58f4fbda7976d3cd7a969a10673c0c5a6d25a5b9cdc32f5bdc4015c8ac65b3298
+  metadata.gz: a24ad66767cf9a42e59d91c990ec7adce78d4f943844082e5a29c0ff36f7c87d00d86cb1ac28632c272fb24da20625136fe62bedc7e9f3f990d8cfc5fb592445
+  data.tar.gz: 5f74141f55e33675c210d5c6080c4d04bec99f2a347281ac7ce9b02d7fbfef1c4a5bd8edc2630b6c112df4fce6ee4b00e4121a5757941437f3904c3a9225d569

data/el_finder_s3.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency('aws-sdk', '~> 2')
-  #FIXME remove after testing
-  spec.add_dependency('net-ftp-list', '~> 3.2')
+  spec.add_dependency('mini_magick', '~> 4.2')
+  spec.add_dependency('memcached', '~> 1.8')
+  spec.add_dependency('cache', '~> 0.4')
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/el_finder_s3.rb

@@ -1,6 +1,8 @@
 # require 'fileutils'
 # require 'net/ftp'
 
+require 'el_finder_s3/operations'
+require 'el_finder_s3/dummy_cache_client'
 require 'el_finder_s3/cache_connector'
 require 'el_finder_s3/adapter'
 require 'el_finder_s3/railties'

data/lib/el_finder_s3/adapter.rb

@@ -1,17 +1,19 @@
 module ElFinderS3
+  require 'memcached'
+  require 'cache'
+
   class Adapter
-    attr_reader :connection, :server, :s3_connector
+    attr_reader :server, :s3_connector
 
-    def initialize(server)
+    def initialize(server, cache_connector)
       @server = {
         response_cache_expiry_seconds: 3000
       }
       @cached_responses = {}
       @s3_connector = ElFinderS3::S3Connector.new server
-    end
-
-    def connect
-      @connection
+      @cache_connector = cache_connector.nil? ? ElFinderS3::CacheConnector.new : @cache_connector = cache_connector
+      # client = Memcached.new('127.0.0.1:11211', :binary_protocol => true)
+      # @cache = Cache.wrap(client)
     end
 
     def close
@@ -19,64 +21,58 @@ module ElFinderS3
     end
 
     def children(pathname, with_directory)
-      cached :children, pathname do
-        @s3_connector.ls_la(pathname, with_directory)
+      elements = @cache_connector.cached ElFinderS3::Operations::CHILDREN, pathname do
+        @s3_connector.ls_la(pathname)
       end
+
+      result = []
+      elements[:folders].each { |folder|
+        result.push(pathname.fullpath + ElFinderS3::S3Pathname.new(@s3_connector, folder, {:type => :directory}))
+      }
+      elements[:files].each { |file|
+        if with_directory
+          result.push(pathname.fullpath + ElFinderS3::S3Pathname.new(@s3_connector, file, {:type => :file}))
+        else
+          result.push(ElFinderS3::S3Pathname.new(@s3_connector, file, {:type => :file}))
+        end
+      }
+      result
     end
 
     def touch(pathname, options={})
-      @s3_connector.touch(pathname.to_file_prefix_s)
+      if @s3_connector.touch(pathname.to_file_prefix_s)
+        @cache_connector.clear_cache(pathname, false)
+        true
+      end
     end
 
     def exist?(pathname)
-      cached :exist?, pathname do
+      @cache_connector.cached ElFinderS3::Operations::EXIST, pathname do
         @s3_connector.exist? pathname
       end
     end
 
-    # @param [ElFinderS3::Pathname] pathname
     def path_type(pathname)
-      cached :path_type, pathname do
+      @cache_connector.cached ElFinderS3::Operations::PATH_TYPE, pathname do
         result = :directory
-        begin
-          if pathname.to_s == '/'
-            result = :directory
-          end
-        rescue
-          result = pathname[:type]
+        if pathname.to_s == '/'
+          result = :directory
         end
-        return result
+        result
       end
     end
 
     def size(pathname)
-      #FIXME
-      # cached :size, pathname do
-      #   ftp_context do
-      #     ElFinderS3::Connector.logger.debug "  \e[1;32mFTP:\e[0m    Getting size of #{pathname}"
-      #     begin
-      #       size(pathname.to_s)
-      #     rescue Net::FTPPermError => e
-      #       nil
-      #     rescue Net::FTPReplyError => e
-      #       nil
-      #     end
-      #   end
-      # end
+      @cache_connector.cached :size, pathname do
+        @s3_connector.size(pathname)
+      end
     end
 
     #FIXME
     def mtime(pathname)
-      cached :mtime, pathname do
-        # ftp_context do
-        #   ElFinderS3::Connector.logger.debug "  \e[1;32mFTP:\e[0m    Getting modified time of #{pathname}"
-        #   begin
-        #     mtime(pathname.to_s)
-        #   rescue Net::FTPPermError => e
-        # This command doesn't work on directories
+      @cache_connector.cached ElFinderS3::Operations::MTIME, pathname do
+        #mtime(pathname.to_s)
         0
-        # end
-        # end
       end
     end
 
@@ -106,9 +102,7 @@ module ElFinderS3
 
     def mkdir(pathname)
       if @s3_connector.mkdir(pathname.to_prefix_s)
-        #FIXME review cache clear
-        # clear_cache(pathname)
-        true
+        @cache_connector.clear_cache(pathname)
       else
         false
       end
@@ -137,86 +131,12 @@ module ElFinderS3
     end
 
     def retrieve(pathname)
-      #FIXME
-      # ftp_context do
-      #   ElFinderS3::Connector.logger.debug "  \e[1;32mFTP:\e[0m    Retrieving #{pathname}"
-      #   content = StringIO.new()
-      #   begin
-      #     retrbinary("RETR #{pathname}", 10240) do |block|
-      #       content << block
-      #     end
-      #     content.string
-      #   ensure
-      #     content.close
-      #   end
-      # end
+      @s3_connector.get(pathname.to_file_prefix_s)
     end
 
     def store(pathname, content)
       @s3_connector.store(pathname.to_file_prefix_s, content)
       #TODO clear_cache(pathname)
     end
-
-    private
-
-    ##
-    # Remove all entries for the given pathname (and its parent folder)
-    # from the FTP cache
-    def clear_cache(pathname)
-      @cached_responses.delete(pathname.to_s)
-
-      if pathname.to_s != '/' && pathname.to_s != '.'
-        # Clear parent of this entry, too
-        @cached_responses.delete(pathname.dirname.to_s)
-      end
-    end
-
-    ##
-    # Looks in the cache for an entry for the given pathname and operation,
-    # returning the cached result if one is found.  If one is not found, the given
-    # block is invoked and its result is stored in the cache and returned
-    #
-    # The FTP cache is used to prevent redundant FTP queries for information such as a
-    # file's size, or a directory's contents, during a *single* FTP session.
-    def cached(operation, pathname)
-      response = cache_get(operation, pathname)
-      unless response.nil?
-        return response
-      end
-
-      response = yield
-      cache_put operation, pathname, response
-
-      response
-    end
-
-    ##
-    # Store an FTP response in the cache
-    def cache_put(operation, pathname, response)
-      @cached_responses[pathname.to_s] = {} unless @cached_responses.include?(pathname.to_s)
-
-      @cached_responses[pathname.to_s][operation] = {
-        timestamp: Time.now,
-        response: response
-      }
-    end
-
-    ##
-    # Fetch an FTP response from the cache
-    def cache_get(operation, pathname)
-      if @cached_responses.include?(pathname.to_s) && @cached_responses[pathname.to_s].include?(operation)
-        response = @cached_responses[pathname.to_s][operation]
-
-        #FIXME cache timeout
-        # max_staleness = Time.now - @server[:response_cache_expiry_seconds]
-
-        # if response[:timestamp] < max_staleness
-        #   @cached_responses[pathname.to_s].delete(operation)
-        #   nil
-        # else
-        response[:response]
-        # end
-      end
-    end
   end
 end

data/lib/el_finder_s3/cache_connector.rb

@@ -1,27 +1,39 @@
 module ElFinderS3
+  require 'cache'
   class CacheConnector
 
-    def ls_folder(folder)
-      raise 'This is not implemented!'
+    def initialize(client = nil)
+      @cache = client.nil? ? ElFinderS3::DummyCacheClient.new : Cache.wrap(client)
     end
 
-    def tree_for(root)
-      raise 'This is not implemented!'
+    def cache_hash(operation, pathname)
+      Base64.urlsafe_encode64("#{operation}::#{pathname}").chomp.tr("=\n", "")
     end
 
-    def mkdirSuccess(folder)
-      raise 'This is not implemented!'
-    end
-
-    def list_objects search_parameters
-      raise 'This is not implemented!'
-    end
+    def cached(operation, pathname)
+      cache_hash_key = cache_hash(operation, pathname)
+      if @cache.exist? cache_hash_key
+        return @cache.get(cache_hash_key)
+      else
+        response = yield
 
+        @cache.set(cache_hash_key, response, 2.years)
 
-
-    def update_ls_folder_results query, response
-      raise 'This is not implemented!'
+        response
+      end
     end
 
+    def clear_cache(pathname, recursive = true)
+      ElFinderS3::Operations.each do |operation|
+        @cache.delete cache_hash(operation, pathname)
+      end
+
+      if recursive || pathname.file?
+        pathname_str = pathname.to_s
+        if pathname_str != '/' && pathname_str != '.'
+          clear_cache(pathname.dirname, recursive)
+        end
+      end
+    end
   end
 end

data/lib/el_finder_s3/connector.rb

@@ -77,7 +77,7 @@ module ElFinderS3
     # @see VALID_COMMANDS
     def run(params)
 
-      @adapter = ElFinderS3::Adapter.new(@options[:server])
+      @adapter = ElFinderS3::Adapter.new(@options[:server], @options[:cache_connector])
       # @adapter = ElFinderS3::FtpAdapter.new(@options[:server])
       @root = ElFinderS3::Pathname.new(adapter)
 
@@ -103,7 +103,9 @@ module ElFinderS3
 
           begin
             send("_#{@params[:cmd]}")
-          rescue Net::FTPPermError
+          rescue Exception => exception
+            puts exception.message
+            puts exception.backtrace.inspect
             @response[:error] = 'Access Denied'
           end
         else
@@ -272,6 +274,7 @@ module ElFinderS3
       end
 
       file = @target + @params[:name]
+      file.type = :file
       if !file.exist? && file.touch
         @response[:select] = [to_hash(file)]
         _open(@target)
@@ -465,7 +468,26 @@ module ElFinderS3
 
     #
     def _tmb
-      command_not_implemented
+      if image_handler.nil?
+        command_not_implemented
+      else
+        @response[:current] = to_hash(@current)
+        @response[:images] = {}
+        idx = 0
+        @current.children.select { |e| mime_handler.for(e) =~ /image/ }.each do |img|
+          if (idx >= @options[:thumbs_at_once])
+            @response[:tmb] = true
+            break
+          end
+          thumbnail = thumbnail_for(img)
+          unless thumbnail.exist? && thumbnail.file?
+            imgSourcePath = @options[:url] + '/' + img.path.to_s
+            image_handler.thumbnail(imgSourcePath, thumbnail, :width => @options[:thumbs_size].to_i, :height => @options[:thumbs_size].to_i)
+            @response[:images][to_hash(img)] = @options[:url] + '/' + thumbnail.path.to_s
+            idx += 1
+          end
+        end
+      end
     end
 
     # of tmb
@@ -500,7 +522,9 @@ module ElFinderS3
 
     #
     def thumbnail_for(pathname)
-      @thumb_directory + "#{to_hash(pathname)}.png"
+      result = @thumb_directory + "#{to_hash(pathname)}.png"
+      result.type = :file
+      result
     end
 
     #

data/lib/el_finder_s3/dummy_cache_client.rb

@@ -0,0 +1,16 @@
+module ElFinderS3
+  # No cache client
+  class DummyCacheClient
+    def get(key)
+      nil
+    end
+
+    def set(key, value, ttl = 24.hours)
+      nil
+    end
+
+    def delete(key)
+      nil
+    end
+  end
+end

data/lib/el_finder_s3/image.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'shellwords'
 require 'image_size'
+require 'mini_magick'
 
 module ElFinderS3
 
@@ -17,12 +18,20 @@ module ElFinderS3
 
     def self.resize(pathname, options = {})
       return nil unless File.exist?(pathname)
-      system( ::Shellwords.join(['mogrify', '-resize', "#{options[:width]}x#{options[:height]}!", pathname.to_s]) )
-    end # of self.resize
+      system(::Shellwords.join(['mogrify', '-resize', "#{options[:width]}x#{options[:height]}!", pathname.to_s]))
+    end
+
+    # of self.resize
 
-    def self.thumbnail(src, dst, options = {})
-      return nil unless File.exist?(src)
-      system( ::Shellwords.join(['convert', '-resize', "#{options[:width]}x#{options[:height]}", '-background', 'white', '-gravity', 'center', '-extent', "#{options[:width]}x#{options[:height]}", src.to_s, dst.to_s]) )
+    def self.thumbnail(imgSourcePath, dst, options = {})
+      image = MiniMagick::Image.open(imgSourcePath)
+      image.combine_options do |c|
+        c.thumbnail "#{options[:width]}x#{options[:height]}"
+        c.background 'white'
+        c.gravity 'center'
+        c.extent "#{options[:width]}x#{options[:height]}"
+      end
+      dst.write(image)
     end # of self.resize
 
   end # of class Image

data/lib/el_finder_s3/operations.rb

@@ -0,0 +1,18 @@
+module ElFinderS3
+  class Operations
+    include Enumerable
+
+    PATH_TYPE = :path_type
+    EXIST = :exist
+    CHILDREN = :children
+    MTIME = :mtime
+
+    def self.each
+      yield PATH_TYPE
+      yield EXIST
+      yield CHILDREN
+      yield MTIME
+    end
+
+  end
+end

data/lib/el_finder_s3/pathname.rb

@@ -34,8 +34,9 @@ module ElFinderS3
 
     # of initialize
 
-    def type(type)
-      @type = type
+    def type=(value)
+      @type = value
+      fullpath.type = value
     end
 
     #
@@ -65,6 +66,25 @@ module ElFinderS3
       @path.relative?
     end
 
+    def exist?
+      realpath.exist?
+    rescue Errno::ENOENT
+      false
+    end
+
+    def directory?
+      realpath.directory?
+    rescue Errno::ENOENT
+      false
+    end
+
+    def file?
+      realpath.file?
+    rescue Errno::ENOENT
+      false
+    end
+
+
     # of relative?
 
     #
@@ -111,13 +131,6 @@ module ElFinderS3
 
     # of basename
 
-    #
-    def basename(*args)
-      @path.basename(*args)
-    end
-
-    # of basename
-
     #
     def dirname
       self.class.new(@adapter, @path.dirname)
@@ -172,7 +185,9 @@ module ElFinderS3
 
     #
     def touch(options = {})
-      adapter.touch(cleanpath, options)
+      file2Touch = cleanpath
+      self.file? ? file2Touch.type = :file : file2Touch.type = :directory
+      adapter.touch(file2Touch, options)
     end
 
     #
@@ -220,9 +235,6 @@ module ElFinderS3
     # of rename
 
     {
-      'directory?' => {:path => 'realpath', :rescue => true},
-      'exist?' => {:path => 'realpath', :rescue => true},
-      'file?' => {:path => 'realpath', :rescue => true},
       'ftype' => {:path => 'realpath', },
       'mkdir' => {:path => 'fullpath', :args => '(*args)'},
       'mtime' => {:path => 'realpath', },

data/lib/el_finder_s3/s3_connector.rb

@@ -16,8 +16,7 @@ module ElFinderS3
       @s3_client = Aws::S3::Client.new
     end
 
-    # @param [ElFinderS3::Pathname] pathname
-    def ls_la(pathname, with_directory)
+    def ls_la(pathname)
       prefix = pathname.to_prefix_s
       query = {
         bucket: @bucket_name,
@@ -28,23 +27,23 @@ module ElFinderS3
       }
 
       response = @s3_client.list_objects(query)
-      result = []
+      result = {
+        :folders => [],
+        :files => []
+      }
+
       #Files
       response.contents.each { |e|
         if e.key != prefix
           e.key = e.key.gsub(prefix, '')
-          if with_directory
-            result.push(pathname.fullpath + ::ElFinderS3::S3Pathname.new(self, e))
-          else
-            result.push(::ElFinderS3::S3Pathname.new(self, e))
-          end
+          result[:files].push(e[:key])
         end
       }
       #Folders
       response.common_prefixes.each { |f|
         if f.prefix != '' && f.prefix != prefix && f.prefix != '/'
           f.prefix = f.prefix.split('/').last
-          result.push(pathname.fullpath + ::ElFinderS3::S3Pathname.new(self, f))
+          result[:folders].push(f[:prefix])
         end
       }
       return result
@@ -54,7 +53,7 @@ module ElFinderS3
     def exist?(pathname)
       query = {
         bucket: @bucket_name,
-        key: pathname.to_prefix_s
+        key: pathname.file? ? pathname.to_file_prefix_s : pathname.to_prefix_s
       }
       begin
         @s3_client.head_object(query)
@@ -83,7 +82,29 @@ module ElFinderS3
     end
 
     def store(filename, content)
-      @s3_client.put_object(bucket: @bucket_name, key: filename, body: content, acl: 'public-read')
+      if content.is_a?(MiniMagick::Image)
+        @s3_client.put_object(bucket: @bucket_name, key: filename, body: content.to_blob, acl: 'public-read')
+      elsif @s3_client.put_object(bucket: @bucket_name, key: filename, body: content, acl: 'public-read')
+      end
+    end
+
+    def get(filename)
+      response = @s3_client.get_object(bucket: @bucket_name, key: filename)
+      return nil unless !response.nil?
+      response.body
+    end
+
+    def size(pathname)
+      query = {
+        bucket: @bucket_name,
+        key: pathname.file? ? pathname.to_file_prefix_s : pathname.to_prefix_s
+      }
+      begin
+        head = @s3_client.head_object(query)
+        head[:content_length]
+      rescue Aws::S3::Errors::NotFound
+        0
+      end
     end
   end
 end

data/lib/el_finder_s3/s3_pathname.rb

@@ -94,6 +94,10 @@ module ElFinderS3
       @type ||= adapter.path_type(self)
     end
 
+    def type=(value)
+      @type = value
+    end
+
     def size
       unless @type == :directory
         @size ||= adapter.size(self)

data/lib/el_finder_s3/version.rb

@@ -1,3 +1,3 @@
 module ElFinderS3
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: el_finder_s3
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Raúl Anatol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -25,19 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: net-ftp-list
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: memcached
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +118,10 @@ files:
 - lib/el_finder_s3/base64.rb
 - lib/el_finder_s3/cache_connector.rb
 - lib/el_finder_s3/connector.rb
+- lib/el_finder_s3/dummy_cache_client.rb
 - lib/el_finder_s3/image.rb
 - lib/el_finder_s3/mime_type.rb
+- lib/el_finder_s3/operations.rb
 - lib/el_finder_s3/pathname.rb
 - lib/el_finder_s3/railties.rb
 - lib/el_finder_s3/s3_connector.rb