rom-rails 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53fad0999e88095261c12196674bf05ef9754eb
-  data.tar.gz: 134a8100ee7b0b4967315b3ce342a1526b9280e8
+  metadata.gz: 3eb6dc7cbe13616ba42eb04dedbf46d454e5fee6
+  data.tar.gz: 3de6f1246346eda7234baec3ada3af5ee425603a
 SHA512:
-  metadata.gz: ff2d1b07af8d3e2ad0263ea1f7fa1d433dc1f3da4c801710f51daa778dc9b903224747bdd55a9ca9bb232103a4561ef332161a6db12bd367a9ffe6e130fd127b
-  data.tar.gz: ebf50d904cd43b7be7addd0c9167921e4ae9924250b8e69aea2bbd8f9f705020f80865fc5336b8a1ee67480b8b6833d241250cb3c732afc4ed2138d2bf67c571
+  metadata.gz: 7f4f2a71ecc81887fee3c3fd326119af378d3a633dcadcab03191b7410756bbcf39db3ba65d5e1b78e498469299c0de1511b340cd0af861a99ae76a8b3085b64
+  data.tar.gz: 89106263fa73c8346e2eb7b0062e1c7386c7995e0a9630ae490b40adf5f6e7fde3e6f943b1b1c07d36154469f9f8bf94d0b4004f5dd6e5b8f0e26487a2ab16b6

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## v0.4.0 2015-06-22
+
+### Added
+
+* `embedded` validators allowing to nest validations for embedded values (solnic)
+* Uniqueness validation supports `:scope` option (vrish88)
+
+### Changed
+
+* `ROM.env` is lazy-finalized on first access of any of the components (solnic)
+* `db:setup` provided by the railtie now loads `:environment` (solnic)
+* `repositories` in railtie configuration deprecated in favor of `gateways` (solnic)
+
+### Fixed
+
+* `method_missing` in validators behaves properly now (solnic)
+
+[Compare v0.3.3...v0.4.0](https://github.com/rom-rb/rom-rails/compare/v0.3.3...v0.4.0)
+
 ## v0.3.3 2015-05-22
 
 ### Added

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

@@ -1,8 +1,8 @@
 class <%= class_name %>Relation < ROM::Relation<%= "[:#{adapter}]" %>
-<% if repository -%>
-  repository :<%= repository %>
+<% if gateway -%>
+  gateway :<%= gateway %>
 <% else -%>
-  # repository :default
+  # gateway :default
 <% end -%>
 
   dataset :<%= dataset %>

data/lib/generators/rom/relation_generator.rb

@@ -8,9 +8,9 @@ module ROM
         desc: "specify an adapter to use", required: true,
         default: ROM.adapters.keys.first
 
-      class_option :repository,
-        banner: "--repository=repo",
-        desc: "specify a repository to connect to",
+      class_option :gateway,
+        banner: "--gateway=repo",
+        desc: "specify a gateway to connect to",
         required: false
 
       class_option :register,
@@ -40,8 +40,8 @@ module ROM
         options[:register] || dataset
       end
 
-      def repository
-        options[:repository]
+      def gateway
+        options[:gateway]
       end
 
     end

data/lib/rom/rails/active_record/configuration.rb

@@ -17,7 +17,7 @@ module ROM
           :root
         ].freeze
 
-        # Returns repository configuration for the current environment.
+        # Returns gateway configuration for the current environment.
         #
         # @note This relies on ActiveRecord being initialized already.
         # @param [Rails::Application]

data/lib/rom/rails/configuration.rb

@@ -1,11 +1,16 @@
 require 'virtus'
+require 'rom/support/deprecations'
 
 module ROM
   module Rails
     class Configuration
+      extend ROM::Deprecations
+
       include Virtus.model(strict: true)
 
-      attribute :repositories, Hash, default: {}
+      attribute :gateways, Hash, default: {}
+
+      deprecate :repositories, :gateways
     end
   end
 end

data/lib/rom/rails/inflections.rb

@@ -1,5 +1,6 @@
 require 'active_support/inflections'
 
 ActiveSupport::Inflector.inflections do |inflect|
-  inflect.acronym 'ROM'
+  # `acronym` was added in ActiveSupport 3.2.5
+  inflect.acronym 'ROM' if inflect.respond_to?(:acronym)
 end

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

@@ -431,8 +431,8 @@ module ROM
           klass.validator @validator
 
           relation = rom.relations[rel_name]
-          repository = rom.repositories[relation.repository]
-          repository.extend_command_class(klass, relation.dataset)
+          gateway = rom.gateways[relation.gateway]
+          gateway.extend_command_class(klass, relation.dataset)
 
           klass.build(relation)
         end

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

@@ -1,4 +1,5 @@
 require 'rom/rails/model/validator/uniqueness_validator'
+require 'rom/support/class_macros'
 
 module ROM
   module Model
@@ -30,8 +31,14 @@ module ROM
       def self.included(base)
         base.class_eval do
           extend ClassMethods
+          extend ROM::ClassMacros
+
           include ActiveModel::Validations
           include Equalizer.new(:attributes, :errors)
+
+          base.defines :embedded_validators
+
+          embedded_validators({})
         end
       end
 
@@ -40,11 +47,15 @@ module ROM
       # @api private
       attr_reader :attributes
 
+      # @api private
+      attr_reader :attr_names
+
       delegate :model_name, to: :attributes
 
       # @api private
       def initialize(attributes)
         @attributes = attributes
+        @attr_names = self.class.validators.map(&:attributes).flatten.uniq
       end
 
       # @return [Model::Attributes]
@@ -72,8 +83,12 @@ module ROM
       # as it expects the object to provide attribute values. Meh.
       #
       # @api private
-      def method_missing(name)
-        attributes[name]
+      def method_missing(name, *args, &block)
+        if attr_names.include?(name)
+          attributes[name]
+        else
+          super
+        end
       end
 
       module ClassMethods
@@ -99,9 +114,13 @@ module ROM
           @relation
         end
 
-        # FIXME: this looks like not needed
-        def model_name
-          attributes.model_name
+        # @api private
+        def set_model_name(name)
+          class_eval <<-RUBY
+            def self.model_name
+              @model_name ||= ActiveModel::Name.new(self, nil, #{name.inspect})
+            end
+          RUBY
         end
 
         # Trigger validation for specific attributes
@@ -115,6 +134,57 @@ module ROM
           validator = new(attributes)
           validator.call
         end
+
+        # Specify an embedded validator for nested structures
+        #
+        # @example
+        #   class UserValidator
+        #     include ROM::Model::Validator
+        #
+        #     set_model_name 'User'
+        #
+        #     embedded :address do
+        #       validates :city, :street, :zipcode, presence: true
+        #     end
+        #
+        #     emebdded :tasks do
+        #       validates :title, presence: true
+        #     end
+        #   end
+        #
+        #   validator = UserAttributes.new(address: {}, tasks: {})
+        #
+        #   validator.valid? # false
+        #   validator.errors[:address].first # errors for address
+        #   validator.errors[:tasks] # errors for tasks
+        #
+        # @api public
+        def embedded(name, &block)
+          validator_class = Class.new { include ROM::Model::Validator }
+          validator_class.class_eval(&block)
+          validator_class.set_model_name(name.to_s.classify)
+
+          embedded_validators[name] = validator_class
+
+          validates name, presence: true
+
+          validate do
+            value = attributes[name]
+
+            if value.present?
+              Array([value]).flatten.each do |object|
+                validator = validator_class.new(object)
+                validator.validate
+
+                if validator.errors.any?
+                  errors.add(name, validator.errors)
+                else
+                  errors.add(name, [])
+                end
+              end
+            end
+          end
+        end
       end
     end
   end

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

@@ -24,13 +24,17 @@ module ROM
           super
           @klass = options.fetch(:class)
           @message = options.fetch(:message) { :taken }
+          @scope_keys = options[:scope]
         end
 
         # Hook called by ActiveModel internally
         #
         # @api private
         def validate_each(validator, name, value)
-          validator.errors.add(name, message) unless unique?(name, value)
+          scope = Array(@scope_keys).each_with_object({}) do |key, scope|
+            scope[key] = validator.to_model[key]
+          end
+          validator.errors.add(name, message) unless unique?(name, value, scope)
         end
 
         private
@@ -66,8 +70,8 @@ module ROM
         # @return [TrueClass,FalseClass]
         #
         # @api private
-        def unique?(name, value)
-          relation.unique?(name => value)
+        def unique?(name, value, scope)
+          relation.unique?({name => value}.merge(scope))
         end
       end
     end

data/lib/rom/rails/railtie.rb

@@ -12,42 +12,11 @@ module ROM
     class Railtie < ::Rails::Railtie
       COMPONENT_DIRS = %w(relations mappers commands).freeze
 
-      MissingRepositoryConfigError = Class.new(StandardError)
+      MissingGatewayConfigError = Class.new(StandardError)
 
-      # @api public
-      def self.setup_repositories
-        raise(
-          MissingRepositoryConfigError,
-          "seems like you didn't configure any repositories"
-        ) unless config.rom.repositories.any?
-
-        ROM.setup(config.rom.repositories)
-        self
-      end
-
-      # @api public
-      def self.finalize
-        ROM.finalize
-        self
-      end
-
-      # If there's no default repository configured, try to infer it from
-      # other sources, e.g. ActiveRecord.
-      #
-      # @api private
-      def self.infer_default_repository
-        return unless active_record?
-        spec = ROM::Rails::ActiveRecord::Configuration.call
-        [:sql, spec[:uri], spec[:options]]
-      end
-
-      # @api private
-      def self.active_record?
-        defined?(::ActiveRecord)
-      end
-
-      # @api private
-      def before_initialize
+      # 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
 
@@ -59,25 +28,19 @@ module ROM
 
       initializer 'rom.adjust_eager_load_paths' do |app|
         paths = COMPONENT_DIRS.map do |directory|
-          ::Rails.root.join('app', directory).to_s
+          root.join('app', directory).to_s
         end
 
-        app.config.eager_load_paths -=  paths
+        app.config.eager_load_paths -= paths
       end
 
       rake_tasks do
-        load "rom/rails/tasks/db.rake" unless self.class.active_record?
-      end
-
-      # Make `ROM::Rails::Configuration` instance available to the user via
-      # `Rails.application.config` before other initializers run.
-      config.before_initialize do |_app|
-        before_initialize
+        load "rom/rails/tasks/db.rake" unless active_record?
       end
 
       # Reload ROM-related application code on each request.
       config.to_prepare do |_config|
-        Railtie.setup
+        Railtie.finalize
       end
 
       # Behaves like `Railtie#configure` if the given block does not take any
@@ -85,11 +48,13 @@ module ROM
       #
       # @example
       #   ROM::Rails::Railtie.configure do |config|
-      #     config.repositories[:default] = [:yaml, 'yaml:///data']
+      #     config.gateways[:default] = [:yaml, 'yaml:///data']
       #   end
       #
       # @api public
       def configure(&block)
+        config.rom = Configuration.new unless config.respond_to?(:rom)
+
         if block.arity == 1
           block.call(config.rom)
         else
@@ -97,40 +62,69 @@ module ROM
         end
       end
 
+      # @api private
+      def setup(gateways)
+        raise(
+          MissingGatewayConfigError,
+          "seems like you didn't configure any gateways"
+        ) unless gateways.any?
+
+        ROM.setup(gateways)
+      end
+
+      # @api private
+      def setup_gateways
+        gateways =
+          if env
+            env.gateways
+          else
+            prepare_gateways
+          end
+
+        setup(gateways)
+      end
+
+      # @api private
+      def finalize
+        setup_gateways
+        load_components
+        ROM.finalize
+      end
+
       # TODO: Add `ROM.env.disconnect` to core.
       #
       # @api private
       def disconnect
-        ROM.env.repositories.each_value(&:disconnect)
+        ROM.gateways.each_key(&:disconnect)
       end
 
       # @api private
-      def setup
-        if ROM.env
-          ROM.setup(ROM.env.repositories)
-        else
-          repositories = config.rom.repositories
+      def prepare_gateways
+        config.rom.gateways[:default] ||= infer_default_gateway if active_record?
+        config.rom.gateways
+      end
 
-          if self.class.active_record?
-            repositories[:default] ||= self.class.infer_default_repository
-          end
+      # If there's no default gateway configured, try to infer it from
+      # other sources, e.g. ActiveRecord.
+      #
+      # @api private
+      def infer_default_gateway
+        spec = ROM::Rails::ActiveRecord::Configuration.call
+        [:sql, spec[:uri], spec[:options]]
+      end
 
-          self.class.setup_repositories
-        end
-        load_all
-        self.class.finalize
+      def load_initializer
+        load "#{root}/config/initializers/rom.rb" rescue LoadError
       end
 
       # @api private
-      def load_all
-        COMPONENT_DIRS.each do |type|
-          load_files(type)
-        end
+      def load_components
+        COMPONENT_DIRS.each { |type| load_files(type) }
       end
 
       # @api private
       def load_files(type)
-        Dir[root.join("app/#{type}/**/*.rb").to_s].each do |path|
+        Dir[root.join("app/#{type}/**/*.rb")].each do |path|
           require_dependency(path)
         end
       end
@@ -139,6 +133,16 @@ module ROM
       def root
         ::Rails.root
       end
+
+      # @api private
+      def env
+        ROM.env
+      end
+
+      # @api private
+      def active_record?
+        defined?(::ActiveRecord)
+      end
     end
   end
 end

data/lib/rom/rails/tasks/db.rake

@@ -1,11 +1,7 @@
 namespace :db do
-  desc 'Set up ROM repositories'
+  desc 'Set up ROM gateways'
   task :setup do
-    railtie = ROM::Rails::Railtie
-    railtie.before_initialize
-
-    require "#{Rails.root}/config/initializers/rom"
-
-    railtie.setup_repositories.finalize
+    ROM::Rails::Railtie.load_initializer
+    ROM::Rails::Railtie.setup_gateways
   end
 end

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/rom-rails.gemspec

@@ -17,7 +17,7 @@ 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.7', '>= 0.7.0'
+  spec.add_runtime_dependency 'rom', '~> 0.8', '>= 0.8.0'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'charlatan', '~> 0.1'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.5'

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

@@ -7,4 +7,5 @@ class UserMapper < ROM::Mapper
   attribute :id
   attribute :name
   attribute :email
+  attribute :birthday
 end

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

@@ -1,4 +1,4 @@
 class DummyRelation < ROM::Relation[:test_adapter]
   register_as :dummy
-  repository :test
+  gateway :test
 end

data/spec/dummy/config/initializers/rom.rb

@@ -1,5 +1,5 @@
 ROM::Rails::Railtie.configure do |config|
   scheme = RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite' : 'sqlite'
-  config.repositories[:default] = [:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3"]
-  config.repositories[:test] = [:test_adapter, foo: :bar]
+  config.gateways[:default] = [:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3"]
+  config.gateways[:test] = [:test_adapter, foo: :bar]
 end

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

@@ -4,6 +4,7 @@ ROM::SQL.migration do
       primary_key :id
       String :name
       String :email
+      Date   :birthday
       DateTime :created_at
       DateTime :updated_at
     end

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

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

data/spec/{dummy/spec/integration → integration}/activerecord_setup.rb

@@ -1,4 +1,4 @@
-describe 'Connects to repositories using database.yml' do
+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

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'ROM initializer' do
+  it 'allows setting up a custom gateway' do
+    gateway = ROM::TestAdapter::Gateway.new(foo: :bar)
+    relation = DummyRelation.new([])
+
+    expect(rom.gateways[:test]).to eql(gateway)
+    expect(rom.relations.dummy).to eql(relation)
+  end
+end

data/spec/{dummy/spec/integration → integration}/logger_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe 'ROM logger' do
   let(:rom) { ROM.env }
 
-  it 'sets up rails logger for all repositories' do
+  it 'sets up rails logger for all gateways' do
     pending 'this will be re-enabled once we have feature detection on ' \
       'adapters and in case of missing rails-log-subscriber support we ' \
       'will set logger to Rails.logger'
-    rom.repositories.each_value do |repository|
-      expect(repository.logger).to be(Rails.logger)
+    rom.gateways.each_value do |gateway|
+      expect(gateway.logger).to be(Rails.logger)
     end
   end
 end

data/spec/lib/generators/relation_generator_spec.rb

@@ -19,7 +19,7 @@ describe ROM::Generators::RelationGenerator, type: :generator do
           file 'users_relation.rb' do
             contains <<-CONTENT.strip_heredoc
               class UsersRelation < ROM::Relation[:#{default_adapter}]
-                # repository :default
+                # gateway :default
 
                 dataset :users
 
@@ -45,11 +45,11 @@ describe ROM::Generators::RelationGenerator, type: :generator do
     expect(relation).to include("class UsersRelation < ROM::Relation[:memory]")
   end
 
-  specify "with given repository" do
-    run_generator ['users', '--repository=remote']
+  specify "with given gateway" do
+    run_generator ['users', '--gateway=remote']
 
     relation = File.read(File.join(destination_root, 'app', 'relations', 'users_relation.rb'))
-    expect(relation).to include("repository :remote")
+    expect(relation).to include("gateway :remote")
   end
 
   specify "with given registration" do

data/spec/spec_helper.rb

@@ -24,14 +24,14 @@ RSpec.configure do |config|
   config.order = "random"
 
   config.before(:suite) do
-    conn = ROM.env.repositories[:default].connection
+    conn = ROM.env.gateways[:default].connection
 
     DatabaseCleaner[:sequel, connection: conn].strategy = :transaction
     DatabaseCleaner[:sequel, connection: conn].clean_with(:truncation)
   end
 
   config.around(:each) do |example|
-    conn = ROM.env.repositories[:default].connection
+    conn = ROM.env.gateways[:default].connection
 
     DatabaseCleaner[:sequel, connection: conn].cleaning { example.run }
   end

data/spec/unit/validator/embedded_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+
+describe 'Embedded validators' do
+  it 'allows defining a validator for a nested hash' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :address do
+        set_model_name 'Address'
+
+        validates :street, :city, :zipcode, presence: true
+      end
+    end
+
+    attributes = { name: '', address: { street: '', city: '', zipcode: '' } }
+
+    expect { user_validator.call(attributes) }.to raise_error(
+      ROM::Model::ValidationError)
+
+    validator = user_validator.new(attributes)
+
+    expect(validator).to_not be_valid
+
+    expect(validator.errors[:name]).to include("can't be blank")
+
+    address_errors = validator.errors[:address].first
+
+    expect(address_errors).to_not be_empty
+
+    expect(address_errors[:street]).to include("can't be blank")
+    expect(address_errors[:city]).to include("can't be blank")
+    expect(address_errors[:zipcode]).to include("can't be blank")
+  end
+
+  it 'allows defining a validator for a nested array' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :tasks do
+        set_model_name 'Task'
+
+        validates :title, presence: true
+      end
+    end
+
+    attributes = {
+      name: '',
+      tasks: [
+        { title: '' },
+        { title: 'Two' }
+      ]
+    }
+
+    expect { user_validator.call(attributes) }.to raise_error(
+      ROM::Model::ValidationError)
+
+    validator = user_validator.new(attributes)
+
+    expect(validator).to_not be_valid
+
+    expect(validator.errors[:name]).to include("can't be blank")
+
+    task_errors = validator.errors[:tasks]
+
+    expect(task_errors).to_not be_empty
+
+    expect(task_errors[0][:title]).to include("can't be blank")
+    expect(task_errors[1]).to be_empty
+  end
+
+  it 'validates presence of the nested structure' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :tasks do
+        set_model_name 'Task'
+
+        validates :title, presence: true
+      end
+    end
+
+    validator = user_validator.new(name: '')
+    validator.validate
+
+    expect(validator.errors[:name]).to include("can't be blank")
+    expect(validator.errors[:tasks]).to include("can't be blank")
+  end
+
+  it 'exposes registered validators in embedded_validators hash' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :tasks do
+        set_model_name 'Task'
+
+        validates :title, presence: true
+      end
+    end
+
+    expect(user_validator.embedded_validators[:tasks]).to be_present
+  end
+end

data/spec/unit/validator_spec.rb

@@ -11,6 +11,7 @@ describe 'Validation' do
 
       attribute :name, String
       attribute :email, String
+      attribute :birthday, Date
     }
   end
 
@@ -58,11 +59,9 @@ describe 'Validation' do
   describe ':uniqueness' do
     let(:attributes) { user_attrs.new(name: 'Jane', email: 'jane@doe.org') }
 
-    before do
+    it 'sets default error messages' do
       rom.relations.users.insert(name: 'Jane', email: 'jane@doe.org')
-    end
 
-    it 'sets default error messages' do
       expect(validator).to_not be_valid
       expect(validator.errors[:email]).to eql(['has already been taken'])
     end
@@ -73,5 +72,71 @@ describe 'Validation' do
       expect(validator).to_not be_valid
       expect(validator.errors[:name]).to eql(['TAKEN!'])
     end
+
+    context 'with unique attributes within a scope' do
+      let(:user_validator) do
+        Class.new {
+          include ROM::Model::Validator
+
+          relation :users
+
+          validates :email, uniqueness: {scope: :name}
+
+          def self.name
+            'User'
+          end
+        }
+      end
+
+      let(:doubly_scoped_validator) do
+        Class.new {
+          include ROM::Model::Validator
+
+          relation :users
+
+          validates :email, uniqueness: {scope: [:name, :birthday]}
+
+          def self.name
+            'User'
+          end
+        }
+      end
+
+      it 'does not add errors' do
+        rom.relations.users.insert(name: 'Jane', email: 'jane+doe@doe.org')
+        attributes = user_attrs.new(name: 'Jane', email: 'jane@doe.org', birthday: Date.parse('2014-12-12'))
+        validator = user_validator.new(attributes)
+        expect(validator).to be_valid
+      end
+
+      it 'adds an error when the doubly scoped validation fails' do
+        attributes = user_attrs.new(name: 'Jane', email: 'jane@doe.org', birthday: Date.parse('2014-12-12'))
+        validator = doubly_scoped_validator.new(attributes)
+        expect(validator).to be_valid
+
+        rom.relations.users.insert(attributes.attributes)
+        expect(validator).to_not be_valid
+
+        attributes = user_attrs.new(name: 'Jane', email: 'jane+doe@doe.org', birthday: Date.parse('2014-12-12'))
+        validator = doubly_scoped_validator.new(attributes)
+        expect(validator).to be_valid
+      end
+    end
+  end
+
+  describe '#method_missing' do
+    let(:attributes) { { name: 'Jane' } }
+
+    it 'returns attribute value if present' do
+      expect(validator.name).to eql('Jane')
+    end
+
+    it 'returns nil if attribute is not present' do
+      expect(validator.email).to be(nil)
+    end
+
+    it 'raises error when name does not match any of the attributes' do
+      expect { validator.foobar }.to raise_error(NoMethodError, /foobar/)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -241,17 +241,17 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
-- spec/dummy/spec/features/users_spec.rb
-- spec/dummy/spec/integration/activerecord_setup.rb
-- spec/dummy/spec/integration/form_with_injected_commands_spec.rb
-- spec/dummy/spec/integration/initializer_spec.rb
-- spec/dummy/spec/integration/logger_spec.rb
-- spec/dummy/spec/integration/new_user_form_spec.rb
-- spec/dummy/spec/integration/user_attributes_spec.rb
-- spec/dummy/spec/integration/user_commands_spec.rb
-- spec/dummy/spec/integration/user_model_mapping_spec.rb
 - spec/dummy/vendor/assets/javascripts/.keep
 - 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_attributes_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
@@ -259,6 +259,7 @@ files:
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
 - spec/unit/form_spec.rb
+- spec/unit/validator/embedded_spec.rb
 - spec/unit/validator_spec.rb
 homepage: http://rom-rb.org
 licenses:
@@ -341,17 +342,17 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
-- spec/dummy/spec/features/users_spec.rb
-- spec/dummy/spec/integration/activerecord_setup.rb
-- spec/dummy/spec/integration/form_with_injected_commands_spec.rb
-- spec/dummy/spec/integration/initializer_spec.rb
-- spec/dummy/spec/integration/logger_spec.rb
-- spec/dummy/spec/integration/new_user_form_spec.rb
-- spec/dummy/spec/integration/user_attributes_spec.rb
-- spec/dummy/spec/integration/user_commands_spec.rb
-- spec/dummy/spec/integration/user_model_mapping_spec.rb
 - spec/dummy/vendor/assets/javascripts/.keep
 - 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_attributes_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
@@ -359,4 +360,5 @@ test_files:
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
 - spec/unit/form_spec.rb
+- spec/unit/validator/embedded_spec.rb
 - spec/unit/validator_spec.rb

data/spec/dummy/spec/integration/initializer_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe 'ROM initializer' do
-  it 'allows setting up a custom repository' do
-    repository = ROM::TestAdapter::Repository.new(foo: :bar)
-    relation = DummyRelation.new([])
-
-    expect(rom.repositories[:test]).to eql(repository)
-    expect(rom.relations.dummy).to eql(relation)
-  end
-end