spree_dash 1.1.6 → 1.2.0.rc1

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

@@ -6,7 +6,7 @@ module Spree
       @store = {
         :first_name => '',
         :last_name => '',
-        :email => current_user.email,
+        :email => try_spree_current_user.email,
         :currency => 'USD',
         :time_zone => Time.zone,
         :name => Spree::Config.site_name,

data/app/helpers/spree/analytics_helper.rb

@@ -19,7 +19,7 @@ module Spree
       { :product => { :name => @product.name,
                       :price => @product.price,
                       :sku => @product.sku,
-                      :categories => @product.taxons.map { |t| t.permalink }
+                      :categories => @product.taxons.map(&:permalink)
                     }
       }
     end
@@ -42,7 +42,7 @@ module Spree
     end
 
     def completed_analytics_tags
-      return {} unless flash[:commerce_tracking] and @order and @order.complete?
+      return {} unless @order and @order.complete?
       { :confirm => { :orderid => @order.number,
                       :total => @order.total,
                       :shipping => @order.ship_total,
@@ -56,11 +56,12 @@ module Spree
     def products_for_order
       @order.line_items.map do |line_item|
         variant = line_item.variant
-        { :name => variant.name,
+        {
+          :name => variant.name,
           :qty => line_item.quantity,
           :price => variant.price,
           :sku => variant.sku,
-          :categories => variant.product.taxons.map { |t| t.permalink }
+          :categories => variant.product.taxons.map(&:permalink)
         }
       end
     end

data/app/overrides/analytics_header.rb

@@ -1,5 +1,5 @@
-Deface::Override.new(:virtual_path => Spree::Config[:layout].gsub(/^\//, ''),
+Deface::Override.new(:virtual_path => "spree/layouts/spree_application",
                      :name => "add_analytics_header",
-                     :insert_bottom => "head",
+                     :insert_bottom => "[data-hook='inside_head']",
                      :partial => "spree/analytics/header",
                      :original => '6f23c8af6e863d0499835c00b3f2763cb98e1d75')

data/app/views/spree/admin/analytics/sign_up.html.erb

@@ -3,11 +3,11 @@
     <legend><%= t(:analytics_sign_up) %></legend>
     <p>
       <%= check_box_tag 'store[terms_of_service]', @store[:terms_of_service], @store.has_key?(:terms_of_service), :size => 50 %>
-      <%= label_tag 'store[terms_of_service]', t(:agree_to_terms_of_service) %> (<a href="http://jirafe.com/about/terms" target="_new"><%= t(:review) %></a>)
+      <%= label_tag 'store[terms_of_service]', t(:agree_to_terms_of_service) %> (<a href="http://jirafe.com/terms" target="_new"><%= t(:review) %></a>)
     </p>
     <p>
       <%= check_box_tag 'store[privacy_policy]', @store[:privacy_policy], @store.has_key?(:privacy_policy), :size => 50 %>
-      <%= label_tag 'store[privacy_policy]', t(:agree_to_privacy_policy) %> (<a href="http://jirafe.com/about/privacy" target="_new"><%= t(:review) %></a>)
+      <%= label_tag 'store[privacy_policy]', t(:agree_to_privacy_policy) %> (<a href="http://jirafe.com/privacy" target="_new"><%= t(:review) %></a>)
     </p>
     <p>
       <%= label_tag :first_name %><br>

data/lib/spree/dash.rb

@@ -10,13 +10,6 @@ end
 require 'spree/dash/engine'
 require 'spree/dash/jirafe'
 
-# add helper to all the base controllers
-# Spree::BaseController includes Spree::Core::ControllerHelpers
-require 'spree/core/controller_helpers'
-class << Spree::Core::ControllerHelpers
-  def included_with_analytics(receiver)
-    included_without_analytics(receiver)
-    receiver.send :helper, 'spree/analytics'
-  end
-  alias_method_chain :included, :analytics
+Spree::Dash::Engine.config.to_prepare do
+  Spree::BaseController.send :helper, 'spree/analytics'
 end

metadata

@@ -1,59 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: spree_dash
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.6
+  version: 1.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Brian Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
   name: spree_core
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-  name: spree_auth
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
-  name: httparty
+  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -84,8 +68,7 @@ files:
 - lib/spree/dash.rb
 - lib/spree_dash.rb
 homepage: http://spreecommerce.com
-licenses:
-- BSD-3
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,12 +82,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2230583432281266077
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: