warehouse_items 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98e337833a9d62456fe917317e31ba5b7920a8d8
-  data.tar.gz: fd67a7f10709c72beb1b0724dc8da69333044504
+  metadata.gz: f7ae3eb84eaf2129459844170902c41896f8bd6e
+  data.tar.gz: b83f135e3ef919864e78b30b99c1e326a396e396
 SHA512:
-  metadata.gz: 2df7dbdf07b08217e35ed6db18bdee06fba51111777a371234592ff7246e5ffdaee5bd81dfcaf2ff004eb7dd2806cdf640cbe40aa1fa37e39129fb93840ea56e
-  data.tar.gz: 8f8954b931cd2003ba30837e81a3dc04fb74f1cceab52d663d0d9ed4fb8e15d281c4cea311511d174d93ac37d721e90bac83e2f41bb6ece13ea27abcdc3bbbd1
+  metadata.gz: bf6e08cce5ba858901229893f7b6e091bfbf1af37b289367bc6e25c6262dfe55af9bfcc6ffeef6d2ad1d9cc33e08f16d1ab66d2ca70dfdc25b54e6a9d6ade52a
+  data.tar.gz: 8cf0a6c1296f0d4a34982842dcf445ae5560b645407eeecaf3cd42568393b0bafbaa673f2f2a69b4de9d17e30501ddf8307dc2d5add040ef1094ec50ceec9604

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    warehouse_items (0.1.0)
+    warehouse_items (0.2.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.3)
-    i18n (1.1.1)
+    concurrent-ruby (1.1.5)
+    i18n (1.5.1)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)

data/README.md

@@ -1,39 +1,36 @@
-# WarehouseItems
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/warehouse_items`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
+# Warehouse::Item
 
 ```ruby
-gem 'warehouse_items'
+@item1 = Warehouse::Item.new('迷黑', '迷黑', 3, 250)
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install warehouse_items
+# Warehouse::Random
 
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
+```ruby
+@item1 = Warehouse::Item.new('迷黑', '迷黑', nil, 250)
+@item2 = Warehouse::Item.new('迷黃', '迷黃', nil, 250)
+@item3 = Warehouse::Item.new('迷綠', '迷綠', nil, 250)
+@random_item = Warehouse::Random.new([@item1, @item2, @item3], 4)
+@list = @random_item.fetch! # (Warehouse::List)
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+# Warehouse::List
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+@item1 = Warehouse::Item.new('迷黑', '迷黑', 1, 250)
+@item2 = Warehouse::Item.new('迷黃', '迷黃', 1, 250)
+@item3 = Warehouse::Item.new('迷綠', '迷綠', 1, 250)
+@list = Warehouse::List.new([@item1, @item2, @item3])
 
-## Contributing
+# 所有數量變兩倍 (會解壓縮 RandomItem)
+@list *= 2
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/warehouse_items.
+# 迷黑數量 + 1
+@list += @item1
 
-## License
+# 解壓 random item (回傳都是已經隨機好的品項)
+@list = @random_item.items!
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# 回傳 item
+@list.find('迷黑') 
+```

data/lib/warehouse/item/barcode.rb

@@ -0,0 +1,26 @@
+module Warehouse
+  module Item
+    class Barcode < Base
+      def initialize(*)
+        super
+        self.code_type = :barcode
+      end
+
+      def barcode
+        code_or_barcode
+      end
+
+      def code
+        raise NoMethodError, "use #barcode instead."
+      end
+
+      def to_h
+        {
+          'barcode' => code_or_barcode,
+          'title' => title,
+          'qty' => qty
+        }
+      end
+    end
+  end
+end

data/lib/warehouse/item/base.rb

@@ -0,0 +1,36 @@
+module Warehouse
+  module Item
+    Base = Struct.new(:code_or_barcode, :title, :qty, :price) do
+      attr_accessor :code_type
+      attr_accessor :items
+
+      def barcode?
+        code_type == :barcode
+      end
+
+      def code?
+        code_type == :code
+      end
+
+      def type
+        'single'
+      end
+
+      def random?
+        false
+      end
+
+      def single?
+        true
+      end
+
+      def deep_dup
+        self.class.new(code_or_barcode, title, qty, price)
+      end
+
+      # 給 form 用的
+      def persisted?; false end
+      def product; end
+    end
+  end
+end

data/lib/warehouse/item/code.rb

@@ -0,0 +1,22 @@
+module Warehouse
+  module Item
+    class Code < Base
+      def initialize(*)
+        super
+        self.code_type = :code
+      end
+
+      def code
+        code_or_barcode
+      end
+
+      def to_h
+        {
+          'code' => code_or_barcode,
+          'title' => title,
+          'qty' => qty
+        }
+      end
+    end
+  end
+end

data/lib/warehouse/item/random.rb

@@ -0,0 +1,39 @@
+module Warehouse
+  module Item
+    Random = Struct.new(:items, :qty) do
+      attr_accessor :code, :title, :price
+
+      def type
+        'random'
+      end
+
+      def random?
+        true
+      end
+
+      def single?
+        false
+      end
+
+      def fetch
+        @fetch ||= fetch!
+      end
+
+      def fetch!
+        random_items = {}
+        (1..qty).each do
+          item = items.sample
+          random_items[item.code] ||= Warehouse::Item::Code.new(item.code, item.title, 0, item.price)
+          random_items[item.code].qty += 1
+        end
+        Warehouse::List.new(random_items.values)
+      end
+
+      def persisted?; end
+
+      def deep_dup
+        Warehouse::Item::Random.new(items.map { |item| item.deep_dup }, qty)
+      end
+    end
+  end
+end

data/lib/warehouse/list.rb

@@ -4,32 +4,43 @@ class Warehouse::List
   delegate :empty?, to: :items
   delegate :length, to: :items
   delegate :present?, to: :items
+  delegate :any?, to: :items
+  delegate :all?, to: :items
   delegate :each, to: :items
   delegate :each_with_index, to: :items
   delegate :map, to: :items
   delegate :[], to: :items
   delegate :to_json, to: :items
 
-  def initialize(items=nil)
-    self.items = (items || [])
-  end
-
   class << self
     def none
       new
     end
   end
 
+  def initialize(items=nil)
+    self.items = (items || [])
+  end
+
   # 找到此清單底下料號 (同樣 object_id)
-  def find(code)
-    items.detect { |item| item.code == code }
+  def find(code, type: nil)
+    case type
+    when :code
+      items.detect { |item| item.code? && item.code == code }
+    when :barcode
+      items.detect { |item| item.barcode? && item.barcode == code }
+    else
+      items.detect do |item|
+        (item.code? && item.code == code) || (item.barcode? && item.barcode == code)
+      end
+    end
   end
 
   # 解開隨機料號 (New List)
   def items!
     list = Warehouse::List.new
     items.each do |item|
-      extra_items = item.is_a?(Warehouse::Random) ? item.fetch! : [ item ]
+      extra_items = item.is_a?(Warehouse::Item::Random) ? item.fetch! : [ item ]
 
       extra_items.each do |item|
         list.items << item
@@ -41,9 +52,9 @@ class Warehouse::List
   # 把料號加入到清單內 (Clone List)
   def +(item)
     case item
-    when Warehouse::Item
+    when Warehouse::Item::Code, Warehouse::Item::Barcode
       add_item(item)
-    when Warehouse::Random
+    when Warehouse::Item::Random
       # 隨機抽一個
       add_item(item.fetch!)
     when Warehouse::List
@@ -68,11 +79,30 @@ class Warehouse::List
     Warehouse::List.new(items.map { |item| item.deep_dup })
   end
 
+  def to_h
+    items.map do |item|
+      [
+        (item.code? ? item.code : item.barcode),
+        item.qty
+      ]
+    end.to_h
+  end
+
+  def to_a
+    items.map(&:to_h)
+  end
+
   protected
 
   def add_item(item)
     list = deep_dup
-    target = list.find(item.code)
+    # 找到 barcode or code item
+    target = if item.code?
+      list.find(item.code, type: :code)
+    else
+      list.find(item.barcode, type: :barcode)
+    end
+
     if target.present?
       target.qty = (target.qty + item.qty)
     else

data/lib/warehouse/version.rb

@@ -1,3 +1,3 @@
 module Warehouse
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/warehouse.rb

@@ -2,8 +2,10 @@ require "warehouse/version"
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/class'
 require 'active_support'
-require "warehouse/item"
-require "warehouse/random"
+require "warehouse/item/base"
+require "warehouse/item/code"
+require "warehouse/item/barcode"
+require "warehouse/item/random"
 require "warehouse/list"
 
 module Warehouse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warehouse_items
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Eddie Li
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,9 +97,11 @@ files:
 - bin/console
 - bin/setup
 - lib/warehouse.rb
-- lib/warehouse/item.rb
+- lib/warehouse/item/barcode.rb
+- lib/warehouse/item/base.rb
+- lib/warehouse/item/code.rb
+- lib/warehouse/item/random.rb
 - lib/warehouse/list.rb
-- lib/warehouse/random.rb
 - lib/warehouse/version.rb
 - warehouse_items.gemspec
 homepage: https://github.com/superlanding/warehouse_items

data/lib/warehouse/item.rb

@@ -1,21 +0,0 @@
-class Warehouse::Item < Struct.new(:code, :title, :qty, :price)
-  attr_accessor :items
-
-  def type
-    'single'
-  end
-
-  def random?
-    false
-  end
-
-  def single?
-    true
-  end
-
-  def persisted?; end
-
-  def deep_dup
-    Warehouse::Item.new(code, title, qty, price) 
-  end
-end

data/lib/warehouse/random.rb

@@ -1,36 +0,0 @@
-class Warehouse::Random < Struct.new(:items, :qty)
-
-  attr_accessor :code, :title, :price
-
-  def type
-    'random'
-  end
-
-  def random?
-    true
-  end
-
-  def single?
-    false
-  end
-
-  def fetch
-    @fetch ||= fetch!
-  end
-
-  def fetch!
-    random_items = {}
-    (1..qty).each do
-      item = items.sample
-      random_items[item.code] ||= Warehouse::Item.new(item.code, item.title, 0, item.price)
-      random_items[item.code].qty += 1
-    end
-    Warehouse::List.new(random_items.values)
-  end
-
-  def persisted?; end
-
-  def deep_dup
-    Warehouse::Random.new(items.map { |item| item.deep_dup }, qty)
-  end
-end