comable-frontend 0.7.0.beta1 → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd8d3056a1d712053111167dc1077011461824ac
-  data.tar.gz: 533909155a352a26e60ec64901310c293d8b72d3
+  metadata.gz: 870c952f33ce77fec8cdafb0871f58345024231e
+  data.tar.gz: 511e035e802ae57a27106f3d8477f4eb172723be
 SHA512:
-  metadata.gz: c866da507485e1170c6f21354a07e07bcc6f79e3c110d2da26a130814dcee10629f0f95e37c6c94c08eb266e92d6cbac7969e501ee4b3bbb50a1c634ebdb8317
-  data.tar.gz: 6def5925e8c1e1ba5a8817296f9d4061e66c1075fd9cc6792ee007d1b1ea6c95e3f984f831a505b8e00a9f707e3b57612c3cf0fa79931ca64e03e3c3573b3d9c
+  metadata.gz: 1a058efa161f9a0bedb9d9c829e95285ab6ed4931d75dff22784b1a45446bb9f59304937d66829cfb2c619d219d4cdebb5697d3de3b7011bc2dc7dc7ddeee751
+  data.tar.gz: a1175f75f112243e600e0200de8b54a1d9e49163e12fd2dfcfd0ddc243b538faa67934acb772b966af4489f46a1dc41e5e0950ecfc80a360ef5849ff37d15138

data/Rakefile

@@ -4,6 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+require 'rspec/core/rake_task'
 require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
@@ -69,9 +70,9 @@ if File.exist?('comable.gemspec')
     end
   end
 
-  task default: ['app:spec:all', 'rubocop', 'brakeman:all']
+  task default: ['app:spec:all', 'jasmine', 'rubocop', 'brakeman:all']
 else
-  task default: ['app:spec', 'rubocop', 'brakeman']
+  task default: ['app:spec', 'jasmine', 'rubocop', 'brakeman']
 end
 
 Bundler::GemHelper.install_tasks
@@ -79,6 +80,10 @@ Bundler::GemHelper.install_tasks
 # from https://github.com/rspec/rspec-rails/issues/936
 task 'test:prepare'
 
+task :jasmine do
+  sh 'bundle exec rake app:spec:javascript RAILS_ENV=test'
+end
+
 task :rubocop do
   sh 'rubocop'
 end

data/app/assets/javascripts/comable/frontend/application.coffee

@@ -2,4 +2,7 @@
 #= require jquery_ujs
 #= require jquery-ui
 #= require bootstrap-sprockets
-#= require_tree
+#= require comable/frontend/dispatcher
+#= require comable/frontend/module
+#= require_tree .
+#= require_self

data/app/assets/javascripts/comable/frontend/dispatcher.coffee

@@ -0,0 +1,19 @@
+$(->
+  new Dispatcher
+)
+
+class Dispatcher
+  constructor: ->
+    @initialize_page_scripts()
+
+  initialize_page_scripts: ->
+    page = $('body').attr('data-page')
+    return false unless page
+
+    path = page.split(':')
+    contoller_name = path[0]
+    action_name = path[1]
+
+    switch page
+      when 'products:show'
+        new VariantSelector

data/app/assets/javascripts/comable/frontend/module.coffee

@@ -0,0 +1,28 @@
+@Comable = {}
+
+# TODO: Move to comable-core
+# Based on https://arcturo.github.io/library/coffeescript/03_classes.html
+class Comable.Module
+  moduleKeywords = ['extended', 'included']
+
+  @extend: (obj) ->
+    for key, value of obj when key not in moduleKeywords
+      @[key] = value
+    obj.extended?.apply(@)
+    this
+
+  @include: (obj) ->
+    for key, value of obj when key not in moduleKeywords
+      # Assign properties to the prototype
+      @::[key] = value
+    obj.included?.apply(@)
+    this
+
+Comable.helpers =
+  numberWithDelimiter: (number, delimiter = ',') ->
+    numbers = number.toString().split('.')
+    integers = numbers[0]
+    decimals = if numbers.length > 1 then '.' + numbers[1] else ''
+    pattern = /(\d+)(\d{3})/
+    integers = integers.replace(pattern, '$1' + delimiter + '$2') while pattern.test(integers)
+    integers + decimals

data/app/assets/javascripts/comable/frontend/products.coffee

