spree_dash 1.3.2 → 2.0.0.rc1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTBhMWQyZWU2YWU5Zjg2YTY3N2ZhNDI2OWM4NTA2ZGM2YTNiYzdjNQ==
+  data.tar.gz: !binary |-
+    ZWY4MGI2YzEzNGE3NzIxMGMzMmYzN2Y5YjkxZjM3ODhjNmFkMzY2OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjVmNzE1YThhMDQxYmY2NWZjMjFkNTNkYmNhNGYxMWUzMThjNWFkMTAwZjIy
+    MmJkYjExYTRmM2E3MDk2OGY4NThlZTdkNjU4YjNmMDQ4NzMwM2ZhNWM3NDFm
+    YmQ1MmRmYmZjMzIwNTU0ZmNhOWFjNWQzNjgyODJhY2M4NzZkMWY=
+  data.tar.gz: !binary |-
+    MjhmMTZkZWZjYmVjYTRmZjRlZWNjMjA2NjZlZGIyZjZmMzhiN2Y2NTkyNjdj
+    N2MxOTQ2MDg5MmQ5Y2EyNzkwZDg4NjFhOWJmMmMwMTQyMGI1YTEzYmU0MjQx
+    YTY3MWUwNTc0ZDUwY2M0ODc0M2YyMGQzZjFkNmNlMzgzOWMxN2U=

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

@@ -22,7 +22,7 @@ module Spree
       begin
         store = Spree::Dash::Jirafe.synchronize_resources(store_hash)
       rescue SocketError
-        flash[:error] = t(:could_not_connect_to_jirafe)
+        flash[:error] = Spree.t(:could_not_connect_to_jirafe)
       rescue Spree::Dash::JirafeException => e
         flash[:error] = e.message
       ensure
@@ -35,7 +35,7 @@ module Spree
       Spree::Dash::Config.app_token = params[:app_token]
       Spree::Dash::Config.site_id = params[:site_id]
       Spree::Dash::Config.token = params[:token]
-      flash[:success] = t(:jirafe_settings_updated, :scope => "spree.dash")
+      flash[:success] = Spree.t(:jirafe_settings_updated, :scope => "dash")
       redirect_to admin_analytics_path
     end
 
@@ -43,7 +43,7 @@ module Spree
 
     def redirect_if_registered
       if Spree::Dash::Config.configured?
-        flash[:success] = t(:already_signed_up_for_analytics)
+        flash[:success] = Spree.t(:already_signed_up_for_analytics)
         redirect_to admin_path and return true
       end
     end

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

@@ -27,5 +27,9 @@ module Spree
         end
       end
     end
+
+    def model_class
+      Spree::Admin::OverviewController
+    end
   end
 end

data/app/overrides/configuration_menu_link.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 %>",
+                     :text => "<%= configurations_sidebar_menu_item Spree.t(:jirafe), admin_analytics_path %>",
                      :original => 'a74f177275dc303c9cd5994b2e24e027434c3cbb')

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

@@ -1,26 +1,42 @@
-<h2><%= t(:header, :scope => "spree.dash.jirafe") %></h2>
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<p><%= t(:explanation, :scope => "spree.dash.jirafe") %></p>
+<% content_for :page_title do %>
+  <%= Spree.t(:header, :scope => "dash.jirafe") %>
+<% end %>
 
 <%= form_tag admin_analytics_path, :method => :put do %>
-  <div class="field">
-    <%= label_tag 'app_id', t(:app_id, :scope => "spree.dash.jirafe") %><br>
-    <%= text_field_tag 'app_id', Spree::Dash::Config.app_id %> 
-  </div>
-  <div class="field">
-    <%= label_tag 'app_token', t(:app_token, :scope => "spree.dash.jirafe") %><br>
-    <%= text_field_tag 'app_token', Spree::Dash::Config.app_token, :size => 40 %> 
-  </div>
-  <div class="field">
-    <%= label_tag 'site_id', t(:site_id, :scope => "spree.dash.jirafe") %><br>
-    <%= text_field_tag 'site_id', Spree::Dash::Config.site_id %> 
-  </div>
-  <div class="field">
-    <%= label_tag 'token', t(:token, :scope => "spree.dash.jirafe") %><br>
-    <%= text_field_tag 'token', Spree::Dash::Config.token, :size => 40 %> 
-  </div>
-  <div class="form-buttons" data-hook="buttons">
-    <%= submit_tag "Update" %>
-  </div>
+  <fieldset>
+    <legend><%= Spree.t(:settings)%></legend>
+
+    <p><%= Spree.t(:explanation, :scope => "dash.jirafe") %></p>
+    <div class="alpha five columns">
+      <div class="field">
+        <%= label_tag 'app_id', Spree.t(:app_id, :scope => "dash.jirafe") %><br>
+        <%= text_field_tag 'app_id', Spree::Dash::Config.app_id %>
+      </div>
+      <div class="field">
+        <%= label_tag 'site_id', Spree.t(:site_id, :scope => "dash.jirafe") %><br>
+        <%= text_field_tag 'site_id', Spree::Dash::Config.site_id %>
+      </div>
+    </div>
+
+    <div class="omega seven columns">
+      <div class="field">
+        <%= label_tag 'app_token', Spree.t(:app_token, :scope => "dash.jirafe") %><br>
+        <%= text_field_tag 'app_token', Spree::Dash::Config.app_token, :size => 40 %>
+      </div>
+
+      <div class="field">
+        <%= label_tag 'token', Spree.t(:token, :scope => "dash.jirafe") %><br>
+        <%= text_field_tag 'token', Spree::Dash::Config.token, :size => 40 %>
+      </div>
+    </div>
+
+    <div class="clear"></div>
+
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button Spree.t(:update), 'icon-refresh' %>
+    </div>
+  </fieldset>
 <% end %>
 

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= t(:analytics_sign_up) %>
+  <%= Spree.t(:analytics_sign_up) %>
 <% end %>
 
 <% content_for :page_title_classes do %>
