eddy 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b12c413849c64cbc73cf3d85d562cce61be2ea89d09367ea4f114cb76ccfcb
-  data.tar.gz: 8593188003dba86ad1186aff1ff903eee974d55f6e93fb434e99a576ba6102f4
+  metadata.gz: 1a32819aa478f947399641cb8457f5a06e4a81d86f89881567da6857df815f5b
+  data.tar.gz: 1e46e09711b93f043e0374e9d651f2f7498f18e87f13aaefd0e022be920668b6
 SHA512:
-  metadata.gz: 48c05e66d19015cd438daaff13fd8689d1c0c2e2b3e1629bd993eb870791b0b5ffe2b768c4f60a78cbcadce1f055dd2f7912db62a5d93d8a0644debda4266165
-  data.tar.gz: 4e92a9e0e639041fcf37d064ffbe02d225bb0f6c052f6c736f341195e666515355aa8ccb23a7aa902ac8188822fb88246d5a61f7d303b6f6f095519cf6cc68ec
+  metadata.gz: 6f8f16313bca74dcd860787f2e94d349c1609e450d7efe0b6ebca76e4fa779d283477f282415f45f94fd55c304e2023ae554cdc0e8e371672466df82a95f0a7b
+  data.tar.gz: 78e1996a735712303f6605124c002612d94f31e546fa5ee77f11510f4da3b41733cf313cdc9791e9737ef2119907316b8b4b58ac8c8c9ddefb811c605f3a2fd7

data/CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## master (unreleased)
 
+## 0.8.4 (2020-01-15)
+
+### Changed
+
+- Updated logic for generating functional group control numbers.
+
 ## 0.8.3 (2020-01-15)
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eddy (0.8.3)
+    eddy (0.8.4)
       ginny (~> 0.6.3)
       json_schemer (~> 0.2.8)
       thor (~> 1.0.1)

data/README.md

@@ -10,7 +10,7 @@
 [travis-ci]: https://travis-ci.org/tcd/eddy
 [coveralls]: https://coveralls.io/github/tcd/eddy?branch=master
 [license]: https://github.com/tcd/eddy/blob/master/LICENSE.txt
-[docs]: https://www.rubydoc.info/gems/eddy/0.8.3
+[docs]: https://www.rubydoc.info/gems/eddy/0.8.4
 
 ## Installation
 

data/lib/eddy/data.rb

@@ -54,16 +54,5 @@ module Eddy
       return new_ctrl_num
     end
 
-    # Return a new, unique number.
-    #
-    # @param functional_group [String]
-    # @return [Integer]
-    def self.new_functional_group_control_number(functional_group)
-      existing = Eddy.data.functional_group_control_numbers(functional_group)
-      new_ctrl_num = Eddy::Util.new_number(existing)
-      Eddy.data.add_functional_group_control_number(functional_group, new_ctrl_num)
-      return new_ctrl_num
-    end
-
   end
 end

data/lib/eddy/data/persistence/base.rb

@@ -9,12 +9,6 @@ module Eddy
           raise NotImplementedError
         end
 
-        # @param _functional_group [String]
-        # @return [Array<Integer>]
-        def functional_group_control_numbers(_functional_group)
-          raise NotImplementedError
-        end
-
         # @param _transaction_set_id [String]
         # @return [Array<Integer>]
         def transaction_set_control_numbers(_transaction_set_id)
@@ -27,13 +21,6 @@ module Eddy
           raise NotImplementedError
         end
 
-        # @param _functional_group [String]
-        # @param _new_ctrl_num [Integer]
-        # @return [Array<Integer>]
-        def add_functional_group_control_number(_functional_group, _new_ctrl_num)
-          raise NotImplementedError
-        end
-
         # @param _transaction_set_id [String]
         # @param _new_ctrl_num [Integer]
         # @return [Array<Integer>]

data/lib/eddy/data/persistence/memory.rb

@@ -8,7 +8,6 @@ module Eddy
         def initialize()
           @data = {
             interchange_control_numbers: [],
-            functional_group_control_numbers: {},
             transaction_set_control_numbers: {},
           }
         end
@@ -18,15 +17,6 @@ module Eddy
           return @data[:interchange_control_numbers]
         end
 
-        # @param functional_group [String]
-        # @return [Array<Integer>]
-        def functional_group_control_numbers(functional_group)
-          unless @data[:functional_group_control_numbers].key?(functional_group)
-            @data[:functional_group_control_numbers][functional_group] = []
-          end
-          return @data[:functional_group_control_numbers][functional_group]
-        end
-
         # @param transaction_set_id [String]
         # @return [Array<Integer>]
         def transaction_set_control_numbers(transaction_set_id)
@@ -43,14 +33,6 @@ module Eddy
           return nil
         end
 
-        # @param functional_group [String]
-        # @param new_ctrl_num [Integer]
-        # @return [void]
-        def add_functional_group_control_number(functional_group, new_ctrl_num)
-          self.functional_group_control_numbers(functional_group).append(new_ctrl_num)
-          return nil
-        end
-
         # @param transaction_set_id [String]
         # @param new_ctrl_num [Integer]
         # @return [void]

data/lib/eddy/models/functional_group.rb

@@ -16,17 +16,18 @@ module Eddy
       attr_accessor :transaction_sets
 
       # @param store [Eddy::Data::Store]
+      # @param control_number [Integer]
       # @param transaction_sets [Eddy::Models::TransactionSet]
       # @return [void]
-      def initialize(store, *transaction_sets)
+      def initialize(store, control_number, *transaction_sets)
         self.store = store
+        self.control_number = control_number
         transaction_sets.flatten!
         self.transaction_sets = transaction_sets || []
         if self.transaction_sets.length == 0
           raise ArgumentError, "At least one transaction set is required to create a functional group"
         end
         @id = self.transaction_sets.first.functional_group
-        self.control_number = Eddy::Data.new_functional_group_control_number(@id)
       end
 
       # @return [Array<#render>]

data/lib/eddy/models/interchange.rb

@@ -44,7 +44,11 @@ module Eddy
           sorted_sets[ts.functional_group] ||= []
           sorted_sets[ts.functional_group] << ts
         end
-        return sorted_sets.map { |_, value| Eddy::Models::FunctionalGroup.new(self.store, *value) }
+        i = 0
+        return sorted_sets.map do |_, value|
+          i += 1
+          Eddy::Models::FunctionalGroup.new(self.store, i, *value)
+        end
       end
 
       private

data/lib/eddy/version.rb

@@ -1,3 +1,3 @@
 module Eddy
-  VERSION = "0.8.3".freeze
+  VERSION = "0.8.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eddy
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Clay Dunston
@@ -1569,7 +1569,7 @@ metadata:
   homepage_uri: https://github.com/tcd/eddy
   source_code_uri: https://github.com/tcd/eddy
   changelog_uri: https://github.com/tcd/eddy/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/eddy/0.8.3
+  documentation_uri: https://www.rubydoc.info/gems/eddy/0.8.4
   yard.run: yri
 post_install_message: 
 rdoc_options: []