spree_dash 1.3.0.rc1 → 1.3.0.rc2

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

@@ -1,50 +1,31 @@
 module Spree
   class Admin::AnalyticsController < Admin::BaseController
 
-    def sign_up
-      redirect_if_registered and return
-      @store = {
-        :first_name => '',
-        :last_name => '',
-        :email => try_spree_current_user.email,
-        :currency => 'USD',
-        :time_zone => Time.zone,
-        :name => Spree::Config.site_name,
-        :url => format_url(Spree::Config.site_url)
-      }
-    end
-
     def register
       redirect_if_registered and return
-      @store = params[:store]
-      @store[:url] = format_url(@store[:url])
-
-      unless @store.has_key? :terms_of_service
-        flash[:error] = t(:agree_to_terms_of_service)
-        return render :sign_up
-      end
-
-      unless @store.has_key? :privacy_policy
-        flash[:error] = t(:agree_to_privacy_policy)
-        return render :sign_up
-      end
 
       begin
-        @store = Spree::Dash::Jirafe.register(@store)
-        Spree::Dash::Config.app_id = @store[:app_id]
-        Spree::Dash::Config.app_token = @store[:app_token]
-        Spree::Dash::Config.site_id = @store[:site_id]
-        Spree::Dash::Config.token = @store[:site_token]
-        flash[:notice] = t(:successfully_signed_up_for_analytics)
+        store = Spree::Dash::Jirafe.register(store_hash)
+        Spree::Dash::Config.app_id = store[:app_id]
+        Spree::Dash::Config.app_token = store[:app_token]
+        Spree::Dash::Config.site_id = store[:site_id]
+        Spree::Dash::Config.token = store[:site_token]
         redirect_to admin_path
       rescue Spree::Dash::JirafeException => e
         flash[:error] = e.message
-        render :sign_up
+        redirect_to root_path
       end
     end
 
-    def edit
-
+    def sync
+      session[:last_jirafe_sync] = DateTime.now
+      begin
+        store = Spree::Dash::Jirafe.synchronize_resources(store_hash)
+        redirect_to admin_path
+      rescue Spree::Dash::JirafeException => e
+        flash[:error] = e.message
+        redirect_to admin_path
+      end
     end
 
     def update
@@ -65,9 +46,33 @@ module Spree
       end
     end
 
+    def store_hash
+      url = Spree::Config.site_url || "http://demo.spreecommerce.com"
+      email = "junk@spreecommerce.com"
+      name = Spree::Config.site_name || "Spree Store"
+      platform_type = Rails.env.production? ? "spree" : "spree-#{Rails.env}"
+
+      store = {
+        :first_name    => 'Spree',
+        :last_name     => 'User',
+        :email         => email,
+        :name          => 'Spree Store',
+        :url           => format_url(url),
+        :platform_type => platform_type,
+        :currency      => 'USD',
+        :time_zone     => ActiveSupport::TimeZone::MAPPING['Eastern Time (US & Canada)'],
+      }
+
+      if Spree::Dash::Config.configured?
+        store[:app_id] = Spree::Dash::Config.app_id
+        store[:app_token] = Spree::Dash::Config.app_token
+        store[:site_id] = Spree::Dash::Config.site_id
+      end
+      store
+    end
+
     def format_url(url)
       url =~ /^http/ ? url : "http://#{url}"
     end
-
   end
 end

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

@@ -1,5 +1,6 @@
 module Spree
   class Admin::OverviewController < Admin::BaseController
+    before_filter :check_last_jirafe_sync_time, :only => :index
 
     JIRAFE_LOCALES = { :english => 'en_US',
                        :french => 'fr_FR',
@@ -7,10 +8,22 @@ module Spree
                        :japanese => 'ja_JA' }
 
     def index
+      redirect_to admin_analytics_register_path unless Spree::Dash::Config.configured?
+
       if JIRAFE_LOCALES.values.include? params[:locale]
         Spree::Dash::Config.locale = params[:locale]
       end
     end
 
+    private
+
+    def check_last_jirafe_sync_time
+      if session[:last_jirafe_sync]
+        hours_since_last_sync = ((DateTime.now - session[:last_jirafe_sync]) * 24).to_i
+        redirect_to admin_analytics_sync_path if hours_since_last_sync > 24
+      else
+        redirect_to admin_analytics_sync_path
+      end
+    end
   end
 end

