spree_clean 1.0.6 → 1.0.7

data/Versionfile

@@ -1,3 +1,4 @@
+"2.0.x" => { :tag => "v1.0.7", :version => "1.0.7" }
 "1.3.x" => { :tag => "v1.0.6", :version => "1.0.6" }
 "1.2.x" => { :tag => "v1.0.4", :version => "1.0.4" }
 "1.1.x" => { :tag => "v1.0.3", :version => "1.0.3" }

data/app/assets/javascripts/admin/spree_clean.js

@@ -1,2 +1 @@
-//= require admin/spree_core
 //= require_tree .

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

@@ -5,7 +5,7 @@ module Spree
         params[:resources].each_key do |resource|
           case resource
           when "user"
-            Spree::User.where('id NOT IN (SELECT user_id FROM spree_roles_users)').delete_all
+            Spree.user_class.where('id NOT IN (SELECT user_id FROM spree_roles_users)').delete_all
           when "address"
             Spree::Address.delete_all
           else
@@ -13,7 +13,7 @@ module Spree
           end
         end
 
-        flash[:notice] = "Selected data has been successfully deleted"
+        flash[:success] = "Selected data has been successfully deleted"
         redirect_to admin_clean_data_path
       end
     end

data/app/views/spree/admin/clean_data/show.html.erb

@@ -1,10 +1,10 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= t(:clean_data) %>
+  <%= Spree.t(:clean_data) %>
 <% end %>
 
-<p class="warning"><strong><%= t :clean_data_warning %></strong></p>
+<p class="warning"><strong><%= Spree.t :clean_data_warning %></strong></p>
 
 <p>
   <a href="#select_all">Select All</a> |
@@ -17,89 +17,89 @@
 <%= form_tag admin_destroy_data_path, :method => :delete do %>
   <p data-hook="resources-list" class="resources-list">
     <%= check_box_tag 'resources[address]', '1', true %>
-    <%= label_tag 'resources[address]', t(:addresses) %>
+    <%= label_tag 'resources[address]', Spree.t(:addresses) %>
     <br />
     <%= check_box_tag 'resources[adjustment]', '1', true %>
-    <%= label_tag 'resources[adjustment]', t(:adjustments) %>
+    <%= label_tag 'resources[adjustment]', Spree.t(:adjustments) %>
     <br />
     <%= check_box_tag 'resources[asset]', '1', true %>
-    <%= label_tag 'resources[asset]', t(:assets) %>
+    <%= label_tag 'resources[asset]', Spree.t(:assets) %>
     <br />
     <%= check_box_tag 'resources[calculator]', '1', true %>
-    <%= label_tag 'resources[calculator]', t(:calculators) %>
+    <%= label_tag 'resources[calculator]', Spree.t(:calculators) %>
     <br />
     <%= check_box_tag 'resources[country]', '1', false %>
-    <%= label_tag 'resources[country]', t(:countries) %>
+    <%= label_tag 'resources[country]', Spree.t(:countries) %>
     <br />
     <%= check_box_tag 'resources[line_item]', '1', true %>
-    <%= label_tag 'resources[line_item]', t(:line_items) %>
+    <%= label_tag 'resources[line_item]', Spree.t(:line_items) %>
     <br />
     <%= check_box_tag 'resources[option_type]', '1', true %>
-    <%= label_tag 'resources[option_type]', t(:option_types) %>
+    <%= label_tag 'resources[option_type]', Spree.t(:option_types) %>
     <br />
     <%= check_box_tag 'resources[option_value]', '1', true %>
-    <%= label_tag 'resources[option_value]', t(:option_values) %>
+    <%= label_tag 'resources[option_value]', Spree.t(:option_values) %>
     <br />
     <%= check_box_tag 'resources[order]', '1', true %>
-    <%= label_tag 'resources[order]', t(:orders) %>
+    <%= label_tag 'resources[order]', Spree.t(:orders) %>
     <br />
     <%= check_box_tag 'resources[payment_method]', '1', true %>
-    <%= label_tag 'resources[payment_method]', t(:payment_methods) %>
+    <%= label_tag 'resources[payment_method]', Spree.t(:payment_methods) %>
     <br />
     <%= check_box_tag 'resources[product_option_type]', '1', true %>
-    <%= label_tag 'resources[product_option_type]', t(:product_option_types) %>
+    <%= label_tag 'resources[product_option_type]', Spree.t(:product_option_types) %>
     <br />
     <%= check_box_tag 'resources[product_property]', '1', true %>
-    <%= label_tag 'resources[product_property]', t(:product_properties) %>
+    <%= label_tag 'resources[product_property]', Spree.t(:product_properties) %>
     <br />
     <%= check_box_tag 'resources[product]', '1', true %>
-    <%= label_tag 'resources[product]', t(:products) %>
+    <%= label_tag 'resources[product]', Spree.t(:products) %>
     <br />
     <%= check_box_tag 'resources[property]', '1', true %>
-    <%= label_tag 'resources[property]', t(:properties) %>
+    <%= label_tag 'resources[property]', Spree.t(:properties) %>
     <br />
     <%= check_box_tag 'resources[prototype]', '1', true %>
-    <%= label_tag 'resources[prototype]', t(:prototypes) %>
+    <%= label_tag 'resources[prototype]', Spree.t(:prototypes) %>
     <br />
     <%= check_box_tag 'resources[shipment]', '1', true %>
