rom-rails 0.2.1 → 0.3.0.beta1

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

@@ -0,0 +1,74 @@
+require 'rom/rails/model/validator/uniqueness_validator'
+
+module ROM
+  module Model
+    # Mixin for ROM-compliant validator objects
+    #
+    # @example
+    #
+    #
+    #   class UserParams
+    #     include ROM::Model::Params
+    #
+    #     attribute :name
+    #
+    #     validates :name, presence: true
+    #   end
+    #
+    #   class UserValidator
+    #     include ROM::Model::Validator
+    #   end
+    #
+    #   params = UserParams.new(name: '')
+    #   UserValidator.call(params) # raises ValidationError
+    #
+    # @api public
+    module Validator
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+          include ActiveModel::Validations
+          include Equalizer.new(:params, :errors)
+        end
+      end
+
+      attr_reader :params
+      delegate :model_name, to: :params
+
+      def initialize(params)
+        @params = params
+      end
+
+      def to_model
+        params
+      end
+
+      def call
+        raise ValidationError, errors unless valid?
+        params
+      end
+
+      private
+
+      def method_missing(name)
+        params[name]
+      end
+
+      module ClassMethods
+        def relation(name = nil)
+          @relation = name if name
+          @relation
+        end
+
+        def model_name
+          params.model_name
+        end
+
+        def call(params)
+          validator = new(params)
+          validator.call
+        end
+      end
+    end
+  end
+end

data/lib/rom/rails/model/validator/uniqueness_validator.rb

@@ -0,0 +1,39 @@
+require 'active_model/validator'
+
+module ROM
+  module Model
+    module Validator
+      class UniquenessValidator < ActiveModel::EachValidator
+        attr_reader :klass, :message
+
+        def initialize(options)
+          super
+          @klass = options.fetch(:class)
+          @message = options.fetch(:message) { :taken }
+        end
+
+        def validate_each(validator, name, value)
+          validator.errors.add(name, message) unless unique?(name, value)
+        end
+
+        private
+
+        def relation
+          rom.relations[relation_name]
+        end
+
+        def relation_name
+          klass.relation
+        end
+
+        def rom
+          ROM.env
+        end
+
+        def unique?(name, value)
+          relation.unique?(name => value)
+        end
+      end
+    end
+  end
+end

data/lib/rom/rails/railtie.rb

@@ -3,56 +3,92 @@ require 'rails'
 require 'rom/rails/inflections'
 require 'rom/rails/configuration'
 require 'rom/rails/controller_extension'
+require 'rom/rails/active_record/configuration'
 
-if defined?(Spring)
-  Spring.after_fork { ROM::Rails::Railtie.disconnect }
-end
+Spring.after_fork { ROM::Rails::Railtie.disconnect } if defined?(Spring)
 
 module ROM
   module Rails
     class Railtie < ::Rails::Railtie
-      def self.disconnect
-        return unless ROM.env
-
-        ROM.env.repositories.each_value do |repository|
-          repository.adapter.disconnect
+      initializer 'rom.configure_action_controller' do
+        ActiveSupport.on_load(:action_controller) do
+          ActionController::Base.send(:include, ControllerExtension)
         end
       end
 
-      def self.load_all
-        %w(relations mappers commands).each do |type|
-          load_files(type, ::Rails.root)
+      initializer 'rom.adjust_eager_load_paths' do |app|
+        paths = %w(commands mappers relations).map do |directory|
+          ::Rails.root.join('app', directory).to_s
         end
+
+        app.config.eager_load_paths -=  paths
       end
 
-      def self.load_files(type, root)
-        Dir[root.join("app/#{type}/**/*.rb").to_s].each do |path|
-          load(path)
-        end
+      # Make `ROM::Rails::Configuration` instance available to the user via
+      # `Rails.application.config` before other initializers run.
+      config.before_initialize do |_app|
+        config.rom = Configuration.new
       end
 
-      initializer "rom.configure" do |app|
-        config.rom = Configuration.build(app)
+      # Reload ROM-related application code on each request.
+      config.to_prepare do |_config|
+        Railtie.setup
       end
 
-      initializer "rom.load_schema" do |_app|
-        require schema_file if schema_file.exist?
+      # Behaves like `Railtie#configure` if the given block does not take any
+      # arguments. Otherwise yields the ROM configuration to the block.
+      #
+      # @example
+      #   ROM::Rails::Railtie.configure do |config|
+      #     config.repositories[:yaml] = {uri: 'yaml:///data'}
+      #   end
+      #
+      # @api public
+      def configure(&block)
+        if block.arity == 1
+          block.call(config.rom)
+        else
+          super
+        end
       end
 
-      initializer "rom:prepare" do |app|
-        config.to_prepare do |_config|
-          Railtie.disconnect
-          app.config.rom.setup!
-          app.config.rom.load!
-          app.config.rom.finalize!
-          ActionController::Base.send(:include, ControllerExtension)
+      def disconnect
+        # TODO: Add `ROM.env.disconnect` to core.
+        ROM.env.repositories.each_value(&:disconnect)
+      end
+
+      def setup
+        if ROM.env
+          ROM.setup(ROM.env.repositories)
+        else
+          repositories = config.rom.repositories
+
+          # If there's no default repository configured, try to infer it from
+          # other sources, e.g. ActiveRecord.
+          repositories[:default] ||= infer_default_repository
+
+          ROM.setup(repositories.symbolize_keys)
         end
+        load_all
+        ROM.finalize
+      end
+
+      def infer_default_repository
+        return unless defined?(::ActiveRecord)
+        spec = ActiveRecord::Configuration.call
+        [:sql, spec[:uri], spec[:options]]
       end
 
-      private
+      def load_all
+        %w(relations mappers commands).each do |type|
+          load_files(type)
+        end
+      end
 
-      def schema_file
-        root.join('db/rom/schema.rb')
+      def load_files(type)
+        Dir[root.join("app/#{type}/**/*.rb").to_s].each do |path|
+          require_dependency(path)
+        end
       end
 
       def root

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = "0.2.1".freeze
+    VERSION = "0.3.0.beta1".freeze
   end
 end

data/rom-rails.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rom', '~> 0.5', '>= 0.5.0'
+  spec.add_runtime_dependency 'rom', '~> 0.6.0.beta1'
+  spec.add_runtime_dependency 'addressable', '~> 2.3'
+  spec.add_runtime_dependency 'charlatan', '~> 0.1'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.4'
   spec.add_runtime_dependency 'railties', ['>= 3.0', '< 5.0']
 

data/spec/dummy/app/commands/tasks.rb

@@ -0,0 +1,5 @@
+class CreateTask < ROM::Commands::Create[:sql]
+  relation :tasks
+  register_as :create
+  result :one
+end

data/spec/dummy/app/commands/users.rb

@@ -1,11 +1,5 @@
-ROM.commands(:users) do
-  define(:create) do
-    input UserParams
-    validator UserValidator
-    result :one
-  end
-
-  define(:delete) do
-    result :one
-  end
+class DeleteUser < ROM::Commands::Delete[:sql]
+  relation :users
+  register_as :delete
+  result :one
 end

data/spec/dummy/app/controllers/users_controller.rb

@@ -10,6 +10,36 @@ class UsersController < ApplicationController
     render
   end
 
+  def new
+    render :new, locals: { user: NewUserForm.build }
+  end
+
+  def create
+    user_form = NewUserForm.build(params[:user]).save
+
+    if user_form.success?
+      redirect_to :users
+    else
+      render :new, locals: { user: user_form }
+    end
+  end
+
+  def edit
+    user_form = UpdateUserForm.build({}, { id: params[:id] })
+
+    render :edit, locals: { user: user_form }
+  end
+
+  def update
+    user_form = UpdateUserForm.build(params[:user], id: params[:id]).save
+
+    if user_form.success?
+      redirect_to :users
+    else
+      render :edit, locals: { user: user_form }
+    end
+  end
+
   def search
     render :index
   end

data/spec/dummy/app/forms/new_user_form.rb

@@ -0,0 +1,9 @@
+class NewUserForm < UserForm
+  commands users: :create
+
+  params.timestamps(:created_at)
+
+  def commit!
+    users.try { users.create.call(params) }
+  end
+end

data/spec/dummy/app/forms/update_user_form.rb

@@ -0,0 +1,9 @@
+class UpdateUserForm < UserForm
+  commands users: :update
+
+  params.timestamps(:updated_at)
+
+  def commit!
+    users.try { users.update.by_id(id).set(params) }
+  end
+end

data/spec/dummy/app/forms/user_form.rb

@@ -0,0 +1,15 @@
+class UserForm < ROM::Model::Form
+  input do
+    set_model_name 'User'
+
+    attribute :name, String
+    attribute :email, String
+  end
+
+  validations do
+    relation :users
+
+    validates :name, :email, presence: true
+    validates :email, uniqueness: true
+  end
+end

data/spec/dummy/app/mappers/users.rb

@@ -1,8 +1,8 @@
-ROM.mappers do
-  define(:users) do
-    model User
+class UserMapper < ROM::Mapper
+  relation :users
 
-    attribute :id
-    attribute :name
-  end
+  model User
+
+  attribute :id
+  attribute :name
 end

data/spec/dummy/app/relations/tasks.rb

@@ -0,0 +1,9 @@
+class Tasks < ROM::Relation[:sql]
+  def by_id(id)
+    where(id: id)
+  end
+
+  def all
+    select(:id, :title).order(:id)
+  end
+end

data/spec/dummy/app/relations/users.rb

@@ -1,4 +1,8 @@
-ROM.relation(:users) do
+class Users < ROM::Relation[:sql]
+  def by_id(id)
+    where(id: id)
+  end
+
   def index
     order(:name)
   end

data/spec/dummy/app/views/users/edit.html.erb

@@ -0,0 +1,6 @@
+<%= form_for user do |f| %>
+  <%= user.errors.full_messages if user.errors %>
+  <%= f.text_field :email %>
+  <%= f.text_field :name %>
+  <%= f.submit %>
+<% end %>

data/spec/dummy/app/views/users/new.html.erb

@@ -0,0 +1,6 @@
+<%= form_for user do |f| %>
+  <%= user.errors.full_messages if user.errors %>
+  <%= f.text_field :email %>
+  <%= f.text_field :name %>
+  <%= f.submit %>
+<% end %>

data/spec/dummy/config/routes.rb

@@ -1,5 +1,9 @@
 Dummy::Application.routes.draw do
-  get '/users' => 'users#index'
+  get '/users' => 'users#index', as: :users
+  post '/users' => 'users#create'
+  get '/users/:id/edit' => 'users#edit'
+  patch '/users/:id' => 'users#update', as: :user
+  get '/users/new' => 'users#new'
   get '/users/search' => 'users#search'
   get '/users/ping' => 'users#ping'
 end

data/spec/dummy/db/migrate/20141110205016_add_users.rb

@@ -2,6 +2,8 @@ class AddUsers < ActiveRecord::Migration
   def change
     create_table(:users) do |t|
       t.string :name
+      t.string :email
+      t.timestamps
     end
   end
 end

data/spec/dummy/db/migrate/20150202194440_create_tasks.rb

@@ -0,0 +1,7 @@
+class CreateTasks < ActiveRecord::Migration
+  def change
+    create_table :tasks do |t|
+      t.string :title
+    end
+  end
+end