spree_active_sale 1.0.6 → 1.3.0

data/config/locales/active_sales_es.yml

@@ -0,0 +1,74 @@
+# Active Sale localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+es:
+  spree:
+    active_sale:
+      active_record:
+        name: "Nombre de la campaña"
+      event:
+        active_record:
+          description: "Descripción del evento"
+          is_active: "Activo"
+          is_hidden: "Oculto"
+          is_permanent: "Permanente"
+          is_live: "Vigente"
+          discount: "Porcentaje de descuento"
+          name: "Nombre del evento"
+          start_date: "Fecha de comienzo"
+          end_date: "Fecha de finalización"
+          eventable_name: "Nombre de elemento asociado"
+          eventable_type: "Tipo de evento"
+          permalink: "Nombre o permalink"
+        boolean:
+          yes: "Sí"
+          no: "No"
+        can_not_be_nil: "Argument can not be nil or instance of any other class than Spree::ActiveSaleEvent"
+        create_if_no_record: "You don't have any event in this active sale, let's create an event?"
+        datetimepicker:
+          format: ! '%d/%m/%Y %H:%M:%S %z'
+          js_format: 'HH:mm:ss z'
+          js_date_format: 'dd/mm/yy'
+          time_only_title: 'Sólo hora'
+          time_text: 'Hora'
+          hour_text: 'Hora'
+          minute_text: 'Minuto'
+          second_text: 'Segundo'
+          current_text: 'Actual'
+          close_text: 'Cerrar'
+        ending_message: "EL EVENTO TERMINA EN"
+        eventable_hint: "¿Esta campaña estará asociada a un producto concreto o a un taxón?"
+        eventable_name_hint: "Teclea el nombre del producto o del taxón que estará asociado a esta campaña."
+        discount_hint: "Número que indique el porcentaje medio aplicado (p.e. '30' para expresar un 30%)."
+        flash:
+          error: "La página que buscas ya no está disponible."
+        link:
+          new: "Nuevo evento"
+          edit: "Editar evento"
+          back: "Volver a eventos"
+        no_image: "Imagen no encontrada. Si la campaña no tiene asociada una imagen entonces la imagen del producto/taxón asociado será utilizado para mostarla en la tienda."
+        notice_messages:
+          created: "El evento ha sido creado con éxito."
+          updated: "El evento ha sido actualizado con éxito."
+          deleted: "El evento ha sido eliminado."
+        title:
+          new: "Nuevo evento"
+          edit: "Editar evento"
+          list: "Listar eventos"
+        validation:
+          errors:
+            invalid_dates: "no puede ser superior o igual a la fecha de finalización."
+            live_event: "ya está creada y vigente."
+      events_not_found: "No hay eventos disponibles en este momento."
+      link:
+        new: "Nueva campaña"
+        edit: "Editar campaña"
+        back: "Volver a listado de campañas"
+      notice_messages:
+        created: "La campaña ha sido creada con éxito."
+        updated: "La campaña ha sido actualizada con éxito."
+        deleted: "La campaña ha sido borrada."
+      title:
+        new: "Nueva campaña"
+        edit: "Editar campaña"
+        list: "Listar campañas"

data/config/routes.rb

@@ -1,3 +1,15 @@
 Spree::Core::Engine.routes.draw do
   # Add this extension's routes here
+  namespace :admin do
+    resources :active_sales do
+      resources :active_sale_events do
+        get 'eventables', :on => :collection
+        resources :sale_images do
+          collection do
+            post :update_positions
+          end
+        end
+      end
+    end
+  end
 end

data/db/migrate/20130404062459_create_sale_events.rb

@@ -0,0 +1,70 @@
+class OldActiveSale < ActiveRecord::Base
+  self.table_name = "spree_active_sales"
+end
+
+class CreateSaleEvents < ActiveRecord::Migration
+  def up
+    # New migration starts here:
+    rename_table :spree_active_sale_events, :spree_sale_events
+    add_column :spree_sale_events, :type, :string
+    add_column :spree_sale_events, :parent_id, :integer
+    add_column :spree_sale_events, :lft, :integer
+    add_column :spree_sale_events, :rgt, :integer
+    add_column :spree_sale_events, :position, :integer, :default => 0
+
+    # Required to have old data backed up!
+    # Saving data to new structure by running steps below:
+    if table_exists?(:spree_active_sales)
+      add_column :spree_active_sales, :type, :string, :default => "Spree::ActiveSale"
+      update_changes
+      drop_table :spree_active_sales
+    end
+
+    # Index for search
+    add_index :spree_sale_events, [:parent_id], :name => 'index_active_sale_on_parent_id'
+    add_index :spree_sale_events, [:active_sale_id], :name => 'index_active_sale_on_active_sale_id'
+    add_index :spree_sale_events, [:permalink], :name => 'index_active_sale_on_permalink'
+  end
+
+  def down
+    # Required to get new data saved in old format!
+    # Saving data to old structure by running steps below:
+    unless table_exists?(:spree_active_sales)
+      create_table :spree_active_sales do |t|
+        t.string :name
+
+        t.timestamps
+      end
+      add_column :spree_active_sales, :type, :string, :default => "Spree::ActiveSale"
+      revert_changes
+      remove_column :spree_active_sales, :type
+    end
+
+    remove_column :spree_sale_events, :position
+    remove_column :spree_sale_events, :rgt
+    remove_column :spree_sale_events, :lft
+    remove_column :spree_sale_events, :parent_id
+    remove_column :spree_sale_events, :type
+    rename_table :spree_sale_events, :spree_active_sale_events
+  end
+
+  def update_changes
+    OldActiveSale.where(:type => nil).each{ |a| a.update_attributes(:type => "Spree::ActiveSale") }
+    Spree::SaleEvent.where(:type => nil).each{ |sale| sale.update_attributes(:type => "Spree::ActiveSaleEvent") }
+    OldActiveSale.all.each{ |as| 
+      sale = Spree::SaleEvent.find_or_create_by_name_and_active_sale_id_and_type(as.name, nil, "Spree::ActiveSale")
+      as.active_sale_events.each{ |event| 
+        event.update_attributes(:active_sale_id => sale.id) 
+      }      
+    }
+  end
+
+  def revert_changes
+    Spree::SaleEvent.where(:type => "Spree::ActiveSale").update_all(:type => nil)
+    Spree::SaleEvent.where(:active_sale_id => nil).each{ |as|
+      sale = OldActiveSale.find_or_create_by_name(as.name)
+      Spree::ActiveSaleEvent.where(:active_sale_id => as.id).update_all(:active_sale_id => sale.id)
+    }
+    Spree::SaleEvent.where(:active_sale_id => nil).destroy_all
+  end
+end

data/db/migrate/20130411091742_add_discount_to_sale_events.rb

@@ -0,0 +1,5 @@
+class AddDiscountToSaleEvents < ActiveRecord::Migration
+  def change
+    add_column :spree_sale_events, :discount, :integer
+  end
+end

data/lib/generators/spree_active_sale/assets/assets_generator.rb

@@ -0,0 +1,37 @@
+module SpreeActiveSale
+  module Generators
+    class AssetsGenerator < Rails::Generators::Base
+
+      source_root File.expand_path('../../templates', __FILE__)
+
+      desc 'Copies the assets from spree_active_sale plugin to the applciation\'s assets folder.'
+
+      def copy_locale
+        directory assets_source_path, assets_destination_path
+        directory js_source_path, js_destination_path
+      end
+
+      def show_readme
+        readme 'README.md' if behavior == :invoke
+      end
+
+      private
+
+      def assets_source_path
+        '../../../../vendor/assets/stylesheets/'
+      end
+      
+      def assets_destination_path
+        'app/assets/stylesheets/'
+      end
+      
+      def js_source_path
+        '../../../../vendor/assets/javascripts/'
+      end
+      
+      def js_destination_path
+        'app/assets/javascripts/'
+      end
+    end
+  end
+end

data/lib/generators/spree_active_sale/templates/README.md

@@ -0,0 +1,3 @@
+****************************************************************
+SpreeActiveSale for daily deals/ flash sale behavior for Spree
+****************************************************************

data/lib/spree_active_sale/engine.rb

@@ -6,6 +6,11 @@ module SpreeActiveSale
 
     config.autoload_paths += %W(#{config.root}/lib)
 
+    initializer "spree_active_sale.environment", :after => "spree.environment" do |app|
+      Spree::ActiveSaleConfig = Spree::ActiveSaleConfiguration.new
+      %w(ActionController::Base Spree::BaseController).each { |controller| controller.constantize.send(:helper, Spree::ActiveSaleEventsHelper) }
+    end
+
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec
@@ -20,3 +25,5 @@ module SpreeActiveSale
     config.to_prepare &method(:activate).to_proc
   end
 end
+
+

data/lib/tasks/spree_active_sale.rake

@@ -1,9 +1,17 @@
-namespace :spree do
-  namespace :active_sale do
-    desc "Create admin username and password"
-    task :create => :environment do
-      require File.join(File.dirname(__FILE__), '..', '..', 'db', 'default', 'users.rb')
-      puts "Done!"
+namespace :spree_active_sale do
+  desc "Copies all migrations and assets"
+  task :install do
+    Rake::Task['spree_active_sale:install:migrations'].invoke
+    Rake::Task['spree_active_sale:install:assets'].invoke
+  end
+
+  namespace :install do
+    desc "Copies all assets to the application"
+    task :assets do
+      source = File.join(File.dirname(__FILE__), '..', '..', 'app', 'assets')
+      destination = File.join(Rails.root, 'app', 'assets')
+      puts "INFO: Mirroring assets from #{source} to #{destination}"
+      `rails generate spree_active_sale:assets`
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_active_sale
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -170,25 +170,57 @@ files:
 - LICENSE
 - README.md
 - app/models/spree.rb
+- app/models/spree/active_sale_configuration.rb
 - app/models/spree/product_decorator.rb
-- app/models/spree/active_sale/event.rb
+- app/models/spree/line_item_decorator.rb
+- app/models/spree/order_decorator.rb
+- app/models/spree/sale_image.rb
 - app/models/spree/taxon_decorator.rb
 - app/models/spree/variant_decorator.rb
 - app/models/spree/active_sale.rb
-- app/assets/stylesheets/admin/spree_active_sale.css
-- app/assets/stylesheets/store/spree_active_sale.css
-- app/assets/javascripts/admin/spree_active_sale.js
-- app/assets/javascripts/store/spree_active_sale.js
-- app/controllers/products_controller_decorator.rb
-- app/controllers/taxons_controller_decorator.rb
+- app/models/spree/active_sale_event.rb
+- app/models/spree/sale_event.rb
+- app/views/spree/home/index.html.erb
+- app/views/spree/admin/active_sales/_form.html.erb
+- app/views/spree/admin/active_sales/new.html.erb
+- app/views/spree/admin/active_sales/index.html.erb
+- app/views/spree/admin/active_sales/edit.html.erb
+- app/views/spree/admin/active_sale_events/_form.html.erb
+- app/views/spree/admin/active_sale_events/new.html.erb
+- app/views/spree/admin/active_sale_events/index.html.erb
+- app/views/spree/admin/active_sale_events/edit.html.erb
+- app/views/spree/admin/shared/_translations.html.erb
+- app/views/spree/admin/shared/_list_events.html.erb
+- app/views/spree/admin/shared/_sale_images.html.erb
+- app/views/spree/admin/sale_images/_form.html.erb
+- app/views/spree/admin/sale_images/new.html.erb
+- app/views/spree/admin/sale_images/edit.html.erb
+- app/views/spree/shared/_sale_events.html.erb
+- app/controllers/spree/admin/sale_images_controller.rb
+- app/controllers/spree/admin/active_sales_controller.rb
+- app/controllers/spree/admin/active_sale_events_controller.rb
+- app/controllers/spree/home_controller_decorator.rb
+- app/controllers/spree/orders_controller_decorator.rb
+- app/controllers/spree/checkout_controller_decorator.rb
+- app/controllers/spree/products_controller_decorator.rb
+- app/controllers/spree/store_controller_decorator.rb
+- app/controllers/spree/taxons_controller_decorator.rb
+- app/helpers/spree/active_sale_events_helper.rb
+- app/helpers/spree/active_sales_helper.rb
+- app/overrides/admin_active_sales_tab.rb
 - config/routes.rb
-- config/locales/en.yml
+- config/locales/active_sales_en.yml
+- config/locales/active_sales_es.yml
 - lib/tasks/spree_active_sale.rake
+- lib/generators/spree_active_sale/assets/assets_generator.rb
 - lib/generators/spree_active_sale/install/install_generator.rb
+- lib/generators/spree_active_sale/templates/README.md
 - lib/spree_active_sale/engine.rb
 - lib/spree_active_sale.rb
 - db/migrate/20130119154826_create_active_sales.rb
 - db/migrate/20130119182020_create_events.rb
+- db/migrate/20130404062459_create_sale_events.rb
+- db/migrate/20130411091742_add_discount_to_sale_events.rb
 homepage: https://github.com/suryart/spree_active_sale
 licenses: []
 post_install_message: 
@@ -207,6 +239,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3636572579804555877
 requirements:
 - none
 rubyforge_project: 

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

@@ -1 +0,0 @@
-//= require admin/spree_core

data/app/assets/javascripts/store/spree_active_sale.js

@@ -1 +0,0 @@
-//= require store/spree_core

data/app/assets/stylesheets/admin/spree_active_sale.css

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_core
-*/

data/app/assets/stylesheets/store/spree_active_sale.css

@@ -1,3 +0,0 @@
-/*
- *= require store/spree_core
-*/

data/app/models/spree/active_sale/event.rb

@@ -1,57 +0,0 @@
-# EVENTS
-# Events represent an entity for active sale in a flash sale/ daily deal.
-# There can be many events for one sale.
-#
-module Spree
-  class ActiveSale::Event < ActiveRecord::Base
-    belongs_to :eventable, :polymorphic => true
-    belongs_to :active_sale
-
-    attr_accessible :description, :end_date, :eventable_id, :eventable_type, :is_active, :is_hidden, :name, :permalink, :active_sale_id, :start_date
-
-    validates :name, :presence => true
-    validates :permalink, :presence => true
-    validates :start_date, :presence => true
-    validates :end_date, :presence => true
-    validates :active_sale_id, :presence => true
-    validate  :validate_start_and_end_date
-
-    scope :live, lambda { where("(start_date <= :start_date AND end_date >= :end_date) OR is_permanent = :is_permanent", { :start_date => Time.now, :end_date => Time.now, :is_permanent => true }) }
-    scope :active, lambda { |*args| where(:is_active => valid_argument(args)) }
-    scope :hidden, lambda { |*args| where(:is_hidden => valid_argument(args)) }
-    scope :live_active, lambda { |*args| self.live.active(valid_argument(args)) }
-    scope :live_active_and_hidden, lambda { |*args| 
-                            args = [{}] if [nil, true, false].include? args.first
-                            self.live.active(valid_argument([args.first[:active]])).hidden(valid_argument([args.first[:hidden]])) 
-                          }
-    scope :upcoming_events, lambda { where("start_date > :start_date", { :start_date => Time.now }) }
-    scope :starting_today, lambda { where(:start_date => Time.now.at_beginning_of_day..Time.now.end_of_day) }
-    scope :ending_today, lambda { where(:end_date => Time.now.at_beginning_of_day..Time.now.end_of_day) }
-
-    def validate_start_and_end_date
-      errors.add(:start_date, I18n.t('spree.active_sale.event.validation.errors.invalid_dates')) if (self.start_date and self.end_date) and (self.start_date > self.end_date)
-    end
-
-    def live?
-      current_time = Time.now
-      (self.start_date <= current_time and self.end_date >= current_time) or self.is_permanent?
-    end
-
-    def live_and_active?
-      self.live? and self.is_active?
-    end
-
-    # Spree::ActiveSale::Event.is_live? method 
-    # should only/ always represents live and active events and not just live events.
-    def self.is_live? object
-      object_class_name = object.class.name
-      return (object.live_and_active?) if object_class_name == self.name
-      %w(Spree::Product Spree::Variant Spree::Taxon).include?(object_class_name) ? object.live? : false
-    end
-
-    private
-      def self.valid_argument args
-        (args.first == nil || args.first == true)
-      end
-  end
-end

data/config/locales/en.yml

@@ -1,12 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-en:
-  spree:
-    active_sale:
-      event:
-        validation:
-          errors:
-            invalid_dates: "Event's start date can not be greater than end date."
-        flash:
-          error: "The page you are looking for is no longer available."