el_vfs_client 0.0.4.1 → 0.0.5

data/Rakefile

@@ -1,24 +1,2 @@
 #!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ElVfsClient'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
-
+require "bundler/gem_tasks"

data/app/controllers/el_vfs_client/el_finder_controller.rb

@@ -1,10 +1,14 @@
 require 'curb'
 require 'configliere'
+require 'uuid'
+
 module ElVfsClient
   class ElFinderController < ApplicationController
     respond_to :json, :html
 
     def show
+      session[:root_path] = session[:root_path]  || (params[:root_path] ? params[:root_path] : generate_folder_uuid)
+
       render :file => 'el_finder/layout', :layout => false
     end
 
@@ -12,7 +16,8 @@ module ElVfsClient
       params.delete(:format)
       params.delete(:controller)
       params.delete(:action)
-      c = Curl::Easy.new("#{Settings[:el_vfs][:protocol]}://#{Settings[:el_vfs][:host]}:#{Settings[:el_vfs][:port]}/api/el_finder/v2") do |curl|
+
+      c = Curl::Easy.new(url) do |curl|
         curl.headers['User-Agent'] = request.user_agent
         curl.headers['Accept'] = 'application/json'
         curl.headers['CLIENT_IP'] = request.env['HTTP_CLIENT_IP']
@@ -36,5 +41,15 @@ module ElVfsClient
         format.json { render :json => c.body_str }
       end
     end
+
+    private
+      def url
+        url = "#{Settings[:el_vfs][:protocol]}://#{Settings[:el_vfs][:host]}:#{Settings[:el_vfs][:port]}/api/el_finder/v2"
+        url << "/#{Settings[:el_vfs][:root_path]}/#{session[:root_path]}" if session[:root_path]
+      end
+
+      def generate_folder_uuid
+        "#{Time.now.year}_#{Time.now.month}_#{Time.now.day}_#{Time.now.hour}_#{Time.now.min}_#{UUID.generate.split('-').first}"
+      end
   end
 end

data/app/views/el_finder/layout.html.erb

@@ -18,6 +18,7 @@
 
           $('#elfinder').elfinder({
             url: '/api/el_finder/v2',
+            height: window.innerHeight - 23,
             lang: 'ru',
             getFileCallback : function(file) {
               window.opener.CKEDITOR.tools.callFunction(funcNum, file);
@@ -25,6 +26,8 @@
               },
             resizable: false
           }).elfinder('instance');
+
+          $('#root_path', window.parent.document).val('<%= session[:root_path] %>');
         });
       //]]>
     </script>

data/lib/el_vfs_client/version.rb

@@ -1,3 +1,3 @@
 module ElVfsClient
-  VERSION = "0.0.4.1"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: el_vfs_client
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &13436880 !ruby/object:Gem::Requirement
+  requirement: &5696660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13436880
+  version_requirements: *5696660
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &13436440 !ruby/object:Gem::Requirement
+  requirement: &5695760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13436440
+  version_requirements: *5695760
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &5694480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *5694480
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &5693280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *5693280
 description: Description of ElVfsClient.
 email:
 - mail@openteam.ru
@@ -100,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3193506943565488734
+      hash: 4227916524854329935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3193506943565488734
+      hash: 4227916524854329935
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10