unidom-article_number 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a1f4df40f7546982076b4da6bfbd563802a8cb
-  data.tar.gz: d7948dd68b302b05a260468f6abf7516caf1aafa
+  metadata.gz: e103c694c4ed80ec65b731cda49a3e0783e0b437
+  data.tar.gz: 6fc564bfd5fdaeef8c35500e6304c5ec989a7f48
 SHA512:
-  metadata.gz: 0c6a7c3640053d6b0305f0b6b72d75bcd76939e3992b7486a91ad422ef19c69dd94f6e92c3311733251b1498804f5546e097f3a0182ce28009886e55456b9f7a
-  data.tar.gz: ce3c56cdac51936f84e87186ba54c010c67320cd8d4d3bc77cc18c229bed05d4719f47dfbb4a17f57e55670d26b30035106c4df75c795cdbec7ad8f2ca892044
+  metadata.gz: 72a46da309964735cbd859632f7fbef9cbc52ae82130e7737ae3c676513bd697f328e9b065116514e8cfa685b65ac89e8126f3e77187003142e3f526afe468d5
+  data.tar.gz: 0c183c6d24e22f7cf1217dbe5c30f28a404078ef37ddf71c76f37e613a7088c6a27c6fc3c8f826d32418cf180d299c77a48fbd621bfa0893412981176f1c330c

data/README.md

@@ -32,3 +32,17 @@ marker  = Person.create  name: 'John'
 ean_13_marking = Unidom::ArticleNumber::Marking.barcode_is(ean_13_barcode).marked_is(marked).first_or_create marker: marker, opened_at: Time.now
 ean_8_marking = Unidom::ArticleNumber::Marking.barcode_is(ean_8_barcode).marked_is(marked).first_or_create marker: marker, opened_at: Time.now
 ```
+
+## Include the Concern
+```ruby
+include Unidom::ArticleNumber::Concerns::AsBarcode
+include Unidom::ArticleNumber::Concerns::AsMarked
+```
+
+### As Barcode concern
+The As Barcode concern do the following tasks for the includer automatically:
+1. Define the Has Many macro as: ``has_many :markings, class_name: 'Unidom::ArticleNumber::Marking', as: :barcode``
+
+### As Marked concern
+The As Marked concern do the following tasks for the includer automatically:
+1. Define the Has Many macro as: ``has_many :markings, class_name: 'Unidom::ArticleNumber::Marking', as: :marked``

data/app/models/unidom/article_number/concerns/as_barcode.rb

@@ -0,0 +1,12 @@
+module Unidom::ArticleNumber::Concerns::AsBarcode
+
+  extend ActiveSupport::Concern
+
+  self.included do |includer|
+
+    has_many :markings,        class_name: 'Unidom::ArticleNumber::Marking', as:     :barcode
+    has_many :marked_products, through:    :markings,                        source: :marked, source_type: 'Unidom::Product::Product'
+
+  end
+
+end

data/app/models/unidom/article_number/concerns/as_marked.rb

@@ -0,0 +1,11 @@
+module Unidom::ArticleNumber::Concerns::AsMarked
+
+  extend ActiveSupport::Concern
+
+  self.included do |includer|
+
+    has_many :markings, class_name: 'Unidom::ArticleNumber::Marking', as: :marked
+
+  end
+
+end

data/app/models/unidom/article_number/ean13_barcode.rb

@@ -8,16 +8,15 @@ class Unidom::ArticleNumber::Ean13Barcode < ActiveRecord::Base
 
   self.table_name = 'unidom_ean_13_barcodes'
 
+  include Unidom::Common::Concerns::ModelExtension
+  include Unidom::ArticleNumber::Concerns::AsBarcode
+
   validates :code,           uniqueness: true,                  numericality: { only_integer: true }
   validates :gs1_prefix,     presence: true, length: { is: 3 }, numericality: { only_integer: true }
   validates :company_number, presence: true, length: { is: 4 }, numericality: { only_integer: true }
   validates :item_reference, presence: true, length: { is: 5 }, numericality: { only_integer: true }
   validates :check_digit,    presence: true, length: { is: 1 }, numericality: { only_integer: true }
 
-  has_many :markings, class_name: 'Unidom::ArticleNumber::Marking'
-
-  include Unidom::Common::Concerns::ModelExtension
-
   def code=(code)
     code = code.to_s
     write_attribute :code, code

data/app/models/unidom/article_number/ean8_barcode.rb

@@ -1,20 +1,20 @@
 # EAN-8 Barcode 是8位条形码。
 # https://en.wikipedia.org/wiki/EAN-8
+
 class Unidom::ArticleNumber::Ean8Barcode < ActiveRecord::Base
 
   RESTRICTED_DISTRIBUTION_GS1_PREFIXES = (('020'..'029').to_a + ('040'..'049').to_a + ('200'..'299').to_a).freeze
 
   self.table_name = 'unidom_ean_8_barcodes'
 
+  include Unidom::Common::Concerns::ModelExtension
+  include Unidom::ArticleNumber::Concerns::AsBarcode
+
   validates :code,           uniqueness: true,                  numericality: { only_integer: true }
   validates :gs1_prefix,     presence: true, length: { is: 3 }, numericality: { only_integer: true }
   validates :item_reference, presence: true, length: { is: 4 }, numericality: { only_integer: true }
   validates :check_digit,    presence: true, length: { is: 1 }, numericality: { only_integer: true }
 
-  has_many :markings, class_name: 'Unidom::ArticleNumber::Marking'
-
-  include Unidom::Common::Concerns::ModelExtension
-
   def code=(code)
     code = code.to_s
     write_attribute :code, code

data/app/models/unidom/article_number/marking.rb

@@ -15,9 +15,14 @@ class Unidom::ArticleNumber::Marking < ActiveRecord::Base
   scope :marked_is,  ->(marked)  { where marked:  marked  }
 
   def self.mark(barcode: nil, marked: nil, marker: nil, opened_at: Time.now)
+    self.mark! barcode: barcode, marked: marked, marker: marker, opened_at: opened_at
+  end
+
+  def self.mark!(barcode: nil, marked: nil, marker: nil, opened_at: Time.now)
 
-    raise ArgumentError.new('Barcode is required.') if barcode.blank?
-    raise ArgumentError.new('Marked is required.' ) if marked.blank?
+    raise ArgumentError.new('The barcode argument is required.'  ) if barcode.blank?
+    raise ArgumentError.new('The marked argument is required.'   ) if marked.blank?
+    raise ArgumentError.new('The opened_at argument is required.') if opened_at.blank?
 
     query    = barcode_is(barcode).marked_is(marked).valid_at.alive
     creation = { opened_at: opened_at }
@@ -31,4 +36,8 @@ class Unidom::ArticleNumber::Marking < ActiveRecord::Base
 
   end
 
+  class << self
+    deprecate mark: :mark!, deprecator: ActiveSupport::Deprecation.new('2.0', 'unidom-article_number')
+  end
+
 end

data/lib/unidom/article_number/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module ArticleNumber
-    VERSION = '1.0'.freeze
+    VERSION = '1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-article_number
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -40,6 +40,8 @@ files:
 - app/assets/stylesheets/unidom/article_number/application.css
 - app/controllers/unidom/article_number/application_controller.rb
 - app/helpers/unidom/article_number/application_helper.rb
+- app/models/unidom/article_number/concerns/as_barcode.rb
+- app/models/unidom/article_number/concerns/as_marked.rb
 - app/models/unidom/article_number/concerns/code128_barcode.rb
 - app/models/unidom/article_number/ean13_barcode.rb
 - app/models/unidom/article_number/ean8_barcode.rb