glysellin 0.4.1 → 0.4.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc3ZmMwNGU1YTk5ODFhMDAxZTgwMjBiNDk1Njk5OGZlYzJmOGJmMQ==
+    OGJiYTNiMzg1M2E3MTAxZjkyMzJkMjQzMWUxY2MwYzg3NDg2NTY1Zg==
   data.tar.gz: !binary |-
-    YzY4Y2U4NmE1NDEzODQ2NmEwNjVlNWE3NmYzN2NjMDNlYWZlMmIyYw==
+    Zjg4ZTQ2ZGQzMjk1ODNiMmFkZDAwZDg4ZTllZDhiYjE4ZjRhMjk1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmZjMzA5YTRiOWUzN2Y5ZjgxYWZiZmUzOWI3NDQ3ODI0ZDA1YzJmZDBkYzBk
-    MjYzMGE2NThkYWE5NDc4NTM2NDlkMmJmMzU4NmE4ZGI2ZGQxMmU1MTM5OGQ5
-    MTU3NTYyMjg5ZGQxMzEwNTEwM2ZjMmE2YjQxMDRmYjcxZDZmZjE=
+    MTU5ZjJhNTcxZTNiNTJkZmEwODQwNDczMTZlZWM1M2MwZjI5MTk5OWJkMjMx
+    MTE0OTRiZjU0ZTBlNWIwNzY4NWQyYzU4YTNlNzllNmYwMDI1NzkwMjY3NjY0
+    YzBjZGUxZDgzY2NjOTc5MTBkN2VhZjVmYjExYTFkNDNjZDZjNmI=
   data.tar.gz: !binary |-
-    MTU1ZjBiY2M0ZjlkNDBmYzdiYThhNzViMDY3N2M0YjY4ODI5Zjk2OTE5MGQ3
-    NzQ4ZjRmNzdmMGNkMDhiNzVhNWJkMzAxY2YyMGVjMjZlYTc3MDNkNmM3MWJm
-    MmM4NjAwYTA3YmE5NDc5N2ZhN2QxZGIwODAwYTE4MTg0MWY5OGM=
+    OGMwZDVjNDk1ZGU0NzAyNDM5YzBmYzlmMzZkOTBmMTlmYTY1NjBlZGZlODRl
+    YmZjNTc2Y2ZkODc0MTVhOWY0NDU5NzVkNmIzNmNmZThmZWE3NjJkZjU5YTEy
+    NWJlZGRiOWU2YmVkZDRmZGYyNGVjNmE5NzljNDA5YjZiMGJlOGM=

data/app/helpers/glysellin/cart_helper.rb

@@ -1,11 +1,11 @@
 module Glysellin
   module CartHelper
-    def add_to_cart_form product, options = {}
+    def add_to_cart_form sellable, options = {}
       # Default to remote form
       options[:remote] = true unless options[:remote] == false
       # Render actual form
       render partial: 'glysellin/products/add_to_cart', locals: {
-        product: product,
+        sellable: sellable,
         options: options
       }
     end
@@ -14,8 +14,8 @@ module Glysellin
       render partial: 'glysellin/cart/added_to_cart_warning'
     end
 
-    def render_cart cart
-      render partial: "glysellin/cart/cart", locals: { cart: cart }
+    def render_cart
+      render partial: "glysellin/cart/cart", locals: { cart: current_cart }
     end
   end
 end

data/app/helpers/glysellin/products_helper.rb

@@ -1,4 +1,23 @@
 module Glysellin
   module ProductsHelper
+    def variants_options_for sellable
+      # Prepare ou arguments arrays
+      all_variants, disabled_variants = [], []
+      # Iterate on each variant to find which are enabled and disabled
+      sellable.published_variants.each do |variant|
+        next unless variant.published?
+        if variant.in_stock?
+          name = variant.name
+        else
+          disabled_variants << variant.id
+          name = variant.name +
+            " (#{ t('glysellin.labels.sellables.out_of_stock') })"
+        end
+
+        all_variants << [name, variant.id]
+      end
+
+      options_for_select(all_variants, disabled: disabled_variants)
+    end
   end
 end

data/app/models/glysellin/{order_item.rb → line_item.rb}

@@ -1,10 +1,12 @@
 module Glysellin
-  class OrderItem < ActiveRecord::Base
-    self.table_name = 'glysellin_order_items'
+  class LineItem < ActiveRecord::Base
+    self.table_name = "glysellin_line_items"
     belongs_to :order, inverse_of: :products
 
+    belongs_to :variant, class_name: "Glysellin::Variant"
+
     attr_accessible :sku, :name, :eot_price, :vat_rate, :bundle, :price,
-      :quantity, :weight
+      :quantity, :weight, :variant_id
 
     # The attributes we getch from a product to build our order item
     PRODUCT_ATTRIBUTES_FOR_ITEM = %w(sku name eot_price vat_rate price weight)
@@ -15,15 +17,19 @@ module Glysellin
       # @param [String] id The id string of the item
       # @param [Boolean] bundle If it's a bundle or just one product
       #
-      # @return [OrderItem] The created order item
+      # @return [LineItem] The created order item
+      #
       def build_from_product id, quantity
-        product = Glysellin::Variant.find_by_id(id)
+        variant = Glysellin::Variant.find_by_id(id)
 
         attrs = PRODUCT_ATTRIBUTES_FOR_ITEM.map do |key|
-          [key, product.public_send(key)]
+          [key, variant.public_send(key)]
         end
 
-        OrderItem.new(Hash[attrs].merge('quantity' => quantity))
+        self.new Hash[attrs].merge(
+          "quantity" => quantity,
+          "variant_id" => variant.id
+        )
       end
     end
 
@@ -34,5 +40,9 @@ module Glysellin
     def total_price
       quantity * price
     end
+
+    def sellable
+      variant && variant.product && variant.product.sellable
+    end
   end
 end

data/app/models/glysellin/order.rb

@@ -27,7 +27,7 @@ module Glysellin
     #
     # Order products are used to map order to cloned and simplified products
     #   so the Order propererties can't be affected by product updates
-    has_many :products, class_name: 'Glysellin::OrderItem',
+    has_many :products, class_name: 'Glysellin::LineItem',
       foreign_key: 'order_id', dependent: :destroy
 
     # The actual buyer
@@ -158,7 +158,7 @@ module Glysellin
 
     def products=(attributes)
       products = attributes.reduce([]) do |list, product|
-        item = OrderItem.build_from_product(product[:id], product[:quantity])
+        item = LineItem.build_from_product(product[:id], product[:quantity])
         item ? (list << item) : list
       end
 

data/app/models/glysellin/product.rb

@@ -3,134 +3,32 @@ require 'friendly_id'
 
 module Glysellin
   class Product < ActiveRecord::Base
-    include ProductMethods
-    extend FriendlyId
-
-    friendly_id :name, use: :slugged
 
     self.table_name = 'glysellin_products'
 
-    # Relations
-    #
-    # The ProductImage model is used for products and bundles with the same
-    has_many :images, as: :imageable, class_name: 'Glysellin::ProductImage',
-      inverse_of: :imageable, dependent: :destroy
-
-    # Can have multiple taxonomies
-    has_and_belongs_to_many :taxonomies, :class_name => 'Glysellin::Taxonomy',
-      join_table: 'glysellin_products_taxonomies', :foreign_key => 'product_id'
-
-    # N..N relation between bundles and products
-    # has_many :bundle_products, class_name: 'Glysellin::BundleProduct',
-    #   foreign_key: 'product_id'
-    # has_many :bundles, class_name: 'Glysellin::Product',
-    #   through: :bundle_products
-
-    # # Bundled products in current_product
-    # has_many :product_bundles, class_name: 'Glysellin::BundleProduct',
-    #   foreign_key: 'bundle_id'
-    # has_many :bundled_products, class_name: 'Glysellin::Product',
-    #   through: :product_bundles
+    belongs_to :sellable, polymorphic: true, inverse_of: :product
 
     # Products can belong to a brand
-    belongs_to :brand, :inverse_of => :products
-
-    belongs_to :product_type
-
-    has_many :variants, class_name: 'Glysellin::Variant',
-      before_add: :set_product_on_variant, dependent: :destroy
-
-    accepts_nested_attributes_for :images, allow_destroy: true, reject_if: :all_blank
-    accepts_nested_attributes_for :variants, allow_destroy: true, reject_if: :all_blank
-
-    # accepts_nested_attributes_for :bundled_products, allow_destroy: true, reject_if: :all_blank
-
-    attr_accessible :description, :name, :sku, :slug, :vat_rate,
-      :brand, :taxonomies, :images, :published,
-      :display_priority, :images_attributes, :taxonomy_ids, :unlimited_stock,
-      :position, :brand_id, :variants_attributes, :variants, :product_type_id
-
-      # :bundled_products_attributes
-
-    # Validations
-    #
-    validates_presence_of :name, :slug
-    # Validates price related attributes only unless we have bundled products
-    # so we can defer validations to them
-    validates :vat_rate, presence: true,
-      numericality: true # , unless: proc { |p| p.bundled_products.length > 0 }
-
-    # We check presence of sku if set in global config
-    validates :sku, presence: true, if: proc { Glysellin.autoset_sku }
+    belongs_to :brand, class_name: "Glysellin::Brand", inverse_of: :products
 
-    # Callbacks
-    #
-    before_validation :set_sku, :set_vat_rate, :ensure_variant
+    attr_accessible :vat_rate, :brand, :brand_id
 
-    scope :published, where('glysellin_products.published = ?', true)
-    scope :with_taxonomy, lambda { |*taxonomies|
-      # Ensure we only have slugs so we got a string vector
-      taxonomies.map! { |t| t.kind_of?(Glysellin::Taxonomy) ? t.slug : t }
-      # Get products with those taxonomies
-      includes(:taxonomies).where('glysellin_taxonomies.slug IN (?)', taxonomies)
-    }
+    validates :vat_rate, presence: true, numericality: true
 
-    # Master variant methods delegation
-    delegate :price, :unmarked_price, :marked_down?, to: :master_variant
-
-
-    # And as for the validation, if the SKU is configured to be autoset,
-    # we check generate it
-    def set_sku
-      unless (sku && sku.length > 0) || !Glysellin.autoset_sku
-        self.sku = generate_sku
-      end
-    end
-
-    def set_vat_rate
-      if !vat_rate
-        self.vat_rate = Glysellin.default_vat_rate
-      end
-    end
-
-    def ensure_variant
-      variants.build(product: self) unless variants.length > 0
+    def name
+      sellable && sellable.name
     end
 
-    # Fetches all available variants for the current product
-    #
-    def available_variants
-      variants.available
+    def vat_rate
+      super.presence || Glysellin.default_vat_rate
     end
 
-    def image
-      images.length > 0 ? images.first.image : nil
+    def vat_ratio
+      1 + vat_rate / 100
     end
 
-    def master_variant
-      self.variants.first
+    def variants
+      sellable.published_variants
     end
-
-    def set_product_on_variant variant
-      variant.product = self
-    end
-
-    # bundle_attribute :price do |product|
-    #   product.bundled_products.reduce(0) do |total, product|
-    #     total + product.price
-    #   end
-    # end
-
-    # bundle_attribute :eot_price do |product, att|
-    #   product.bundled_products.reduce(0) do |total, product|
-    #     total + product.eot_price
-    #   end
-    # end
-
-    # bundle_attribute :vat_rate do |product|
-    #   product.bundled_products.reduce(0) do |total, product|
-    #     total + (product.vat_rate * product.price)
-    #   end / product.price
-    # end
   end
 end

data/app/models/glysellin/product_property.rb

@@ -1,10 +1,13 @@
 module Glysellin
   class ProductProperty < ActiveRecord::Base
     self.table_name = 'glysellin_product_properties'
-    attr_accessible :adjustement, :name, :value, :variant, :variant_id, :type, :type_id
+    attr_accessible :value, :variant_id, :type_id
 
-    belongs_to :variant, polymorphic: true, foreign_key: 'variant_id'
-    belongs_to :type, class_name: 'Glysellin::ProductPropertyType', foreign_key: 'type_id'
+    belongs_to :variant, class_name: "Glysellin::Variant",
+      inverse_of: :properties
+
+    belongs_to :type, class_name: 'Glysellin::ProductPropertyType',
+      inverse_of: :properties
 
     # validate :check_uniqueness_of_type
 
@@ -13,6 +16,10 @@ module Glysellin
 
     private
 
+    def name
+      type && type.name
+    end
+
     def check_uniqueness_of_type
       if self.variant.properties.map(&:type).include? self.type
         errors.add(:type, I18n.t("glysellin.controllers.errors.double_property"))

data/app/models/glysellin/product_property_type.rb

@@ -1,11 +1,13 @@
 module Glysellin
   class ProductPropertyType < ActiveRecord::Base
     self.table_name = 'glysellin_product_property_types'
-    attr_accessible :eot_price, :in_stock, :name, :position, :price, :published, :sku, :slug, :unlimited_stock
+    attr_accessible :name
 
-    has_many :properties, class_name: "Glysellin::ProductProperty"
+    has_many :properties, class_name: "Glysellin::ProductProperty",
+      foreign_key: 'type_id', inverse_of: :type
 
-    has_and_belongs_to_many :product_types, class_name: 'Glysellin::ProductType',
-      join_table: 'glysellin_product_types_property_types'
+    def name
+      "hoo"
+    end
   end
 end

data/app/models/glysellin/variant.rb

@@ -2,7 +2,6 @@ require 'friendly_id'
 
 module Glysellin
   class Variant < ActiveRecord::Base
-    include ProductMethods
     extend FriendlyId
 
     friendly_id :name, use: :slugged
@@ -10,24 +9,28 @@ module Glysellin
     self.table_name = 'glysellin_variants'
 
     attr_accessible :eot_price, :in_stock, :name, :position, :price,
-      :published, :sku, :slug, :unlimited_stock, :product, :product_id,
-      :properties_attributes, :properties, :weight, :unmarked_price
+      :published, :sku, :slug, :unlimited_stock, :sellable_id,
+      :sellable_type, :properties_attributes, :weight,
+      :unmarked_price
 
-    belongs_to :product, class_name: 'Glysellin::Product',
-      foreign_key: 'product_id'
+    belongs_to :sellable, polymorphic: true
 
     has_many :properties, class_name: 'Glysellin::ProductProperty',
-      as: :variant, extend: Glysellin::PropertyFinder, dependent: :destroy
+      extend: Glysellin::PropertyFinder, dependent: :destroy,
+      inverse_of: :variant
 
     accepts_nested_attributes_for :properties, allow_destroy: true
 
-    validates_presence_of :name, if: proc { |v| v.product.variants.length > 1 }
+    validates_presence_of :name, if: proc { |variant|
+      variant.sellable.variants.length > 1
+    }
+
     validates_numericality_of :price
     validates_numericality_of :in_stock, if: proc { |v| v.in_stock.presence }
 
     before_validation :check_prices
 
-    after_initialize :prepare_properties
+    # after_initialize :prepare_properties
 
     AVAILABLE_QUERY = <<-SQL
       glysellin_variants.published = ? AND (
@@ -37,25 +40,24 @@ module Glysellin
     SQL
 
     scope :available, where(AVAILABLE_QUERY, true, true, 0)
+    scope :published, where(published: true)
 
-    def prepare_properties
-      if product && product.product_type
-        product.product_type.property_types.each do |type|
-          properties.build(type: type) if properties.send(type.name) == false
-        end
-      end
-    end
+    # def prepare_properties
+    #   if product && product.product_type
+    #     product.product_type.property_types.each do |type|
+    #       properties.build(type: type) if properties.send(type.name) == false
+    #     end
+    #   end
+    # end
 
     def description
-      product.description
+      sellable.description if sellable.respond_to?(:description)
     end
 
-    def vat_rate
-      product.vat_rate
-    end
+    delegate :vat_rate, :vat_ratio, to: :sellable
+
 
     def check_prices
-      vat_ratio = self.product.vat_ratio rescue Glysellin.default_vat_rate
       # If we have to fill one of the prices when changed
       if eot_changed_alone?
         self.price = (self.eot_price * vat_ratio).round(2)
@@ -84,12 +86,12 @@ module Glysellin
     end
 
     def name fullname = true
-      variant_name, product_name = super().presence, product.name
+      variant_name, sellable_name = super().presence, (sellable && sellable.name)
 
       if fullname
-        variant_name ? "#{ product_name } - #{ variant_name }" : product_name
+        variant_name ? "#{ sellable_name } - #{ variant_name }" : sellable_name
       else
-        variant_name ? variant_name : product_name
+        variant_name ? variant_name : sellable_name
       end
     end
 

data/app/views/glysellin/cart/_added_to_cart_warning.html.erb

@@ -2,12 +2,19 @@
   To implement custom behavior, just replace this view, keeping the .added-to-cart-warning container
   Default behavior is triggered when [data-warning] attribute is present on the container
 %>
-<div class="added-to-cart-warning" style="position:fixed;width:500px;height:400px;top:50%;left:50%;margin-left:-250px;margin-top:-200px;border:1px solid #CCC;border-radius:2px;padding:10px;box-shadow:0 0 15px #DDD;z-index:100;background:white;" data-warning>
+
+<% product = current_cart.product(params[:cart][:product_id]).variant %>
+
+<div class="added-to-cart-warning" style="position:fixed;width:400px;height:200px;top:50%;left:50%;margin-left:-200px;margin-top:-140px;border:1px solid #CCC;border-radius:2px;padding:40px;box-shadow:0 0 15px #DDD;z-index:100;background:white;" data-warning>
   <h3><%= t('glysellin.labels.cart.added_to_cart') %></h3>
   <hr>
-
-  <% product = current_cart.product(params[:cart][:product_id]).variant %>
-  <%= params[:cart][:quantity] %> &times; <%= product.name %> - <%= number_to_currency product.price %>
+  <strong>
+    <%= (quantity = params[:cart][:quantity].to_i) %> &times;
+  </strong>
+  <%= product.name %> - <%= number_to_currency product.price %>
+  <strong style="float:right;">
+    <%= number_to_currency (product.price * quantity) %>
+  </strong>
   <br>
 
   <hr>

data/app/views/glysellin/cart/_products.html.erb

@@ -31,6 +31,7 @@
           <% end %>
         </td>
         <td class="product-eot-price">
+          <% puts "***** #{quantity} -- #{item.inspect}" %>
           <%= number_to_currency(quantity * item.eot_price) %>
         </td>
         <td class="product-price">

data/app/views/glysellin/products/_add_to_cart.html.haml

@@ -0,0 +1,13 @@
+- if sellable.published_variants.length > 0
+  = form_tag cart_products_path, class: 'add-to-cart-form', remote: options[:remote], data: { "add-to-cart-form" => true } do
+    .product-quantity
+      = number_field :cart, :quantity, value: 1
+
+    .submit-container
+      - if sellable.published_variants.length > 1
+        = select_tag 'cart[product_id]', variants_options_for(sellable), prompt: t("glysellin.labels.sellables.choose_your_variant"), required: "required"
+      - else
+        = hidden_field_tag 'cart[product_id]', sellable.published_variants.first.id
+
+      %button.submit{ type: "submit" }
+        = t('glysellin.labels.cart.add_to_cart')

data/config/locales/glysellin.en.yml

@@ -78,6 +78,7 @@ en:
         back_to_shop: "Back to shop"
         remove_from_cart: "Delete"
         update: "Update cart"
+        added_to_cart: "Product added to cart"
         update_discount: "Update discount code"
         create_order_form: "Submit order"
         follow: "Go to order"
@@ -86,12 +87,12 @@ en:
         informations: "Your informations"
         shipping_method: "Shipping method"
         payment_method: "Payment method"
+      sellables:
+        out_of_stock: "Out of stock"
+        choose_your_variant: "--- Choose your product ---"
     orders:
       states:
-        created: "Created"
-        filling_address: "Addresses not filled"
-        address: "Addresses filled"
-        payment: "Payment method chosen"
+        ready: "Payment pending"
         paid: "Paid"
         shipped: "Shipped"
     cart:

data/config/locales/glysellin.fr.yml

@@ -97,6 +97,9 @@ fr:
         informations: "Vos informations"
         shipping_method: "Mode de livraison"
         payment_method: "Mode de paiement"
+      sellables:
+        out_of_stock: "Épuisé"
+        choose_your_variant: "--- Choisissez votre produit ---"
     orders:
       states:
         ready: "Paiement en attente"

data/db/migrate/20130609013900_add_sellable_references_to_glysellin_products.rb

@@ -0,0 +1,6 @@
+class AddSellableReferencesToGlysellinProducts < ActiveRecord::Migration
+  def change
+    add_column :glysellin_products, :sellable_type, :string
+    add_column :glysellin_products, :sellable_id, :integer
+  end
+end

data/db/migrate/20130609023300_remove_unused_fields_from_glysellin_products.rb

@@ -0,0 +1,18 @@
+class RemoveUnusedFieldsFromGlysellinProducts < ActiveRecord::Migration
+  def up
+    remove_column :glysellin_products, :name, :description, :display_priority,
+      :position, :slug, :sku, :published
+  end
+
+  def down
+    change_table :glysellin_products do |t|
+      t.string :name
+      t.text :description
+      t.integer :display_priority
+      t.integer :position
+      t.string :slug
+      t.string :sku
+      t.boolean :published, default: true
+    end
+  end
+end

data/db/migrate/20130609025800_remove_taxonomies_from_system.rb

@@ -0,0 +1,21 @@
+class RemoveTaxonomiesFromSystem < ActiveRecord::Migration
+  def up
+    drop_table :glysellin_taxonomies
+    drop_table :glysellin_products_taxonomies
+  end
+
+  def down
+    create_table :glysellin_taxonomies do |t|
+      t.string :name
+      t.string :slug
+      t.integer :parent_taxonomy_id
+
+      t.timestamps
+    end
+
+    create_table :glysellin_products_taxonomies, :id => false do |t|
+      t.integer :product_id
+      t.integer :taxonomy_id
+    end
+  end
+end

data/db/migrate/20130609040600_rename_order_items_to_line_items.rb

@@ -0,0 +1,6 @@
+class RenameOrderItemsToLineItems < ActiveRecord::Migration
+  def change
+    rename_table :glysellin_order_items, :glysellin_line_items
+  end
+end
+

data/db/migrate/20130609142100_add_variant_id_to_glysellin_line_items.rb

@@ -0,0 +1,5 @@
+class AddVariantIdToGlysellinLineItems < ActiveRecord::Migration
+  def change
+    add_column :glysellin_line_items, :variant_id, :integer
+  end
+end

data/db/migrate/20130609155600_make_variants_belong_to_sellables_and_not_products.rb

@@ -0,0 +1,16 @@
+class MakeVariantsBelongToSellablesAndNotProducts < ActiveRecord::Migration
+  def up
+    change_table :glysellin_variants do |t|
+      t.integer :sellable_id
+      t.string :sellable_type
+      t.remove :product_id
+    end
+  end
+
+  def down
+    change_table :glysellin_variants do |t|
+      t.integer :product_id
+      t.remove :sellable_id, :sellable_type
+    end
+  end
+end

data/db/migrate/20130609193600_drop_product_types.rb

@@ -0,0 +1,22 @@
+class DropProductTypes < ActiveRecord::Migration
+  def up
+    drop_table :glysellin_product_types
+    drop_table :glysellin_product_types_properties
+
+    remove_column :glysellin_products, :product_type_id
+  end
+
+  def down
+    create_table :glysellin_product_types_properties, id: false do |t|
+      t.references :product_type, :product_property
+    end
+
+    create_table :glysellin_product_types do |t|
+      t.string   :name
+      t.timestamps
+    end
+
+    add_column :glysellin_products, :product_type_id, :integer
+    add_column :glysellin_product_types_properties, :product_type_id, :integer
+  end
+end

data/db/migrate/20130609200000_remove_unused_product_properties_columns.rb

@@ -0,0 +1,15 @@
+class RemoveUnusedProductPropertiesColumns < ActiveRecord::Migration
+  def up
+    change_table :glysellin_product_properties do |t|
+      t.remove :name, :adjustement, :variant_type
+    end
+  end
+
+  def down
+    change_table :glysellin_product_properties do |t|
+      t.string   :name
+      t.decimal  :adjustement,  :precision => 11, :scale => 2
+      t.string   :variant_type
+    end
+  end
+end

data/db/migrate/20130609200700_remove_position_from_glysellin_variants.rb

@@ -0,0 +1,9 @@
+class RemovePositionFromGlysellinVariants < ActiveRecord::Migration
+  def up
+    remove_column :glysellin_variants, :position
+  end
+
+  def down
+    add_column :glysellin_variants, :position, :integer
+  end
+end

data/lib/glysellin.rb

@@ -5,7 +5,6 @@ require "glysellin/engine"
 require "glysellin/helpers"
 require "glysellin/gateway"
 require "glysellin/discount_type_calculator"
-require "glysellin/product_methods"
 require "glysellin/property_finder"
 require "glysellin/products_list"
 require "glysellin/shipping_carrier"

data/lib/glysellin/engine.rb

@@ -1,4 +1,5 @@
 require 'glysellin/helpers'
+require 'glysellin/sellable'
 require 'glysellin/engine/routes'
 
 module Glysellin
@@ -10,5 +11,11 @@ module Glysellin
       end
     end
 
+    initializer "Mix acts_as_sellable into ActiveRecord::Base" do
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.send(:include, Sellable)
+      end
+    end
+
   end
 end

data/lib/glysellin/engine/routes.rb

@@ -18,16 +18,6 @@ module ActionDispatch::Routing
           end
         end
 
-        resources :products, controller: controllers[:products] do
-          collection do
-            get 'taxonomy/:id', action: "filter", as: "filter"
-          end
-        end
-
-        resources :taxonomies, only: [] do
-          resources :products, only: [:index]
-        end
-
         resource :cart, controller: controllers[:cart], only: [:show, :destroy] do
           resources :products, controller: "glysellin/cart/products", only: [:create, :update, :destroy] do
             collection do
@@ -51,7 +41,6 @@ module ActionDispatch::Routing
     def parse_controllers options
       defaults = {
         orders: 'glysellin/orders',
-        products: 'glysellin/products',
         cart: 'glysellin/cart'
       }
 

data/lib/glysellin/property_finder.rb

@@ -1,12 +1,12 @@
 module Glysellin
   module PropertyFinder
-    def method_missing method, *args, &block
+    def method_missing method, *args
       if (prop = find { |prop| prop.type.name == method.to_s })
         prop.value
       elsif Glysellin::ProductPropertyType.select('1').find_by_name(method)
         false
       else
-        super(method, *args, &block)
+        super
       end
     end
   end

data/lib/glysellin/sellable.rb

@@ -0,0 +1,69 @@
+require "glysellin/sellable/simple"
+require "glysellin/sellable/multi"
+
+module Glysellin
+  module Sellable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      # Macro to include sellable behaviour in side any model
+      #
+      # @param [Hash] options An option hash to configure the mixin
+      #
+      # @option options [Symbol] :simple If set to true, sellable will only have
+      #   one variant, a has_one relation is defined between sellable and the
+      #   Variant model
+      # @option options [Boolean] :stock If set to false, consider every itmes
+      #   should have unlimited stock. Defaults to true
+      #
+      def acts_as_sellable options = {}
+        # Merge options with defaults and store them for further use
+        cattr_accessor :sellable_options
+        self.sellable_options = options.reverse_merge(
+          simple: false,
+          stock: true
+        )
+
+        if sellable_options[:simple]
+          include Sellable::Simple
+        else
+          include Sellable::Multi
+        end
+
+        # Defines the polymorphic has_one association with the
+        # Glysellin::Product model, holding product wide configurations
+        has_one :product, as: :sellable, class_name: "Glysellin::Product",
+          inverse_of: :sellable, dependent: :destroy
+        accepts_nested_attributes_for :product, allow_destroy: true
+        attr_accessible :product_attributes
+
+        unless sellable_options[:stock]
+          before_validation :ensure_unlimited_stock
+        end
+
+        # Attributes delegation. Allowing to consider Product as a simple
+        # configuration model for the sellable one.
+        #
+        delegate :vat_rate, :vat_ratio, to: :product
+
+        # delegate :price, :unmarked_price, :marked_down?, to: :master_variant
+      end
+    end
+
+    # If acts_as_sellable is called with the option `stock: false`, we admit
+    # every variant must be unlimited stock, so admins never have to bother
+    # filling in stock or selecting `unlimited_stock: true`
+    #
+    def ensure_unlimited_stock
+      variants.each do |variant|
+        variant.unlimited_stock = true
+        variant.save unless variant.new_record?
+      end
+    end
+
+    def published_variants
+      variants.published
+    end
+  end
+end

data/lib/glysellin/sellable/multi.rb

@@ -0,0 +1,24 @@
+module Glysellin
+  module Sellable
+    module Multi
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :variants, as: :sellable, class_name: "Glysellin::Variant",
+          inverse_of: :sellable, dependent: :destroy
+        accepts_nested_attributes_for :variants, allow_destroy: true,
+          reject_if: :all_blank
+        attr_accessible :variants_attributes
+
+        # Published sellables are the ones that have at least one variant
+        # published.
+        #
+        # This behaviour can be overriden inside the sellable's model if the
+        # scope is declared after the `acts_as_sellable` call
+        scope :published, -> {
+          includes(:variants).where(glysellin_variants: { published: true })
+        }
+      end
+    end
+  end
+end

data/lib/glysellin/sellable/simple.rb

@@ -0,0 +1,30 @@
+module Glysellin
+  module Sellable
+    module Simple
+      extend ActiveSupport::Concern
+
+      included do
+        has_one :variant, as: :sellable, class_name: "Glysellin::Variant",
+          inverse_of: :sellable, dependent: :destroy
+        accepts_nested_attributes_for :variant, allow_destroy: true,
+          reject_if: :all_blank
+        attr_accessible :variant_attributes
+
+        # Published sellables are the ones that have at least one variant
+        # published.
+        #
+        # This behaviour can be overriden inside the sellable's model if the
+        # scope is declared after the `acts_as_sellable` call
+        scope :published, -> {
+          includes(:variant).where( glysellin_variants: { published: true })
+        }
+      end
+
+      # Fetches variant wrapping it in an ActiveRecord::Relation object to
+      # make behavior consistent with sellables in Multi mode
+      def variants
+        Variant.where(sellable_id: id, sellable_type: self.class.to_s)
+      end
+    end
+  end
+end

data/lib/glysellin/version.rb

@@ -1,3 +1,3 @@
 module Glysellin
-  VERSION = "0.4.1"
+  VERSION = "0.4.1.1"
 end

data/lib/tasks/glysellin_tasks.rake

@@ -5,7 +5,7 @@ namespace :glysellin do
   task :seed => :environment do
     [['Chèque', 'check'],
     ['Paypal', 'paypal-integral'],
-    ['Atos', 'atos']].each do |payment_method|
+    ['Carte bancaire', 'atos']].each do |payment_method|
       attributes = Hash[[:name, :slug].zip(payment_method)]
       Glysellin::PaymentMethod.create(attributes)
       puts "Created payment method : #{ attributes[:name] }"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glysellin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.1.1
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,7 +161,6 @@ files:
 - app/controllers/glysellin/cart/state_controller.rb
 - app/controllers/glysellin/cart_controller.rb
 - app/controllers/glysellin/orders_controller.rb
-- app/controllers/glysellin/products_controller.rb
 - app/helpers/glysellin/application_helper.rb
 - app/helpers/glysellin/cart_helper.rb
 - app/helpers/glysellin/orders_helper.rb
@@ -172,9 +171,9 @@ files:
 - app/models/glysellin/brand.rb
 - app/models/glysellin/discount_code.rb
 - app/models/glysellin/discount_type.rb
+- app/models/glysellin/line_item.rb
 - app/models/glysellin/order.rb
 - app/models/glysellin/order_adjustment.rb
-- app/models/glysellin/order_item.rb
 - app/models/glysellin/orderer.rb
 - app/models/glysellin/payment.rb
 - app/models/glysellin/payment_method.rb
@@ -182,9 +181,7 @@ files:
 - app/models/glysellin/product_image.rb
 - app/models/glysellin/product_property.rb
 - app/models/glysellin/product_property_type.rb
-- app/models/glysellin/product_type.rb
 - app/models/glysellin/shipping_method.rb
-- app/models/glysellin/taxonomy.rb
 - app/models/glysellin/variant.rb
 - app/views/glysellin/cart/_added_to_cart_warning.html.erb
 - app/views/glysellin/cart/_cart.html.erb
@@ -214,11 +211,7 @@ files:
 - app/views/glysellin/orders/_payment_successful.html.erb
 - app/views/glysellin/orders/payment_response.html.erb
 - app/views/glysellin/payment_methods/_paypal-integral.html.erb
-- app/views/glysellin/products/_add_to_cart.html.erb
-- app/views/glysellin/products/_item.html.erb
-- app/views/glysellin/products/filter.html.erb
-- app/views/glysellin/products/index.html.erb
-- app/views/glysellin/products/show.html.erb
+- app/views/glysellin/products/_add_to_cart.html.haml
 - app/views/glysellin/shared/_address.html.erb
 - app/views/glysellin/shared/_address.text.erb
 - app/views/glysellin/shared/_order.text.erb
@@ -261,6 +254,15 @@ files:
 - db/migrate/20130311135842_add_addressable_to_glysellin_addresses.rb
 - db/migrate/20130314114048_change_addressable_associations_in_glysellin_addresses.rb
 - db/migrate/20130325113903_remove_address_ids_from_glysellin_orders.rb
+- db/migrate/20130609013900_add_sellable_references_to_glysellin_products.rb
+- db/migrate/20130609023300_remove_unused_fields_from_glysellin_products.rb
+- db/migrate/20130609025800_remove_taxonomies_from_system.rb
+- db/migrate/20130609040600_rename_order_items_to_line_items.rb
+- db/migrate/20130609142100_add_variant_id_to_glysellin_line_items.rb
+- db/migrate/20130609155600_make_variants_belong_to_sellables_and_not_products.rb
+- db/migrate/20130609193600_drop_product_types.rb
+- db/migrate/20130609200000_remove_unused_product_properties_columns.rb
+- db/migrate/20130609200700_remove_position_from_glysellin_variants.rb
 - db/seeds/shipping_carrier/rates/colissimo.csv
 - db/seeds/shipping_carrier/rates/lettre-max.csv
 - lib/active_model/model.rb
@@ -269,7 +271,6 @@ files:
 - lib/generators/glysellin/install/templates/initializer.rb
 - lib/generators/glysellin/install/templates/order_observer.rb
 - lib/generators/glysellin/install/utils.rb
-- lib/glysellin/acts_as_sellable.rb
 - lib/glysellin/cart/address.rb
 - lib/glysellin/cart/adjustment/base.rb
 - lib/glysellin/cart/adjustment/discount_code.rb
@@ -299,9 +300,11 @@ files:
 - lib/glysellin/helpers/countries.rb
 - lib/glysellin/helpers/views.rb
 - lib/glysellin/helpers.rb
-- lib/glysellin/product_methods.rb
 - lib/glysellin/products_list.rb
 - lib/glysellin/property_finder.rb
+- lib/glysellin/sellable/multi.rb
+- lib/glysellin/sellable/simple.rb
+- lib/glysellin/sellable.rb
 - lib/glysellin/shipping_carrier/base.rb
 - lib/glysellin/shipping_carrier/colissimo.rb
 - lib/glysellin/shipping_carrier/flat_rate.rb

data/app/controllers/glysellin/products_controller.rb

@@ -1,12 +0,0 @@
-module Glysellin
-  class ProductsController < ApplicationController
-    def index
-      @products = Glysellin::Product.order('created_at DESC').limit(10)
-      @products = @products.with_taxonomy(params[:taxonomy_id]) if params[:taxonomy_id]
-    end
-
-    def show
-      @product = Glysellin::Product.find(params[:id])
-    end
-  end
-end

data/app/models/glysellin/product_type.rb

@@ -1,11 +0,0 @@
-class Glysellin::ProductType < ActiveRecord::Base
-  self.table_name = 'glysellin_product_types'
-
-  has_and_belongs_to_many :property_types,
-    class_name: 'Glysellin::ProductPropertyType',
-    join_table: 'glysellin_product_types_property_types'
-
-  has_many :products
-
-  attr_accessible :name, :product_ids, :property_type_ids
-end

data/app/models/glysellin/taxonomy.rb

@@ -1,35 +0,0 @@
-module Glysellin
-  class Taxonomy < ActiveRecord::Base
-    extend FriendlyId
-
-    self.table_name = 'glysellin_taxonomies'
-
-    friendly_id :name, use: :slugged
-
-    has_and_belongs_to_many :products,
-      join_table: 'glysellin_products_taxonomies'
-    has_many :sub_taxonomies, class_name: 'Taxonomy',
-      foreign_key: 'parent_taxonomy_id'
-    belongs_to :parent_taxonomy, foreign_key: 'parent_taxonomy_id',
-      class_name: 'Taxonomy'
-
-    attr_accessible :name, :parent_taxonomy, :sub_taxonomies, :products,
-      :product_ids, :sub_taxonomy_ids, :parent_taxonomy_id
-
-    def all_products
-      Product.includes(:taxonomies).where(
-        'glysellin_products_taxonomies.taxonomy_id IN (?)',
-        taxonomy_tree_ids
-      )
-    end
-
-    def taxonomy_tree_ids
-      if sub_taxonomies.length > 0
-        ts = sub_taxonomies.includes(:sub_taxonomies).map(&:taxonomy_tree_ids)
-        ts.flatten << self.id
-      else
-        self.id
-      end
-    end
-  end
-end

data/app/views/glysellin/products/_add_to_cart.html.erb

@@ -1,16 +0,0 @@
-<%= form_tag cart_products_path, class: 'add-to-cart-form', remote: options[:remote], data: { "add-to-cart-form" => true } do %>
-  <div class="product-quantity">
-    <%= number_field :cart, :quantity, value: 1 %>
-  </div>
-  <div class="submit-container">
-    <% if product.variants.length > 1 %>
-      <%= select_tag 'cart[product_id]', options_for_select(product.variants.collect {|v| [ v.name, v.id ] }) %>
-    <% else %>
-      <%= hidden_field_tag 'cart[product_id]', product.variants.first.id %>
-    <% end %>
-
-    <button class="submit" type="submit">
-      <%= t('glysellin.labels.cart.add_to_cart') %>
-    </button>
-  </div>
-<% end %>

data/app/views/glysellin/products/_item.html.erb

@@ -1,21 +0,0 @@
-<div class="product-container">
-  <span class="name">
-    <%= link_to product.name, product_path(product) %>
-  </span>
-  <% if product.image %>
-    <div class="image">
-      <%= image_tag product.image.url(:thumb) %>
-    </div>
-  <% end %>
-  <div class="description">
-    <%= product.description %>
-  </div>
-
-  <div class="buying-infos">
-    <span class="price">
-      <%= number_to_currency(product.price) %>
-    </span>
-
-    <%= add_to_cart_form(product) %>
-  </div>
-</div>

data/app/views/glysellin/products/index.html.erb

@@ -1,3 +0,0 @@
-<% @products.each do |product| %>
-  <%= render partial: "item", locals: { product: product } %>
-<% end %>

data/app/views/glysellin/products/show.html.erb

@@ -1,3 +0,0 @@
-<%= render partial: "item", locals: { product: @product } %>
-
-<%= link_to t('glysellin.labels.misc.back_to_shop'), root_path %>

data/lib/glysellin/acts_as_sellable.rb

@@ -1,14 +0,0 @@
-module Glysellin
-  module ActsAsSellable
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def acts_as_sellable
-        has_one :product, :class_name => "::Glysellin::Product", :inverse_of => :item
-        accepts_nested_attributes_for :product, :allow_destroy => true
-      end
-    end
-  end
-end
-
-::ActiveRecord::Base.send :include, Glysellin::ActsAsSellable

data/lib/glysellin/product_methods.rb

@@ -1,66 +0,0 @@
-module Glysellin
-  module ProductMethods
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      attr_writer :bundle_attributes
-
-      def bundle_attributes
-        @bundle_attributes ||= {}
-      end
-
-      def bundle_attribute attribute, &block
-        # Store block to be called to retrieve
-        self.bundle_attributes[attribute.to_sym] = block
-
-        class_eval <<-CLASS, __FILE__, __LINE__
-          def bundle_#{ attribute }
-            if bundled_products.length > 0
-              self.class.bundle_attributes[:#{ attribute }].call(self)
-            end
-          end
-
-          def #{ attribute }
-            value = super
-            value = bundle_#{ attribute } if value == nil
-            value
-          end
-
-          def #{ attribute }=(value)
-            super(value) if value != bundle_#{ attribute }
-          end
-        CLASS
-      end
-    end
-
-    # SKU generation helper
-    #
-    # @return [String] The generated SKU
-    def generate_sku
-      # Get last product only selecting id
-      last_item = self.class.select(:id).order('id DESC').first
-      # Generate SKU from the last product id we got,
-      # or appending "1" if there's no product
-      sku = (last_item ? (last_item.id + 1).to_s : '1')
-      sku += self.name.parameterize
-    end
-
-    # Checks if a product is a bundle of other sub products
-    #
-    # @return  [true, false]
-    def bundle?
-      false
-      # bundled_products.length > 0
-    end
-
-    # Gives calculable vat rate
-    #
-    # Example :
-    #    If vat_rate is set to 19.6%, returns back 1.196
-    #
-    # @return  [Float]  The processed VAT rate
-    def vat_ratio
-      1 + vat_rate / 100
-    end
-  end
-end