rom 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37b5bfee7aba0349fc7072c15a936d86b5d64da
-  data.tar.gz: 960446e1976fcfbe3d13d7bafb25a83ce7912626
+  metadata.gz: d5eaa5117425dbec0243b42bfc8e5cd2a246ee67
+  data.tar.gz: b4d0c29e7025e62a7e8cf8660913a1a5c5c9a65a
 SHA512:
-  metadata.gz: 9c251e5659fb72fc73cfca473a1667d4da46a4ca58ed68f31eb2b74f275139ca86ffdf49c93f2b87a194420baa5911655e26927e5d923239ead79ca2bc910cda
-  data.tar.gz: 6c35bbee777498703f1a386ea4ce2f91d96b0860c7a664800ffe05f58ba1ce18199279f088f9ae3dac2b3b0ce6d11fc6aa718d10afbb7db01192b08500012674
+  metadata.gz: fd50b8d43492c960dffcb3782cf0068138bacfaa05791266a8d407fe8938b5cf758360372b88be8a26f98c391fa2c857502a9547574d2e635c76ccad581f8f30
+  data.tar.gz: 45c454986d7b9aa01b06bc1210b75733b9daedb25a13208e7726bbe11e2000039ce0d057c94f11bd3f31adea46bfb08a8a92115abf998b58ffd79af98d1d5b09

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## v0.9.1 2015-08-21
+
+This is a small bug-fix release which addresses a couple of issues for inline
+setup DSL and multi-environments.
+
+### Fixed
+
+- Multi-env setup for adapters with schema-inferration support won't crash (solnic)
+- Default adapter is set correctly when many adapters are configured and one is
+  registered under `:default` name (solnic)
+- When defining a relation using inline DSL with custom dataset name the relation
+  name will be correctly set as `register_as` setting (solnic)
+
+### Changed
+
+- When using inline-setup for env the auto_registration mechanism will be turned
+  on by default (solnic)
+
+[Compare v0.9.0...v0.9.1](https://github.com/rom-rb/rom/compare/v0.9.0...v0.9.1)
+
 ## v0.9.0 2015-08-19
 
 ### Added

data/lib/rom/commands/abstract.rb

@@ -1,3 +1,4 @@
+require 'rom/support/options'
 require 'rom/support/deprecations'
 
 require 'rom/commands/composite'

data/lib/rom/commands/composite.rb

@@ -1,3 +1,5 @@
+require 'rom/pipeline'
+
 module ROM
   module Commands
     # Composite command that consists of left and right commands

data/lib/rom/environment.rb

@@ -114,7 +114,16 @@ module ROM
     # @api public
     def setup(*args, &block)
       config = setup_config(*args)
-      @boot = Setup.new(setup_gateways(config), adapters.keys.first)
+      configured_gateways = setup_gateways(config)
+
+      default_adapter = gateways.fetch(
+        configured_gateways[:default], adapters.keys.first
+      )
+
+      @boot = Setup.new(configured_gateways,
+        gateway_map: gateways,
+        default_adapter: default_adapter
+      )
 
       config.each do |name, config_args|
         options = config_args.is_a?(Array) && config_args.last
@@ -122,13 +131,21 @@ module ROM
       end
 
       if block
+        use :auto_registration unless auto_registration?
         @boot.instance_exec(&block)
-        @boot.finalize
+        finalize.container
       else
         @boot
       end
     end
 
+    # Check if auto-registration is enabled for this environment
+    #
+    # @api private
+    def auto_registration?
+      false
+    end
+
     # Global relation setup DSL
     #
     # @example

data/lib/rom/environment_plugins/auto_registration.rb

@@ -6,8 +6,19 @@ module ROM
     #
     # @api public
     module AutoRegistration
+      # Say "yes" for envs that have this plugin enabled
+      #
+      # By default it says "no" in Environment#auto_registration?
+      #
+      # @api private
+      def auto_registration?
+        true
+      end
+
       # @api private
       def self.apply(environment, options = {})
+        environment.extend(AutoRegistration)
+
         if_proc = options.fetch(:if, ->(*args) { true })
 
         ROM::Relation.on(:inherited) do |relation|

data/lib/rom/memory/dataset.rb

@@ -1,3 +1,4 @@
+require 'rom/support/options' # FIXME: this shouldn't be required, fix needed in rom-support
 require 'rom/support/array_dataset'
 
 module ROM

data/lib/rom/setup.rb

@@ -18,6 +18,11 @@ module ROM
     # @api private
     attr_reader :gateways
 
+    # @attr_reader [Hash<Gateway=>Symbol>] gateway_map Environment gateway map
+    #
+    # @api private
+    attr_reader :gateway_map
+
     # Deprecated accessor for gateways.
     #
     # @see gateways
@@ -50,12 +55,15 @@ module ROM
     alias_method :env, :container
 
     # @api private
-    def initialize(gateways, default_adapter = nil)
+    def initialize(gateways, options = {})
       @gateways = gateways
-      @default_adapter = default_adapter
+
+      @gateway_map = options.fetch(:gateway_map, {})
+      @default_adapter = options.fetch(:default_adapter, nil)
+
       @relation_classes = []
-      @mapper_classes = []
       @command_classes = []
+      @mapper_classes = []
       @container = nil
     end
 
@@ -76,7 +84,12 @@ module ROM
       end
 
       finalize = Finalize.new(
-        gateways, relation_classes, mapper_classes, command_classes, config.freeze
+        gateways: gateways,
+        gateway_map: gateway_map,
+        relation_classes: relation_classes,
+        command_classes: command_classes,
+        mappers: mapper_classes,
+        config: config.freeze
       )
 
       @container = finalize.run!

data/lib/rom/setup/finalize.rb

@@ -16,18 +16,23 @@ module ROM
     #
     # @private
     class Finalize
-      attr_reader :gateways, :repo_adapter, :datasets,
-        :relation_classes, :mapper_classes, :mappers, :command_classes, :config
+      attr_reader :gateways, :repo_adapter, :datasets, :gateway_map,
+        :relation_classes, :mapper_classes, :mapper_objects, :command_classes, :config
 
       # @api private
-      def initialize(gateways, relation_classes, mappers, command_classes, config)
-        @gateways = gateways
-        @repo_adapter_map = ROM.gateways
-        @relation_classes = relation_classes
+      def initialize(options)
+        @gateways = options.fetch(:gateways)
+        @gateway_map = options.fetch(:gateway_map)
+
+        @relation_classes = options.fetch(:relation_classes)
+        @command_classes = options.fetch(:command_classes)
+
+        mappers = options.fetch(:mappers, [])
         @mapper_classes = mappers.select { |mapper| mapper.is_a?(Class) }
-        @mappers = (mappers - @mapper_classes).reduce(:merge) || {}
-        @command_classes = command_classes
-        @config = config
+        @mapper_objects = (mappers - @mapper_classes).reduce(:merge) || {}
+
+        @config = options.fetch(:config)
+
         initialize_datasets
       end
 
@@ -37,7 +42,7 @@ module ROM
       #
       # @api private
       def adapter_for(gateway)
-        @repo_adapter_map.fetch(gateways[gateway])
+        @gateway_map.fetch(gateways[gateway])
       end
 
       # Run the finalization process
@@ -90,7 +95,7 @@ module ROM
           h[relation] = MapperRegistry.new(mappers)
         }
 
-        mappers.each do |relation, mappers|
+        mapper_objects.each do |relation, mappers|
           if registry_hash.key?(relation)
             mappers.each { |name, mapper| registry[name] = mapper }
           else

data/lib/rom/setup_dsl/setup.rb

@@ -22,6 +22,7 @@ module ROM
     def relation(name, options = EMPTY_HASH, &block)
       klass_opts = { adapter: default_adapter }.merge(options)
       klass = Relation.build_class(name, klass_opts)
+      klass.register_as(name)
       klass.class_eval(&block) if block
       klass
     end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.9.1'.freeze
 end

data/spec/integration/inline_setup_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'rom/memory'
+
+RSpec.describe 'Inline setup' do
+  before do
+    module Test
+      module Dummy
+        class Gateway < ROM::Memory::Gateway
+          def schema
+            [:users, :tasks]
+          end
+        end
+
+        class Relation < ROM::Relation
+          adapter :dummy
+        end
+      end
+    end
+
+    ROM.register_adapter :dummy, Test::Dummy
+  end
+
+  context 'using global env' do
+    it 'auto-registers components' do
+      rom = ROM.setup(:dummy) do
+        relation(:users)
+      end
+
+      users = rom.relation(:users)
+
+      expect(users).to be_kind_of(Test::Dummy::Relation)
+    end
+  end
+
+  context 'using local env' do
+    it 'auto-registers components' do
+      env = ROM::Environment.new
+
+      rom = env.setup(:dummy) do
+        relation(:users)
+      end
+
+      users = rom.relation(:users)
+
+      expect(users).to be_kind_of(Test::Dummy::Relation)
+    end
+  end
+
+  context 'defining a relation with custom dataset name' do
+    it 'registers under provided name and uses custom dataset' do
+      env = ROM::Environment.new
+
+      rom = env.setup(:dummy) do
+        relation(:super_users) do
+          dataset :users
+        end
+      end
+
+      users = rom.relation(:super_users)
+
+      expect(users).to be_kind_of(Test::Dummy::Relation)
+      expect(users.dataset).to be(rom.gateways[:default].dataset(:users))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -204,6 +204,7 @@ files:
 - spec/integration/commands/error_handling_spec.rb
 - spec/integration/commands/graph_spec.rb
 - spec/integration/commands/update_spec.rb
+- spec/integration/inline_setup_spec.rb
 - spec/integration/mappers/combine_spec.rb
 - spec/integration/mappers/deep_embedded_spec.rb
 - spec/integration/mappers/definition_dsl_spec.rb