spree_dash 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: af813a84c3abda15fc14acbf602ae345dceb790a
+  data.tar.gz: dfe88e0930f6513cac7e0b43570c8149f0d5fc86
+SHA512:
+  metadata.gz: f6e796a21e6d3a608525855091980515a85b0b7e3f447036eda1dd30a7e0f0611089a8d79369598e814b37d2fd49e9446e77dd115241ed58b0512929e6786a83
+  data.tar.gz: c5ac96802c2faf7bc98adc978fe345c8c6be617e14cd0c163097718974cf1b1f8aeec433eba375096dc57274fffbe2fc2708d0885e9d2a4892ee895d34cb183b

data/app/controllers/spree/admin/analytics_controller.rb

@@ -10,7 +10,14 @@ module Spree
         Spree::Dash::Config.app_token = store[:app_token]
         Spree::Dash::Config.site_id = store[:site_id]
         Spree::Dash::Config.token = store[:site_token]
+        Spree::Dash::Config.jirafe_available = true
         redirect_to admin_path
+
+      rescue Spree::Dash::JirafeUnavailable => e
+        session[:jirafe_unavailable_since] = Time.now.to_i
+        flash[:error] = e.message
+        Spree::Dash::Config.jirafe_available = false
+        redirect_to spree.admin_path
       rescue Spree::Dash::JirafeException => e
         flash[:error] = e.message
         redirect_to root_path

data/app/controllers/spree/admin/overview_controller.rb

@@ -8,7 +8,14 @@ module Spree
                        :japanese => 'ja_JA' }
 
     def index
-      redirect_to admin_analytics_register_path unless Spree::Dash::Config.configured?
+      if session[:jirafe_unavailable_since]
+        jirafe_unavailable_since = Time.at(session[:jirafe_unavailable_since])
+        if jirafe_unavailable_since < Time.now - 10.minutes
+          redirect_to admin_analytics_register_path if !dash_config.configured?
+        end
+      else
+        redirect_to admin_analytics_register_path if !dash_config.configured?
+      end
 
       if JIRAFE_LOCALES.values.include? params[:locale]
         Spree::Dash::Config.locale = params[:locale]
@@ -31,5 +38,9 @@ module Spree
     def model_class
       Spree::Admin::OverviewController
     end
+
+    def dash_config
+      Spree::Dash::Config
+    end
   end
 end

data/app/models/spree/dash_configuration.rb

@@ -5,6 +5,7 @@ module Spree
     preference :site_id, :string
     preference :token, :string
     preference :locale, :string, :default => 'en_US'
+    preference :jirafe_available, :boolean, :default => true
 
     def configured?
       preferred_app_id.present? and preferred_site_id.present? and preferred_token.present?

data/app/views/spree/admin/overview/index.html.erb

@@ -25,7 +25,7 @@
         }
     }, 10000);
   <% end %>
-<% else %>
+<% elsif Spree::Dash::Config.jirafe_available %>
   <div class="no-border-top analytics-description">
     <div class="description-text">
       <hgroup>
@@ -41,11 +41,12 @@
       </ul>
     </div>
     <div class="preview-buttons filter-actions actions">
-      <%= link_to_with_icon 'icon-ok', Spree.t(:activate), admin_analytics_sign_up_path, :class => 'button' %>
+      <%= link_to_with_icon 'icon-ok', Spree.t(:activate), admin_analytics_register_path, :class => 'button' %>
       <span class="or">&nbsp; <%= Spree.t(:or) %> &nbsp;</span>
       <%= link_to_with_icon 'icon-info-sign', Spree.t(:learn_more), "http://spreecommerce.com/blog/2012/01/31/introducing-spree-analytics/", :class => 'button', :target => '_blank' %>
     </div>
   </div>
-
   <div class="analytics_splash"></div>
+<% else %>
+  <%= Spree.t(:'dash.jirafe.currently_unavailable') %>
 <% end %>

data/lib/spree/dash/jirafe.rb

@@ -1,6 +1,7 @@
 module Spree
   module Dash
     class JirafeException < Exception; end
+    class JirafeUnavailable < Exception; end
 
     class Jirafe
       include HTTParty
@@ -32,12 +33,15 @@ module Spree
             }
           }
           response = post '/applications', options
-          raise JirafeException, 'unable to create jirafe application' unless response.code == 200 &&
-                                                                              response['app_id'].present? &&
-                                                                              response['token'].present?
-          store[:app_id] = response['app_id']
-          store[:app_token] = response['token']
-          store
+          if response.code == 200
+            store[:app_id] = response['app_id']
+            store[:app_token] = response['token']
+            return store
+          elsif response.code == 503
+            raise JirafeUnavailable, Spree.t(:'dash.jirafe.currently_unavailable')
+          else
+            raise JirafeException, 'unable to create jirafe application'
+          end
         end
 
         def synchronize_resources(store)

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: spree_dash
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Brian Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: spree_frontend
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,30 +80,26 @@ files:
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1677247741916088368
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Overview dashboard for use with Spree.
 test_files: []