-    <%= label_tag 'resources[shipment]', t(:shipments) %>
+    <%= label_tag 'resources[shipment]', Spree.t(:shipments) %>
     <br />
     <%= check_box_tag 'resources[shipping_category]', '1', true %>
-    <%= label_tag 'resources[shipping_category]', t(:shipping_categories) %>
+    <%= label_tag 'resources[shipping_category]', Spree.t(:shipping_categories) %>
     <br />
     <%= check_box_tag 'resources[shipping_method]', '1', true %>
-    <%= label_tag 'resources[shipping_method]', t(:shipping_methods) %>
+    <%= label_tag 'resources[shipping_method]', Spree.t(:shipping_methods) %>
     <br />
     <%= check_box_tag 'resources[state]', '1', false %>
-    <%= label_tag 'resources[state]', t(:states) %>
+    <%= label_tag 'resources[state]', Spree.t(:states) %>
     <br />
     <%= check_box_tag 'resources[tax_category]', '1', true %>
-    <%= label_tag 'resources[tax_category]', t(:tax_categories) %>
+    <%= label_tag 'resources[tax_category]', Spree.t(:tax_categories) %>
     <br />
     <%= check_box_tag 'resources[tax_rate]', '1', true %>
-    <%= label_tag 'resources[tax_rate]', t(:tax_rates) %>
+    <%= label_tag 'resources[tax_rate]', Spree.t(:tax_rates) %>
     <br />
     <%= check_box_tag 'resources[taxonomy]', '1', true %>
-    <%= label_tag 'resources[taxonomy]', t(:taxonomies) %>
+    <%= label_tag 'resources[taxonomy]', Spree.t(:taxonomies) %>
     <br />
     <%= check_box_tag 'resources[taxon]', '1', true %>
-    <%= label_tag 'resources[taxon]', t(:taxons) %>
+    <%= label_tag 'resources[taxon]', Spree.t(:taxons) %>
     <br />
     <%= check_box_tag 'resources[user]', '1', true %>
-    <%= label_tag 'resources[user]', t(:users) %>
+    <%= label_tag 'resources[user]', Spree.t(:users) %>
     <br />
     <%= check_box_tag 'resources[variant]', '1', true %>
-    <%= label_tag 'resources[variant]', t(:variants) %>
+    <%= label_tag 'resources[variant]', Spree.t(:variants) %>
     <br />
     <%= check_box_tag 'resources[zone_member]', '1', false %>
-    <%= label_tag 'resources[zone_member]', t(:zone_members) %>
+    <%= label_tag 'resources[zone_member]', Spree.t(:zone_members) %>
     <br />
     <%= check_box_tag 'resources[zone]', '1', false %>
-    <%= label_tag 'resources[zone]', t(:zones) %>
+    <%= label_tag 'resources[zone]', Spree.t(:zones) %>
   </p>
 
   <p class="form-buttons" data-hook="buttons">
-    <%= submit_tag t(:destroy_data), :confirm => "#{t(:confirm_delete_data)}" %>
-    <%= t(:or) %> <%= link_to t(:cancel), edit_admin_general_settings_path %>
+    <%= submit_tag Spree.t(:destroy_data), :confirm => "#{Spree.t(:confirm_delete_data)}" %>
+    <%= Spree.t(:or) %> <%= link_to Spree.t(:cancel), edit_admin_general_settings_path %>
   </p>
 <% end %>

data/app/views/spree/admin/shared/_configurations_menu.html.erb

@@ -1 +1 @@
-<%= configurations_sidebar_menu_item t(:clean_data), admin_clean_data_path %>
+<%= configurations_sidebar_menu_item Spree.t(:clean_data), admin_clean_data_path %>

data/config/locales/en.yml

@@ -2,8 +2,10 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  clean_data_description: "Bulk delete data from your application."
-  clean_data_warning: "Warning: Any actions taken on this page will permanently delete data from the application. Use with caution!"
-  confirm_delete_data: "Are you sure you wish to continue? This operation cannot be undone."
-  destroy_data: "Destroy Data"
-  product_scopes_label: "Product Scopes"
+  spree:
+    clean_data: "Clean Data"
+    clean_data_description: "Bulk delete data from your application."
+    clean_data_warning: "Warning: Any actions taken on this page will permanently delete data from the application. Use with caution!"
+    confirm_delete_data: "Are you sure you wish to continue? This operation cannot be undone."
+    destroy_data: "Destroy Data"
+    product_scopes_label: "Product Scopes"

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.routes.append do
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     resource :clean_data
     match "destroy_data" => "clean_data#destroy_data"

data/spree_clean.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_clean'
-  s.version     = '1.0.6'
+  s.version     = '1.0.7'
   s.summary     = 'Delete data via the Spree admin'
   s.description = 'Spree Extension that facilitates mass deletion of application data'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_path  = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 1.3.0'
+  s.add_dependency 'spree_core', '~> 2.0.0'
 
   s.add_development_dependency 'capybara', '1.0.1'
   s.add_development_dependency 'factory_girl'

metadata

@@ -2,21 +2,21 @@
 name: spree_clean
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - John Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
     none: false
   name: spree_core
   type: :runtime
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
     none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement