satisfactory 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06dfe6edd70f452888cfeb3d5379a592a3d88983c5651024cdc634dad1af3ca5
-  data.tar.gz: f50122a32a4068fd77e3fb6d4639957117ceaf7592af1530bf35e0b4a2b9594f
+  metadata.gz: eb0881c675798a625a5af2ba2837a9689191df29051a54c12f3e0f6e38a948d7
+  data.tar.gz: cfe749028066a66f517679c6132e6d5a884b673e4bf5f3c329aadc4cb43acaf4
 SHA512:
-  metadata.gz: 6fe4c14011c38c9b3116e20b501ce8d65dcc458cd63b9fe44dd1e8291db5ca535d61d63069bc95b118342d17550e5c424aea7217bb5802a51df0cc74e8a0cbf8
-  data.tar.gz: 522edd69c8e2e31138e7a8cd0fe5521135b5bf42b544c2f9511ef8aa5144635a8cc3a3b953c9578446d041a6144b1e367723c6d7d00f3c679c2bdb0ce0955d17
+  metadata.gz: 87e998bfc2817381695b8b16a212fe5d328db770549613dbe962406574446f8017f77d068f5ea447df97b2abe75710662544500fae9728855e167c3915b6b737
+  data.tar.gz: 442023301434a224e7b3b71f36762a21432ef681cdf9951672286c6377454649aa4fea7abd8f3e93e5de79f17587f0cc0c8f7e1398c61239dc6f6dc0dedc85ab

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## [Unreleased]
 
+## [0.3.1] - 2023-01-18
+
+- Fix associations bug
+
+## [0.3.0] - 2022-12-22
+
+- Fix some API inconsistencies
+- Add a starter acceptance test (with dummy Rails application)
+
+## [0.2.1] - 2022-12-19
+
+- Fix a clashing executable name by not packaging any
+
+## [0.2.0] - 2022-12-19
+
+- Main functionality implemented
+- Documentation added
+- Licence added
+
 ## [0.1.0] - 2022-12-09
 
 - Initial release

data/lib/satisfactory/record.rb

@@ -65,6 +65,14 @@ module Satisfactory
       end
     end
 
+    # Same as {#with} but always creates a new record.
+    #
+    # @param (see #and)
+    # @return (see #with)
+    def with_new(count = nil, downstream_type, **attributes) # rubocop:disable Style/OptionalArguments
+      with(count, downstream_type, force: true, **attributes)
+    end
+
     # Add a sibling record to the parent record's build plan.
     # e.g. adding a second user to a project.
     #
@@ -78,7 +86,7 @@ module Satisfactory
 
     # Apply one or more traits to this record's build plan.
     #
-    # @param *traits [Symbol, ...] The traits to apply.
+    # @param traits [Symbol, ...] The traits to apply.
     def which_is(*traits)
       traits.each { |trait| self.traits << trait }
       self
@@ -91,11 +99,7 @@ module Satisfactory
     def and_same(upstream_type)
       Satisfactory::UpstreamRecordFinder.new(upstream:).find(upstream_type)
     end
-
-    # @api private
-    def modify
-      yield(self).upstream
-    end
+    alias return_to and_same
 
     # Trigger the creation of this tree's build plan.
     #
@@ -145,7 +149,7 @@ module Satisfactory
 
     # @return [ApplicationRecord]
     def reify(method)
-      FactoryBot.public_send(method, factory_name, *traits, attributes.merge(associations.transform_values(&:build)))
+      FactoryBot.public_send(method, factory_name, *traits, provided_associations.merge(attributes))
     end
 
     def associations_plan
@@ -204,5 +208,9 @@ module Satisfactory
 
       associations[name].last
     end
+
+    def provided_associations
+      associations.transform_values(&:build).compact_blank
+    end
   end
 end

data/lib/satisfactory/root.rb

@@ -43,5 +43,8 @@ module Satisfactory
     def upstream
       nil
     end
+
+    # @api private
+    class FactoryNotDefinedError < StandardError; end
   end
 end

data/lib/satisfactory/upstream_record_finder.rb

@@ -7,8 +7,24 @@ module Satisfactory
       @upstream = upstream
     end
 
+    # @api private
     attr_accessor :upstream
 
+    # @!method create
+    #   Delegates to the upstream record.
+    #   @return (see Satisfactory::Record#create)
+    #   @see Satisfactory::Record#create
+    # @!method with_new
+    #   Delegates to the upstream record.
+    #   @return (see Satisfactory::Record#with_new)
+    #   @see Satisfactory::Record#with_new
+    delegate :create, :with_new, to: :upstream
+
+    # Find the upstream record of the given type.
+    #
+    # @api private
+    # @param type [Symbol] The type of upstream record to find.
+    # @return [Satisfactory::Record, Satisfactory::Collection, Satisfactory::Root]
     def find(type)
       raise MissingUpstreamRecordError, type if upstream.nil?
 
@@ -20,6 +36,7 @@ module Satisfactory
       end
     end
 
+    # (see Satisfactory::Record#with)
     def with(*args, **kwargs)
       upstream.with(*args, force: true, **kwargs)
     end

data/lib/satisfactory/version.rb

@@ -1,3 +1,3 @@
 module Satisfactory
-  VERSION = "0.2.1".freeze
+  VERSION = "0.3.1".freeze
 end

data/satisfactory.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
       "lib/**/*",
       "CHANGELOG.md",
       "LICENCE",
-      "Rakefile",
       "README.md",
       "satisfactory.gemspec",
     ]
@@ -31,7 +30,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "factory_bot_rails", "~> 6.2"
-
-  spec.add_development_dependency "rubocop", "~> 1.40"
-  spec.add_development_dependency "yard", "~> 0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satisfactory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.40'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.40'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 description:
 email:
 - elliot.cm@gmail.com
@@ -62,7 +34,6 @@ files:
 - CHANGELOG.md
 - LICENCE
 - README.md
-- Rakefile
 - lib/satisfactory.rb
 - lib/satisfactory/collection.rb
 - lib/satisfactory/loader.rb
@@ -75,7 +46,7 @@ homepage: https://github.com/SmartCasual/satisfactory
 licenses:
 - CC-BY-NC-SA-4.0
 metadata:
-  changelog_uri: https://github.com/SmartCasual/satisfactory/blob/v0.2.1/CHANGELOG.md
+  changelog_uri: https://github.com/SmartCasual/satisfactory/blob/v0.3.1/CHANGELOG.md
   homepage_uri: https://github.com/SmartCasual/satisfactory
   source_code_uri: https://github.com/SmartCasual/satisfactory
   rubygems_mfa_required: 'true'

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: :rubocop