rom 0.6.0.beta2 → 0.6.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0566fa80999c8309f81d1794f0a46cf0bd388ba
-  data.tar.gz: e826953ae0a313183e1982f0b9a6a2d7d3cd033b
+  metadata.gz: 3860ac36d7e9d938342e022c7fb0e227fc6273e1
+  data.tar.gz: 1a650f4573310fd5d543839c258338344827989b
 SHA512:
-  metadata.gz: 5854435a14df8841408d3f8b3b2c4fc7226d7050e68198ca148775db4b06fe724c49bca5a54e253d8a81fc9adc428ab9b471fce440f3865f6ceaf0b3639bf07b
-  data.tar.gz: f375e69352c707c5ea33e512c1a337f0527deab4d864167831af24cf7937b62091bb9e907ca5f7fc4920efb507d54cd6095b812d013c46b6d9db732bcc1c9be0
+  metadata.gz: b1239e346a1626da09367e8d4c37a222a43d9a7f70dd248d427dc2046fc1272033913859b38c9e5183d316bd31296c72bdbff4d0a55be590ab9f94f9c907d669
+  data.tar.gz: 4a711b1a776e137d1e953acc7eb8230f5c7c1695d5e8a812b9a7ef23f2673f3fe91619c83b9a93e317dc72e66f2a39b6ce37d082a19ab03110c84abbea8be7e8

data/README.md

@@ -26,6 +26,7 @@ Learn more:
 ## Adapters
 
   * [rom-sql](https://github.com/rom-rb/rom-sql)
+  * [rom-yesql](https://github.com/rom-rb/rom-yesql)
   * [rom-mongo](https://github.com/rom-rb/rom-mongo)
   * [rom-yaml](https://github.com/rom-rb/rom-yaml)
   * [rom-csv](https://github.com/rom-rb/rom-csv)
@@ -66,6 +67,7 @@ end
 # could define it explicitly
 class UserMapper < ROM::Mapper
   relation :users
+  register_as :entity
 
   model User
 
@@ -89,7 +91,7 @@ rom.command(:users).create.call(name: "Joe", age: 17)
 rom.command(:users).create.call(name: "Jane", age: 18)
 
 # reading relations using defined mappers
-puts rom.relation(:users) { |r| r.by_name("Jane").adults }.as(:users).to_a.inspect
+puts rom.relation(:users) { |r| r.by_name("Jane").adults }.as(:entity).to_a.inspect
 # => [#<User:0x007fdba161cc48 @id=2, @name="Jane", @age=18>]
 ```
 

data/lib/rom/env.rb

@@ -33,12 +33,12 @@ module ROM
     attr_reader :mappers
 
     # @api private
-    def initialize(repositories, relations, readers, commands)
+    def initialize(repositories, relations, mappers, commands, readers = nil)
       @repositories = repositories
       @relations = relations
-      @readers = readers
+      @mappers = mappers
       @commands = commands
-      initialize_mappers
+      @readers = readers
       freeze
     end
 
@@ -109,15 +109,5 @@ module ROM
     def command(name)
       commands[name]
     end
-
-    private
-
-    # @api private
-    def initialize_mappers
-      elements = readers.each_with_object({}) { |(name, reader), h|
-        h[name] = reader.mappers
-      }
-      @mappers = Registry.new(elements)
-    end
   end
 end

data/lib/rom/lint/linter.rb

@@ -36,7 +36,9 @@ module ROM
       #
       # @api public
       def lint(name)
+        before_lint
         public_send name
+        after_lint
         true # for assertions
       end
 
@@ -59,6 +61,18 @@ module ROM
       def complain(*args)
         raise Failure, *args
       end
+
+      # Hook method executed before each lint method run
+      #
+      # @api private
+      def before_lint
+      end
+
+      # Hook method executed after each lint method run
+      #
+      # @api private
+      def after_lint
+      end
     end
   end
 end

data/lib/rom/lint/repository.rb

@@ -31,6 +31,7 @@ module ROM
         @identifier = identifier
         @repository = repository
         @uri = uri
+        @repository_instance = setup_repository_instance
       end
 
       # Lint: Ensure that +repository+ setups up its instance
@@ -63,16 +64,31 @@ module ROM
         complain "#{repository_instance} must respond to dataset?"
       end
 
+      private
+
+      # Repository instance
+      #
+      # @api private
+      attr_reader :repository_instance
+
       # Setup repository instance
       #
-      # @api public
-      def repository_instance
+      # @api private
+      def setup_repository_instance
         if uri
           ROM::Repository.setup(identifier, uri)
         else
           ROM::Repository.setup(identifier)
         end
       end
+
+      # Run Repository#disconnect
+      #
+      # @api private
+      def after_lint
+        super
+        repository_instance.disconnect
+      end
     end
   end
 end

data/lib/rom/mapper_registry.rb

@@ -11,6 +11,11 @@ module ROM
       elements.fetch(name) { raise(MapperMissingError, name) }
     end
 
+    # @api private
+    def key?(name)
+      elements.key?(name)
+    end
+
     # @api private
     def by_path(path)
       elements.fetch(paths(path).detect { |name| elements.key?(name) }) {

data/lib/rom/setup/finalize.rb

@@ -50,10 +50,11 @@ module ROM
         infer_schema_relations
 
         relations = load_relations
-        readers = load_readers(relations)
+        mappers = load_mappers
         commands = load_commands(relations)
+        readers = load_readers(relations, mappers)
 
-        Env.new(repositories, relations, readers, commands)
+        Env.new(repositories, relations, mappers, commands, readers)
       end
 
       private
@@ -81,19 +82,28 @@ module ROM
         RelationRegistry.new(relations)
       end
 
+      # @api private
+      def load_mappers
+        mapper_registry = Mapper.registry(mapper_classes).each_with_object({})
+        registry_hash = mapper_registry.each do |(name, mappers), h|
+          h[name] = MapperRegistry.new(mappers)
+        end
+        Registry.new(registry_hash)
+      end
+
       # Build entire reader and mapper registries
       #
       # @api private
-      def load_readers(relations)
+      def load_readers(relations, mappers)
         readers = {}
 
-        Mapper.registry(mapper_classes).each do |name, mappers|
+        mappers.each do |name, rel_mappers|
+          next unless rel_mappers.key?(name)
+
           relation = relations[name]
           methods = relation.exposed_relations
 
-          readers[name] = Reader.build(
-            name, relation, MapperRegistry.new(mappers), methods
-          )
+          readers[name] = Reader.build(name, relation, rel_mappers, methods)
         end
 
         ReaderRegistry.new(readers)

data/lib/rom/support/options.rb

@@ -45,12 +45,17 @@ module ROM
         @reader = options.fetch(:reader) { false }
         @allow = options.fetch(:allow) { [] }
         @default = options.fetch(:default) { Undefined }
+        @ivar = :"@#{name}" if @reader
       end
 
       def reader?
         @reader
       end
 
+      def assign_reader_value(object, value)
+        object.instance_variable_set(@ivar, value)
+      end
+
       def default?
         @default != Undefined
       end
@@ -85,22 +90,19 @@ module ROM
         @options[option.name] = option
       end
 
-      def validate_options(options)
-        options.each do |name, value|
-          validate_option_value(name, value)
-        end
-      end
+      def process(object, options)
+        ensure_known_options(options)
 
-      def set_defaults(object, options)
         each do |name, option|
-          next unless option.default? && !options.key?(name)
-          options[name] = option.default_value(object)
-        end
-      end
+          if option.default? && !options.key?(name)
+            options[name] = option.default_value(object)
+          end
 
-      def set_option_values(object, options)
-        each do |name, option|
-          object.instance_variable_set("@#{name}", options[name]) if option.reader?
+          if options.key?(name)
+            validate_option_value(option, name, options[name])
+          end
+
+          option.assign_reader_value(object, options[name]) if option.reader?
         end
       end
 
@@ -110,12 +112,16 @@ module ROM
         @options.each(&block)
       end
 
-      def validate_option_value(name, value)
-        option = @options.fetch(name) do
-          raise InvalidOptionKeyError,
-            "#{name.inspect} is not a valid option"
+      def ensure_known_options(options)
+        options.each_key do |name|
+          @options.fetch(name) do
+            raise InvalidOptionKeyError,
+              "#{name.inspect} is not a valid option"
+          end
         end
+      end
 
+      def validate_option_value(option, name, value)
         unless option.type_matches?(value)
           raise InvalidOptionValueError,
             "#{name.inspect}:#{value.inspect} has incorrect type"
@@ -178,10 +184,7 @@ module ROM
     # @param [Array] args
     def initialize(*args)
       options = args.last ? args.last.dup : {}
-      definitions = self.class.option_definitions
-      definitions.set_defaults(self, options)
-      definitions.validate_options(options)
-      definitions.set_option_values(self, options)
+      self.class.option_definitions.process(self, options)
       @options = options.freeze
     end
   end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.6.0.beta2'.freeze
+  VERSION = '0.6.0.beta3'.freeze
 end

data/spec/unit/rom/mapper_spec.rb

@@ -30,15 +30,17 @@ describe ROM::Mapper do
   describe '.registry' do
     it 'builds mapper class registry for base and virtual relations' do
       users = Class.new(ROM::Mapper) { relation(:users) }
+      entity = Class.new(ROM::Mapper) { relation(:users); register_as(:entity) }
       active = Class.new(users) { relation(:active) }
       admins = Class.new(users) { relation(:admins) }
       custom = Class.new(users) { register_as(:custom) }
 
-      registry = ROM::Mapper.registry([users, active, admins, custom])
+      registry = ROM::Mapper.registry([users, entity, active, admins, custom])
 
       expect(registry).to eql(
         users: {
           users: users.build,
+          entity: entity.build,
           active: active.build,
           admins: admins.build,
           custom: custom.build

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta2
+  version: 0.6.0.beta3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc