tienda 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c353c91d9535d57c769d77a22993483c6bf5ff
-  data.tar.gz: 422375d838e7ae6f300d5c28e01ccc1d3cc90d95
+  metadata.gz: 7cbf39151193fd56d6534c18bf0a072120ac1f30
+  data.tar.gz: a95c6575885a48531121d4ab1982baa0cccdb298
 SHA512:
-  metadata.gz: d1eb050c1dc64d52d09af2be5cac06026bbaf496eea9f0a3402005abc0300e1a469d077f7f19ff8ce25c7d4b55c8f7c401016c332a3f90c68f68456037cfa612
-  data.tar.gz: 7fcacca4b9419a445695548cce0c65db86f2391e47d4dfd92ce4b97f9b309820d62a66988b249297af5ecf3bdd349f05de5e8965ce8040571da68d2f25ed0214
+  metadata.gz: 6e7ccf7113bcf2b07f1fef6b177e7edbf277775acc0f9111638ad038918b8e0f9944cd024ae459b47469cc0d8797c60fb842288f9f6703b84871e4170890048f
+  data.tar.gz: cfef63a6fc1c72b4134b901bd4240b2225ca25333d1669319b86b75c78cc3c05152a5f05ebb8543a2ab2252d89e5cad643f9e9cbb4799d444e585a1ecb62ba4f

data/app/controllers/tienda/products_controller.rb

@@ -15,7 +15,7 @@ module Tienda
     def create
       @product = Tienda::Product.new(safe_params)
       if @product.save
-        redirect_to :products, flash: { notice:  t('tienda.products.create_notice') }
+        redirect_to :products, flash: { notice: t('tienda.products.create_notice') }
       else
         render action: "new"
       end
@@ -51,7 +51,12 @@ module Tienda
     private
 
     def safe_params
-      params[:product].permit(:product_category_id, :name, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate_id, :stock_control, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box, :product_attributes_array => [:key, :value, :searchable, :public])
+      params[:product].permit(:product_category_id, :name, :sku, :permalink,
+        :description, :short_description, :weight, :price, :cost_price,
+        :tax_rate_id, :stock_control, :default_image_file, :second_image_file,
+        :third_image_file, :fourth_image_file, :fifth_image_file,
+        :data_sheet_file, :active, :featured, :in_the_box,
+        :product_attributes_array => [:key, :value, :searchable, :public])
     end
 
   end

data/app/helpers/tienda/application_helper.rb

@@ -28,7 +28,7 @@ module Tienda
           s << "</div>"
         end.html_safe
       elsif !options[:hide_if_blank]
-        "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>#{t('helpers.attachment_preview.no_attachment')},</div></div>".html_safe
+        "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>#{t('helpers.attachment_preview.no_attachment')}</div></div>".html_safe
       end
     end
 

data/app/models/tienda/product.rb

@@ -9,8 +9,12 @@ module Tienda
     require_dependency 'tienda/product/product_attributes'
     require_dependency 'tienda/product/variants'
 
-    # Products have a default_image and a data_sheet
+    # Products have 5 images and a data_sheet
     attachment :default_image
+    attachment :second_image
+    attachment :third_image
+    attachment :fourth_image
+    attachment :fifth_image
     attachment :data_sheet
 
     # The product's category
@@ -94,6 +98,13 @@ module Tienda
       self.stock_level_adjustments.sum(:adjustment)
     end
 
+    # Return all product images
+    #
+    # @return [Array]
+    def images
+      nifty_attachments.select { |attachment| attachment.role != "data_sheet" }
+    end
+
     # Search for products which include the given attributes and return an active record
     # scope of these products. Chainable with other scopes and with_attributes methods.
     # For example:

data/app/views/tienda/products/_form.html.haml

@@ -57,15 +57,43 @@
   = field_set_tag t('tienda.products.attachments') do
     .splitContainer
       %dl.half
-        %dt= f.label :default_image_file, t('tienda.products.default_image')
+        %dt
+          = f.label :default_image_file, t('tienda.products.default_image')
+          %p= f.file_field :default_image_file
         %dd
           = attachment_preview @product.default_image
-          %p= f.file_field :default_image_file
       %dl.half
-        %dt= f.label :data_sheet_file, t('tienda.products.datasheet')
+        %dt
+          = f.label :second_image_file, t('tienda.products.second_image')
+          %p= f.file_field :second_image_file
         %dd
-          = attachment_preview @product.data_sheet
+          = attachment_preview @product.second_image
+    .splitContainer
+      %dl.half
+        %dt
+          = f.label :third_image_file, t('tienda.products.third_image')
+          %p= f.file_field :third_image_file
+        %dd
+          = attachment_preview @product.third_image
+      %dl.half
+        %dt
+          = f.label :fourth_image_file, t('tienda.products.fourth_image')
+          %p= f.file_field :fourth_image_file
+        %dd
+          = attachment_preview @product.fourth_image
+    .splitContainer
+      %dl.half
+        %dt
+          = f.label :fifth_image_file, t('tienda.products.fifth_image')
+          %p= f.file_field :fifth_image_file
+        %dd
+          = attachment_preview @product.fifth_image
+      %dl.half
+        %dt
+          = f.label :data_sheet_file, t('tienda.products.datasheet')
           %p= f.file_field :data_sheet_file
+        %dd
+          = attachment_preview @product.data_sheet
 
   - unless @product.has_variants?
     = field_set_tag t('tienda.products.pricing') do

data/lib/tasks/tienda.rake

@@ -1,29 +1,32 @@
 namespace :tienda do
-  desc "Load seed data for the Tienda"
-  task :seed => :environment do
+  desc 'Load seed data for the Tienda'
+  task seed: :environment do
     require File.join(Tienda.root, 'db', 'seeds')
   end
 
-  desc "Create a default admin user"
-  task :create_default_user => :environment do
-    Tienda::User.create(:email_address => 'admin@example.com', :password => 'password', :password_confirmation => 'password', :first_name => 'Default', :last_name => 'Admin')
+  desc 'Create a default admin user'
+  task create_default_user: :environment do
+    Tienda::User.create(
+      email_address: 'admin@example.com',
+      password: 'password', password_confirmation: 'password',
+      first_name: 'Default', last_name: 'Admin'
+    )
     puts
-    puts "    New user has been created successfully."
+    puts '    New user has been created successfully.'
     puts
-    puts "    E-Mail Address..: admin@example.com"
-    puts "    Password........: password"
+    puts '    E-Mail Address..: admin@example.com'
+    puts '    Password........: password'
     puts
   end
 
-  desc "Import default set of countries"
-  task :import_countries => :environment do
+  desc 'Import default set of countries'
+  task import_countries: :environment do
     Tienda::CountryImporter.import
   end
 
-  desc "Run the key setup tasks for a new application"
-  task :setup => :environment do
-    Rake::Task["tienda:import_countries"].invoke    if Tienda::Country.all.empty?
-    Rake::Task["tienda:create_default_user"].invoke if Tienda::User.all.empty?
+  desc 'Run the key setup tasks for a new application'
+  task setup: :environment do
+    Rake::Task['tienda:import_countries'].invoke if Tienda::Country.all.empty?
+    Rake::Task['tienda:create_default_user'].invoke if Tienda::User.all.empty?
   end
-
 end

data/lib/tienda/associated_countries.rb

@@ -1,20 +1,18 @@
 module Tienda
   module AssociatedCountries
-
     def self.included(base)
       base.serialize :country_ids, Array
-      base.before_validation { self.country_ids = self.country_ids.map(&:to_i).select { |i| i > 0} if self.country_ids.is_a?(Array) }
+      base.before_validation { self.country_ids = country_ids.map(&:to_i).select { |i| i > 0 } if country_ids.is_a?(Array) }
     end
 
     def country?(id)
       id = id.id if id.is_a?(Tienda::Country)
-      self.country_ids.is_a?(Array) && self.country_ids.include?(id.to_i)
+      country_ids.is_a?(Array) && country_ids.include?(id.to_i)
     end
 
     def countries
-      return [] unless self.country_ids.is_a?(Array) && !self.country_ids.empty?
-      Tienda::Country.where(:id => self.country_ids)
+      return [] unless country_ids.is_a?(Array) && !country_ids.empty?
+      Tienda::Country.where(id: country_ids)
     end
-
   end
 end

data/lib/tienda/country_importer.rb

@@ -1,14 +1,19 @@
 module Tienda
   module CountryImporter
     def self.import
-      eu_members = ['Austria', 'Belgium', 'Bulgaria', 'Croatia','Cyprus','Czech Republic','Denmark','Estonia','Finland','France','Germany','Greece','Hungary','Ireland','Italy','Latvia','Lithuania','Luxembourg','Malta','Netherlands','Poland','Portugal','Romania','Slovakia','Slovenia','Spain','Sweden','United Kingdom']
+      eu_members = [
+        'Austria', 'Belgium', 'Bulgaria', 'Croatia', 'Cyprus', 'Czech Republic',
+        'Denmark', 'Estonia', 'Finland', 'France', 'Germany', 'Greece',
+        'Hungary', 'Ireland', 'Italy', 'Latvia', 'Lithuania', 'Luxembourg',
+        'Malta', 'Netherlands', 'Poland', 'Portugal', 'Romania', 'Slovakia',
+        'Slovenia', 'Spain', 'Sweden', 'United Kingdom'
+      ]
       countries = File.read(File.join(Tienda.root, 'db', 'countries.txt')).gsub(/\r/, "\n").split("\n").map { |c| c.split(/\t/) }
       countries.each do |code2, code3, name, continent, tld, currency|
-        country = Country.new(:name => name, :code2 => code2, :code3 => code3, :continent => continent, :tld => tld.gsub('.', ''), :currency => currency)
+        country = Country.new(name: name, code2: code2, code3: code3, continent: continent, tld: tld.gsub('.', ''), currency: currency)
         country.eu_member = true if eu_members.map(&:upcase).include?(name.upcase)
         country.save
       end
-
     end
   end
 end

data/lib/tienda/default_navigation.rb

@@ -1,9 +1,9 @@
 require 'tienda/navigation_manager'
 
-# This file defines all the default navigation managers used in Tienda. Of course,
-# modules can make changes to these by removing them or adding their own. This
-# file is loaded on application initialization so if you make changes, you'll need
-# to restart the webserver.
+# This file defines all the default navigation managers used in Tienda.
+# Of course, modules can make changes to these by removing them or adding their
+# own. This file is loaded on application initialization so if you make changes,
+# you'll need to restart the webserver.
 
 #
 # This is the default navigation manager for the admin interface.

data/lib/tienda/engine.rb

@@ -9,24 +9,26 @@ module Tienda
 
     # We don't want any automatic generators in the engine.
     config.generators do |g|
-      g.orm             :active_record
-      g.test_framework  false
-      g.stylesheets     false
-      g.javascripts     false
-      g.helper          false
+      g.orm :active_record
+      g.test_framework false
+      g.stylesheets false
+      g.javascripts false
+      g.helper false
     end
 
     initializer 'tienda.initialize' do |app|
       # Add the default settings
-      Tienda.add_settings_group :system_settings, [:store_name, :email_address, :currency_unit, :tax_name, :demo_mode]
+      Tienda.add_settings_group :system_settings, [:store_name, :email_address,
+                                                   :currency_unit, :tax_name,
+                                                   :demo_mode]
 
       # Add middleware
       app.config.middleware.use Tienda::SettingsLoader
 
       # Load our migrations into the application's db/migrate path
       unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+        config.paths['db/migrate'].expanded.each do |expanded_path|
+          app.config.paths['db/migrate'] << expanded_path
         end
       end
 
@@ -43,6 +45,5 @@ module Tienda
     generators do
       require 'tienda/setup_generator'
     end
-
   end
 end

data/lib/tienda/error.rb

@@ -1,6 +1,5 @@
 module Tienda
   class Error < StandardError
-
     def initialize(options = {})
       if options.is_a?(String)
         @options = {:message => options}
@@ -16,6 +15,5 @@ module Tienda
     def options
       @options
     end
-
   end
 end

data/lib/tienda/errors/inappropriate_delivery_service.rb

@@ -3,4 +3,4 @@ module Tienda
     class InappropriateDeliveryService < Error
     end
   end
-end
+end

data/lib/tienda/errors/insufficient_stock_to_fulfil.rb

@@ -1,7 +1,6 @@
 module Tienda
   module Errors
     class InsufficientStockToFulfil < Error
-
       def order
         @options[:order]
       end
@@ -9,7 +8,6 @@ module Tienda
       def out_of_stock_items
         @options[:out_of_stock_items]
       end
-
     end
   end
 end

data/lib/tienda/errors/invalid_configuration.rb

@@ -3,4 +3,4 @@ module Tienda
     class InvalidConfiguration < Error
     end
   end
-end
+end

data/lib/tienda/errors/not_enough_stock.rb

@@ -1,7 +1,6 @@
 module Tienda
   module Errors
     class NotEnoughStock < Error
-
       def available_stock
         @options[:ordered_item].stock
       end
@@ -9,7 +8,6 @@ module Tienda
       def requested_stock
         @options[:requested_stock]
       end
-
     end
   end
 end

data/lib/tienda/errors/payment_declined.rb

@@ -3,4 +3,4 @@ module Tienda
     class PaymentDeclined < Tienda::Error
     end
   end
-end
+end

data/lib/tienda/errors/refund_failed.rb

@@ -3,4 +3,4 @@ module Tienda
     class RefundFailed < Error
     end
   end
-end
+end

data/lib/tienda/errors/unorderable_item.rb

@@ -3,4 +3,4 @@ module Tienda
     class UnorderableItem < Error
     end
   end
-end
+end

data/lib/tienda/navigation_manager.rb

@@ -1,16 +1,15 @@
 module Tienda
   class NavigationManager
-
     def self.managers
       @managers ||= []
     end
 
     def self.create(identifier)
-      managers << self.new(identifier.to_s)
+      managers << new(identifier.to_s)
     end
 
     def self.build(identifier, &block)
-      manager = self.new(identifier.to_s)
+      manager = new(identifier.to_s)
       manager.instance_eval(&block) if block_given?
       managers << manager
     end
@@ -37,9 +36,9 @@ module Tienda
       item                  = NavigationItem.new
       item.manager          = self
       item.identifier       = identifier.to_s
-      item.url              = options[:url]             if options[:url]
-      item.link_options     = options[:link_options]    if options[:link_options]
-      item.active_if        = block                     if block_given?
+      item.url              = options[:url]            if options[:url]
+      item.link_options     = options[:link_options]   if options[:link_options]
+      item.active_if        = block                    if block_given?
       items << item
     end
 
@@ -59,9 +58,9 @@ module Tienda
       end
 
       def url(request = nil)
-        (@url.is_a?(Proc) && request && request.instance_eval(&@url) ) ||
-        @url ||
-        Tienda::Engine.routes.url_helpers.send("#{identifier}_path")
+        (@url.is_a?(Proc) && request && request.instance_eval(&@url)) ||
+          @url ||
+          Tienda::Engine.routes.url_helpers.send("#{identifier}_path")
       end
 
       def active?(request)
@@ -76,6 +75,5 @@ module Tienda
         @link_options ||= {}
       end
     end
-
   end
 end

data/lib/tienda/orderable_item.rb

@@ -2,7 +2,6 @@ module Tienda
   # All items which can be ordered should include this module and ensure that all methods
   # have been overridden. It's a lazy-mans protocol.
   module OrderableItem
-
     # stock_level_adjustments must be an association
 
     def full_name
@@ -34,6 +33,5 @@ module Tienda
 
     def weight
     end
-
   end
 end

data/lib/tienda/settings.rb

@@ -1,6 +1,5 @@
 module Tienda
   class Settings
-
     def initialize(hash)
       @hash = hash
     end
@@ -13,14 +12,13 @@ module Tienda
       key = key.to_s.gsub(/\?\z/, '')
       if value = @hash[key.to_s]
         value
-      elsif I18n.translate("tienda.settings.defaults").keys.include?(key.to_sym)
-        I18n.translate("tienda.settings.defaults")[key.to_sym]
+      elsif I18n.translate('tienda.settings.defaults').keys.include?(key.to_sym)
+        I18n.translate('tienda.settings.defaults')[key.to_sym]
       end
     end
 
     def [](value)
       @hash[value]
     end
-
   end
 end

data/lib/tienda/settings_loader.rb

@@ -1,6 +1,5 @@
 module Tienda
   class SettingsLoader
-
     def initialize(app)
       @app = app
     end
@@ -11,6 +10,5 @@ module Tienda
     ensure
       Tienda.reset_settings
     end
-
   end
 end

data/lib/tienda/setup_generator.rb

@@ -1,10 +1,8 @@
 require 'rails/generators'
 module Tienda
   class SetupGenerator < Rails::Generators::Base
-
     def create_route
       route 'mount Tienda::Engine => "/tienda"'
     end
-
   end
 end

data/lib/tienda/version.rb

@@ -1,3 +1,3 @@
 module Tienda
-  VERSION = "1.0.0"
+  VERSION = '1.1.0'
 end

data/lib/tienda/view_helpers.rb

@@ -1,7 +1,7 @@
 module Tienda
   module ViewHelpers
-
-    # Returns currency values with the currency unit as specified by the Tienda settings
+    # Returns currency values with the currency unit as specified by
+    # the Tienda settings
     def number_to_currency(number, options = {})
       options[:unit] ||= Tienda.settings.currency_unit
       super
@@ -9,8 +9,7 @@ module Tienda
 
     # Returns a number of kilograms with the appropriate suffix
     def number_to_weight(kg)
-      "#{kg}#{t('tienda.helpers.number_to_weight.kg', :default => 'kg')}"
+      "#{kg}#{t('tienda.helpers.number_to_weight.kg', default: 'kg')}"
     end
-
   end
 end

data/lib/tienda.rb

@@ -1,6 +1,6 @@
-require "coffee-rails"
-require "sass-rails"
-require "jquery-rails"
+require 'coffee-rails'
+require 'sass-rails'
+require 'jquery-rails'
 require 'haml'
 require 'bcrypt'
 require 'dynamic_form'
@@ -50,10 +50,8 @@ module Tienda
     def settings_groups
       @settings_groups ||= {}
     end
-
   end
-
 end
 
 # Start your engines.
-require "tienda/engine"
+require 'tienda/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tienda
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails