comable_core 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c536b5876786ca72543cabf34fcd2455208b3dc0
-  data.tar.gz: dcf567d97ec1f5cc7e807948f627ada05e868c2f
+  metadata.gz: ea4dbaa8dfc838607fcec82a1fc77d7c36854669
+  data.tar.gz: cabc6a6dab76d530e84c2e569aa26a6888a27aff
 SHA512:
-  metadata.gz: 08428ce798a52b7b0522785e8ee40cc4861091a411e6317df3fdddae229035b223c92482611f87b552c56767d6565937243ba86b040408ac22ad2fba136efaae
-  data.tar.gz: 3fa0d8c4e117046da6f0a0422bb7be3ece5e25559dcb1918c5c28d84d4902bde2b682ecde5183181f5059dcabd9e2c356e6c66cfd2927381fa28edfb1fa6f25d
+  metadata.gz: c1a205986c287b466329fad23c3bf44a1fe6379eff5ee6a4720208ff41212a3ad96b205a0e0fa7bcd6aada1871cbccf575cb076e50df795e296fc5e85e98c39a
+  data.tar.gz: a7cff0da79f6f1070520c26c61822cf4a67b7e7b373e8e5b17ede7d34d29b2cf8f2e3e7a446787c6edb3578a164e4ef9e97c4c33529ba9691accef16fd3db466

data/app/models/comable/address.rb

@@ -12,7 +12,7 @@ module Comable
 
     class << self
       def find_or_clone(address)
-        find { |obj| obj.same_as? address } || address.clone
+        all.to_a.find { |obj| obj.same_as? address } || address.clone
       end
     end
 
@@ -31,5 +31,9 @@ module Comable
     def full_name
       "#{family_name} #{first_name}"
     end
+
+    def full_address
+      "#{state_name} #{city} #{detail}"
+    end
   end
 end

data/app/models/comable/stock.rb

@@ -4,6 +4,7 @@ module Comable
   # 商品に複数紐付き、品数やSKU(Stock Keeping Unit)情報を保持する。
   #
   class Stock < ActiveRecord::Base
+    include Comable::SkuItem
     include Comable::SkuChoice
 
     belongs_to :product, class_name: Comable::Product.name
@@ -33,7 +34,8 @@ module Comable
 
     delegate :name, to: :product
     delegate :price, to: :product
-    delegate :sku?, to: :product
+    delegate :sku_h_item_name, to: :product
+    delegate :sku_v_item_name, to: :product
 
     # 在庫の有無を取得する
     #

data/config/locales/ja.yml

@@ -105,6 +105,7 @@ ja:
       you_can_drag_and_drop: ドラッグ＆ドロップの操作でツリーを編集できます。
       you_can_right_click: 右クリックでメニューを表示できます。
       link_to_add_new_node: '次のリンクから新しいカテゴリを追加できます: '
+      link_to_add_new_stock: '次のリンクから新しい在庫を追加できます: '
       check_this_product_in_frontend: 'この商品をフロントで確認する'
       note: 'NOTE:'
       results: 件
@@ -118,10 +119,19 @@ ja:
       better_than_last_week: '先週との比較 (%{percentage}%)'
       edit_profile: プロフィールを編集
       please_fill_when_using_sku: SKUを利用する場合はこの項目を記入してください。
+      operation: 操作
+      stocks: 在庫
+      clear_search_conditions: 検索条件をクリア
+      bill: 請求先
+      ship: 配送先
+      add_sub_image: サブ画像を追加
+      sign_in: ログイン
+      sign_out: ログアウト
       nav:
         dashboard: ダッシュボード
         order: 注文管理
         product: 商品管理
+        stock: 在庫管理
         category: カテゴリ
         customer: ユーザー
         general_settings: 一般設定
@@ -130,7 +140,6 @@ ja:
         payment_method: 決済管理
         products:
           detail: 商品詳細
-          stock: 在庫管理
         orders:
           detail: 注文明細
           cart: カート情報
@@ -153,6 +162,7 @@ ja:
         edit: 編集する
         update: 変更する
         destroy: 削除する
+        save: 保存する
         cancel: キャンセル
       categories:
         new_node: 新しいカテゴリ

data/lib/comable/state_machine_patch.rb

@@ -9,8 +9,24 @@ if StateMachine::VERSION != '1.2.0'
   Rails.logger.warn 'Please remove me, StateMachine version has changed'
 end
 
-if Rails.version =~ /^4.1./
+if Rails.version =~ /^4./
   module StateMachine::Integrations::ActiveModel
     public :around_validation
   end
 end
+
+if Rails.version =~ /^4.2./
+  # Hacks around https://github.com/pluginaweek/state_machine/issues/334
+  module StateMachine::Integrations::ActiveRecord
+    def define_state_initializer
+      define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
+        def initialize(*)
+          super do |*args|
+            self.class.state_machines.initialize_states self
+            yield(*args) if block_given?
+          end
+        end
+      end_eval
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -48,72 +48,72 @@ dependencies:
   name: enumerize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,8 @@ files:
 - lib/comable_core.rb
 - lib/tasks/comable_tasks.rake
 homepage: https://github.com/hyoshida/comable#comable
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="