rom-rails 0.9.0 → 1.0.0.beta1

data/spec/lib/generators/mapper_generator_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
 require 'generators/rom/mapper_generator'
 
-describe ROM::Generators::MapperGenerator do
+RSpec.describe ROM::Generators::MapperGenerator do
   destination File.expand_path('../../../../tmp', __FILE__)
 
   before(:all) do

data/spec/lib/generators/relation_generator_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
 require 'generators/rom/relation_generator'
 
-describe ROM::Generators::RelationGenerator, type: :generator do
+RSpec.describe ROM::Generators::RelationGenerator, type: :generator do
   destination File.expand_path('../../../../tmp', __FILE__)
 
   before(:each) do
@@ -19,11 +17,9 @@ describe ROM::Generators::RelationGenerator, type: :generator do
           file 'users_relation.rb' do
             contains <<-CONTENT.strip_heredoc
               class UsersRelation < ROM::Relation[:#{default_adapter}]
-                # gateway :default
-
-                dataset :users
+                gateway :default
 
-                register_as :users
+                schema(:users, infer: true)
 
                 # define your methods here ie:
                 #
@@ -56,6 +52,6 @@ describe ROM::Generators::RelationGenerator, type: :generator do
     run_generator ['users', '--register=profiles']
 
     relation = File.read(File.join(destination_root, 'app', 'relations', 'users_relation.rb'))
-    expect(relation).to include("register_as :profiles")
+    expect(relation).to match(/schema.*as: :profiles/)
   end
 end

data/spec/lib/generators/repository_generator_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
 require 'rom-repository'
 require 'generators/rom/repository_generator'
 
-describe ROM::Generators::RepositoryGenerator, type: :generator do
+RSpec.describe ROM::Generators::RepositoryGenerator, type: :generator do
   destination File.expand_path('../../../../tmp', __FILE__)
 
   before(:each) do

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 Dry::Core::Deprecations.set_logger!(Rails.root.join('log/deprecations.log'))
 
 RSpec.configure do |config|
-  config.order = "random"
+  config.disable_monkey_patching!
   config.example_status_persistence_file_path = "tmp/examples.txt"
 
   config.before(:suite) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rom-model
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.0.0.beta
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: charlatan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -197,10 +163,6 @@ files:
 - lib/generators/rom/commands/templates/delete.rb.erb
 - lib/generators/rom/commands/templates/update.rb.erb
 - lib/generators/rom/commands_generator.rb
-- lib/generators/rom/form/templates/base_form.rb.erb
-- lib/generators/rom/form/templates/edit_form.rb.erb
-- lib/generators/rom/form/templates/new_form.rb.erb
-- lib/generators/rom/form_generator.rb
 - lib/generators/rom/mapper/templates/mapper.rb.erb
 - lib/generators/rom/mapper_generator.rb
 - lib/generators/rom/relation/templates/relation.rb.erb
@@ -212,9 +174,6 @@ files:
 - lib/rom/rails/configuration.rb
 - lib/rom/rails/controller_extension.rb
 - lib/rom/rails/inflections.rb
-- lib/rom/rails/model/form.rb
-- lib/rom/rails/model/form/class_interface.rb
-- lib/rom/rails/model/form/error_proxy.rb
 - lib/rom/rails/railtie.rb
 - lib/rom/rails/tasks/db.rake
 - lib/rom/rails/version.rb
@@ -223,11 +182,11 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/commands/create_task.rb
+- spec/dummy/app/commands/create_user.rb
 - spec/dummy/app/commands/delete_user.rb
+- spec/dummy/app/commands/update_user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
-- spec/dummy/app/forms/new_user_form.rb
-- spec/dummy/app/forms/update_user_form.rb
 - spec/dummy/app/forms/user_form.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
@@ -280,20 +239,16 @@ files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/features/users_spec.rb
 - spec/integration/activerecord_setup.rb
-- spec/integration/form_with_injected_commands_spec.rb
 - spec/integration/initializer_spec.rb
 - spec/integration/logger_spec.rb
-- spec/integration/new_user_form_spec.rb
 - spec/integration/user_commands_spec.rb
 - spec/integration/user_model_mapping_spec.rb
 - spec/lib/active_record/configuration_spec.rb
 - spec/lib/generators/commands_generator_spec.rb
-- spec/lib/generators/form_generator_spec.rb
 - spec/lib/generators/mapper_generator_spec.rb
 - spec/lib/generators/relation_generator_spec.rb
 - spec/lib/generators/repository_generator_spec.rb
 - spec/spec_helper.rb
-- spec/unit/form_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -309,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1
@@ -323,11 +278,11 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/commands/create_task.rb
+- spec/dummy/app/commands/create_user.rb
 - spec/dummy/app/commands/delete_user.rb
+- spec/dummy/app/commands/update_user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
-- spec/dummy/app/forms/new_user_form.rb
-- spec/dummy/app/forms/update_user_form.rb
 - spec/dummy/app/forms/user_form.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
@@ -380,17 +335,13 @@ test_files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/features/users_spec.rb
 - spec/integration/activerecord_setup.rb
-- spec/integration/form_with_injected_commands_spec.rb
 - spec/integration/initializer_spec.rb
 - spec/integration/logger_spec.rb
-- spec/integration/new_user_form_spec.rb
 - spec/integration/user_commands_spec.rb
 - spec/integration/user_model_mapping_spec.rb
 - spec/lib/active_record/configuration_spec.rb
 - spec/lib/generators/commands_generator_spec.rb
-- spec/lib/generators/form_generator_spec.rb
 - spec/lib/generators/mapper_generator_spec.rb
 - spec/lib/generators/relation_generator_spec.rb
 - spec/lib/generators/repository_generator_spec.rb
 - spec/spec_helper.rb
-- spec/unit/form_spec.rb

data/lib/generators/rom/form/templates/base_form.rb.erb

@@ -1,17 +0,0 @@
-class <%= model_name %>Form < ROM::Model::Form
-
-  input do
-    set_model_name '<%= model_name %>'
-
-    # define always-present form input attributes
-    # attribute :name, String
-  end
-
-  validations do
-    relation :<%= relation %>
-
-    # Add invariant form validations
-    # validates :name, presence: true
-  end
-
-end

data/lib/generators/rom/form/templates/edit_form.rb.erb

@@ -1,20 +0,0 @@
-class Edit<%= model_name %>Form < <%= model_name %>Form
-  commands <%= relation %>: :update
-
-  input do
-    # define form input attributes
-    # attribute :name, String
-
-    timestamps :updated_at
-  end
-
-  validations do
-    # Add form validations
-    # validates :name, presence: true
-  end
-
-  def commit!
-    <%= relation %>.try { <%= relation %>.update.by_id(id).set(attributes) }
-  end
-
-end

data/lib/generators/rom/form/templates/new_form.rb.erb

@@ -1,20 +0,0 @@
-class New<%= model_name %>Form < <%= model_name %>Form
-  commands <%= relation %>: :create
-
-  input do
-    # define form input attributes
-    # attribute :name, String
-
-    timestamps
-  end
-
-  validations do
-    # Add form validations
-    # validates :name, presence: true
-  end
-
-  def commit!
-    <%= relation %>.try { <%= relation %>.create.call(attributes) }
-  end
-
-end

data/lib/generators/rom/form_generator.rb

@@ -1,47 +0,0 @@
-require 'generators/rom'
-
-module ROM
-  module Generators
-    class FormGenerator < Base
-      class_option :command,
-        banner: "--command=command",
-        desc: "specify command to use"
-
-      def create_base_form
-        template "base_form.rb.erb",
-          File.join("app", "forms", "#{file_name.singularize}_form.rb")
-      end
-
-      def create_new
-        create(:new) if create_new_form?
-      end
-
-      def create_edit
-        create(:edit) if create_edit_form?
-      end
-
-      private
-
-      def create(type)
-        template "#{type}_form.rb.erb",
-          File.join("app", "forms", "#{type}_#{file_name.singularize}_form.rb")
-      end
-
-      def create_new_form?
-        options[:command].blank? || %w(new create).include?(options[:command].to_s.downcase)
-      end
-
-      def create_edit_form?
-        options[:command].blank? || %w(edit update).include?(options[:command].to_s.downcase)
-      end
-
-      def model_name
-        class_name.singularize.camelcase
-      end
-
-      def relation
-        class_name.pluralize.underscore
-      end
-    end
-  end
-end

data/lib/rom/rails/model/form.rb

@@ -1,173 +0,0 @@
-require 'dry/equalizer'
-require 'dry/core/class_attributes'
-
-require 'rom-model'
-
-require 'rom/rails/model/form/class_interface'
-require 'rom/rails/model/form/error_proxy'
-
-module ROM
-  module Model
-    # Abstract form class
-    #
-    # Form objects in ROM are your top-level interface to persist data in the
-    # database. They combine many features that you know from ActiveRecord:
-    #
-    #   * params processing with sanitization and coercion
-    #   * attribute validations
-    #   * persisting data in the database
-    #
-    # The major difference is that a ROM form object separates those
-    # responsibilities - a ROM form class has its own Attributes, Validator and
-    # ROM commands that are accessible within its instance.
-    #
-    # @example
-    #   class UserForm < ROM::Model::Form
-    #     commands users: :create
-    #
-    #     input do
-    #       set_model_name 'User'
-    #
-    #       attribute :name, String
-    #     end
-    #
-    #     validations do
-    #       validates :name, presence: true
-    #     end
-    #   end
-    #
-    #   class CreateUserForm < UserForm
-    #     attributes.timestamps :created_at
-    #
-    #     def commit!
-    #       users.try { users.create.call(attributes) }
-    #     end
-    #   end
-    #
-    #   # then in your controller
-    #   CreateUserForm.build(params[:user]).save
-    #
-    # @api public
-    class Form
-      include Dry::Equalizer(:params, :model, :result)
-
-      extend Dry::Core::ClassAttributes
-      extend Form::ClassInterface
-
-      defines :relation, :mappings
-
-      # Return raw params received from the request
-      #
-      # @return [Object]
-      #
-      # @api public
-      attr_reader :params
-
-      # Return model instance representing an ActiveModel object that will be
-      # persisted or updated
-      #
-      # @return [Object]
-      #
-      # @api public
-      attr_reader :model
-
-      # Return the result of commit!
-      #
-      # @return [Object]
-      #
-      # @api public
-      attr_reader :result
-
-      # Return any errors with the form
-      #
-      # @return [ErrorProxy]
-      #
-      # @api public
-      attr_reader :errors
-
-      delegate :model_name, :persisted?, :to_key, to: :model
-      alias to_model model
-
-      class << self
-        delegate :model_name, to: :attributes
-      end
-
-      # Raise deprecation warning when class is used:
-      #
-      # @api private
-      def self.inherited(klass)
-        Dry::Core::Deprecations.announce "ROM::Model::Form", <<-MSG, tag: :rom
-          We now recommend using Reform or another dedicated form library,
-          in conjunction with ROM::Repository or explicit command invocations.
-        MSG
-
-        super
-      end
-
-      # @api private
-      def initialize(params = {}, options = {})
-        @params = params.respond_to?(:to_unsafe_hash) ?
-          params.to_unsafe_hash : params
-        @model  = self.class.model.new(params.to_h.merge(options.slice(*self.class.key)))
-        @result = nil
-        @errors = ErrorProxy.new
-        options.each { |key, value| instance_variable_set("@#{key}", value) }
-      end
-
-      # A specialized form object must implement this method
-      #
-      # @abstract
-      #
-      # @api public
-      def commit!
-        raise NotImplementedError, "#{self.class}#commit! must be implemented"
-      end
-
-      # Save a form by calling commit! and memoizing result
-      #
-      # @return [self]
-      #
-      # @api public
-      def save(*args)
-        validate!
-
-        @result = commit!(*args) unless @errors.present?
-        @errors.set @result.error if result.respond_to? :error
-
-        self
-      end
-
-      # Return whether commit was successful
-      #
-      # @return [TrueClass,FalseClass]
-      #
-      # @api public
-      def success?
-        errors.success?
-      end
-
-      # Trigger validation and store errors (if any)
-      #
-      # @api public
-      def validate!
-        @errors.clear
-        return unless defined? self.class::Validator
-        validator = self.class::Validator.new(attributes)
-        validator.validate
-
-        @errors.set validator.errors
-      end
-
-      # Sanitize and coerce input params
-      #
-      # This can also set default values
-      #
-      # @return [Model::Attributes]
-      #
-      # @api public
-      def attributes
-        self.class.attributes[params]
-      end
-    end
-  end
-end