data/app/helpers/spree/analytics_helper.rb

@@ -42,7 +42,7 @@ module Spree
     end
 
     def completed_analytics_tags
-      return {} unless @order and @order.complete?
+      return {} unless flash[:commerce_tracking] and @order and @order.complete?
       { :confirm => { :orderid => @order.number,
                       :total => @order.total,
                       :shipping => @order.ship_total,

data/app/overrides/analytics_header.rb

@@ -1,5 +1,5 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
-                     :name => "add_dashboard_sidebar_link",
-                     :insert_bottom => ".sidebar",
-                     :text => "<%= configurations_sidebar_menu_item t(:jirafe), admin_analytics_path %>",
-                     :original => 'a74f177275dc303c9cd5994b2e24e027434c3cbb')
+Deface::Override.new(:virtual_path => Spree::Config[:layout],
+                     :name => "add_analytics_header",
+                     :insert_bottom => "head",
+                     :partial => "spree/analytics/header",
+                     :original => '6f23c8af6e863d0499835c00b3f2763cb98e1d75')

data/app/overrides/configuration_menu_link.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
+                     :name => "add_dashboard_sidebar_link",
+                     :insert_bottom => ".sidebar",
+                     :text => "<%= configurations_sidebar_menu_item t(:jirafe), admin_analytics_path %>",
+                     :original => 'a74f177275dc303c9cd5994b2e24e027434c3cbb')

data/config/routes.rb

@@ -1,8 +1,8 @@
 Spree::Core::Engine.routes.prepend do
   match '/admin' => 'admin/overview#index', :as => :admin
 
-  get '/admin/analytics/sign_up' => 'admin/analytics#sign_up', :as => :admin_analytics_sign_up
-  post '/admin/analytics/register' => 'admin/analytics#register', :as => :admin_analytics_register
+  get '/admin/analytics/register' => 'admin/analytics#register', :as => :admin_analytics_register
+  get '/admin/analytics/sync' => 'admin/analytics#sync', :as => :admin_analytics_sync
 
   get '/jirafe' => 'admin/analytics#edit', :as => :admin_analytics
   put '/jirafe' => 'admin/analytics#update', :as => :admin_analytics

data/lib/spree/dash/jirafe.rb

@@ -10,8 +10,6 @@ module Spree
       class << self
         def register(store)
           validate_required_keys! store
-          store[:time_zone] = ActiveSupport::TimeZone::MAPPING[store[:time_zone]] # jirafe expects 'America/New_York'
-
           store = register_application(store)
           store = synchronize_resources(store)
         end
@@ -55,9 +53,7 @@ module Spree
                         :timezone => store[:time_zone],
                         :external_id => 1,
                         :site_id => store[:site_id] }],
-              :users => [{ :email => store[:email],
-                        :first_name => store[:first_name],
-                        :last_name => store[:last_name] }]
+              :users => users_hash
             }.to_json
           }
           response = post "/applications/#{store[:app_id]}/resources", options
@@ -68,7 +64,19 @@ module Spree
           store[:site_token] = response["users"].first["token"]
           store
         end
+
+        def users_hash
+          users = []
+          Spree.user_class.includes(:spree_roles).where("spree_roles.name = 'admin'").each do |user|
+            users << {
+              :email => user.email,
+              :first_name => 'Spree',
+              :last_name => 'User'
+            }
+          end
+          users
+        end
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_dash
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+  version: 1.3.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc1
+        version: 1.3.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc1
+        version: 1.3.0.rc2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,7 @@ files:
 - app/helpers/spree/analytics_helper.rb
 - app/models/spree/dash_configuration.rb
 - app/overrides/analytics_header.rb
+- app/overrides/configuration_menu_link.rb
 - app/views/spree/admin/analytics/edit.html.erb
 - app/views/spree/admin/analytics/sign_up.html.erb
 - app/views/spree/admin/overview/index.html.erb
@@ -69,7 +70,8 @@ files:
 - lib/spree/dash.rb
 - lib/spree_dash.rb
 homepage: http://spreecommerce.com
-licenses: []
+licenses:
+- BSD-3
 post_install_message: 
 rdoc_options: []
 require_paths: