kms_catalog 0.4.0 → 0.5.0

data/app/serializers/kms/product_serializer.rb

@@ -0,0 +1,12 @@
+module Kms
+  class ProductSerializer < ActiveModel::Serializer
+    attributes :id, :name, :description, :category_ids, :seo_title, :seo_keywords, :seo_description
+    has_one :master
+    has_many :variants
+
+    def category_ids
+      object.category_ids
+    end
+
+  end
+end

data/config/locales/en.yml

@@ -2,14 +2,17 @@ en:
   catalog: "Catalog"
   new_category: "New Category"
   add_category: "Add Category"
+  edit_category: "Edit Category"
   update_category: "Update Category"
   new_product: "New Product"
   add_product: "Add Product"
+  edit_product: "Edit Product"
   update_product: "Update Product"
   create_property: "Create Property"
   create_option_type: "Create Option Type"
   new_variant: "New Variant"
   add_variant: "Add Variant"
+  edit_variant: "Edit Variant"
   update_variant: "Update Variant"
   add_option_value: "Add Option Value"
   type_group_name_for_options_placeholder: "Type group/tag name for grouping option types..."
@@ -19,7 +22,7 @@ en:
   liquor_help:
     variables:
       categories:
-        main_description: '"categories" returns collection of categories created in "Categories" section: '
+        main_description: '"categories" returns collection of categories created in "Categories" section:'
         properties:
           name: 'Category name'
           permalink: 'Permalink for generating link to category page'
@@ -29,7 +32,7 @@ en:
           parent: 'Parent category'
           products: 'Products'
       products:
-        main_description: '"products" returns collection of products created in "Products" section: '
+        main_description: '"products" returns collection of products created in "Products" section:'
         properties:
           name: 'Product name'
           price: 'Price'

data/config/locales/ru.yml

@@ -2,14 +2,17 @@ ru:
   catalog: "Каталог"
   new_category: "Новая Категория"
   add_category: "Добавить категорию"
+  edit_category: "Редактирование категории"
   update_category: "Обновить категорию"
   new_product: "Новый Продукт"
   add_product: "Добавить продукт"
+  edit_product: "Редактирование продукта"
   update_product: "Обновить продукт"
   create_property: "Создать свойство"
   create_option_type: "Создать товарную опцию"
   new_variant: "Новый Вариант"
   add_variant: "Добавить вариант"
+  edit_variant: "Редактирование варианта"
   update_variant: "Обновить вариант"
   add_option_value: "Добавить значение товарное опции"
   type_group_name_for_options_placeholder: "Введите название группы для группировки товарных опций..."
@@ -19,7 +22,7 @@ ru:
   liquor_help:
     variables:
       categories:
-        main_description: '"categories" возвращает коллекцию категорий, созданных в разделе "Категории": '
+        main_description: '"categories" возвращает коллекцию категорий, созданных в разделе "Категории":'
         properties:
           name: 'Название'
           permalink: 'Ссылка'
@@ -29,7 +32,7 @@ ru:
           parent: 'Родительская категория'
           products: 'Продукты'
       products:
-        main_description: '"products" возвращает коллекцию товаров, созданных в разделе "Продукты": '
+        main_description: '"products" возвращает коллекцию товаров, созданных в разделе "Продукты":'
         properties:
           name: 'Название'
           price: 'Цена'

data/db/migrate/20170112133235_add_type_to_variants.rb

@@ -0,0 +1,5 @@
+class AddTypeToVariants < ActiveRecord::Migration[5.0]
+  def change
+    add_column :kms_variants, :type, :string, default: Kms::Variant.name
+  end
+end

data/db/migrate/20170112135659_init_master_variants.rb

@@ -0,0 +1,15 @@
+class InitMasterVariants < ActiveRecord::Migration[5.0]
+  def up
+    Kms::Product.find_each do |product|
+      unless product.master
+        product.create_master(price: product.price, name: product.name)
+      end
+    end
+  end
+
+  def down
+    Kms::Product.find_each do |product|
+      product.master&.destroy
+    end
+  end
+end

data/db/migrate/20170112140822_drop_redundant_columns_from_products.rb

@@ -0,0 +1,7 @@
+class DropRedundantColumnsFromProducts < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :kms_products, :price, :decimal, precision: 12, scale: 2
+    remove_column :kms_products, :image, :string
+    remove_column :kms_products, :preview_image, :string
+  end
+end

data/lib/drops/kms/master_variant_drop.rb

@@ -0,0 +1,14 @@
+module Kms
+  class MasterVariantDrop < VariantDrop
+    attributes :id, :name, :price
+    export :image_url
+
+    def image_url
+      source.image.url
+    end
+
+    def price
+      source.price.to_s
+    end
+  end
+end

data/lib/{kms/drops → drops/kms}/product_drop.rb

@@ -4,24 +4,20 @@ module Kms
     attributes :name, :description, :price, :permalink
     has_many :children
     has_many :categories
+    has_one :master
     has_many :variants
     # has_many :properties
 
     export :image_url
-    export :preview_image_url
     export :properties
     scopes :order
 
     def image_url
-      source.image.url
-    end
-
-    def preview_image_url
-      source.preview_image.url
+      source.master.image.url
     end
 
     def price
-      source.price.to_s
+      source.master.price.to_s
     end
 
     def properties

data/lib/{kms/drops → drops/kms}/variant_drop.rb

@@ -1,6 +1,6 @@
 module Kms
   class VariantDrop < Liquor::Drop
-    attributes :name, :price
+    attributes :id, :name, :price
     has_many :option_values
     export :image_url
 

data/lib/kms/catalog/engine.rb

@@ -10,6 +10,10 @@ module Kms
           require_dependency(c)
         end
       end
+      config.generators do |g|
+        g.test_framework :rspec, fixture: false
+        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      end
     end
   end
 end

data/lib/kms/catalog/version.rb

@@ -1,5 +1,5 @@
 module Kms
   module Catalog
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/spec/factories/variants.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :variant, class: 'Kms::Variant' do
+
+  end
+end

data/spec/internal/Rakefile

@@ -0,0 +1,2 @@
+require 'combustion'
+Combustion::Application.load_tasks

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  #
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,3 @@
+ActiveRecord::Schema.define do
+  #
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'combustion'
+
+Combustion.initialize! :all
+
+require 'rspec/rails'
+require 'factory_girl_rails'
+require 'devise'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  # config.include Devise::TestHelpers, type: :controller
+  #config.extend ControllerMacros, type: :controller
+  #config.include Requests::JsonHelpers, type: :controller
+  config.color = true
+  config.mock_with :rspec
+  config.use_transactional_fixtures = true
+  config.infer_base_class_for_anonymous_controllers = false
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Igor Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: kms
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 description: Provides catalog functionality for KMS website - Categories, Products,
   Variants
 email:
@@ -105,12 +119,12 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/assets/javascripts/kms_catalog/application.js
-- app/assets/javascripts/kms_catalog/application/controllers/categories_controller.coffee
+- app/assets/javascripts/kms_catalog/application/controllers/categories_controller.coffee.erb
 - app/assets/javascripts/kms_catalog/application/controllers/option_types_controller.coffee
 - app/assets/javascripts/kms_catalog/application/controllers/option_values_controller.coffee
-- app/assets/javascripts/kms_catalog/application/controllers/products_controller.coffee
+- app/assets/javascripts/kms_catalog/application/controllers/products_controller.coffee.erb
 - app/assets/javascripts/kms_catalog/application/controllers/properties_controller.coffee
-- app/assets/javascripts/kms_catalog/application/controllers/variants_controller.coffee
+- app/assets/javascripts/kms_catalog/application/controllers/variants_controller.coffee.erb
 - app/assets/javascripts/kms_catalog/application/routes.coffee.erb
 - app/assets/javascripts/templates/categories/edit.html.slim
 - app/assets/javascripts/templates/categories/form.html.slim
@@ -135,12 +149,14 @@ files:
 - app/controllers/kms/catalog/properties_controller.rb
 - app/controllers/kms/catalog/variants_controller.rb
 - app/models/kms/category.rb
+- app/models/kms/master_variant.rb
 - app/models/kms/option_type.rb
 - app/models/kms/option_value.rb
 - app/models/kms/product.rb
 - app/models/kms/product_option_type.rb
 - app/models/kms/property.rb
 - app/models/kms/variant.rb
+- app/serializers/kms/product_serializer.rb
 - app/uploaders/category_logo_uploader.rb
 - app/uploaders/product_image_uploader.rb
 - config/initializers/ability.rb
@@ -168,66 +184,26 @@ files:
 - db/migrate/20150818073220_add_seo_fields_to_categories.rb
 - db/migrate/20150818073725_add_seo_fields_to_products.rb
 - db/migrate/20151001065303_add_image_to_variants.rb
+- db/migrate/20170112133235_add_type_to_variants.rb
+- db/migrate/20170112135659_init_master_variants.rb
+- db/migrate/20170112140822_drop_redundant_columns_from_products.rb
+- lib/drops/kms/category_drop.rb
+- lib/drops/kms/master_variant_drop.rb
+- lib/drops/kms/product_drop.rb
+- lib/drops/kms/property_drop.rb
+- lib/drops/kms/variant_drop.rb
 - lib/generators/kms_catalog/install/install_generator.rb
 - lib/kms/catalog/engine.rb
 - lib/kms/catalog/version.rb
-- lib/kms/drops/category_drop.rb
-- lib/kms/drops/product_drop.rb
-- lib/kms/drops/property_drop.rb
-- lib/kms/drops/variant_drop.rb
 - lib/kms_catalog.rb
 - lib/tasks/kms_catalog_tasks.rake
-- test/catalog_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/fixtures/categories.yml
-- test/fixtures/option_types.yml
-- test/fixtures/option_values.yml
-- test/fixtures/product_option_types.yml
-- test/fixtures/products.yml
-- test/fixtures/properties.yml
-- test/fixtures/variants.yml
-- test/integration/navigation_test.rb
-- test/models/category_test.rb
-- test/models/option_type_test.rb
-- test/models/option_value_test.rb
-- test/models/product_option_type_test.rb
-- test/models/product_test.rb
-- test/models/property_test.rb
-- test/models/variant_test.rb
-- test/test_helper.rb
+- spec/factories/variants.rb
+- spec/internal/Rakefile
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
+- spec/spec_helper.rb
 homepage: http://webgradus.ru
 licenses:
 - MIT
@@ -253,54 +229,10 @@ signing_key:
 specification_version: 4
 summary: Provides catalog functionality for KMS website - Categories, Products, Variants
 test_files:
-- test/catalog_test.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/fixtures/categories.yml
-- test/fixtures/option_types.yml
-- test/fixtures/option_values.yml
-- test/fixtures/product_option_types.yml
-- test/fixtures/products.yml
-- test/fixtures/properties.yml
-- test/fixtures/variants.yml
-- test/integration/navigation_test.rb
-- test/models/category_test.rb
-- test/models/option_type_test.rb
-- test/models/option_value_test.rb
-- test/models/product_option_type_test.rb
-- test/models/product_test.rb
-- test/models/property_test.rb
-- test/models/variant_test.rb
-- test/test_helper.rb
+- spec/spec_helper.rb
+- spec/factories/variants.rb
+- spec/internal/public/favicon.ico
+- spec/internal/Rakefile
+- spec/internal/config/routes.rb
+- spec/internal/config/database.yml
+- spec/internal/db/schema.rb