el_vfs_client 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/app/controllers/el_vfs_client/el_finder_controller.rb +14 -1
  2. data/lib/el_vfs_client/engine.rb +11 -1
  3. data/lib/el_vfs_client/version.rb +1 -1
  4. metadata +47 -41
data/app/controllers/el_vfs_client/el_finder_controller.rb CHANGED
@@ -44,8 +44,21 @@ module ElVfsClient
44
44
  end
45
45
 
46
46
  private
47
+ # NOTE: deprecation warning
48
+ def storage_url
49
+ if Settings['vfs.url']
50
+ puts ''
51
+ puts '=== DEPRECATION WARNING: Use storage.url instead of vfs.url'
52
+ puts ''
53
+
54
+ return Settings['vfs.url']
55
+ end
56
+
57
+ Settings['storage.url']
58
+ end
59
+
47
60
  def url
48
- url = "#{Settings['vfs.url']}/api/el_finder/v2"
61
+ url = "#{storage_url}/api/el_finder/v2"
49
62
  url << params.delete(:root_path)
50
63
  return url
51
64
  end
data/lib/el_vfs_client/engine.rb CHANGED
@@ -4,7 +4,17 @@ module ElVfsClient
4
4
  engine_root = File.expand_path("../../../", __FILE__)
5
5
  config.after_initialize do
6
6
  require 'configliere'
7
- Settings.define 'vfs.url', :env_var => 'VFS_URL', :required => true
7
+
8
+ # NOTE: deprecation warning
9
+ Settings.define 'vfs.url', :env_var => 'VFS_URL'
10
+ Settings.define 'storage.url', :env_var => 'STORAGE_URL'
11
+
12
+ if Settings['vfs.url']
13
+ puts ''
14
+ puts '=== DEPRECATION WARNING: Use storage.url instead of vfs.url'
15
+ puts ''
16
+ end
17
+
8
18
  Settings.resolve!
9
19
  end
10
20
  end
data/lib/el_vfs_client/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ElVfsClient
2
- VERSION = "0.3.1"
2
+ VERSION = "0.3.2"
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.3.1
4
+ version: 0.3.2
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: 2012-02-28 00:00:00.000000000 Z
15
+ date: 2012-03-21 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: configliere
19
- requirement: &11438360 !ruby/object:Gem::Requirement
19
+ requirement: &13280820 !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: *11438360
27
+ version_requirements: *13280820
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: curb
30
- requirement: &11437700 !ruby/object:Gem::Requirement
30
+ requirement: &13280280 !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: *11437700
38
+ version_requirements: *13280280
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: rails
41
- requirement: &11437220 !ruby/object:Gem::Requirement
41
+ requirement: &13279800 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
46
46
  version: '0'
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *11437220
49
+ version_requirements: *13279800
50
50
  description: Description of ElVfsClient.
51
51
  email:
52
52
  - mail@openteam.ru
@@ -54,48 +54,48 @@ executables: []
54
54
  extensions: []
55
55
  extra_rdoc_files: []
56
56
  files:
57
- - app/views/el_finder/layout.html.erb
58
- - app/assets/javascripts/engine.js
59
- - app/assets/javascripts/el_vfs/i18n/elfinder.ar.js
60
- - app/assets/javascripts/el_vfs/i18n/elfinder.ru.js
61
- - app/assets/javascripts/el_vfs/i18n/elfinder.LANG.js
62
- - app/assets/javascripts/el_vfs/elfinder.js
63
- - app/assets/stylesheets/el_vfs/elfinder.sass
64
- - app/assets/stylesheets/el_vfs/reset.sass
65
- - app/assets/stylesheets/el_vfs/jquery_ui.sass
66
- - app/assets/stylesheets/el_vfs/el_vfs.sass
67
- - app/assets/stylesheets/el_vfs/theme.sass
68
- - app/assets/images/el_vfs/ui/ui-icons_888888_256x240.png
57
+ - app/assets/images/el_vfs/elfinder/arrows-active.png
58
+ - app/assets/images/el_vfs/elfinder/arrows-normal.png
59
+ - app/assets/images/el_vfs/elfinder/dialogs.png
60
+ - app/assets/images/el_vfs/elfinder/icons-big.png
61
+ - app/assets/images/el_vfs/elfinder/icons-small.png
62
+ - app/assets/images/el_vfs/elfinder/logo.png
63
+ - app/assets/images/el_vfs/elfinder/progress.gif
64
+ - app/assets/images/el_vfs/elfinder/quicklook-bg.png
65
+ - app/assets/images/el_vfs/elfinder/quicklook-icons.png
66
+ - app/assets/images/el_vfs/elfinder/resize.png
67
+ - app/assets/images/el_vfs/elfinder/spinner-mini.gif
68
+ - app/assets/images/el_vfs/elfinder/toolbar.png
69
+ - app/assets/images/el_vfs/ui/ui-bg_flat_0_aaaaaa_40x100.png
70
+ - app/assets/images/el_vfs/ui/ui-bg_flat_75_ffffff_40x100.png
69
71
  - app/assets/images/el_vfs/ui/ui-bg_glass_55_fbf9ee_1x400.png
70
- - app/assets/images/el_vfs/ui/ui-icons_cd0a0a_256x240.png
72
+ - app/assets/images/el_vfs/ui/ui-bg_glass_65_ffffff_1x400.png
71
73
  - app/assets/images/el_vfs/ui/ui-bg_glass_75_dadada_1x400.png
72
74
  - app/assets/images/el_vfs/ui/ui-bg_glass_75_e6e6e6_1x400.png
73
- - app/assets/images/el_vfs/ui/ui-bg_flat_0_aaaaaa_40x100.png
74
- - app/assets/images/el_vfs/ui/ui-bg_flat_75_ffffff_40x100.png
75
- - app/assets/images/el_vfs/ui/ui-icons_2e83ff_256x240.png
75
+ - app/assets/images/el_vfs/ui/ui-bg_glass_95_fef1ec_1x400.png
76
76
  - app/assets/images/el_vfs/ui/ui-bg_highlight-soft_75_cccccc_1x100.png
77
- - app/assets/images/el_vfs/ui/ui-icons_454545_256x240.png
78
77
  - app/assets/images/el_vfs/ui/ui-icons_222222_256x240.png
79
- - app/assets/images/el_vfs/ui/ui-bg_glass_95_fef1ec_1x400.png
80
- - app/assets/images/el_vfs/ui/ui-bg_glass_65_ffffff_1x400.png
81
- - app/assets/images/el_vfs/elfinder/logo.png
82
- - app/assets/images/el_vfs/elfinder/quicklook-icons.png
83
- - app/assets/images/el_vfs/elfinder/toolbar.png
84
- - app/assets/images/el_vfs/elfinder/arrows-normal.png
85
- - app/assets/images/el_vfs/elfinder/spinner-mini.gif
86
- - app/assets/images/el_vfs/elfinder/quicklook-bg.png
87
- - app/assets/images/el_vfs/elfinder/icons-big.png
88
- - app/assets/images/el_vfs/elfinder/dialogs.png
89
- - app/assets/images/el_vfs/elfinder/progress.gif
90
- - app/assets/images/el_vfs/elfinder/icons-small.png
91
- - app/assets/images/el_vfs/elfinder/arrows-active.png
92
- - app/assets/images/el_vfs/elfinder/resize.png
78
+ - app/assets/images/el_vfs/ui/ui-icons_2e83ff_256x240.png
79
+ - app/assets/images/el_vfs/ui/ui-icons_454545_256x240.png
80
+ - app/assets/images/el_vfs/ui/ui-icons_888888_256x240.png
81
+ - app/assets/images/el_vfs/ui/ui-icons_cd0a0a_256x240.png
82
+ - app/assets/javascripts/el_vfs/elfinder.js
83
+ - app/assets/javascripts/el_vfs/i18n/elfinder.LANG.js
84
+ - app/assets/javascripts/el_vfs/i18n/elfinder.ar.js
85
+ - app/assets/javascripts/el_vfs/i18n/elfinder.ru.js
86
+ - app/assets/javascripts/engine.js
87
+ - app/assets/stylesheets/el_vfs/el_vfs.sass
88
+ - app/assets/stylesheets/el_vfs/elfinder.sass
89
+ - app/assets/stylesheets/el_vfs/jquery_ui.sass
90
+ - app/assets/stylesheets/el_vfs/reset.sass
91
+ - app/assets/stylesheets/el_vfs/theme.sass
93
92
  - app/controllers/el_vfs_client/el_finder_controller.rb
93
+ - app/views/el_finder/layout.html.erb
94
94
  - config/routes.rb
95
- - lib/el_vfs_client/version.rb
96
95
  - lib/el_vfs_client/engine.rb
97
- - lib/tasks/el_vfs_client_tasks.rake
96
+ - lib/el_vfs_client/version.rb
98
97
  - lib/el_vfs_client.rb
98
+ - lib/tasks/el_vfs_client_tasks.rake
99
99
  - MIT-LICENSE
100
100
  - Rakefile
101
101
  - README.rdoc
@@ -111,12 +111,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
111
111
  - - ! '>='
112
112
  - !ruby/object:Gem::Version
113
113
  version: '0'
114
+ segments:
115
+ - 0
116
+ hash: -2589442921370577494
114
117
  required_rubygems_version: !ruby/object:Gem::Requirement
115
118
  none: false
116
119
  requirements:
117
120
  - - ! '>='
118
121
  - !ruby/object:Gem::Version
119
122
  version: '0'
123
+ segments:
124
+ - 0
125
+ hash: -2589442921370577494
120
126
  requirements: []
121
127
  rubyforge_project:
122
128
  rubygems_version: 1.8.16