@@ -45,17 +45,17 @@
 
     <div class="field">
       <%= 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]', Spree.t(:agree_to_terms_of_service) %> (<a href="http://jirafe.com/about/terms" target="_new"><%= Spree.t(:review) %></a>)
     </div>
     
     <div class="field">
       <%= 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]', Spree.t(:agree_to_privacy_policy) %> (<a href="http://jirafe.com/about/privacy" target="_new"><%= Spree.t(:review) %></a>)
     </div>
   </div>
   <div class="form-buttons" data-hook="buttons">
-    <%= button t(:activate), 'icon-ok' %>
-    <%= t(:or) %>
-    <%= link_to_with_icon 'icon-remove', t(:cancel), admin_path, :class => 'button' %>
+    <%= button Spree.t(:activate), 'icon-ok' %>
+    <%= Spree.t(:or) %>
+    <%= link_to_with_icon 'icon-remove', Spree.t(:cancel), admin_path, :class => 'button' %>
   </div>
 <% end %>

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

@@ -7,7 +7,7 @@
   
   <% content_for :page_actions do %>
     <li id="jirafe_locales">
-      <i class="icon-globe"></i> <%= t(:choose_dashboard_locale) %>: <%= raw jirafe_locale_links.join(' ') %>
+      <i class="icon-globe"></i> <%= Spree.t(:choose_dashboard_locale) %>: <%= raw jirafe_locale_links.join(' ') %>
     </li>
   <% end %>
 
@@ -29,21 +29,21 @@
   <div class="no-border-top analytics-description">
     <div class="description-text">
       <hgroup>
-        <h1><%= t(:analytics_desc_header_1)%></h1>
-        <h6><%= t(:analytics_desc_header_2)%></h6>
+        <h1><%= Spree.t(:analytics_desc_header_1)%></h1>
+        <h6><%= Spree.t(:analytics_desc_header_2)%></h6>
       </hgroup>
 
       <ul>
-        <li><%= t(:analytics_desc_list_1)%></li>
-        <li><%= t(:analytics_desc_list_2)%></li>
-        <li><%= t(:analytics_desc_list_3)%></li>
-        <li><%= t(:analytics_desc_list_4)%></li>
+        <li><%= Spree.t(:analytics_desc_list_1)%></li>
+        <li><%= Spree.t(:analytics_desc_list_2)%></li>
+        <li><%= Spree.t(:analytics_desc_list_3)%></li>
+        <li><%= Spree.t(:analytics_desc_list_4)%></li>
       </ul>
     </div>
     <div class="preview-buttons filter-actions actions">
-      <%= link_to_with_icon 'icon-ok', t(:activate), admin_analytics_sign_up_path, :class => 'button' %>
-      <span class="or">&nbsp; <%= t(:or) %> &nbsp;</span>
-      <%= link_to_with_icon 'icon-info-sign', t(:learn_more), "http://spreecommerce.com/blog/2012/01/31/introducing-spree-analytics/", :class => 'button', :target => '_blank' %>
+      <%= link_to_with_icon 'icon-ok', Spree.t(:activate), admin_analytics_sign_up_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>
 

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.routes.prepend do
+Spree::Core::Engine.routes.draw do
   match '/admin' => 'admin/overview#index', :as => :admin
 
   get '/admin/analytics/register' => 'admin/analytics#register', :as => :admin_analytics_register

data/lib/spree/dash.rb

@@ -1,4 +1,4 @@
-require 'spree_core'
+require 'spree_backend'
 require 'httparty'
 
 module Spree

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spree_dash
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Brian Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spree_core
+  name: spree_backend
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: spree_frontend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.11.0
 description: Required dependency for Spree
 email: brian@spreecommerce.com
 executables: []
@@ -63,7 +72,6 @@ files:
 - app/views/spree/admin/analytics/sign_up.html.erb
 - app/views/spree/admin/overview/index.html.erb
 - app/views/spree/analytics/_header.html.erb
-- config/locales/en.yml
 - config/routes.rb
 - lib/spree/dash/engine.rb
 - lib/spree/dash/jirafe.rb
@@ -72,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.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3356854868244981941
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Overview dashboard for use with Spree.
 test_files: []

data/config/locales/en.yml

@@ -1,24 +0,0 @@
-en:
-  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
-  analytics_desc_header_1: Spree Analytics
-  analytics_desc_header_2: Live analytics integrated into your Spree dashboard
-  analytics_desc_list_1: Get live sales information as it happens
-  analytics_desc_list_2: Requires only a free Spree account to activate
-  analytics_desc_list_3: Absolutely no code to install
-  analytics_desc_list_4: It's completely free!
-
-  could_not_connect_to_jirafe: Could not connect to Jirafe to sync data. This will be automatically retried later.
-
-  spree:
-    dash:
-      jirafe:
-        header: Jirafe Analytics Settings
-        app_id: App ID
-        app_token: App Token
-        site_id: Site ID
-        token: Token
-        explanation: The fields below may already be populated if you chose to register with Jirafe from the admin dashboard.
-      jirafe_settings_updated: Jirafe Settings have been updated.