spree_dash 1.0.7 → 1.1.0.rc1

data/app/helpers/spree/analytics_helper.rb

@@ -2,7 +2,7 @@ module Spree
   module AnalyticsHelper
 
     def spree_analytics
-      render :partial => 'spree/analytics/header'
+      render :partial => 'analytics/header'
     end
 
     def analytics_tags
@@ -19,7 +19,7 @@ module Spree
       { :product => { :name => @product.name,
                       :price => @product.price,
                       :sku => @product.sku,
-                      :categories => @product.taxons.map(&:permalink)
+                      :categories => @product.taxons.map { |t| t.permalink }
                     }
       }
     end
@@ -31,7 +31,7 @@ module Spree
 
     def keywords_analytics_tags
       return {} unless params[:keywords]
-      { :search => { :keyword => u(params[:keywords]) } }
+      { :search => { :keyword => params[:keywords] } }
     end
 
     def cart_analytics_tags
@@ -56,12 +56,11 @@ 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(&:permalink)
+          :categories => variant.product.taxons.map { |t| t.permalink }
         }
       end
     end

data/app/overrides/analytics_header.rb

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

data/config/locales/en.yml

@@ -1,6 +1,5 @@
 en:
-  activate: Activate
   agree_to_terms_of_service: Agree to Terms of Service
   agree_to_privacy_policy: Agree to Privacy Policy
   already_signed_up_for_analytics: You have already signed up for Spree Analytics
-  successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
+  successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics

data/lib/spree/dash.rb

@@ -10,3 +10,13 @@ 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
+end

metadata

@@ -1,35 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spree_dash
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Brian Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70262067599580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70262067599580
+- !ruby/object:Gem::Dependency
+  name: spree_auth
+  requirement: &70262067597400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70262067597400
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70262067610640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,12 +43,7 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+  version_requirements: *70262067610640
 description: Required dependency for Spree
 email: brian@spreecommerce.com
 executables: []
@@ -59,7 +60,6 @@ files:
 - app/models/spree/dash_configuration.rb
 - app/overrides/analytics_header.rb
 - app/views/spree/admin/analytics/sign_up.html.erb
-- app/views/spree/admin/overview/_form.html.erb
 - app/views/spree/admin/overview/index.html.erb
 - app/views/spree/analytics/_header.html.erb
 - config/locales/en.yml
@@ -83,16 +83,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2482164716183180734
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Overview dashboard for use with Spree.

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

@@ -1,23 +0,0 @@
-<h2><%= t(:spree_analytics_token) %></h2>
-
-<%= form_tag admin_dash_preferences_path, :method => :put  do %>
-  <table data-hook="dash_preferences">
-    <tr data-hook="app_id">
-      <td><%= t(:analytics_app_id) %>:</td>
-      <td><%= text_field_tag :app_id, Spree::Dash::Config.app_id, :size => 50 %></td>
-    </tr>
-    <tr data-hook="site_id">
-      <td><%= t(:analytics_site_id) %>:</td>
-      <td><%= text_field_tag :site_id, Spree::Dash::Config.site_id, :size => 50 %></td>
-    </tr>
-    <tr data-hook="token">
-      <td><%= t(:analytics_token) %>:</td>
-      <td><%= text_field_tag :token, Spree::Dash::Config.token, :size => 50 %></td>
-    </tr>
-  </table>
-
-  <p class="form-buttons" data-hook="buttons">
-  <%= button t(:update) %> <%= link_to t(:cancel), admin_path %>
-  </p>
-
-<% end %>