el_vfs_client 0.0.5.3 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/app/controllers/el_vfs_client/el_finder_controller.rb +1 -1
  2. data/lib/el_vfs_client/engine.rb +9 -1
  3. data/lib/el_vfs_client/version.rb +1 -1
  4. metadata +38 -44
data/app/controllers/el_vfs_client/el_finder_controller.rb CHANGED
@@ -46,7 +46,7 @@ module ElVfsClient
46
46
 
47
47
  private
48
48
  def url
49
- url = "#{Settings[:el_vfs][:protocol]}://#{Settings[:el_vfs][:host]}:#{Settings[:el_vfs][:port]}/api/el_finder/v2"
49
+ url = "#{Settings['vfs.url']}/api/el_finder/v2"
50
50
  url << params.delete(:root_path)
51
51
  return url
52
52
  end
data/lib/el_vfs_client/engine.rb CHANGED
@@ -3,7 +3,15 @@ module ElVfsClient
3
3
  isolate_namespace ElVfsClient
4
4
  engine_root = File.expand_path("../../../", __FILE__)
5
5
  config.after_initialize do
6
- raise 'Please specify url for El VFS in settings yml!' unless defined?(Settings) && Settings[:el_vfs]
6
+ require 'configliere'
7
+ Settings.define 'vfs.url', :env_var => 'VFS_HOST', :required => true
8
+ if Settings['el_vfs']
9
+ Settings['vfs.url'] = "#{Settings[:el_vfs][:protocol]}://#{Settings[:el_vfs][:host]}:#{Settings[:el_vfs][:port]}"
10
+ puts
11
+ puts "!!! WARNING !!! Use vfs.host instead el_vfs.protocol, el_vfs.host, el_vfs.port."
12
+ puts
13
+ end
14
+ Settings.resolve!
7
15
  end
8
16
  end
9
17
  end
data/lib/el_vfs_client/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ElVfsClient
2
- VERSION = "0.0.5.3"
2
+ VERSION = "0.1.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: el_vfs_client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5.3
4
+ version: 0.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -12,11 +12,11 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2011-12-12 00:00:00.000000000 Z
15
+ date: 2011-12-15 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: configliere
19
- requirement: &4160680 !ruby/object:Gem::Requirement
19
+ requirement: &16024500 !ruby/object:Gem::Requirement
20
20
  none: false
21
21
  requirements:
22
22
  - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
24
24
  version: '0'
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *4160680
27
+ version_requirements: *16024500
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: curb
30
- requirement: &4159660 !ruby/object:Gem::Requirement
30
+ requirement: &16023940 !ruby/object:Gem::Requirement
31
31
  none: false
32
32
  requirements:
33
33
  - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
35
35
  version: '0'
36
36
  type: :runtime
37
37
  prerelease: false
38
- version_requirements: *4159660
38
+ version_requirements: *16023940
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: uuid
41
- requirement: &4158420 !ruby/object:Gem::Requirement
41
+ requirement: &16023400 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: '0'
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *4158420
49
+ version_requirements: *16023400
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: rails
52
- requirement: &4173540 !ruby/object:Gem::Requirement
52
+ requirement: &16022760 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
57
57
  version: '0'
58
58
  type: :runtime
59
59
  prerelease: false
60
- version_requirements: *4173540
60
+ version_requirements: *16022760
61
61
  description: Description of ElVfsClient.
62
62
  email:
63
63
  - mail@openteam.ru
@@ -65,45 +65,45 @@ executables: []
65
65
  extensions: []
66
66
  extra_rdoc_files: []
67
67
  files:
68
- - app/views/el_finder/layout.html.erb
69
- - app/assets/javascripts/el_vfs/i18n/elfinder.ar.js
70
- - app/assets/javascripts/el_vfs/i18n/elfinder.ru.js
71
- - app/assets/javascripts/el_vfs/i18n/elfinder.LANG.js
72
- - app/assets/javascripts/el_vfs/elfinder.js
73
- - app/assets/stylesheets/el_vfs/elfinder.sass
74
- - app/assets/stylesheets/el_vfs/reset.sass
75
- - app/assets/stylesheets/el_vfs/jquery_ui.sass
76
- - app/assets/stylesheets/el_vfs/el_vfs.sass
77
- - app/assets/stylesheets/el_vfs/theme.sass
78
- - app/assets/images/el_vfs/ui/ui-icons_888888_256x240.png
79
- - app/assets/images/el_vfs/ui/ui-bg_glass_55_fbf9ee_1x400.png
80
- - app/assets/images/el_vfs/ui/ui-icons_cd0a0a_256x240.png
81
- - app/assets/images/el_vfs/ui/ui-bg_glass_75_dadada_1x400.png
82
- - app/assets/images/el_vfs/ui/ui-bg_glass_75_e6e6e6_1x400.png
83
- - app/assets/images/el_vfs/ui/ui-bg_flat_0_aaaaaa_40x100.png
84
- - app/assets/images/el_vfs/ui/ui-bg_flat_75_ffffff_40x100.png
85
- - app/assets/images/el_vfs/ui/ui-icons_2e83ff_256x240.png
86
68
  - app/assets/images/el_vfs/ui/ui-bg_highlight-soft_75_cccccc_1x100.png
87
- - app/assets/images/el_vfs/ui/ui-icons_454545_256x240.png
88
- - app/assets/images/el_vfs/ui/ui-icons_222222_256x240.png
69
+ - app/assets/images/el_vfs/ui/ui-bg_flat_0_aaaaaa_40x100.png
70
+ - app/assets/images/el_vfs/ui/ui-icons_cd0a0a_256x240.png
89
71
  - app/assets/images/el_vfs/ui/ui-bg_glass_95_fef1ec_1x400.png
72
+ - app/assets/images/el_vfs/ui/ui-icons_454545_256x240.png
73
+ - app/assets/images/el_vfs/ui/ui-bg_glass_75_dadada_1x400.png
90
74
  - app/assets/images/el_vfs/ui/ui-bg_glass_65_ffffff_1x400.png
75
+ - app/assets/images/el_vfs/ui/ui-icons_222222_256x240.png
76
+ - app/assets/images/el_vfs/ui/ui-icons_888888_256x240.png
77
+ - app/assets/images/el_vfs/ui/ui-icons_2e83ff_256x240.png
78
+ - app/assets/images/el_vfs/ui/ui-bg_flat_75_ffffff_40x100.png
79
+ - app/assets/images/el_vfs/ui/ui-bg_glass_55_fbf9ee_1x400.png
80
+ - app/assets/images/el_vfs/ui/ui-bg_glass_75_e6e6e6_1x400.png
81
+ - app/assets/images/el_vfs/elfinder/spinner-mini.gif
82
+ - app/assets/images/el_vfs/elfinder/arrows-normal.png
83
+ - app/assets/images/el_vfs/elfinder/toolbar.png
91
84
  - app/assets/images/el_vfs/elfinder/logo.png
92
85
  - app/assets/images/el_vfs/elfinder/quicklook-icons.png
93
- - app/assets/images/el_vfs/elfinder/toolbar.png
94
- - app/assets/images/el_vfs/elfinder/arrows-normal.png
95
- - app/assets/images/el_vfs/elfinder/spinner-mini.gif
96
- - app/assets/images/el_vfs/elfinder/quicklook-bg.png
86
+ - app/assets/images/el_vfs/elfinder/icons-small.png
97
87
  - app/assets/images/el_vfs/elfinder/icons-big.png
98
- - app/assets/images/el_vfs/elfinder/dialogs.png
99
88
  - app/assets/images/el_vfs/elfinder/progress.gif
100
- - app/assets/images/el_vfs/elfinder/icons-small.png
101
89
  - app/assets/images/el_vfs/elfinder/arrows-active.png
90
+ - app/assets/images/el_vfs/elfinder/quicklook-bg.png
102
91
  - app/assets/images/el_vfs/elfinder/resize.png
92
+ - app/assets/images/el_vfs/elfinder/dialogs.png
93
+ - app/assets/stylesheets/el_vfs/theme.sass
94
+ - app/assets/stylesheets/el_vfs/reset.sass
95
+ - app/assets/stylesheets/el_vfs/el_vfs.sass
96
+ - app/assets/stylesheets/el_vfs/jquery_ui.sass
97
+ - app/assets/stylesheets/el_vfs/elfinder.sass
98
+ - app/assets/javascripts/el_vfs/elfinder.js
99
+ - app/assets/javascripts/el_vfs/i18n/elfinder.ru.js
100
+ - app/assets/javascripts/el_vfs/i18n/elfinder.LANG.js
101
+ - app/assets/javascripts/el_vfs/i18n/elfinder.ar.js
103
102
  - app/controllers/el_vfs_client/el_finder_controller.rb
103
+ - app/views/el_finder/layout.html.erb
104
104
  - config/routes.rb
105
- - lib/el_vfs_client/version.rb
106
105
  - lib/el_vfs_client/engine.rb
106
+ - lib/el_vfs_client/version.rb
107
107
  - lib/tasks/el_vfs_client_tasks.rake
108
108
  - lib/el_vfs_client.rb
109
109
  - MIT-LICENSE
@@ -121,21 +121,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
121
121
  - - ! '>='
122
122
  - !ruby/object:Gem::Version
123
123
  version: '0'
124
- segments:
125
- - 0
126
- hash: 3624400893189405873
127
124
  required_rubygems_version: !ruby/object:Gem::Requirement
128
125
  none: false
129
126
  requirements:
130
127
  - - ! '>='
131
128
  - !ruby/object:Gem::Version
132
129
  version: '0'
133
- segments:
134
- - 0
135
- hash: 3624400893189405873
136
130
  requirements: []
137
131
  rubyforge_project:
138
- rubygems_version: 1.8.10
132
+ rubygems_version: 1.8.11
139
133
  signing_key:
140
134
  specification_version: 3
141
135
  summary: Summary of ElVfsClient.