@@ -0,0 +1,90 @@
+class @VariantSelector
+  class: VariantSelector
+
+  @setProduct: (productJson) ->
+    @variants = productJson.variants
+
+  constructor: ->
+    @setSelectors()
+    @selectVariant()
+    @$optionSelector.on('change', => @selectVariant())
+
+  setSelectors: ->
+    @$optionSelector = $('[name="option_values[]"]')
+    @$variantSelector = $('[name="variant_id"]')
+
+  selectVariant: ->
+    return unless @class.variants
+    options = @getSelectedOptions()
+    variant = @getVariant(options)
+    @resetVariantSelector(variant && variant.id)
+    new ProductPage(variant)
+
+  getVariant: (optionValues) ->
+    matchedVariant = null
+    $.each(@class.variants, (_, variant) =>
+      matched = true
+      $.each(variant.options, (index, option) =>
+        return matched = false if option != optionValues[index]
+      )
+      matchedVariant = variant if matched
+      return !matched
+    )
+    matchedVariant
+
+  getSelectedOptions: ->
+    @$optionSelector.find(':selected').map( ->
+      $(this).text()
+    )
+
+  resetVariantSelector: (id = null) ->
+    @$variantSelector.find(':selected').each(
+      -> $(this).prop('selected', false)
+    )
+    @$variantSelector.find('[value="' + id + '"]').prop('selected', true) if id
+
+class @ProductPage extends Comable.Module
+  @include Comable.helpers
+
+  # TODO: Get translations from Rails
+  translations: {
+    add_to_cart: 'カートに入れる'
+    sold_out: '品切れ'
+    currency_format: '%{number}円'
+  }
+
+  constructor: (variant) ->
+    @variant = variant
+    @setSelectors()
+    @changeProductInfomations()
+
+  setSelectors: ->
+    @$productPrice = $('#comable-product .price')
+    @$cartForm = $('#comable-product form')
+    @$cartFormSubmit = @$cartForm.find('input[type="submit"]')
+
+  changeProductInfomations: ->
+    @changeProductPrice()
+    @changeCartForm()
+
+  changeProductPrice: ->
+    return unless @variant
+    currency = @numberToCurrency(@variant.price)
+    @$productPrice.text(currency)
+
+  changeCartForm: ->
+    return @disableCartFormSubmit() unless @variant
+    return @disableCartFormSubmit() if @variant.quantity <= 0
+    @enableCartFormSubmit()
+
+  enableCartFormSubmit: ->
+    @$cartFormSubmit.prop('disabled', false)
+    @$cartFormSubmit.val(@translations.add_to_cart)
+
+  disableCartFormSubmit: ->
+    @$cartFormSubmit.prop('disabled', true)
+    @$cartFormSubmit.val(@translations.sold_out)
+
+  numberToCurrency: (number) ->
+    numberLabel = @numberWithDelimiter(number)
+    @translations.currency_format.replace(/%{number}/, numberLabel)

data/app/assets/stylesheets/comable/frontend/products.scss

@@ -0,0 +1,3 @@
+.property {
+  margin-top: 10px;
+}

data/app/controllers/comable/carts_controller.rb

@@ -2,6 +2,7 @@ module Comable
   class CartsController < Comable::ApplicationController
     before_filter :set_cart_item, only: [:add, :update, :destroy]
     before_filter :ensure_found_cart_item, only: [:add, :update, :destroy]
+    after_filter :reset_shipments, only: [:add, :update, :destroy], if: -> { current_order.shipments.any? }
 
     def add
       if current_comable_user.add_cart_item(@cart_item, cart_item_options)
@@ -47,24 +48,23 @@ module Comable
     end
 
     def find_cart_item
-      cart_item = Comable::Stock.where(id: params[:stock_id]).first
-      cart_item ||= find_variant
-      cart_item ||= Comable::Product.where(id: params[:product_id]).first
+      cart_item = Comable::Stock.find_by(id: params[:stock_id])
+      cart_item ||= Comable::Variant.find_by(id: params[:variant_id])
+      cart_item ||= Comable::Product.find_by(id: params[:product_id])
       return unless cart_item
       return if cart_item.is_a?(Comable::Product) && cart_item.sku?
       cart_item
     end
 
-    def find_variant
-      Comable::Variant.joins(:option_values).where(
-        Comable::OptionValue.table_name => { id: params[:option_values] }
-      ).first
-    end
-
     def cart_item_options
       options = {}
       options.update(quantity: params[:quantity].to_i) if params[:quantity]
       options
     end
+
+    def reset_shipments
+      current_order.reset_shipments
+      current_order.update!(state: 'cart')
+    end
   end
 end

data/app/controllers/comable/orders_controller.rb

@@ -55,7 +55,7 @@ module Comable
     end
 
     def ensure_saleable_stocks
-      return if current_order.stocked_items.empty?
+      return if current_order.unstocked_items.empty?
       flash[:alert] = Comable.t('errors.messages.out_of_stocks')
       redirect_to comable.cart_path
     end

data/app/controllers/comable/products_controller.rb

@@ -7,7 +7,8 @@ module Comable
     end
 
     def show
-      @product = preview? ? Comable::Product.find(params[:id]) : Comable::Product.published.find(params[:id])
+      products = Comable::Product.includes(:variants)
+      @product = preview? ? products.find(params[:id]) : products.published.find(params[:id])
     end
 
     private

data/app/controllers/concerns/comable/shipment_action.rb

@@ -10,7 +10,7 @@ module Comable
 
     def order_params_for_shipment
       params.fetch(:order, {}).permit(
-        shipment_attributes: [:shipment_method_id]
+        shipments_attributes: [:id, :shipment_method_id]
       )
     end
   end

data/app/views/comable/orders/confirm.slim

