shoppe 1.0.5 → 1.0.6

data/config/locales/en.yml

@@ -387,17 +387,27 @@ en:
       attachments: Attachments
       back_to_categories: Back to categories list
       category_details: Category Details
+      choose_product_category: Choose a product category
       create_notice: Category has been created successfully
       delete_confirmation:  Are you sure you wish to remove this category?
       description: Description
       destroy_notice: Category has been removed successfully
+      destroy_alert: Category could not be removed
       image: Image
       name: Name
       new_category: New category
       no_categories: No categories to display.
       permalink: Permalink
+      permalink_includes_ancestors: Prefix links in store with ancestor categories
       product_categories: Product categories
       update_notice: Category has been updated successfully
+      nesting:
+        blank_option: None
+        category_nesting: Nesting
+        category_parent: Parent
+        current_category: Current
+        no_children: No Children
+        hierarchy: Hierarchy
 
     products:
       add_attribute: Add attribute

data/config/locales/pl.yml

@@ -393,6 +393,7 @@ pl:
       attachments: Załączniki
       back_to_categories: Powrót do listy kategorii
       category_details: Szczegóły kategorii
+      choose_product_category: Wybierz kategorię produktu
       create_notice: Kategoria została utworzona
       delete_confirmation:  Czy na pewno usunąć kategorię?
       description: Opis
@@ -402,8 +403,16 @@ pl:
       new_category: Nowa kategoria
       no_categories: Brak kategorii do wyświetlenia
       permalink: Permalink
+      permalink_includes_ancestors: Prefix links in store with ancestor categories
       product_categories: Kategorie produktów
       update_notice: Kategoria została zaktualizowana
+      nesting:
+        blank_option: None
+        category_nesting: Nesting
+        category_parent: Parent
+        current_category: Current
+        no_children: No Children
+        hierarchy: Hierarchy
 
     products:
       add_attribute: Dodaj atrybut

data/config/locales/pt-BR.yml

@@ -380,6 +380,7 @@ pt-BR:
       attachments: Anexos
       back_to_categories: Voltar para a lista de categorias
       category_details: Detalhes da Categoria
+      choose_product_category: Escolha uma categoria de produto
       create_notice: A Categoria foi criada com sucesso
       delete_confirmation: Você tem certeza que deseja remover esta categoria?
       description: Descrição
@@ -389,8 +390,16 @@ pt-BR:
       new_category: Nova categoria
       no_categories: Nenhuma categoria para mostrar.
       permalink: Permalink
+      permalink_includes_ancestors: Prefix links in store with ancestor categories
       product_categories: Categorias de Produto
       update_notice: A Categoria foi atualizada com sucesso
+      nesting:
+        blank_option: None
+        category_nesting: Nesting
+        category_parent: Parent
+        current_category: Current
+        no_children: No Children
+        hierarchy: Hierarchy
 
     products:
       add_attribute: Adicionar atributo

data/db/migrate/20141026181717_allow_multiple_shoppe_products_per_shoppe_product_category.rb

@@ -0,0 +1,46 @@
+class AllowMultipleShoppeProductsPerShoppeProductCategory < ActiveRecord::Migration
+  def up
+    # create our join table first before we migrate
+    # we have an id to allow :restrict_with_exception on product_category
+    create_table :shoppe_product_categorizations do |t|
+      t.integer :product_id, null: false
+      t.integer :product_category_id, null: false
+    end
+    add_index :shoppe_product_categorizations, :product_id, name: 'categorization_by_product_id'
+    add_index :shoppe_product_categorizations, :product_category_id, name: 'categorization_by_product_category_id'
+    # define the old belongs_to association (as it's no longer on the model)
+    Shoppe::Product.class_eval do
+      belongs_to :old_category,
+                 :class_name => "Shoppe::ProductCategory",
+                 :foreign_key => "product_category_id"
+    end
+    # migrate over to our new join table
+    Shoppe::Product.all.each do |product|
+      product.product_categories << product.old_category
+      product.save
+    end
+    # lastly, remove the old product_category_id and associated index
+    remove_index :shoppe_products, :product_category_id if index_exists?(:shoppe_products, :product_category_id)
+    remove_column :shoppe_products, :product_category_id
+  end
+
+  def down
+    # first, we re-add our column so we've got something to populate
+    add_column :shoppe_products, :product_category_id, :integer
+    add_index :shoppe_products, :product_category_id
+    # define the old belongs_to association once again as we're going to re-add our goodies
+    Shoppe::Product.class_eval do
+      belongs_to :new_category,
+                 :class_name => "Shoppe::ProductCategory",
+                 :foreign_key => "product_category_id"
+    end
+    # migrate over from the new table to the old association
+    Shoppe::Product.all.each do |product|
+      next unless product.product_categories.count
+      product.new_category = product.product_categories.first
+      product.save
+    end
+    # drop our join table
+    drop_table :shoppe_product_categorizations
+  end
+end

data/db/migrate/20141026181718_add_nested_to_product_categories.rb

@@ -0,0 +1,30 @@
+class AddNestedToProductCategories < ActiveRecord::Migration
+  def up
+    add_column :shoppe_product_categories, :parent_id, :integer
+    add_column :shoppe_product_categories, :lft, :integer
+    add_column :shoppe_product_categories, :rgt, :integer
+    add_column :shoppe_product_categories, :depth, :integer
+
+    add_index :shoppe_product_categories, :lft
+    add_index :shoppe_product_categories, :rgt
+    
+    add_column :shoppe_product_categories, :ancestral_permalink, :string
+    add_column :shoppe_product_categories, :permalink_includes_ancestors, :boolean, default: false
+
+    Shoppe::ProductCategory.reset_column_information
+    Shoppe::ProductCategory.rebuild!
+  end
+
+  def down
+    remove_column :shoppe_product_categories, :ancestral_permalink
+    remove_column :shoppe_product_categories, :permalink_includes_ancestors
+
+    remove_index :shoppe_product_categories, :lft
+    remove_index :shoppe_product_categories, :rgt
+
+    remove_column :shoppe_product_categories, :parent_id
+    remove_column :shoppe_product_categories, :lft
+    remove_column :shoppe_product_categories, :rgt
+    remove_column :shoppe_product_categories, :depth
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141026181716) do
+ActiveRecord::Schema.define(version: 20141026181718) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -178,34 +178,48 @@ ActiveRecord::Schema.define(version: 20141026181716) do
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "parent_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "depth"
+    t.string   "ancestral_permalink"
+    t.boolean  "permalink_includes_ancestors", default: false
   end
 
+  add_index "shoppe_product_categories", ["lft"], name: "index_shoppe_product_categories_on_lft", using: :btree
   add_index "shoppe_product_categories", ["permalink"], name: "index_shoppe_product_categories_on_permalink", using: :btree
+  add_index "shoppe_product_categories", ["rgt"], name: "index_shoppe_product_categories_on_rgt", using: :btree
+
+  create_table "shoppe_product_categorizations", force: true do |t|
+    t.integer "product_id",          null: false
+    t.integer "product_category_id", null: false
+  end
+
+  add_index "shoppe_product_categorizations", ["product_category_id"], name: "categorization_by_product_category_id", using: :btree
+  add_index "shoppe_product_categorizations", ["product_id"], name: "categorization_by_product_id", using: :btree
 
   create_table "shoppe_products", force: true do |t|
     t.integer  "parent_id"
-    t.integer  "product_category_id"
     t.string   "name"
     t.string   "sku"
     t.string   "permalink"
     t.text     "description"
     t.text     "short_description"
-    t.boolean  "active",                                      default: true
-    t.decimal  "weight",              precision: 8, scale: 3, default: 0.0
-    t.decimal  "price",               precision: 8, scale: 2, default: 0.0
-    t.decimal  "cost_price",          precision: 8, scale: 2, default: 0.0
+    t.boolean  "active",                                    default: true
+    t.decimal  "weight",            precision: 8, scale: 3, default: 0.0
+    t.decimal  "price",             precision: 8, scale: 2, default: 0.0
+    t.decimal  "cost_price",        precision: 8, scale: 2, default: 0.0
     t.integer  "tax_rate_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "featured",                                    default: false
+    t.boolean  "featured",                                  default: false
     t.text     "in_the_box"
-    t.boolean  "stock_control",                               default: true
-    t.boolean  "default",                                     default: false
+    t.boolean  "stock_control",                             default: true
+    t.boolean  "default",                                   default: false
   end
 
   add_index "shoppe_products", ["parent_id"], name: "index_shoppe_products_on_parent_id", using: :btree
   add_index "shoppe_products", ["permalink"], name: "index_shoppe_products_on_permalink", using: :btree
-  add_index "shoppe_products", ["product_category_id"], name: "index_shoppe_products_on_product_category_id", using: :btree
   add_index "shoppe_products", ["sku"], name: "index_shoppe_products_on_sku", using: :btree
 
   create_table "shoppe_settings", force: true do |t|

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,6 +170,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: awesome_nested_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: nifty-key-value-store
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +385,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
+- README.md
 - Rakefile
 - app/assets/images/shoppe/chosen-sprite.png
 - app/assets/images/shoppe/chosen-sprite@2x.png
@@ -441,6 +456,7 @@ files:
 - app/controllers/shoppe/users_controller.rb
 - app/controllers/shoppe/variants_controller.rb
 - app/helpers/shoppe/application_helper.rb
+- app/helpers/shoppe/product_category_helper.rb
 - app/mailers/shoppe/order_mailer.rb
 - app/mailers/shoppe/user_mailer.rb
 - app/models/shoppe/country.rb
@@ -457,6 +473,7 @@ files:
 - app/models/shoppe/product/product_attributes.rb
 - app/models/shoppe/product/variants.rb
 - app/models/shoppe/product_attribute.rb
+- app/models/shoppe/product_categorization.rb
 - app/models/shoppe/product_category.rb
 - app/models/shoppe/setting.rb
 - app/models/shoppe/stock_level_adjustment.rb
@@ -520,6 +537,7 @@ files:
 - app/views/shoppe/users/new.html.haml
 - app/views/shoppe/variants/form.html.haml
 - app/views/shoppe/variants/index.html.haml
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/pl.yml
@@ -540,6 +558,8 @@ files:
 - db/migrate/20141026181354_add_indexes_to_shoppe_stock_level_adjustments.rb
 - db/migrate/20141026181559_add_indexes_to_shoppe_users.rb
 - db/migrate/20141026181716_add_indexes_to_shoppe_delivery_services.rb
+- db/migrate/20141026181717_allow_multiple_shoppe_products_per_shoppe_product_category.rb
+- db/migrate/20141026181718_add_nested_to_product_categories.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg