upgrow 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3238cf0308b8e81b0349792dc104880479702dc5c802a8985d2f37461fb1029f
-  data.tar.gz: 3c06e81104d588ae28d500d4db9946e16afeee449eb7b58a70700a8e3f6b7bb1
+  metadata.gz: ee034f6fa4ddd317a01b6f80d4762259f205a6763cd06fdfa637cdac186f0063
+  data.tar.gz: 82b9fa66aab3ca2b3bec78ef2c04415d5aa199c0eb9734216010ae0806bb5476
 SHA512:
-  metadata.gz: b7f23d2e55b0b06d99c168353c99e1b13e3ee4c0d9a12371e5f6771c7bc9dfae347512c583d716188454b634d54d57149e24b98cf203738d5aee718148405f29
-  data.tar.gz: 646705859b0fb813b215081f1f52058b2b36b2e15b2a0b81cdeb0dfd537ebe30e84c2846a5b37e99d9646e9706015ded057f365100798bdec360918c8936ae5a
+  metadata.gz: 720d3134774aac67239a7681e2e61dcc525fbd8e38852ebb07f2ec82b8be8cc61ac0b71bcaea13fd375e2fc027bd5092aae11fdd70269da1d1fb299325afbd42
+  data.tar.gz: 0f16e74a9a07c2e186f10ec14806fc8c59890149204252f25ff2fbc083d8284625f1967a9a74db5e5d1dfb377f315aec864c739a39c8542071a622991bcf8bfb

data/lib/upgrow/action.rb

@@ -3,11 +3,11 @@
 require_relative 'result'
 
 module Upgrow
-  # Actions represent the entry points to the app’s core logic. These objects
+  # Actions represent the entry points to the app's core logic. These objects
   # coordinate workflows in order to get operations and activities done.
-  # Ultimately, Actions are the public interface of the app’s business layers.
+  # Ultimately, Actions are the public interface of the app's business layers.
   #
-  # Rails controllers talk to the app’s internals by sending messages to
+  # Rails controllers talk to the app's internals by sending messages to
   # specific Actions, optionally with the required inputs. Actions have a
   # one-to-one relationship with incoming requests: they are paired
   # symmetrically with end-user intents and demands. This is quite a special
@@ -15,7 +15,7 @@ module Upgrow
   # should be handled by a single Action.
   #
   # The fact that each Action represents a meaningful and complete
-  # request-response cycle forces modularization for the app’s business logic,
+  # request-response cycle forces modularization for the app's business logic,
   # exposing immediately complex relationships between objects at the same time
   # that frees up the app from scenarios such as interdependent requests. In
   # other words, Actions do not have knowledge or coupling between other Actions
@@ -29,6 +29,11 @@ module Upgrow
     # decorate methods implemented by subclasses so they can have additional
     # behaviour.
     module Decorator
+      # Calls the original `perform` method of the Action object and returns its
+      # Result. In case the Action throws a `:failure`, catches and returns its
+      # value, which is supposed to be a failed Result generated by the Action.
+      #
+      # @return [Result] the Action Result.
       def perform(...)
         catch(:failure) do
           super

data/lib/upgrow/actions.rb

@@ -24,7 +24,7 @@ module Upgrow
     #
     # @return [Action] the Action specified by the names.
     def [](*names)
-      action_class_name = names.map(&:capitalize).join('::') + 'Action'
+      action_class_name = "#{names.map(&:capitalize).join("::")}Action"
       Object.const_get(action_class_name)
     end
   end

data/lib/upgrow/active_record_conversion.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Upgrow
+  # Offers convenience funcionality to convert Active Records into Models.
+  module ActiveRecordConversion
+    # Converts the given Active Record or Records into Models.
+    #
+    # @param record_or_enum [ActiveRecord::Base, Enumerable] an Active Record
+    #   instance or a collection of Records to be converted.
+    #
+    # @return [Model] the Model instance generated based on the single Record
+    #   given.
+    # @return [Array<Model>] the collection of Model instances generated based
+    #   on the collection of Records provided.
+    # @return [nil] if the given value is nil.
+    def to_model(record_or_enum)
+      if record_or_enum.respond_to?(:map)
+        record_or_enum.map do |record|
+          _to_model(record)
+        end
+      elsif !record_or_enum.nil?
+        _to_model(record_or_enum)
+      end
+    end
+
+    # @private
+    def _to_model(record)
+      associations = record.class.reflections.keys.map do |reflection|
+        association = record.association(reflection.to_sym)
+        next unless association.loaded?
+
+        name = reflection.sub('_record', '').to_sym
+        [name, to_model(record.public_send(reflection))]
+      end.compact.to_h
+
+      model_class = Object.const_get(record.class.name.delete_suffix('Record'))
+
+      attributes = record.attributes.merge(associations)
+
+      model_class.new(**attributes.transform_keys(&:to_sym))
+    end
+  end
+end

data/lib/upgrow/{active_record_adapter.rb → active_record_queries.rb}

@@ -4,7 +4,7 @@ module Upgrow
   # Mixin that implements Repository methods with an Active Record Base. When
   # included in a Repository class, it sets the default base to be a class
   # ending with `Record`.
-  module ActiveRecordAdapter
+  module ActiveRecordQueries
     # Class methods for classes that include this module.
     module ClassMethods
       # Callback method used by Basic Repository to set a default Repository
@@ -19,7 +19,7 @@ module Upgrow
       # @return [Class] the Active Record Base class to be used as the
       #   Repository base according to the architecture's naming convention.
       def default_base
-        base_name = name[/\A(.+)Repository\z/, 1] + 'Record'
+        base_name = "#{name[/\A(.+)Repository\z/, 1]}Record"
         Object.const_get(base_name)
       end
     end
@@ -34,7 +34,7 @@ module Upgrow
     # @return [Array<Model>] a collection of Models representing all persisted
     #   Records.
     def all
-      base.all.map { |record| to_model(record.attributes) }
+      to_model(base.all)
     end
 
     # Persists a new Record with the given input, and materializes the newly
@@ -46,7 +46,7 @@ module Upgrow
     #   Record.
     def create(input)
       record = base.create!(input.attributes)
-      to_model(record.attributes)
+      to_model(record)
     end
 
     # Retrieves the Record with the given ID, representing its data as a Model.
@@ -57,7 +57,7 @@ module Upgrow
     #   ID.
     def find(id)
       record = base.find(id)
-      to_model(record.attributes)
+      to_model(record)
     end
 
     # Updates the Record with the given ID with the given Input attributes.
@@ -69,7 +69,7 @@ module Upgrow
     # @return [Model] the Model instance with the updated data of the Record.
     def update(id, input)
       record = base.update(id, input.attributes)
-      to_model(record.attributes)
+      to_model(record)
     end
 
     # Deletes the Record that has the given ID.

data/lib/upgrow/basic_model.rb

@@ -54,7 +54,11 @@ module Upgrow
 
     def method_missing(name, *args, &block)
       return super unless associations.include?(name)
-      associations[name] || raise(AssociationNotLoadedError)
+
+      associations[name] || raise(
+        AssociationNotLoadedError,
+        "Association #{name} not loaded for #{self.class.name}."
+      )
     end
 
     def respond_to_missing?(name, _include_private = false)

data/lib/upgrow/basic_repository.rb

@@ -7,17 +7,6 @@ module Upgrow
   class BasicRepository
     class << self
       attr_writer :base
-      attr_writer :model_class
-
-      # model_class [Class] the Model class to be used to map and return the
-      # materialized data as instances of the domain. Defaults to a constant
-      # derived from the Repository class' name. For example, a `UserRepository`
-      # will have its default Model class set to `User`.
-      #
-      # @return [Class] the Repository Model class.
-      def model_class
-        @model_class || default_model_class
-      end
 
       # the base object to be used internally to retrieve the persisted data.
       # For example, a base class in which queries can be performed for a
@@ -31,42 +20,13 @@ module Upgrow
       private
 
       def default_base; end
-
-      def default_model_class
-        model_class_name = name.delete_suffix('Repository')
-        Object.const_get(model_class_name)
-      end
     end
 
-    attr_reader :base, :model_class
+    attr_reader :base
 
     # Sets the Basic Repositorie's state.
     def initialize
       @base = self.class.base
-      @model_class = self.class.model_class
-    end
-
-    # Represents the raw Hash of data attributes as a Model instance from the
-    # Repositorie's Model class.
-    #
-    # @param model_class_or_attributes [Class, Hash<Symbol, Object>] the Model
-    #   class to be instantiated, in case it is a different class than the
-    #   Repositorie's Model class, or the list of attributes the model will
-    #   have, in case the Model class is the Repositorie's Model class.
-    # @param attributes [Hash<Symbol, Object>] the list of attributes the Model
-    #   will have, in case the Model to be instantiated is passed as the first
-    #   argument.
-    #
-    # @return [Model] the Model instance populated with the given attributes.
-    def to_model(model_class_or_attributes, attributes = {})
-      model_class = model_class_or_attributes
-
-      if model_class_or_attributes.respond_to?(:transform_keys)
-        model_class = self.model_class
-        attributes = model_class_or_attributes
-      end
-
-      model_class.new(**attributes.transform_keys(&:to_sym))
     end
   end
 end

data/lib/upgrow/immutable_struct.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Upgrow
   # A read-only Struct. An Immutable Struct is initialized with its member
   # values and subsequent state changes are not permitted.

data/lib/upgrow/input.rb

@@ -21,7 +21,7 @@ module Upgrow
   # integrity for inputs, since user-entered data can contain any information of
   # different types, or even not to be present at all.
   #
-  # User input validation is a core part of any app’s business logic. It ensures
+  # User input validation is a core part of any app's business logic. It ensures
   # that incoming data is sane, proper, and respects a predefined schema. A
   # default Rails app overloads Record objects with yet another responsibility:
   # being the place where validation rules are written and checked. While there
@@ -48,7 +48,6 @@ module Upgrow
 
     # Overwrites the validation context writer so the Input's state is not
     # mutated.
-    def validation_context=(_)
-    end
+    def validation_context=(_); end
   end
 end

data/lib/upgrow/model.rb

@@ -4,7 +4,7 @@ require_relative 'active_record_schema'
 require_relative 'basic_model'
 
 module Upgrow
-  # Models are objects that represent core entities of the app’s business logic.
+  # Models are objects that represent core entities of the app's business logic.
   # These are usually persisted and can be fetched and created as needed. They
   # have unique keys for identification (usually a numeric value), and, most
   # importantly perhaps, they are immutable. This is the key difference between
@@ -12,7 +12,7 @@ module Upgrow
   # referred to as models in typical Rails default apps.
   #
   # Another difference between Models and Records is that, once instantiated,
-  # Models simply hold its attributes immutably, and they don’t have any
+  # Models simply hold its attributes immutably, and they don't have any
   # capabilities to create or update any information in the persistence layer.
   #
   # The collaboration between Repositories and Models is what allows Active
@@ -27,7 +27,7 @@ module Upgrow
         super
 
         subclass.schema = ActiveRecordSchema.new(
-          subclass.name + 'Record', subclass.schema
+          "#{subclass.name}Record", subclass.schema
         )
       end
     end

data/lib/upgrow/repository.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require_relative 'active_record_adapter'
+require_relative 'active_record_conversion'
+require_relative 'active_record_queries'
 require_relative 'basic_repository'
 
 module Upgrow
   # Repositories are responsible for the persistence layer of the app. They
-  # encapsulate Rails’ Active Record in a subset of simple methods for querying
+  # encapsulate Rails' Active Record in a subset of simple methods for querying
   # and persistence of data, and return simple read-only objects as a result.
   # This allows the app to isolate Active Record only to this subset, exposing
   # only the desired queries and methods to other layers through Repositories.
   class Repository < BasicRepository
-    include ActiveRecordAdapter
+    include ActiveRecordConversion
+    include ActiveRecordQueries
   end
 end

data/lib/upgrow/result.rb

@@ -18,7 +18,7 @@ module Upgrow
   #
   # Additionally, Result instances behave like monadic values by offering
   # bindings to be called only in case of success or failure, which further
-  # simplifies the caller’s code by not having to use conditional to check for
+  # simplifies the caller's code by not having to use conditional to check for
   # errors.
   class Result < ImmutableStruct
     class << self

data/test/dummy/app/actions/application_action.rb

@@ -3,8 +3,8 @@
 class ApplicationAction < Upgrow::Action
   expose :current_user
 
-  # rubocop:disable Lint/MissingSuper
   def initialize(user_id:)
+    super()
     @current_user = UserRepository.new.find_from_context(user_id)
   end
 end

data/test/dummy/app/actions/articles/new_action.rb

@@ -2,7 +2,6 @@
 
 module Articles
   class NewAction < UserAction
-    def perform
-    end
+    def perform; end
   end
 end

data/test/dummy/app/actions/comments/new_action.rb

@@ -2,7 +2,6 @@
 
 module Comments
   class NewAction < UserAction
-    def perform
-    end
+    def perform; end
   end
 end

data/test/dummy/app/actions/sessions/new_action.rb

@@ -2,7 +2,6 @@
 
 module Sessions
   class NewAction < ApplicationAction
-    def perform
-    end
+    def perform; end
   end
 end

data/test/dummy/app/actions/users/new_action.rb

@@ -2,7 +2,6 @@
 
 module Users
   class NewAction < ApplicationAction
-    def perform
-    end
+    def perform; end
   end
 end

data/test/dummy/app/channels/application_cable/channel.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   rescue_from(UserAction::UnauthorizedError) { redirect_to(new_session_path) }
 

data/test/dummy/app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationHelper
   class BulmaFormBuilder < ActionView::Helpers::FormBuilder
     # Generic field wrapper for form inputs.
@@ -111,12 +112,10 @@ module ApplicationHelper
 
     private
 
-    def control(expanded: false)
+    def control(expanded: false, &block)
       control_class = ['control']
       control_class << ['is-expanded'] if expanded
-      @template.content_tag(:p, class: control_class) do
-        yield
-      end
+      @template.content_tag(:p, class: control_class, &block)
     end
 
     def errors_for(method)

data/test/dummy/app/jobs/application_job.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked

data/test/dummy/app/mailers/application_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: 'from@example.com'
   layout 'mailer'

data/test/dummy/app/records/user_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UserRecord < ApplicationRecord
   self.table_name = 'users'
 

data/test/dummy/app/repositories/article_repository.rb

@@ -2,29 +2,20 @@
 
 class ArticleRepository < Upgrow::Repository
   def all
-    base.all.includes(:user_record).map do |record|
-      user = to_model(User, record.user_record.attributes)
-      to_model(record.attributes.merge(user: user))
-    end
+    to_model(base.all.includes(:user_record))
   end
 
   def find_with_comments(id)
-    record = ArticleRecord.find(id)
+    record = base
+      .includes(:user_record)
+      .includes(comment_records: :user_record)
+      .find(id)
 
-    comment_records = record.comment_records.includes(:user_record)
-
-    comments = comment_records.map do |comment_record|
-      user = to_model(User, comment_record.user_record.attributes)
-      to_model(Comment, comment_record.attributes.merge(user: user))
-    end
-
-    user = to_model(User, record.user_record.attributes)
-
-    to_model(record.attributes.merge(comments: comments, user: user))
+    to_model(record)
   end
 
   def find_for_user(id, user:)
     record = base.find_by(id: id, user_id: user.id)
-    to_model(record.attributes) if record
+    to_model(record)
   end
 end

data/test/dummy/app/repositories/comment_repository.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 class CommentRepository < Upgrow::Repository
 end

data/test/dummy/app/repositories/user_repository.rb

@@ -3,10 +3,11 @@
 class UserRepository < Upgrow::Repository
   def find_for_authentication(input)
     record = UserRecord.find_by(email: input.email)
-    to_model(record.attributes) if record&.authenticate(input.password)
+    to_model(record) if record&.authenticate(input.password)
   end
 
   def find_from_context(id)
-    UserRecord.find_by(id: id)
+    record = UserRecord.find_by(id: id)
+    to_model(record)
   end
 end

data/test/dummy/config/application.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'boot'
 
 require 'rails/all'

data/test/dummy/config/boot.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 

data/test/dummy/config/environment.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Load the Rails application.
 require_relative 'application'
 

data/test/dummy/config/environments/development.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do

data/test/dummy/config/environments/production.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
@@ -100,7 +101,7 @@ Rails.application.configure do
   # )
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end

data/test/dummy/config/environments/test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 # The test environment is used exclusively to run your application's

data/test/dummy/config/initializers/assets.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish

data/test/dummy/config/initializers/cookies_serializer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Specify a serializer for the signed and encrypted cookie jars.

data/test/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/test/dummy/config/puma.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
+max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
 min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
 threads min_threads_count, max_threads_count
 
@@ -16,14 +17,14 @@ worker_timeout 3600 if ENV.fetch('RAILS_ENV', 'development') == 'development'
 
 # Specifies the `port` that Puma will listen on to receive requests.
 #
-port ENV.fetch('PORT') { 3000 }
+port ENV.fetch('PORT', 3000)
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch('RAILS_ENV') { 'development' }
+environment ENV.fetch('RAILS_ENV', 'development')
 
 # Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
+pidfile ENV.fetch('PIDFILE', 'tmp/pids/server.pid')
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked web server processes. If using threads and workers together

data/test/dummy/db/migrate/20210219211631_create_articles.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class CreateArticles < ActiveRecord::Migration[6.1]
   def change
     create_table(:articles) do |t|

data/test/dummy/db/migrate/20210320140432_create_comments.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class CreateComments < ActiveRecord::Migration[6.1]
   def change
     create_table(:comments) do |t|

data/test/dummy/db/migrate/20210409164927_create_users.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class CreateUsers < ActiveRecord::Migration[6.1]
   def change
     create_table(:users) do |t|

data/test/rails_helper.rb

@@ -14,7 +14,7 @@ if ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActionDispatch::IntegrationTest.fixture_path =
     ActiveSupport::TestCase.fixture_path
   ActiveSupport::TestCase.file_fixture_path =
-    ActiveSupport::TestCase.fixture_path + '/files'
+    "#{ActiveSupport::TestCase.fixture_path}/files"
   ActiveSupport::TestCase.fixtures(:all)
 end
 

data/test/system/articles_test.rb

@@ -120,7 +120,7 @@ class ArticlesTest < ApplicationSystemTestCase
   test 'guest User cannot access the edit page directly' do
     click_link 'Lorem Barnak'
 
-    visit current_path + '/edit'
+    visit "#{current_path}/edit"
 
     assert_title 'Sign In'
   end
@@ -137,7 +137,7 @@ class ArticlesTest < ApplicationSystemTestCase
 
     click_link 'The Hobbit'
 
-    visit current_path + '/edit'
+    visit "#{current_path}/edit"
 
     assert_title 'Sign In'
   end

data/test/test_helper.rb

@@ -10,3 +10,41 @@ module Warning
   end
 end
 Warning[:deprecated] = true
+
+class TestRecord
+  class Association
+    def initialize(loaded:)
+      @loaded = loaded
+    end
+
+    def loaded?
+      @loaded
+    end
+  end
+
+  class << self
+    attr_accessor :reflections
+
+    def inherited(subclass)
+      super
+      subclass.reflections = {}
+    end
+
+    def belongs_to(name)
+      reflections[name.to_s] = :belongs_to
+      define_method(name) { attributes[name.to_s] }
+    end
+  end
+
+  def initialize(**attributes)
+    @attributes = attributes
+  end
+
+  def attributes
+    @attributes.transform_keys(&:to_s)
+  end
+
+  def association(name)
+    Association.new(loaded: !public_send(name).nil?)
+  end
+end

data/test/upgrow/action_test.rb

@@ -31,7 +31,7 @@ module Upgrow
     class FailedAction < SampleAction
       def perform
         super
-        failure(:error_1, :error_2)
+        failure(:error1, :error2)
       end
     end
 
@@ -78,7 +78,7 @@ module Upgrow
       result = FailedAction.new.perform
 
       assert_equal 'volmer', result.user
-      assert_equal [:error_1, :error_2], result.errors
+      assert_equal [:error1, :error2], result.errors
     end
 
     test '#failure throws a failed Result with the given errors' do

data/test/upgrow/active_record_conversion_test.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+require 'upgrow/active_record_conversion'
+require 'upgrow/basic_model'
+require 'upgrow/basic_repository'
+require 'upgrow/input'
+
+module Upgrow
+  class ActiveRecordConversionTest < ActiveSupport::TestCase
+    class UserRecord < TestRecord
+    end
+
+    class ArticleRecord < TestRecord
+      belongs_to :user_record
+    end
+
+    class User < BasicModel
+      attribute :name
+    end
+
+    class Article < BasicModel
+      attribute :title
+      belongs_to :user
+    end
+
+    class ArticleRepository < BasicRepository
+      include ActiveRecordConversion
+    end
+
+    setup do
+      @repository = ArticleRepository.new
+      @record = ArticleRecord.new(id: 1, title: 'The Hobbit')
+    end
+
+    test '#to_model converts a Record into a Model' do
+      model = @repository.to_model(@record)
+
+      assert_instance_of Article, model
+      assert_equal 1, model.id
+      assert_equal 'The Hobbit', model.title
+    end
+
+    test '#to_model converts an array of Records into an array of Models' do
+      second_record = ArticleRecord.new(id: 2, title: 'Harry Potter')
+
+      models = @repository.to_model([@record, second_record])
+
+      assert_equal 2, models.size
+
+      assert_instance_of Article, models.first
+      assert_equal 'The Hobbit', models.first.title
+      assert_equal 1, models.first.id
+
+      assert_instance_of Article, models.last
+      assert_equal 'Harry Potter', models.last.title
+      assert_equal 2, models.last.id
+    end
+
+    test '#to_model adds any loaded assocation to the resulting Model' do
+      user_record = UserRecord.new(id: 666, name: 'JRR Tolkien')
+
+      record = ArticleRecord.new(
+        id: 1, title: 'The Hobbit', user_record: user_record
+      )
+
+      model = @repository.to_model(record)
+
+      assert_instance_of User, model.user
+      assert_equal 666, model.user.id
+      assert_equal 'JRR Tolkien', model.user.name
+    end
+
+    test '#to_model does not add unloaded assocations to the resulting Model' do
+      model = @repository.to_model(@record)
+
+      assert_raises(BasicModel::AssociationNotLoadedError) { model.user }
+    end
+
+    test '#to_model is nil when the given object is nil' do
+      assert_nil @repository.to_model(nil)
+    end
+  end
+end

data/test/upgrow/{active_record_adapter_test.rb → active_record_queries_test.rb}

@@ -2,34 +2,32 @@
 
 require 'test_helper'
 
-require 'upgrow/active_record_adapter'
 require 'upgrow/basic_model'
-require 'upgrow/basic_repository'
+require 'upgrow/repository'
 require 'upgrow/input'
 
 module Upgrow
-  class ActiveRecordAdapterTest < ActiveSupport::TestCase
+  class ActiveRecordQueriesTest < ActiveSupport::TestCase
     class User < BasicModel
       attribute :name
     end
 
+    class UserRecord < TestRecord
+    end
+
     class UserInput < Input
       attribute :name
     end
 
-    class UserRepository < BasicRepository
-      include ActiveRecordAdapter
+    class UserRepository < Repository
     end
 
-    class UserRecord; end
-
     setup do
       @base = Minitest::Mock.new
       UserRepository.base = @base
       @repository = UserRepository.new
-      @record = Minitest::Mock.new
-      @record_attributes = { name: 'volmer', id: 1 }
-      @record.expect(:attributes, @record_attributes)
+
+      @record = UserRecord.new(name: 'volmer', id: 1)
     end
 
     test '.base is the Active Record Base class according to the Repository name by default' do
@@ -70,9 +68,9 @@ module Upgrow
 
     test '#update changes the existing Record attributes' do
       input = UserInput.new(name: 'rafael')
+      new_record = UserRecord.new(id: 1, name: 'rafael')
 
-      @base.expect(:update, @record, [1, { name: 'rafael' }])
-      @record_attributes[:name] = 'rafael'
+      @base.expect(:update, new_record, [1, { name: 'rafael' }])
 
       model = @repository.update(1, input)
 

data/test/upgrow/basic_model_test.rb

@@ -76,17 +76,20 @@ module Upgrow
       model = SampleModel.new(
         title: 'volmer',
         body: 'My long body',
-        id: 1,
+        id: 1
       )
 
-      assert_raises(Model::AssociationNotLoadedError) { model.user }
+      error = assert_raises(Model::AssociationNotLoadedError) { model.user }
+      message = 'Association user not loaded for ' \
+        'Upgrow::BasicModelTest::SampleModel.'
+      assert_equal message, error.message
     end
 
     test 'attribute readers work when association is not loaded' do
       model = SampleModel.new(
         title: 'volmer',
         body: 'My long body',
-        id: 1,
+        id: 1
       )
 
       assert_equal 'volmer', model.title

data/test/upgrow/basic_repository_test.rb

@@ -4,25 +4,15 @@ require 'test_helper'
 
 module Upgrow
   class BasicRepositoryTest < ActiveSupport::TestCase
-    class User < BasicModel; end
-
-    class Car < BasicModel
-      attribute :wheels
-    end
-
     class UserRepository < BasicRepository; end
 
-    class NoModelRepository < BasicRepository; end
-
     setup do
       @original_base = UserRepository.base
-      @original_model_class = UserRepository.model_class
       @repository = UserRepository.new
     end
 
     teardown do
       UserRepository.base = @original_base
-      UserRepository.model_class = @original_model_class
     end
 
     test '.base is nil by default' do
@@ -34,61 +24,9 @@ module Upgrow
       assert_equal :my_base, UserRepository.base
     end
 
-    test '.model_class is iferred based on the Repository name' do
-      assert_equal User, UserRepository.model_class
-    end
-
-    test '.model_class can be set' do
-      UserRepository.model_class = :my_model_class
-      assert_equal :my_model_class, UserRepository.model_class
-    end
-
-    test '.model_class raises a Name Error if the Model class is undefined' do
-      error = assert_raises(NameError) do
-        NoModelRepository.model_class
-      end
-
-      assert_includes(
-        error.message,
-        'uninitialized constant Upgrow::BasicRepositoryTest::NoModel'
-      )
-    end
-
     test '#base is inferred from the Repository class base' do
       UserRepository.base = :my_base
       assert_equal :my_base, UserRepository.new.base
     end
-
-    test '#model_class is inferred from the Repository class Model class' do
-      UserRepository.model_class = :my_model_class
-      assert_equal :my_model_class, UserRepository.new.model_class
-    end
-
-    test '#to_model returns a new Model with the given attributes as keyword arguments' do
-      model = @repository.to_model(id: 1)
-
-      assert_equal 1, model.id
-    end
-
-    test '#to_model accepts a Model class explicitly' do
-      model = @repository.to_model(Car, id: 1, wheels: 4)
-
-      assert_equal 1, model.id
-      assert_equal 4, model.wheels
-    end
-
-    test '#to_model accepts a Hash of Symbols' do
-      args = { id: 1 }
-      model = @repository.to_model(args)
-
-      assert_equal 1, model.id
-    end
-
-    test '#to_model accepts a Hash of Strings' do
-      args = { 'id' => 1 }
-      model = @repository.to_model(args)
-
-      assert_equal 1, model.id
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upgrow
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shopify Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -35,7 +35,8 @@ files:
 - lib/upgrow.rb
 - lib/upgrow/action.rb
 - lib/upgrow/actions.rb
-- lib/upgrow/active_record_adapter.rb
+- lib/upgrow/active_record_conversion.rb
+- lib/upgrow/active_record_queries.rb
 - lib/upgrow/active_record_schema.rb
 - lib/upgrow/basic_model.rb
 - lib/upgrow/basic_repository.rb
@@ -123,7 +124,8 @@ files:
 - test/test_helper.rb
 - test/upgrow/action_test.rb
 - test/upgrow/actions_test.rb
-- test/upgrow/active_record_adapter_test.rb
+- test/upgrow/active_record_conversion_test.rb
+- test/upgrow/active_record_queries_test.rb
 - test/upgrow/active_record_schema_test.rb
 - test/upgrow/basic_model_test.rb
 - test/upgrow/basic_repository_test.rb
@@ -139,7 +141,7 @@ homepage: https://github.com/Shopify/upgrow
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/Shopify/upgrow/tree/v0.0.3
+  source_code_uri: https://github.com/Shopify/upgrow/tree/v0.0.4
   allowed_push_host: https://rubygems.org
 post_install_message:
 rdoc_options: []
@@ -236,7 +238,8 @@ test_files:
 - test/test_helper.rb
 - test/upgrow/action_test.rb
 - test/upgrow/actions_test.rb
-- test/upgrow/active_record_adapter_test.rb
+- test/upgrow/active_record_conversion_test.rb
+- test/upgrow/active_record_queries_test.rb
 - test/upgrow/active_record_schema_test.rb
 - test/upgrow/basic_model_test.rb
 - test/upgrow/basic_repository_test.rb