Allow the spec of product to be nil

lib/shotengai/series.rb

@@ -23,13 +23,15 @@ module Shotengai
   
   class Series < Shotengai::Model
     self.table_name = 'shotengai_series'
-    validates_presence_of :spec
+    validates_presence_of :spec, unless: :product_spec_empty?
     validates_presence_of :price
     
-    validate :check_spec_value
-    validate :check_remark
+    validate :check_spec_value, unless: :product_spec_empty?
     # Using validates_uniqueness_of do not work if the order of Hash is diff
-    validate :uniq_spec
+    validate :uniq_spec, unless: :product_spec_empty?
+    validate :only_one_series, if: :product_spec_empty?
+
+    validate :check_remark
 
     custom_hash_columns :spec, :remark, :info
 
@@ -102,6 +104,10 @@ module Shotengai
     
     private 
       # spec 字段
+      def product_spec_empty?
+        product.spec.empty?
+      end
+      
       def check_spec_value
         errors.add(:spec, 'spec 必须是个 Hash') unless spec.is_a?(Hash) 
         errors.add(:spec, '非法的关键字，或关键字缺失') unless (product.spec.keys - spec.keys).empty?
@@ -110,17 +116,21 @@ module Shotengai
         errors.add(:spec, "非法的值，#{illegal_values}") unless illegal_values.empty?
       end
 
+      def uniq_spec
+        if self.class.query_spec_with_product(self.spec, self.product).alive.where.not(id: self.id).any?
+          errors.add(:spec, 'Non uniq spec for the product.') 
+        end
+      end
+
+      def only_one_series
+        errors.add(:spec, "无规格系列仅允许存在一项") unless product.series.empty?
+      end
+
       def check_remark
         errors.add(:remark, 'remark 必须是个 Hash') unless remark.is_a?(Hash) 
         # product.remark.keys 包含 remark.keys
         illegal_key = (remark.keys - product.remark.keys)
         errors.add(:remark, "非法的关键字, #{illegal_key}") unless illegal_key.empty?        
       end
-
-      def uniq_spec
-        if self.class.query_spec_with_product(self.spec, self.product).alive.where.not(id: self.id).any?
-          errors.add(:spec, 'Non uniq spec for the product.') 
-        end
-      end
   end
 end

lib/shotengai/snapshot.rb

@@ -32,7 +32,7 @@ module Shotengai
 
   class Snapshot < Shotengai::Model
     self.table_name = 'shotengai_snapshots'
-    validate :check_spec
+    validate :check_spec, unless: :product_spec_empty?
     validate :check_remark
     validates :count, numericality: { only_integer: true, greater_than: 0 }
         
@@ -166,6 +166,10 @@ module Shotengai
 
     private 
       # spec 字段
+      def product_spec_empty?
+        product.spec.empty?
+      end
+
       def check_spec
         errors.add(:spec, 'spec 必须是个 Hash') unless spec.is_a?(Hash) 
         errors.add(:spec, '非法的关键字，或关键字缺失') unless (series.product.spec.keys - spec.keys).empty?