rom-rails 0.9.0 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0e59843d440aaeb2a02a9d491e563a4d688fb0e
-  data.tar.gz: a26ee36178717a151f1d7bdddc149ca5da8d7468
+  metadata.gz: 15ad5132adeb785fc04f97c8090c43adb48c41d0
+  data.tar.gz: fe847edfa4122b433dee45eea46b2c3795b9ccfd
 SHA512:
-  metadata.gz: b485fd70f08ae8a61bf678cd9dad6125fb28389cd1ecd21fbb9378bb6960738044ed2398772a04fe34b0f02b5729ccd9bbb481c3c836e48ebf91b51251480027
-  data.tar.gz: f16230e0d340682c8e3b32a2e6214d89049e80791ffd3de9ed610868db1cf87c4a39c6fcd974e726304a0d7cd7c41919f75876b9ad1435c76dfcb317a9b226c0
+  metadata.gz: 5348f013e4afbadb3d90b85391253d7ecd30737499b0c2a71ba3c330e643b87db80a109a0ebfe7986ec9375a09aa3e988e8b8e39ac3532099ebef5385ed67612
+  data.tar.gz: 70386c85f3322ddd242f5043eb3a37c8fe737b8065afbb5fcf578d4b46de90e5ef00316766533762d4e8e49f088b276eb4635737343c5a2b93dc0dc3d5047a0c

data/.rspec

@@ -1 +1,3 @@
 --color
+--order random
+--require ./spec/spec_helper

data/.travis.yml

@@ -10,6 +10,7 @@ rvm:
   - jruby-9.0.5.0
   - ruby-head
 env:
+  - RAILS_VERSION=5.1.0
   - RAILS_VERSION=5.0.0
   - RAILS_VERSION=4.2.0
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## HEAD
+
+### Changed
+
+* Updated to work with ROM 4.0.beta (cflipse)
+
+### Removed
+
+* remove ROM::Model::Form (cflipse)
+* remove form generator (cflipse)
+* remove deprecated `config.repositories` method (cflipse)
+* No longer depends on `rom-model` gem (cflipse)
+* No longer depends on `charlatan` gem (artofhuman)
+
 ## v0.9.0  2017-01-30
 
 ### Added

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-RAILS_VERSION = ENV.fetch("RAILS_VERSION", '5.0.0').freeze
+RAILS_VERSION = ENV.fetch("RAILS_VERSION", '5.1.0').freeze
 
 %w(railties actionview actionpack activerecord).each do |name|
   gem name, "~> #{RAILS_VERSION}"
@@ -10,11 +10,14 @@ end
 
 gem 'sqlite3', platforms: [:mri, :rbx]
 gem 'byebug', platforms: :mri
-gem 'rom',    github: 'rom-rb/rom', branch: 'master'
+
+gem 'rom', git: 'https://github.com/rom-rb/rom', branch: 'master' do
+  gem 'rom-core'
+  gem 'rom-mapper'
+  gem 'rom-repository', group: :tools
+end
+
 gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
-gem 'rom-model', github: 'rom-rb/rom-model', branch: 'master'
-gem 'rom-repository', github: 'rom-rb/rom-repository', branch: 'master'
-gem 'rom-mapper', github: 'rom-rb/rom-mapper', branch: 'master'
 
 platforms :jruby do
   gem 'jdbc-sqlite3'

data/lib/generators/rom/commands/templates/create.rb.erb

@@ -3,11 +3,9 @@ class Create<%= model_name %> < ROM::Commands::Create<%= "[:#{adapter}]" %>
   register_as :create
   result :one
 
-  # Modify input data before committing it.
-  # before :timestamp
-
-  # def timestamp(tuple)
-  #   time = Time.current
-  #   tuple.merge(created_at: time, updated_at: time)
-  # end
+<% if adapter.to_sym == :sql -%>
+  # set Timestamp plugin
+  # use :timestamps
+  # timestamp :created_at, :updated_at
+<% end -%>
 end

data/lib/generators/rom/commands/templates/update.rb.erb

@@ -3,11 +3,9 @@ class Update<%= model_name %> < ROM::Commands::Update<%= "[:#{adapter}]" %>
   register_as :update
   result :one
 
-  # Modify input data before committing it.
-  # before :timestamp
-
-  # def timestamp(tuple)
-  #   time = Time.current
-  #   tuple.merge(created_at: time)
-  # end
+<% if adapter.to_sym == :sql -%>
+  # set Timestamp plugin
+  # use :timestamps
+  # timestamp :updated_at
+<% end -%>
 end

data/lib/generators/rom/relation/templates/relation.rb.erb

@@ -2,12 +2,14 @@ class <%= class_name %>Relation < ROM::Relation<%= "[:#{adapter}]" %>
 <% if gateway -%>
   gateway :<%= gateway %>
 <% else -%>
-  # gateway :default
+  gateway :default
 <% end -%>
 
-  dataset :<%= dataset %>
-
-  register_as :<%= register_as %>
+<% if register_as != dataset -%>
+  schema(:<%= dataset %>, as: :<%= register_as %>, infer: true)
+<% else -%>
+  schema(:<%= dataset %>, infer: true)
+<% end -%>
 
   # define your methods here ie:
   #

data/lib/rom-rails.rb

@@ -8,4 +8,3 @@ end
 
 require 'rom/rails/version'
 require 'rom/rails/railtie'
-require 'rom/rails/model/form'

data/lib/rom/rails/configuration.rb

@@ -13,8 +13,6 @@ module ROM
       config_accessor :auto_registration_paths do
         []
       end
-
-      deprecate :repositories, :gateways
     end
   end
 end

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '0.9.0'.freeze
+    VERSION = '1.0.0.beta1'.freeze
   end
 end

data/rom-rails.gemspec

@@ -17,12 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rom', '~> 3.0'
-  spec.add_runtime_dependency 'rom-model', '~> 0.3'
+  spec.add_runtime_dependency 'rom', '~> 4.0.0.beta'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-core', '~> 0.2', '>= 0.2.4'
+  spec.add_runtime_dependency 'dry-core', '~> 0.3'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
-  spec.add_runtime_dependency 'charlatan', '~> 0.1'
   spec.add_runtime_dependency 'railties', '>= 3.0', '< 6.0'
 
   spec.add_development_dependency "rom-repository"

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

@@ -0,0 +1,10 @@
+class CreateUser < ROM::Commands::Create[:sql]
+  relation :users
+  register_as :create
+  result :one
+
+  use :timestamps
+
+  timestamp :created_at
+
+end

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

@@ -0,0 +1,9 @@
+class UpdateUser < ROM::Commands::Update[:sql]
+  relation :users
+  register_as :update
+  result :one
+
+  use :timestamps
+
+  timestamp :updated_at
+end

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

@@ -4,23 +4,24 @@ class UsersController < ApplicationController
   end
 
   def index
-    render :index, locals: { users: rom.relation(:users).as(:entity) }
+    render :index, locals: { users: rom.relations[:users].map_with(:user) }
   end
 
   def search
     render :index, locals: {
-      users: rom.relation(:users).as(:entity).by_name(params[:name])
+      users: rom.relations[:users].map_with(:user).by_name(params[:name])
     }
   end
 
   def new
-    render :new, locals: { user: NewUserForm.build }
+    render :new, locals: { user: UserForm.new }
   end
 
   def create
-    user_form = NewUserForm.build(params[:user]).save
+    user_form = UserForm.new(params[:user].permit!)
 
-    if user_form.success?
+    if user_form.valid?
+      rom.commands[:users].create.call(user_form.to_h)
       redirect_to :users
     else
       render :new, locals: { user: user_form }
@@ -28,15 +29,18 @@ class UsersController < ApplicationController
   end
 
   def edit
-    user_form = UpdateUserForm.build({}, { id: params[:id] })
+    data = rom.relations[:users].where(id: params[:id]).one
+    user_form = UserForm.new(data)
 
     render :edit, locals: { user: user_form }
   end
 
   def update
-    user_form = UpdateUserForm.build(params[:user], id: params[:id]).save
+    data = rom.relations[:users].where(id: params[:id]).one
+    user_form = UserForm.new(data).merge(params[:user].permit!)
 
-    if user_form.success?
+    if user_form.valid?
+      rom.commands[:users].update.by_id(params[:id]).call(user_form.to_h)
       redirect_to :users
     else
       render :edit, locals: { user: user_form }

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

@@ -1,15 +1,35 @@
-class UserForm < ROM::Model::Form
-  input do
-    set_model_name 'User'
+require 'active_model'
+class UserForm
+  include ActiveModel::Model
+  include ActiveModel::Validations
 
-    attribute :name, String
-    attribute :email, String
+  attr_accessor :name, :email, :id
+
+  validates :name, :email, presence: true
+
+  def initialize(params = {})
+    @id     = params[:id]
+    @name   = params[:name]
+    @email  = params[:email]
   end
 
-  validations do
-    relation :users
+  def to_h
+    { name: name, email: email }
+  end
 
-    validates :name, :email, presence: true
-    validates :email, uniqueness: true
+  def merge(input)
+    @name  = input[:name]
+    @email = input[:email]
+
+    self
   end
+
+  def persisted?
+    !!id
+  end
+
+  def self.model_name
+    ActiveModel::Name.new(User)
+  end
+
 end

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

@@ -1,6 +1,6 @@
 class TaskMapper < ROM::Mapper
   relation :tasks
-  register_as :entity
+  register_as :task
 
   model name: 'Task'
 

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

@@ -1,6 +1,6 @@
 class UserMapper < ROM::Mapper
   relation :users
-  register_as :entity
+  register_as :user
 
   model User
 

data/spec/dummy/app/models/user.rb

@@ -1,5 +1,5 @@
 class User
-  include Equalizer.new(:id, :name, :email)
+  include Dry::Equalizer(:id, :name, :email)
 
   attr_reader :id, :name, :email
 

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

@@ -1,4 +1,5 @@
 class DummyRelation < ROM::Relation[:test_adapter]
-  register_as :dummy
   gateway :test
+
+  schema(:dummy, infer: true)
 end

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

@@ -1,4 +1,6 @@
 class Tasks < ROM::Relation[:sql]
+  schema(:tasks, infer: true)
+
   def by_id(id)
     where(id: id)
   end

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

@@ -1,4 +1,6 @@
 class Users < ROM::Relation[:sql]
+  schema(:users, infer: true)
+
   def by_id(id)
     where(id: id)
   end

data/spec/dummy/lib/rom/test_adapter.rb

@@ -5,7 +5,7 @@ module ROM
     end
 
     class Gateway < ROM::Gateway
-      include Equalizer.new(:args)
+      include Dry::Equalizer(:args)
 
       attr_reader :args, :datasets
 

data/spec/features/users_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-feature 'Users' do
+RSpec.feature 'Users' do
   background do
     rom.relations.users.insert(name: 'Jane')
     rom.relations.users.insert(name: 'Joe')

data/spec/integration/activerecord_setup.rb

@@ -1,4 +1,4 @@
-describe 'Connects to gateways using database.yml' do
+RSpec.describe 'Connects to gateways using database.yml' do
   it 'works' do
     pending 'I have no idea how to load AR in isolation'
     raise 'database.yml must go'

data/spec/integration/initializer_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe 'ROM initializer' do
+RSpec.describe 'ROM initializer' do
   it 'allows setting up a custom gateway' do
     gateway = ROM::TestAdapter::Gateway.new(foo: :bar)
     relation = DummyRelation.new([])

data/spec/integration/logger_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe 'ROM logger' do
+RSpec.describe 'ROM logger' do
   let(:rom) { ROM.env }
 
   it 'sets up rails logger for all gateways' do

data/spec/integration/user_commands_spec.rb

@@ -1,14 +1,14 @@
-require 'spec_helper'
-
-describe 'User commands' do
-  subject(:users) { rom.command(:users) }
+RSpec.describe 'User commands' do
+  subject(:users) { rom.commands[:users] }
 
   describe 'delete' do
     it 'deletes record' do
-      rom.relations.users.insert(name: 'Piotr', email: 'piotr@test.com')
-      result = users.try { users.delete.by_name('Piotr') }
+      relation = rom.relations[:users]
+      relation.insert(name: 'Piotr', email: 'piotr@test.com')
 
-      expect(result.error).to be(nil)
+      expect{ 
+        users.delete.by_name('Piotr').call
+      }.to change(relation, :count).by(-1)
     end
   end
 end

data/spec/integration/user_model_mapping_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe 'User model mapping' do
+RSpec.describe 'User model mapping' do
   let(:rom) { ROM.env }
 
-  let(:users) { rom.relation(:users).as(:entity) }
+  let(:users) { rom.relations[:users].map_with(:user) }
 
   before do
     rom.relations.users.insert(name: 'Piotr', email: 'piotr@test.com')

data/spec/lib/active_record/configuration_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
 require 'rom/rails/active_record/configuration'
 
-describe ROM::Rails::ActiveRecord::Configuration do
+RSpec.describe ROM::Rails::ActiveRecord::Configuration do
   let(:root) { Pathname.new('/path/to/app') }
 
   def uri_for(config)

data/spec/lib/generators/commands_generator_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
 require 'generators/rom/commands_generator'
 
-describe ROM::Generators::CommandsGenerator do
+RSpec.describe ROM::Generators::CommandsGenerator do
   destination File.expand_path('../../../../tmp', __FILE__)
 
   before(:each) do
@@ -24,13 +22,9 @@ describe ROM::Generators::CommandsGenerator do
                     register_as :create
                     result :one
 
-                    # Modify input data before committing it.
-                    # before :timestamp
-
-                    # def timestamp(tuple)
-                    #   time = Time.current
-                    #   tuple.merge(created_at: time, updated_at: time)
-                    # end
+                    # set Timestamp plugin
+                    # use :timestamps
+                    # timestamp :created_at, :updated_at
                   end
             CONTENT
           end
@@ -42,13 +36,9 @@ describe ROM::Generators::CommandsGenerator do
                     register_as :update
                     result :one
 
-                    # Modify input data before committing it.
-                    # before :timestamp
-
-                    # def timestamp(tuple)
-                    #   time = Time.current
-                    #   tuple.merge(created_at: time)
-                    # end
+                    # set Timestamp plugin
+                    # use :timestamps
+                    # timestamp :updated_at
                   end
             CONTENT
           end