RubyApp 0.0.54 → 0.0.55

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- RubyApp (0.0.54)
4
+ RubyApp (0.0.55)
5
5
  BlueCloth
6
6
  chronic
7
7
  chronic_duration
@@ -1,5 +1,5 @@
1
1
  Given /^I am viewing "([^"]*)"$/ do |url|
2
- visit(url)
2
+ visit("#{url}?show_event_error=false")
3
3
  end
4
4
 
5
5
  When /^I refresh the page$/ do
@@ -49,7 +49,8 @@
49
49
  } );
50
50
  } )
51
51
  .error( function(request, message, exception) {
52
- RubyApp.confirm_refresh(#{RubyApp::Elements::Base::BasePage.translate.error.to_json}, true);
52
+ if (#{RubyApp::Session['show_event_error'] || 'false'} == true)
53
+ RubyApp.confirm_refresh(#{RubyApp::Elements::Base::BasePage.translate.error.to_json});
53
54
  } )
54
55
  .complete( function() {
55
56
  $(window).dequeue();
@@ -25,16 +25,14 @@ module RubyApp
25
25
  attr_reader :session_id, :pages
26
26
  attr_accessor :identity, :data
27
27
 
28
- def initialize(session_id, page = nil)
28
+ def initialize(session_id, page = nil, data = {})
29
+ require 'ruby_app/elements/pages/default_page'
29
30
  @session_id = session_id
30
31
  @pages = []
32
+ @pages.push(page || RubyApp::Elements::Pages::DefaultPage.new)
31
33
  @dialogs = []
34
+ @data = data
32
35
  @identity = nil
33
- @data = {}
34
-
35
- require 'ruby_app/elements/pages/default_page'
36
- @pages.push(page || RubyApp::Elements::Pages::DefaultPage.new)
37
-
38
36
  end
39
37
 
40
38
  def [](key)
@@ -76,7 +74,7 @@ module RubyApp
76
74
 
77
75
  def self.create!
78
76
  RubyApp::Request.session[:_initialize] = true
79
- Thread.current[:_session] = RubyApp::Request.session[:_session] ||= RubyApp::Application.options.session_class.new(RubyApp::Request.env['rack.session.options'] ? RubyApp::Request.env['rack.session.options'][:id] : nil)
77
+ Thread.current[:_session] = RubyApp::Request.session[:_session] ||= RubyApp::Application.options.session_class.new(RubyApp::Request.env['rack.session.options'] ? RubyApp::Request.env['rack.session.options'][:id] : nil, nil, RubyApp::Request.query)
80
78
  if block_given?
81
79
  begin
82
80
  yield
@@ -7,9 +7,9 @@ module _APPLICATION_UPCODE_
7
7
 
8
8
  class Session < RubyApp::Session
9
9
 
10
- def initialize(session_id, page = nil)
10
+ def initialize(session_id, page = nil, data = {})
11
11
  require '_APPLICATION_DOWNCODE_/elements/pages/default_page'
12
- super(session_id, page || _APPLICATION_UPCODE_::Elements::Pages::DefaultPage.new)
12
+ super(session_id, page || _APPLICATION_UPCODE_::Elements::Pages::DefaultPage.new, data)
13
13
  end
14
14
 
15
15
  end
@@ -1,11 +1,11 @@
1
1
  ruby_app:
2
2
  element:
3
3
  exception_event:
4
- message: %1. Do you want to refresh the page and try again?
4
+ message: %1. The page will refresh so you can try again.
5
5
  elements:
6
6
  base:
7
7
  base_page:
8
- error: An error occurred sending the event. Do you want to refresh the page and try again?
8
+ error: An error occurred sending the event. The page will refresh so you can try again.
9
9
  dialogs:
10
10
  base:
11
11
  base_close_dialog:
@@ -1,4 +1,4 @@
1
1
  module RubyApp
2
- VERSION = "0.0.54"
2
+ VERSION = "0.0.55"
3
3
  ROOT = File.expand_path(File.dirname(__FILE__))
4
4
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: RubyApp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 115
4
+ hash: 113
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 54
10
- version: 0.0.54
9
+ - 55
10
+ version: 0.0.55
11
11
  platform: ruby
12
12
  authors:
13
13
  - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-01-04 00:00:00 Z
18
+ date: 2012-01-05 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  version_requirements: &id001 !ruby/object:Gem::Requirement