@@ -22,12 +22,14 @@
             = @order.class.human_attribute_name(:payment_method)
           = @order.payment.name
 
-    - if @order.shipment
+    - if @order.shipments.any?
       .row
         .col-sm-12.comable-shipment
           h2
             = @order.class.human_attribute_name(:shipment_method)
-          = @order.shipment.name
+          - @order.shipments.each.with_index(1) do |shipment, index|
+            p
+              | ##{index} #{shipment.name}
 
     .row
       .col-sm-12.comable-order_items

data/app/views/comable/orders/shipment.slim

@@ -4,12 +4,35 @@
       = @order.class.human_state_name(:shipment)
 
     = form_for @order, as: :order, url: update_order_path, method: :put do |f|
-      - shipment = @order.shipment || @order.build_shipment
-      = f.fields_for :shipment, shipment do |ff|
-        ul
-          - Comable::ShipmentMethod.activated.each.with_index do |shipment_method, index|
-            li
-              - checked_flag = shipment.shipment_method ? (shipment.shipment_method == shipment_method) : index.zero?
-              = ff.radio_button :shipment_method_id, shipment_method.id, checked: checked_flag
-              = ff.label :shipment_method_id, shipment_method.name, value: shipment_method.id
+      - @order.shipments.build if @order.shipments.empty?
+      = f.fields_for :shipments, @order.shipments do |ff|
+        .panel.panel-default
+          .panel-heading
+            | 発送 ##{ff.index.next}
+          ul.list-group
+            - Comable::ShipmentMethod.activated.each.with_index do |shipment_method, index|
+              li.list-group-item
+                - checked_flag = ff.object.shipment_method ? (ff.object.shipment_method == shipment_method) : index.zero?
+                = ff.radio_button :shipment_method_id, shipment_method.id, checked: checked_flag
+                |  
+                = ff.label :shipment_method_id, shipment_method.name, value: shipment_method.id
+          table
+            thead
+              tr
+                th
+                  = Comable.t('products')
+                th
+                  = Comable.t('price')
+                th
+                  = Comable.t('quantity')
+            tbody
+              - ff.object.shipment_items.group_by(&:stock).each_pair do |stock, shipment_items|
+                tr
+                  td
+                    = stock.name
+                  td
+                    = number_to_currency stock.price
+                  td
+                    = number_with_delimiter shipment_items.size
+
       = f.submit Comable.t('next_step')

data/app/views/comable/products/show.slim

@@ -30,6 +30,13 @@
         = @product.caption
       .price
         = number_to_currency @product.price
+      - if @product.properties.any?(&:present?)
+        .property
+          table.table.table-bordered
+            - @product.properties.each do |property|
+              tr
+                td= property['property_key']
+                td= property['property_value']
 
       = form_tag comable.add_cart_path do
         - if @product.sku?
@@ -39,6 +46,11 @@
                 = option_type.name
               = select_tag "option_values[]", options_for_select(option_values.map { |o| [o.name, o.id] }), id: "option_values_#{index}"
 
+          #variant-selector.hidden
+            = select_tag 'variant_id', options_for_select(@product.variants.map { |v| [v.name, v.id] }), include_blank: true
+            javascript:
+              VariantSelector.setProduct(#{@product.to_json.html_safe});
+
         - if @product.stocked?
           .add_cart.form-inline.form-group
             = hidden_field_tag :product_id, @product.id

data/app/views/comable/users/show.slim

@@ -52,7 +52,7 @@
                         = form_tag comable.add_cart_path do
                           - if order_item.stock.stocked?
                             .add_cart.form-inline.form-group
-                              = hidden_field_tag :stock_id, order_item.stock_id
+                              = hidden_field_tag :variant_id, order_item.variant_id
                               = hidden_field_tag :quantity, order_item.quantity
                               = submit_tag Comable.t('reorder'), class: 'btn btn-default'
 

data/app/views/layouts/comable/application.slim

@@ -18,7 +18,7 @@ html
       });
 
   - mini_header_flag = controller_name == 'orders' || devise_controller?
-  body class="#{'comable-checkout-layout' if mini_header_flag}"
+  body class="#{'comable-checkout-layout' if mini_header_flag}" data-page="#{page_name}"
     = render 'comable/shared/tracker'
 
     - if mini_header_flag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable-frontend
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta1
+  version: 0.7.0.beta2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comable-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0.beta1
+        version: 0.7.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0.beta1
+        version: 0.7.0.beta2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +258,9 @@ files:
 - app/assets/images/comable/frontend/home-one.jpg
 - app/assets/images/comable/frontend/home-top.jpg
 - app/assets/javascripts/comable/frontend/application.coffee
+- app/assets/javascripts/comable/frontend/dispatcher.coffee
+- app/assets/javascripts/comable/frontend/module.coffee
+- app/assets/javascripts/comable/frontend/products.coffee
 - app/assets/stylesheets/comable/frontend/application.scss
 - app/assets/stylesheets/comable/frontend/products.scss
 - app/assets/stylesheets/comable/products.scss
@@ -324,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provide frontend functions for Comable.