mix-rails-vouchers 0.22.0 → 0.23.0

data/app/models/admix/vouchers_datagrid.rb

@@ -2,7 +2,7 @@ class Admix::VouchersDatagrid
   include Datagrid
 
   scope do
-    Voucher.all
+    Voucher
   end
   column :name, header: I18n.t('vouchers.fields.name')
 

data/app/models/voucher.rb

@@ -1,22 +1,18 @@
-class Voucher
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Slug
+class Voucher < ActiveRecord::Base
+  extend FriendlyId
 
-  scope :actives, -> { where({:date_from.lte => Date.today, :date_to.gte => Date.today}) }
+  attr_accessible :date_from, :date_to, :name, :partner_photo, :photo, :rules
+  attr_accessible :photo_cache, :partner_photo_cache
+
+  scope :actives, -> { where("date_from <= ? and date_to >= ?", Date.today, Date.today) }
+
+  has_many :users, class_name: 'VoucherUser', dependent: :delete_all
 
-  field :name, type: String
-  field :rules, type: Array
-  field :date_from, type: Date
-  field :date_to, type: Date
   mount_uploader :photo, Vouchers::PhotoUploader
   mount_uploader :partner_photo, Vouchers::PhotoUploader
 
-  has_many :users, class_name: 'VoucherUser', dependent: :delete
-
   validates_presence_of :name, :rules, :photo
 
-  slug :name, history: true do |voucher|
-    voucher.name.parameterize
-  end
+  friendly_id :name, use: :slugged
+
 end

data/app/models/voucher_user.rb

@@ -1,48 +1,43 @@
-class VoucherUser
-    include Mongoid::Document
-    include Mongoid::Timestamps
-
-    field :name, type: String
-    field :email, type: String
-    field :confirmed, type: Boolean, default: false
-    field :confirmation_date, type: Date
-
-    belongs_to :voucher
-
-    attr_protected :confirmed, :confirmation_date
-    validates_presence_of :name, :email
-    validates :email, email: true
-
-    after_create :send_confirmation_email
-
-
-    def confirm
-        @confirmed = true
-        @confirmation_date = Time.now
-        @save
-    end
-
-    # @param voucher instance of Voucher
-    def already_required(voucher)
-        user = VoucherUser.where({voucher_id: voucher[:_id], _id: @attributes['_id']}).first
-        if user
-            true
-        else
-            false
-        end
-    end
-
-    def has_confirmed(voucher)
-        user = VoucherUser.where({voucher_id: voucher[:_id], _id: @attributes['_id'], confirmed: true}).first
-        if user
-            true
-        else
-            false
-        end
-    end
-
-    def send_confirmation_email
-        VoucherMailer.send_confirmation_link(self).deliver
-    end
+class VoucherUser < ActiveRecord::Base
+  attr_accessible :confirmation_date, :confirmed, :email, :name
+  
+  belongs_to :voucher
+
+  attr_protected :confirmed, :confirmation_date
+  validates_presence_of :name, :email
+  validates :email, email: true
+
+  after_create :send_confirmation_email
+
+
+  def confirm
+      @confirmed = true
+      @confirmation_date = Time.now
+      @save
+  end
+
+  # @param voucher instance of Voucher
+  def already_required(voucher)
+      user = VoucherUser.where({voucher_id: voucher[:id], id: @attributes['id']}).first
+      if user
+          true
+      else
+          false
+      end
+  end
+
+  def has_confirmed(voucher)
+      user = VoucherUser.where({voucher_id: voucher[:id], id: @attributes['id'], confirmed: true}).first
+      if user
+          true
+      else
+          false
+      end
+  end
+
+  def send_confirmation_email
+      VoucherMailer.send_confirmation_link(self).deliver
+  end
+
 
 end

data/app/uploaders/vouchers/photo_uploader.rb

@@ -15,13 +15,13 @@ class Vouchers::PhotoUploader < CarrierWave::Uploader::Base
   # include Sprockets::Helpers::IsolatedHelper
 
   # Choose what kind of storage to use for this uploader:
-  storage :grid_fs
+  
   # storage :fog
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   def cache_dir

data/db/migrate/20130208143458_create_vouchers.rb

@@ -0,0 +1,15 @@
+class CreateVouchers < ActiveRecord::Migration
+  def change
+    create_table :vouchers do |t|
+      t.string :name
+      t.text :rules
+      t.date :date_from
+      t.date :date_to
+      t.string :photo
+      t.string :partner_photo
+      t.string :slug
+      
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130208143613_create_voucher_users.rb

@@ -0,0 +1,13 @@
+class CreateVoucherUsers < ActiveRecord::Migration
+  def change
+    create_table :voucher_users do |t|
+      t.string :name
+      t.string :email
+      t.boolean :confirmed
+      t.date :confirmation_date
+
+      t.references :voucher
+      t.timestamps
+    end
+  end
+end

data/lib/mix-rails-vouchers.rb

@@ -1,5 +1,4 @@
 require "mix-rails-vouchers/engine"
-require "carrierwave/mongoid"
 
 module MixRailsVouchers
 end

data/lib/mix-rails-vouchers/version.rb

@@ -1,7 +1,7 @@
 module MixRailsVouchers
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 22
+    MINOR = 23
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-vouchers
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail_form
@@ -44,22 +44,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.9
-- !ruby/object:Gem::Dependency
-  name: carrierwave-mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: Vouchers module for mix-rails
 email:
 - rafbgarcia@gmail.com
@@ -93,6 +77,8 @@ files:
 - app/views/voucher_mailer/send_confirmation_link.text.erb
 - config/locales/vouchers.pt-BR.yml
 - config/routes.rb
+- db/migrate/20130208143458_create_vouchers.rb
+- db/migrate/20130208143613_create_voucher_users.rb
 - lib/mix-rails-vouchers/version.rb
 - lib/mix-rails-vouchers/engine.rb
 - lib/tasks/mix-vouchers_tasks.rake
@@ -114,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1388943337525574068
+      hash: 1731212907017249748
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1388943337525574068
+      hash: 1731212907017249748
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24