rom-rails 0.2.1 → 0.3.0.beta1

data/spec/dummy/db/schema.rb

@@ -11,17 +11,17 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141220203134) do
-  create_table "cars", force: true do |_t|
-  end
+ActiveRecord::Schema.define(version: 20150202194440) do
 
-  create_table "planes", force: true do |_t|
+  create_table "tasks", force: :cascade do |t|
+    t.string "title"
   end
 
-  create_table "stuffs", force: true do |_t|
+  create_table "users", force: :cascade do |t|
+    t.string   "name"
+    t.string   "email"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "users", force: true do |t|
-    t.string "name"
-  end
 end

data/spec/dummy/spec/features/users_spec.rb

@@ -13,6 +13,36 @@ feature 'Users' do
     expect(page).to have_content('Joe')
   end
 
+  scenario 'I save a new user' do
+    visit '/users/new'
+
+    click_on 'Create User'
+    expect(page).to have_content("can't be blank")
+
+    find('#user_email').set('jade@doe.org')
+    find('#user_name').set('Jade')
+    click_on 'Create User'
+
+    expect(page).to have_content('Jade')
+    expect(page).to have_content('Jane')
+    expect(page).to have_content('Joe')
+  end
+
+  scenario 'I edit an existing user' do
+    jane = rom.relations.users.by_name('Jane').first
+    visit "/users/#{jane[:id]}/edit"
+
+    click_on 'Update User'
+    expect(page).to have_content("can't be blank")
+
+    find('#user_email').set('jane.doe@example.org')
+    find('#user_name').set('Jane Doe')
+    click_on 'Update User'
+
+    expect(page).to have_content('Jane Doe')
+    expect(page).to have_content('Joe')
+  end
+
   scenario 'I can search users' do
     visit '/users/search?name=Jane'
 

data/spec/dummy/spec/integration/logger_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'ROM logger' do
-  let(:rom) { Rails.application.config.rom.env }
+  let(:rom) { ROM.env }
 
   it 'sets up rails logger for all repositories' do
     pending 'this will be re-enabled once we have feature detection on ' \

data/spec/dummy/spec/integration/user_commands_spec.rb

@@ -3,26 +3,10 @@ require 'spec_helper'
 describe 'User commands' do
   subject(:users) { rom.command(:users) }
 
-  describe 'create' do
-    it 'inserts user with valid params' do
-      result = users.try { create(name: 'Jade') }
-
-      expect(result.value).to eql(id: result.value[:id], name: 'Jade')
-    end
-
-    it 'returns error if params are not valid' do
-      result = users.try { create(name: '') }
-
-      expect(result.value).to be(nil)
-      expect(result.error).to be_instance_of(ROM::Model::ValidationError)
-      expect(result.error.messages[:name]).to include("can't be blank")
-    end
-  end
-
   describe 'delete' do
     it 'deletes record' do
-      users.create.call(name: 'Piotr')
-      result = users.try { delete(:by_name, 'Piotr') }
+      rom.relations.users.insert(name: 'Piotr', email: 'piotr@test.com')
+      result = users.try { users.delete.by_name('Piotr') }
 
       expect(result.error).to be(nil)
     end

data/spec/dummy/spec/integration/user_model_mapping_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe 'User model mapping' do
-  let(:rom) { Rails.application.config.rom.env }
+  let(:rom) { ROM.env }
 
   let(:users) { rom.read(:users) }
 
   before do
-    rom.command(:users).try { create(name: 'Piotr') }
+    rom.relations.users.insert(name: 'Piotr', email: 'piotr@test.com')
   end
 
   it 'works' do

data/spec/dummy/spec/integration/user_params_spec.rb

@@ -5,29 +5,44 @@ describe ROM::Model::Params do
     Class.new do
       include ROM::Model::Params
 
-      param_key :test
       attribute :name, String
-      validates :name, presence: true
 
-      def self.name
-        'Test'
-      end
+      timestamps
     end
   end
 
-  describe '#valid?' do
-    it 'returns true when attributes are valid' do
-      user_params = params.new(name: 'Jane')
-      expect(user_params).to be_valid
+  describe '.timestamps' do
+    it 'provides a way to specify timestamps with default values' do
+      expect(params.new.created_at).to be_a(DateTime)
+      expect(params.new.updated_at).to be_a(DateTime)
     end
 
-    it 'returns false when attributes are not valid' do
-      user_params = params.new(name: '')
-      expect(user_params).not_to be_valid
-    end
+    context 'passing in arbritrary names' do
+      it 'excludes :created_at when passing in :updated_at' do
+        params = Class.new {
+          include ROM::Model::Params
+
+          timestamps(:updated_at)
+        }
+
+        model = params.new
+
+        expect(model).not_to respond_to(:created_at)
+        expect(model).to respond_to(:updated_at)
+      end
+
+      it 'accepts multiple timestamp attribute names' do
+        params = Class.new {
+          include ROM::Model::Params
+
+          timestamps(:published_at, :revised_at)
+        }
 
-    it 'sets up AM name' do
-      expect(params.model_name.param_key).to eql('test')
+        model = params.new
+
+        expect(model).to respond_to(:published_at)
+        expect(model).to respond_to(:revised_at)
+      end
     end
   end
 end

data/spec/lib/active_record/configuration_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+require 'rom/rails/active_record/configuration'
+
+describe ROM::Rails::ActiveRecord::Configuration do
+  let(:root) { Pathname.new('/path/to/app') }
+
+  def uri_for(config)
+    result = read(config)
+    result.is_a?(Hash) ? result[:uri] : result
+  end
+
+  def read(config)
+    described_class.build(config.merge(root: root))
+  end
+
+  def parse(uri)
+    URI.parse(uri.gsub(/^jdbc:/, ''))
+  end
+
+  it 'raises an error without specifying a database'
+
+  context 'with postgresql adapter' do
+    it 'rewrites the scheme' do
+      uri = uri_for(adapter: 'postgresql', database: 'test')
+      expect(parse(uri).scheme).to eql('postgres')
+    end
+
+    it 'does not use jdbc even on jruby' do
+      uri = uri_for(adapter: 'postgresql', database: 'test')
+      expect(uri).to_not start_with('jdbc:')
+    end
+
+    it 'only includes username if no password is given' do
+      uri = uri_for(
+        adapter: 'postgresql',
+        host: 'example.com',
+        database: 'test',
+        username: 'user'
+      )
+
+      expect(parse(uri).userinfo).to eql('user')
+    end
+
+    it 'includes username and password if both are given' do
+      uri = uri_for(
+        adapter: 'postgresql',
+        database: 'test',
+        username: 'user',
+        password: 'password',
+        host: 'example.com'
+      )
+
+      expect(parse(uri).userinfo).to eql('user:password')
+    end
+
+    it 'omits userinfo if neither username nor password are given' do
+      uri = uri_for(adapter: 'postgresql', database: 'test')
+      expect(parse(uri).userinfo).to be_nil
+    end
+
+    it 'properly handles configuration without a host' do
+      uri = uri_for(adapter: 'postgresql', database: 'test')
+      expect(uri).to eql('postgres:///test')
+    end
+  end
+
+  context 'with mysql adapter' do
+    it 'sets default password to an empty string' do
+      uri = uri_for(adapter: 'mysql', database: 'test', username: 'root', host: 'example.com')
+      expect(parse(uri).userinfo).to eql('root:')
+    end
+
+    it 'uses jdbc only on jruby' do
+      uri = uri_for(adapter: 'mysql', database: 'test')
+      expect(uri.starts_with?('jdbc:')).to be(RUBY_ENGINE == 'jruby')
+    end
+  end
+
+  context 'with sqlite3 adapter' do
+    let(:database) { Pathname.new('db/development.sqlite3') }
+    let(:config) { { adapter: adapter, database: database } }
+
+    it 'rewrites the scheme' do
+      uri = uri_for(adapter: 'sqlite3', database: database)
+      expect(parse(uri).scheme).to eql('sqlite')
+    end
+
+    it 'uses jdbc only on jruby' do
+      uri = uri_for(adapter: 'sqlite3', database: database)
+      expect(uri.starts_with?('jdbc:')).to be(RUBY_ENGINE == 'jruby')
+    end
+
+    it 'expands the path' do
+      uri = uri_for(adapter: 'sqlite3', database: database)
+      expect(parse(uri).path).to eql(root.join(database).to_s)
+    end
+  end
+end

data/spec/lib/generators/commands_generator_spec.rb

@@ -5,36 +5,76 @@ require 'generators/rom/commands_generator'
 describe ROM::Generators::CommandsGenerator do
   destination File.expand_path('../../../../tmp', __FILE__)
 
-  before(:all) do
+  before(:each) do
     prepare_destination
-    run_generator ['users']
   end
 
   specify do
+    run_generator ['users']
+
+    default_adapter = ROM.adapters.keys.first
+
     expect(destination_root).to have_structure {
       directory 'app' do
         directory 'commands' do
-          file 'users.rb' do
-            contains <<-CONTENT.strip_heredoc
-              ROM.commands(:users) do
+          directory 'users' do
+            file 'create.rb' do
+              contains <<-CONTENT.strip_heredoc
+                module UserCommands
+                  class Create < ROM::Commands::Create[:#{default_adapter}]
+                    relation :users
+                    register_as :create
+                    result :one
 
-                define(:create) do
-                  result :one
+                    # define a validator to use
+                    # validator UserValidator
+                  end
                 end
+              CONTENT
+            end
 
-                define(:update) do
-                  result :one
-                end
+            file 'update.rb' do
+              contains <<-CONTENT.strip_heredoc
+                module UserCommands
+                  class Update < ROM::Commands::Update[:#{default_adapter}]
+                    relation :users
+                    register_as :update
+                    result :one
 
-                define(:delete) do
-                  result :one
+                    # define a validator to use
+                    # validator UserValidator
+                  end
                 end
+              CONTENT
+            end
 
-              end
-            CONTENT
+            file 'delete.rb' do
+              contains <<-CONTENT.strip_heredoc
+                module UserCommands
+                  class Delete < ROM::Commands::Delete[:#{default_adapter}]
+                    relation :users
+                    register_as :delete
+                    result :one
+                  end
+                end
+              CONTENT
+            end
           end
         end
       end
     }
   end
+
+  specify "with given adapter" do
+    run_generator ['users', '--adapter=memory']
+
+    create = File.read(File.join(destination_root, 'app', 'commands', 'users', 'create.rb'))
+    expect(create).to include("class Create < ROM::Commands::Create[:memory]")
+
+    update = File.read(File.join(destination_root, 'app', 'commands', 'users', 'update.rb'))
+    expect(update).to include("class Update < ROM::Commands::Update[:memory]")
+
+    delete = File.read(File.join(destination_root, 'app', 'commands', 'users', 'delete.rb'))
+    expect(delete).to include("class Delete < ROM::Commands::Delete[:memory]")
+  end
 end

data/spec/lib/generators/form_generator_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+require 'generators/rom/form_generator'
+
+describe ROM::Generators::FormGenerator do
+  destination File.expand_path('../../../../tmp', __FILE__)
+
+  before(:each) do
+    prepare_destination
+  end
+
+  specify "a create form" do
+    run_generator ['users', '--command=create']
+
+    expect(destination_root).to have_structure {
+      directory 'app' do
+        directory 'forms' do
+          file 'new_user_form.rb' do
+            contains <<-CONTENT.strip_heredoc
+              class NewUserForm < ROM::Model::Form
+                commands users: :create
+
+                input do
+                  set_model_name 'User'
+
+                  # define form input attributes
+                  # attribute :name, String
+
+                  timestamps
+                end
+
+                validations do
+                  relation :users
+
+                  # Add form validations
+                  # validates :name, presence: true
+                end
+
+                def commit!
+                  users.try { users.create.call(params) }
+                end
+
+              end
+            CONTENT
+          end
+        end
+      end
+    }
+  end
+
+  specify "an edit form" do
+    run_generator ['users', '--command=update']
+
+    expect(destination_root).to have_structure {
+      directory 'app' do
+        directory 'forms' do
+          file 'edit_user_form.rb' do
+            contains <<-CONTENT.strip_heredoc
+              class EditUserForm < ROM::Model::Form
+                commands users: :update
+
+                input do
+                  set_model_name 'User'
+
+                  # define form input attributes
+                  # attribute :name, String
+
+                  timestamps :updated_at
+                end
+
+                validations do
+                  relation :users
+
+                  # Add form validations
+                  # validates :name, presence: true
+                end
+
+                def commit!
+                  users.try { users.update.by_id(id).set(params) }
+                end
+
+              end
+            CONTENT
+          end
+        end
+      end
+    }
+  end
+end