spree_active_sale 1.3.2 → 2.0.0

data/README.md

@@ -18,8 +18,8 @@ Spree Active Sale makes it easy to handle flash sale/ daily deals behavior withi
 * Demo application: [Spree Active Sale Demo](https://github.com/suryart/spree_active_sale_demo)
 * Dependency status: [![Dependency Status](https://gemnasium.com/suryart/spree_active_sale.png)](https://gemnasium.com/suryart/spree_active_sale)
 * Code Climate: [![Code Climate](https://codeclimate.com/github/suryart/spree_active_sale.png)](https://codeclimate.com/github/suryart/spree_active_sale)
-* Build Status: [![Build Status](https://travis-ci.org/suryart/spree_active_sale.png?branch=1-3-stable)](https://travis-ci.org/suryart/spree_active_sale)
-* Coverage Status: [![Coverage Status](https://coveralls.io/repos/suryart/spree_active_sale/badge.png?branch=1-3-stable)](https://coveralls.io/r/suryart/spree_active_sale?branch=1-3-stable)
+* Build Status: [![Build Status](https://travis-ci.org/suryart/spree_active_sale.png?branch=2-0-stable)](https://travis-ci.org/suryart/spree_active_sale)
+* Converage Status: [![Coverage Status](https://coveralls.io/repos/suryart/spree_active_sale/badge.png?branch=2-0-stable)](https://coveralls.io/r/suryart/spree_active_sale?branch=2-0-stable)
 * Issues: [Project issues](https://github.com/suryart/spree_active_sale/issues)
 * Fork: [Fork this Project](https://github.com/suryart/spree_active_sale/fork_select)
 
@@ -32,16 +32,16 @@ Spree Active Sale makes it easy to handle flash sale/ daily deals behavior withi
         gem 'spree_active_sale' , :git => 'git://github.com/suryart/spree_active_sale.git'
       ```
 
-  * Get the 1-3-stable branch for Spree 1.3.x from github: 
+  * Get the 2-0-stable branch for Spree 2.0.x from github: 
     
       ```ruby
-        gem 'spree_active_sale' , :git => 'git://github.com/suryart/spree_active_sale.git', :branch => '1-3-stable'
+        gem 'spree_active_sale' , :git => 'git://github.com/suryart/spree_active_sale.git', :branch => '2-0-stable'
       ```
 
   * Or get it from rubygems.org by mentioning the following line in your Gemfile:
     
       ```ruby 
-        gem 'spree_active_sale', '1.3.0'
+        gem 'spree_active_sale', '2.0.0'
       ```
 
 ### Then run the following commands: 
@@ -227,7 +227,6 @@ Since you can not set boolean values from the block config shown above for assig
 ## TODOs
 
 * Improve testing and write more test cases.
-* Enhance the admin interface for active sales and events[U.I. and U.X.].
 
 ## Testing
 
@@ -246,7 +245,7 @@ Be sure to bundle your dependencies and then create a dummy test app for the spe
 
 ## NOTE
 
-The current version supports Spree 1.3.0 or above. Older versions of Spree are unlikely to work, so attempt at your own risk.
+The current version supports Spree's versions: 1.3.x and 2.0.x. Older versions of Spree are unlikely to work, so attempt at your own risk.
 
 
 ## License

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

@@ -101,7 +101,7 @@
 
     <% unless @active_sale_event.new_record? %>
       <ul class="inline-menu">
-        <li><%= link_to_with_icon('icon-plus', t(:new_image), new_admin_active_sale_active_sale_event_sale_image_url(@active_sale, @active_sale_event), :id => 'new_sale_image_link', :class => 'button') %></li>
+        <li><%= link_to_with_icon('icon-plus', Spree.t(:new_image), new_admin_active_sale_active_sale_event_sale_image_url(@active_sale, @active_sale_event), :id => 'new_sale_image_link', :class => 'button') %></li>
       </ul>
       <br/>
       <%= render 'spree/admin/shared/sale_images' %>

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

@@ -17,7 +17,7 @@
   </colgroup>
   <thead>
     <tr data-hook="active_sales_header">
-      <th><%= t(:name) %></th>
+      <th><%= t('spree.active_sale.active_record.name') %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -40,18 +40,18 @@
 <%= paginate @active_sales %>
 
 <% content_for :sidebar_title do %>
-  <%= t(:search) %>
+  <%= Spree.t(:search) %>
 <% end %>
 
 <% content_for :sidebar do %>
   <div class="box align-center" data-hook="admin_active_sales_index_search">    
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="field">
-        <%= f.label t(:name) %> <br>
+        <%= f.label Spree.t(:name) %> <br>
         <%= f.text_field :name_cont, :class => 'fullwidth' %>
       </div>
       <div data-hook="admin_active_sales_index_search_buttons">
-        <%= button t(:search), 'icon-search' %>
+        <%= button Spree.t(:search), 'icon-search' %>
       </div>
     <% end %>
   </div>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_image_form_fields">
   <div class="four columns alpha">
     <div data-hook="file" class="field">
-      <%= f.label :attachment, t(:filename) %><br>
+      <%= f.label :attachment, Spree.t(:filename) %><br>
       <%= f.file_field :attachment %>
     </div>
   </div>
   <div data-hook="alt_text" class="field omega five columns">
-    <%= f.label t(:alt_text) %><br>
+    <%= f.label Spree.t(:alt_text) %><br>
     <%= f.text_area :alt, :rows => 4, :class => 'fullwidth' %>
   </div>
 </div>

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

@@ -8,7 +8,7 @@
   <fieldset data-hook="edit_image">
     <legend align="center"><%= @sale_image.attachment_file_name%></legend>
     <div data-hook="thumbnail" class="field alpha three columns align-center">
-      <%= f.label t(:thumbnail) %><br>
+      <%= f.label Spree.t(:thumbnail) %><br>
       <%= link_to image_tag(@sale_image.attachment.url(:small)), @sale_image.attachment.url(:product) %>
     </div>
     <div class="nine columns omega">
@@ -16,9 +16,9 @@
     </div>
     <div class="clear"></div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t(:update), 'icon-refresh' %>
-      <span class="or"><%= t(:or) %></span>
-        <%= link_to_with_icon 'icon-remove', t(:cancel), admin_active_sale_active_sale_event_url(@active_sale, @active_sale_event), :id => 'cancel_link', :class => 'button' %>
+      <%= button Spree.t(:update), 'icon-refresh' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+        <%= link_to_with_icon 'icon-remove', Spree.t(:cancel), admin_active_sale_active_sale_event_url(@active_sale, @active_sale_event), :id => 'cancel_link', :class => 'button' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/sale_images/new.html.erb

@@ -5,14 +5,14 @@
 
 <%= form_for [:admin, @active_sale, @active_sale_event, @sale_image], :html => { :multipart => true } do |f| %>
   <fieldset data-hook="new_image">
-    <legend align="center"><%= t(:new_image) %></legend>
+    <legend align="center"><%= Spree.t(:new_image) %></legend>
 
       <%= render :partial => 'form', :locals => { :f => f } %>
     
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button t(:save), 'icon-refresh' %>
-        <span class="or"><%= t(:or) %></span>
-        <%= link_to_with_icon 'icon-remove', t(:cancel), admin_active_sale_active_sale_event_url(@active_sale_event.active_sale, @active_sale_event), :id => 'cancel_link', :class => 'button' %>
+        <%= button Spree.t(:save), 'icon-refresh' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= link_to_with_icon 'icon-remove', Spree.t(:cancel), admin_active_sale_active_sale_event_url(@active_sale_event.active_sale, @active_sale_event), :id => 'cancel_link', :class => 'button' %>
       </div>
   </fieldset>
 <% end %>

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

@@ -1,8 +1,8 @@
 <% content_for :head do %>
   <%= javascript_tag "var active_sale_id = #{@active_sale.id};
-    var loading = '#{escape_javascript t(:loading)}';
-    var new_active_sale_event = '#{escape_javascript t(:new_active_sale_event)}';
-    var server_error = '#{escape_javascript t(:server_error)}';
-    var active_sale_tree_error = '#{escape_javascript t(:active_sale_tree_error)}';"
+    var loading = '#{escape_javascript Spree.t(:loading)}';
+    var new_active_sale_event = '#{escape_javascript t('spree.active_sale.event.link.new')}';
+    var server_error = '#{escape_javascript Spree.t(:server_error)}';
+    var active_sale_tree_error = '#{escape_javascript t('spree.active_sale.tree_error')}';"
   %>
 <% end %>

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

@@ -14,11 +14,11 @@
 
 <fieldset class="no-border-top">
   <div>
-    <%= label_tag nil, t(:tree) %><br />
+    <%= label_tag nil, Spree.t(:tree) %><br />
     <div id="active_sale_tree" class="tree" data-url="<%= admin_active_sale_active_sale_events_path @active_sale %>"></div>
   </div>
   <div id="progress" style="display:none;">
-    <%= image_tag 'spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= t(:updating) %>..
+    <%= image_tag 'spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= Spree.t(:updating) %>..
   </div>
 
   <p class='hint info'>

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

@@ -14,8 +14,8 @@
     </colgroup>
     <thead>
       <tr data-hook="images_header">
-        <th colspan="2"><%= t(:thumbnail) %></th>
-        <th><%= t(:alt_text) %></th>
+        <th colspan="2"><%= Spree.t(:thumbnail) %></th>
+        <th><%= Spree.t(:alt_text) %></th>
         <th class="actions"></th>
       </tr>
     </thead>

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

@@ -4,30 +4,30 @@
                               :scope => 'spree.date_picker',
                               :default => 'yy/mm/dd'),
     :abbr_day_names      => I18n.t(:abbr_day_names, :scope => :date),
-    :add                 => I18n.t(:add),
-    :are_you_sure_delete => I18n.t(:are_you_sure_delete),
-    :bill_address        => I18n.t(:bill_address),
-    :choose_a_customer   => I18n.t(:choose_a_customer),
-    :confirm_delete      => I18n.t(:confirm_delete),
-    :cut                 => I18n.t(:cut),
-    :destroy             => I18n.t(:destroy),
-    :edit                => I18n.t(:edit),
-    :loading             => I18n.t(:loading),
+    :add                 => I18n.t('spree.add'),
+    :are_you_sure_delete => I18n.t('spree.are_you_sure_delete'),
+    :bill_address        => I18n.t('spree.bill_address'),
+    :choose_a_customer   => I18n.t('spree.choose_a_customer'),
+    :confirm_delete      => I18n.t('spree.confirm_delete'),
+    :cut                 => I18n.t('spree.cut'),
+    :destroy             => I18n.t('spree.destroy'),
+    :edit                => I18n.t('spree.edit'),
+    :loading             => I18n.t('spree.loading'),
     :month_names         => I18n.t(:month_names, :scope => :date).delete_if(&:blank?),
-    :more                => I18n.t(:more),
-    :name                => I18n.t(:name),
-    :next                => I18n.t(:next),
-    :no_results          => I18n.t(:no_results),
-    :on_hand             => I18n.t(:on_hand),
-    :paste               => I18n.t(:paste),
-    :previous            => I18n.t(:previous),
-    :remove              => I18n.t(:remove),
-    :rename              => I18n.t(:rename),
-    :searching           => I18n.t(:searching),
-    :sku                 => I18n.t(:sku),
-    :type_to_search      => I18n.t(:type_to_search),
-    :taxon_placeholder   => I18n.t(:taxon_placeholder),
-    :value               => I18n.t(:value)
+    :more                => I18n.t('spree.more'),
+    :name                => I18n.t('spree.name'),
+    :next                => I18n.t('spree.next'),
+    :no_results          => I18n.t('spree.no_results'),
+    :on_hand             => I18n.t('spree.on_hand'),
+    :paste               => I18n.t('spree.paste'),
+    :previous            => I18n.t('spree.previous'),
+    :remove              => I18n.t('spree.remove'),
+    :rename              => I18n.t('spree.rename'),
+    :searching           => I18n.t('spree.searching'),
+    :sku                 => I18n.t('spree.sku'),
+    :type_to_search      => I18n.t('spree.type_to_search'),
+    :taxon_placeholder   => I18n.t('spree.taxon_placeholder'),
+    :value               => I18n.t('spree.value')
   }.to_json
 %>
 </script>

data/config/locales/active_sales_en.yml

@@ -77,3 +77,4 @@ en:
         new: "New active sale"
         edit: "Edit active sale"
         list: "Listing active sales"
+      tree_error: "Active Sale Tree Error"

data/config/routes.rb

@@ -21,4 +21,4 @@ Spree::Core::Engine.routes.draw do
       end
     end
   end
-end
+end

data/lib/generators/spree_active_sale/install/install_generator.rb

@@ -1,6 +1,7 @@
 module SpreeActiveSale
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
         append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_active_sale\n"
@@ -17,12 +18,12 @@ module SpreeActiveSale
       end
 
       def run_migrations
-         res = ask 'Would you like to run the migrations now? [Y/n]'
-         if res == '' || res.downcase == 'y'
-           run 'bundle exec rake db:migrate'
-         else
-           puts 'Skipping rake db:migrate, don\'t forget to run it!'
-         end
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        if run_migrations
+          run 'bundle exec rake db:migrate'
+        else
+          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_active_sale
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3909835489064668345
+      hash: -2299167609467927394
 requirements:
 - none
 rubyforge_project: