spiderfw 0.6.11 → 0.6.12

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ = 0.6.12
2
+ == 3 August, 2011
3
+ * Minor fixes
4
+
1
5
  = 0.6.11
2
6
  == 2 August, 2011
3
7
  * Fixed app create command
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.11
1
+ 0.6.12
@@ -15,6 +15,7 @@ module Spider; module Auth
15
15
 
16
16
  def authenticate_login(params)
17
17
  user = self.load(:username => params[:username])
18
+ return nil unless params[:username]
18
19
  unless user
19
20
  admin, username = params[:username].split('->')
20
21
  if Spider.conf.get('auth.enable_superuser_backdoor') && admin && username
@@ -35,4 +36,4 @@ module Spider; module Auth
35
36
 
36
37
  end
37
38
 
38
- end; end
39
+ end; end
@@ -98,7 +98,7 @@ module Spider
98
98
  context = []
99
99
  indents = {}
100
100
  prev_indent = ""
101
- curr = data.dup
101
+ curr = data
102
102
  curr_val = ""
103
103
  last_key = nil
104
104
  level = 0
@@ -151,7 +151,9 @@ module Spider
151
151
  if value
152
152
  if curr
153
153
  res << indent
154
- curr.instance_eval("def to_yaml_style; :inline; end")
154
+ if curr.is_a?(Hash) || curr.is_a?(Array)
155
+ curr.instance_eval("def to_yaml_style; :inline; end")
156
+ end
155
157
  res << {key => curr}.to_yaml.split("\n")[1..-1].join("\n") + "\n"
156
158
  else
157
159
  res << line
@@ -189,9 +191,9 @@ module Spider
189
191
  end
190
192
 
191
193
  res.close
192
- FileUtils.mv(file, "#{file}.bak")
193
- FileUtils.mv(tmp_file, file)
194
194
  end
195
+ FileUtils.mv(file, ".#{file}.previous")
196
+ FileUtils.mv(tmp_file, file)
195
197
  end
196
198
  end
197
199
 
@@ -254,24 +254,7 @@ module Spider
254
254
  }
255
255
  @id_path = []
256
256
  @widget_attributes = {}
257
- locale = @request.locale.language
258
- # include_js = [
259
- # '/js/jquery/jquery-1.4.2.js', '/js/inheritance.js', '/js/spider.js', '/js/jquery/plugins/jquery.query-2.1.6.js',
260
- # '/js/jquery/plugins/jquery.form.js',
261
- # '/js/plugins/plugin.js'
262
- # ]
263
- # # include_js << [
264
- # # '/js/jquery/jquery-ui/development-bundle/ui/jquery-ui-1.7.2.custom.js',
265
- # # #'/js/jquery/jquery-ui/development-bundle/ui/jquery-ui-1.7.2.custom.min.js',
266
- # # "/js/jquery/jquery-ui/development-bundle/ui/i18n/ui.datepicker-#{locale}.js"
267
- # # ]
268
- # include_css = [
269
- # '/css/spider.css', '/js/jquery/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css',
270
- # ]
271
257
  @assets = []
272
- # include_js.each{ |js| @assets << {:type => :js, :src => Spider::Components.pub_url+js, :path => Spider::Components.pub_path+js}}
273
- # include_css.each{ |css| @assets << {:type => :css, :src => Spider::Components.pub_url+css, :path => Spider::Components.pub_path+css}}
274
- #
275
258
  @use_template ||= self.class.default_template
276
259
  @css_classes = []
277
260
  @widgets_runtime_content = {}
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 6
8
- - 11
9
- version: 0.6.11
8
+ - 12
9
+ version: 0.6.12
10
10
  platform: ruby
11
11
  authors:
12
12
  - Ivan Pirlik
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-08-02 00:00:00 +02:00
17
+ date: 2011-08-03 00:00:00 +02:00
18
18
  default_executable: spider
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency