beecart 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a7ab469f00ea88d93def182ca1c0cc046d895c
-  data.tar.gz: 57186de3b6f3d60636efa58589dea92eef260d8a
+  metadata.gz: 4aaaa29438efe2a1fcae03c72606a9e7f7a3f40e
+  data.tar.gz: 74a8a30d656ea09eb4ae394c4c3b4cc7ee11f118
 SHA512:
-  metadata.gz: b2640d1b3ed73fbbca91a6421c75dc6f0dd65d5a3c6d6ac7b7d158c41c51ef79f969aaa9543f589720639749d55c494eee6bb7326df15bc2eb4f5480aae7d3eb
-  data.tar.gz: ad3ca5bcc6dc44b7b33b0f6b70aba728ca40bd5d8c7d824be1d3b2fbcaad76a88ce10a854a0356f24b65353717a18ace7acf26151ebf95b151dc296bcf9915bc
+  metadata.gz: fa8c26d334afae68fe475bdc584bec445231d4c31317d75a903d6c2777b9a6720fdbe2d4f8ea19800a7f2928239ea0a6b7ed0923cfa2196be88ed892c91c1bee
+  data.tar.gz: 88540c4713089d73156a93f56b2b5fc9d5febacc6a2de4d3e81d3356fe12fdeff481de01aeac67bd30ab4e5e614ee4dac53ced58b02f5f52c66768dab6977a93

data/lib/beecart/cart.rb

@@ -79,11 +79,17 @@ module Beecart
     def total_price(with_tax=false)
       price = data[:items].inject(0) do |res, (key, item)|
         res += item[:price].to_i * item[:quantity].to_i
-
         res.to_i
       end
 
-      return with_tax ?  price + ( price * Beecart.config.tax_rate ) : price
+      return with_tax ? price + ( price * Beecart.config.tax_rate ).to_i : price
+    end
+
+    # カート内の商品の合計金額にかかる消費税を計算
+    #
+    # @return [Integer] 合計金額にかかる消費税
+    def tax
+      return ( total_price * Beecart.config.tax_rate ).to_i
     end
 
     # カート内の商品の税込み合計金額を計算する
@@ -121,20 +127,21 @@ module Beecart
 
     # 購入データを追加する
     #
-    # @param [Symbol] key 追加するデータの識別子
-    # @param [Symbol] validator_name Validator名
-    # @param [Hash] data 追加するデータ
-    # @return [Boolean]
+    # @param  [Symbol] key 追加するデータの識別子
+    # @param  [Symbol] validator_name Validator名
+    # @param  [Hash] data 追加するデータ
+    # @return [Data] 追加されたデータ
     def append_info(key, validator_name=false, data)
 
       validator = get_validator(validator_name)
+      validator.run(data)
 
-      if validator.run(data)
+      unless validator.error
         @data[key.to_sym] = data
         dump_data
-      else
-        false
       end
+
+      validator
     end
 
     # 入っている商品に変更を加える
@@ -180,41 +187,22 @@ module Beecart
       @redis.del(@key)
     end
 
-    # 仮計上(与信)をとる
-    #
-    # @param  [Hash] payment_info 支払情報
-    # @return [WebPay::Charge]
-    def authorize payment_info={}
-      gateway.authorize total_price_with_tax, payment_info
-    end
-
-    # 本計上を取る
-    #
-    # @param  [Hash] payment_info 支払情報
-    # @return [WebPay::Charge]
-    def charge payment_info={}
-      gateway.charge total_price_with_tax, payment_info
-    end
-
     private
 
-    def gateway name=nil
-      klass = name.nil? ?
-        gateway_class_name(Beecart.config.default_gateway).constantize :
-        gateway_class_name(name).constantize
-
-      klass.new
-    end
-
-    def gateway_class_name name
-      ["Beecart::Gateway::",name.to_s.camelize,"Gateway"].join('')
-    end
-
     def get_validator validator_name
       begin
         validator = ["Beecart", "Validators", "#{ validator_name.to_s }_validator".camelize].join('::').constantize.new
+
+        p "--------------------------------------------------"
+        p "Get Validator"
+        p "Validator => #{ validator }"
+        p "Validator => #{ validator }"
+        p "--------------------------------------------------"
       rescue NameError
-        validator = Beecart::Validators::DefaultValidator.new
+        p "--------------------------------------------------"
+        p "Get Validator: Failed"
+        p "--------------------------------------------------"
+        validator = Beecart::Validators::BaseValidator.new
       end
 
       validator
@@ -229,13 +217,9 @@ module Beecart
         {
           items: {},
           user_id: nil,
-          shipping_address: {},
-          billing_address: {},
-          credit_card: {},
-          shipping_instruction: {},
           created_at: Time.now.to_s,
           updated_at: Time.now.to_s
-        }
+        }.merge(Beecart.config.default_cart_info)
       else
         symbolize(MessagePack.unpack(data))
       end

data/lib/beecart/configuration.rb

@@ -20,8 +20,15 @@ module Beecart
         host: 'localhost',
         port: 5555
       },
+
       tax_rate: 0.05,
-      default_gateway: :webpay
+
+      default_cart_info: {
+        shipping_address: {},
+        billing_address: {},
+        credit_card: {},
+        shipping_instruction: {},
+      }
     }
 
     def self.defaults
@@ -41,7 +48,7 @@ module Beecart
     end
 
     attr_reader   :redis
-    attr_accessor :logger, :expire_time, :tax_rate, :default_gateway
+    attr_accessor :logger, :expire_time, :tax_rate, :default_cart_info
   end
 
   def self.config

data/lib/beecart/validator.rb

@@ -6,6 +6,7 @@ module Beecart
     @varidators ||= []
   end
 
+  # Beecartの@validatorsに自身をPushする
   module Validator
     def self.included(base)
       Beecart.validators << base

data/lib/beecart/validators/base_validator.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+module Beecart
+  module Validators
+    class BaseValidator
+
+      include Beecart::Validator
+
+      attr_reader :error, :messages
+
+      def initialize
+        @valid       = true
+        @target_data = nil
+        @errors      = {}
+      end
+
+      # Run the validation for given data
+      #
+      # @param [Hash] data Data that should be validated
+      # @return [Boolean] Result of Validation[:w
+      def run args
+        @target_data = args
+        @valid
+      end
+
+      protected
+
+      def record_error error_message, keys=nil
+        @errors[:messages] << error_message
+        @errors[:keys]     << key
+        @valid = false
+      end
+    end
+  end
+end

data/lib/beecart/version.rb

@@ -1,3 +1,3 @@
 module Beecart
-  VERSION = "0.1.2"
+  VERSION = "0.2.2"
 end

data/lib/beecart.rb

@@ -7,7 +7,7 @@ require "beecart/cart"
 require "beecart/error"
 
 require "beecart/validator"
-require "beecart/validators/default_validator"
+require "beecart/validators/base_validator"
 
 require "beecart/gateway/base_gateway"
 require "beecart/gateway/webpay_gateway"

data/test/dummy/app/controllers/carts_controller.rb

@@ -58,7 +58,8 @@ class CartsController < ApplicationController
       }
     })
 
-    render :text => 'OK'
+    # render :text => 'OK'
+    redirect_to :index
   end
 
   def edit_item
@@ -66,7 +67,17 @@ class CartsController < ApplicationController
       quantity: params[:quantity]
     })
 
-    render :text => 'OK'
+    redirect_to :index
+  end
+
+  def append_info
+    result = current_cart.append_info(params[:key], params[:key], params[:append_data])
+
+    unless result.error
+      redirect_to root_path
+    else
+      render text: result.messages.join("<br />")
+    end
   end
 
   private

data/test/dummy/app/views/carts/index.html.erb

@@ -17,48 +17,63 @@
 <h2>Your Current Cart Status</h2>
 
 <%# <%= @current_cart %>
-
-<dt>Cart Key:</dt>
-<dd><%= @current_cart.key %></dd>
-
-<dt>Total Price:</dt>
-<dd><%= @current_cart.total_price %></dd>
-
-<dt>Items:</dt>
-<dd class="item_list">
-  <%= @current_cart.items.each do |item| %>
-    <dt class="item">Price</dt>
-    <dd class="item"><%= item.price %></dd>
-    <br />
-    <dt class="item">Quantity</dt>
-    <dd class="item"><%= item.quantity %></dd>
-
-    <%= form_tag remove_item_path, method: 'delete' do %>
-      <%= hidden_field_tag 'items[key]', item.item_key %>
-      <%= button_tag "Remove This Item", class: "button" %>
+<dl>
+  <dt>Cart Key:</dt>
+  <dd><%= @current_cart.key %></dd>
+
+  <dt>Total Price with TAX:</dt>
+  <dd><%= @current_cart.total_price(true) %></dd>
+
+  <dt>Total Price:</dt>
+  <dd><%= @current_cart.total_price %></dd>
+
+  <dt>Tax:</dt>
+  <dd><%= @current_cart.tax %></dd>
+
+  <dt>Items:</dt>
+  <dd class="item_list">
+    <% @current_cart.items.each do |item| %>
+      <dt class="item">Key</dt>
+      <dd class="item"><%= item.item_key%></dd>
+      <br />
+      <dt class="item">Price</dt>
+      <dd class="item"><%= item.price %></dd>
+      <br />
+      <dt class="item">Quantity</dt>
+      <dd class="item"><%= item.quantity %></dd>
+
+      <%= form_tag remove_item_path, method: 'delete' do %>
+        <%= hidden_field_tag 'items[key]', item.item_key %>
+        <%= button_tag "Remove This Item", class: "button" %>
+      <% end %>
+      <hr />
     <% end %>
-    <hr />
-  <% end %>
-</dd>
+  </dd>
 
-<dt>Created at:</dt>
-<dd><%= @current_cart.data[:created_at] %></dd>
+  <dt>Created at:</dt>
+  <dd><%= @current_cart.data[:created_at] %></dd>
 
-<dt>Updated at:</dt>
-<dd><%= @current_cart.data[:updated_at] %></dd>
+  <dt>Updated at:</dt>
+  <dd><%= @current_cart.data[:updated_at] %></dd>
+</dl>
 
 <hr />
 
-<h2>Buy Cart</h2>
-
-<%= form_tag checkout_cart_path, method: 'post' do %>
-  <%= button_tag "Checkout Cart", class: "button" %>
+<h2>Appended Data</h2>
+<% @current_cart.data.each do |key, value| %>
+  <% unless [ :user_id, :credit_card, :created_at, :updated_at, :items, :shipping_address, :billing_address, :shipping_instruction ].include? key.to_sym %>
+    <dt><%= key %></dt>
+    <dd><%= value %></dd>
+  <% end %>
 <% end %>
 
+<hr />
+
 <h2>Edit Cart</h2>
 
 <% @current_cart.items.each do |item| %>
   <%= form_tag edit_item_path(item_key: item.item_key), method: 'put' do %>
+    <%= item.item_key %>
     <%= text_field_tag :quantity, item.quantity %>
     <%= button_tag "Edit Cart", class: "button" %>
   <% end %>
@@ -69,3 +84,11 @@
 <%= form_tag destroy_cart_path, method: 'delete' do %>
   <%= button_tag "Destroy Cart", class: "button" %>
 <% end %>
+
+<h2>Append data to your cart</h2>
+<%= form_tag append_info_cart_path, method: 'post' do %>
+  <%= text_field_tag 'key', nil, placeholder: "KEY" %>
+  <%= text_field_tag 'append_data[value_1]', nil, placeholder: "Value 1" %>
+  <%= text_field_tag 'append_data[value_2]', nil, placeholder: "Value 2" %>
+  <%= button_tag "Append Data", class: "button" %>
+<% end %>

data/test/dummy/config/initializers/beecart.rb

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 
 Beecart.configure do |config|
-  config.expire_time = 30
+  config.expire_time = 3000
   config.redis = {
     host: 'localhost',
     port: 5555
   }
 
   config.tax_rate = 0.05
-
-  config.default_gateway = :webpay
 end
 
 module Beecart

data/test/dummy/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
   post    '/cart/checkout',    as: 'checkout_cart',    to: 'carts#charge'
   post    '/cart/examine',     as: 'examine_cart',     to: 'carts#charge'
   post    '/cart/add_item',    as: 'add_item',    to: 'carts#add_item'
+  post    '/cart/append_data', as: 'append_info_cart', to: 'carts#append_info'
   delete  '/cart',             as: 'destroy_cart', to: 'carts#destroy'
   delete  '/cart/remove_item', as: 'remove_item', to: 'carts#remove_item'
   put     '/cart/:item_key/edit', as: 'edit_item', to: 'carts#edit_item'

data/test/dummy/lib/beecart/validators/hoge_validator.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+module Beecart
+  module Validators
+    class HogeValidator < Beecart::Validators::BaseValidator
+      def run args
+        puts '---------- hoge_validator start ----------'
+
+        puts args
+
+        args.each do |k, v|
+          puts "k => #{ k }"
+          puts "v => #{ v }"
+        end
+
+        if args["value_1"] != "hoge"
+          record_error "#{ args["value_1"] } is not suitable for value_1"
+        end
+
+        if args["value_2"] == "hoge"
+          record_error "#{ args["value_2"] } is not suitable for value_2"
+        end
+
+        puts '---------- hoge_validator  end  ----------'
+
+        super
+      end
+    end
+  end
+end