spree_dash 1.3.1 → 1.3.2

Sign up to get free protection for your applications and to get access to all the features.
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
1
+ Copyright (c) 2007-2013, Spree Commerce, Inc. and other contributors
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
@@ -21,9 +21,11 @@ module Spree
21
21
  session[:last_jirafe_sync] = DateTime.now
22
22
  begin
23
23
  store = Spree::Dash::Jirafe.synchronize_resources(store_hash)
24
- redirect_to admin_path
24
+ rescue SocketError
25
+ flash[:error] = t(:could_not_connect_to_jirafe)
25
26
  rescue Spree::Dash::JirafeException => e
26
27
  flash[:error] = e.message
28
+ ensure
27
29
  redirect_to admin_path
28
30
  end
29
31
  end
@@ -10,6 +10,8 @@ en:
10
10
  analytics_desc_list_3: Absolutely no code to install
11
11
  analytics_desc_list_4: It's completely free!
12
12
 
13
+ could_not_connect_to_jirafe: Could not connect to Jirafe to sync data. This will be automatically retried later.
14
+
13
15
  spree:
14
16
  dash:
15
17
  jirafe:
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_dash
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-06 00:00:00.000000000 Z
12
+ date: 2013-02-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 1.3.1
21
+ version: 1.3.2
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 1.3.1
29
+ version: 1.3.2
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: httparty
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
90
90
  version: '0'
91
91
  segments:
92
92
  - 0
93
- hash: -1887239626380733646
93
+ hash: 3356854868244981941
94
94
  requirements:
95
95
  - none
96
96
  rubyforge_project: