rom 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49d8efc969391ec0d48db3e9f41d29299537e44
-  data.tar.gz: 5c4ba339c27f15887468a364bd89de0c7c722572
+  metadata.gz: 29e221f399a6c003c04d45c03b9518d19b5ffd48
+  data.tar.gz: 223b1648de818651d5cc89f05e088fefdaf8ec19
 SHA512:
-  metadata.gz: b720586dcc0542d8ab45d22209d91898c695a8f509af73f3bb1f967f3952f39f83ed3c9bcb7aa7b4ec87087518e7f9f2f592c4d5a4ad5763a5a3c8f9829389de
-  data.tar.gz: 1b5f6a9ae2038ea0b539d4e6931a1be194aa13d2cc2b7fbc3a1af03455bc028956f96a4ba39ab4cf94fd551931b86ab425e2c61bef8b13e2c823cd3a0f4ff967
+  metadata.gz: 144b7539ca43248fd1c8304b624e5fd46f229016bb5057b20615f95026421b916b66888d223b49b4f5119a5698b44c7f96165fd454922b722387701e0d9eb7ee
+  data.tar.gz: 7dee28d63ed1e6a7c7eee538172249d6d8c71cd83b8840c38d86550cc323f2944ef4d68cab49236f69c55ac632fa00f29e06d44439fb2c6a1f1cd9a67e054e97

data/.gitignore

@@ -13,6 +13,7 @@ test/version_tmp
 tmp
 Gemfile.lock
 vendor/
+log/
 
 .idea/
 

data/.travis.yml

@@ -6,12 +6,11 @@ env:
 bundler_args: --without sql benchmarks console tools
 script: "bundle exec rake ci"
 rvm:
-  - 2.0
   - 2.1
   - 2.2
   - 2.3.1
   - rbx-2
-  - jruby-9.0.5.0
+  - jruby-9.1.5.0
   - ruby-head
 env:
   global:
@@ -19,10 +18,7 @@ env:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-  include:
-    - rvm: jruby-head
-      before_install: gem install bundler --no-ri --no-rdoc
+    - rvm: rbx-2
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v2.0.1 2016-09-30
+
+### Added
+
+- Support for different auto-registration strategies (janjiss)
+- Support for custom component dir names in auto-registration (AMHOL)
+
+### Fixed
+
+- Finalizing schema that is already finalized no longer crashes (flash-gordon)
+
+[Compare v2.0.0...v2.0.1](https://github.com/rom-rb/rom/compare/v2.0.0...v2.0.1)
+
 ## v2.0.0 2016-07-27
 
 ### Added

data/lib/rom/schema.rb

@@ -78,6 +78,8 @@ module ROM
     #
     # @api private
     def finalize!(gateway = nil, &block)
+      return self if frozen?
+
       @attributes = inferrer.call(name.dataset, gateway) if inferrer
       @primary_key = select { |attr| attr.meta[:primary_key] == true }
       block.call if block

data/lib/rom/setup/auto_registration.rb

@@ -4,19 +4,29 @@ require 'rom/support/constants'
 require 'rom/support/inflector'
 require 'rom/support/options'
 
+require 'rom/setup/auto_registration_strategies/no_namespace'
+require 'rom/setup/auto_registration_strategies/with_namespace'
+require 'rom/setup/auto_registration_strategies/custom_namespace'
+
 module ROM
   class AutoRegistration
     include Options
 
-    option :namespace, reader: true, type: [TrueClass, FalseClass], default: true
+    option :namespace, reader: true, type: [TrueClass, FalseClass, String], default: true
+
+    option :component_dirs, reader: true, type: ::Hash, default: {
+      relations: :relations,
+      mappers: :mappers,
+      commands: :commands
+    }
 
     attr_reader :globs, :directory
 
     def initialize(directory, options = EMPTY_HASH)
       super
       @directory = Pathname(directory)
-      @globs = Hash[[:relations, :commands, :mappers].map { |name|
-        [name, @directory.join("#{name}/**/*.rb")]
+      @globs = Hash[component_dirs.map { |component, directory|
+        [component, @directory.join("#{directory}/**/*.rb")]
       }]
     end
 
@@ -37,19 +47,23 @@ module ROM
     def load_entities(entity)
       Dir[globs[entity]].map do |file|
         require file
-        Inflector.constantize(const_name(entity, file))
+        klass_name =
+          case namespace
+          when String
+            AutoRegistrationStrategies::CustomNamespace.new(
+              namespace: namespace, file: file
+            ).call
+          when TrueClass
+            AutoRegistrationStrategies::WithNamespace.new(
+              file: file, directory: directory
+            ).call
+          when FalseClass
+            AutoRegistrationStrategies::NoNamespace.new(
+              file: file, directory: directory, entity: component_dirs.fetch(entity)
+            ).call
+          end
+        Inflector.constantize(klass_name)
       end
     end
-
-    def const_name(entity, file)
-      name =
-        if namespace
-          file.gsub("#{directory.dirname}/", '')
-        else
-          file.gsub("#{directory}/#{entity}/", '')
-        end.gsub('.rb', '')
-
-      Inflector.camelize(name)
-    end
   end
 end

data/lib/rom/setup/auto_registration_strategies/base.rb

@@ -0,0 +1,11 @@
+module ROM
+  module AutoRegistrationStrategies
+    class Base
+      include Options
+
+      option :file, reader: true, type: String
+
+      EXTENSION_REGEX = /\.rb$/.freeze
+    end
+  end
+end

data/lib/rom/setup/auto_registration_strategies/custom_namespace.rb

@@ -0,0 +1,22 @@
+require 'pathname'
+
+require 'rom/support/inflector'
+require 'rom/setup/auto_registration_strategies/base'
+
+module ROM
+  module AutoRegistrationStrategies
+    class CustomNamespace < Base
+      option :namespace, reader: true, type: String
+
+      def call
+        "#{namespace}::#{Inflector.camelize(filename)}"
+      end
+
+      private
+
+      def filename
+        Pathname(file).basename('.rb')
+      end
+    end
+  end
+end

data/lib/rom/setup/auto_registration_strategies/no_namespace.rb

@@ -0,0 +1,19 @@
+require 'pathname'
+
+require 'rom/support/inflector'
+require 'rom/setup/auto_registration_strategies/base'
+
+module ROM
+  module AutoRegistrationStrategies
+    class NoNamespace < Base
+      option :directory, reader: true, type: Pathname
+      option :entity, reader: true, type: Symbol
+
+      def call
+        Inflector.camelize(
+          file.sub(/^#{directory}\/#{entity}\//, '').sub(EXTENSION_REGEX, '')
+        )
+      end
+    end
+  end
+end

data/lib/rom/setup/auto_registration_strategies/with_namespace.rb

@@ -0,0 +1,18 @@
+require 'pathname'
+
+require 'rom/support/inflector'
+require 'rom/setup/auto_registration_strategies/base'
+
+module ROM
+  module AutoRegistrationStrategies
+    class WithNamespace < Base
+      option :directory, reader: true, type: Pathname
+
+      def call
+        Inflector.camelize(
+          file.sub(/^#{directory.dirname}\//, '').sub(EXTENSION_REGEX, '')
+        )
+      end
+    end
+  end
+end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/spec/fixtures/app/my_commands/create_user.rb

@@ -0,0 +1,2 @@
+class CreateUser
+end

data/spec/fixtures/app/my_mappers/user_list.rb

@@ -0,0 +1,2 @@
+class UserList
+end

data/spec/fixtures/app/my_relations/users.rb

@@ -0,0 +1,2 @@
+class Users
+end

data/spec/fixtures/custom/commands/create_user.rb

@@ -0,0 +1,6 @@
+module My
+  module Namespace
+    class CreateUser
+    end
+  end
+end

data/spec/fixtures/custom/mappers/user_list.rb

@@ -0,0 +1,6 @@
+module My
+  module Namespace
+    class UserList
+    end
+  end
+end

data/spec/fixtures/custom/relations/users.rb

@@ -0,0 +1,6 @@
+module My
+  module Namespace
+    class Users
+    end
+  end
+end

data/spec/fixtures/lib/persistence/my_commands/create_user.rb

@@ -0,0 +1,6 @@
+module Persistence
+  module MyCommands
+    class CreateUser
+    end
+  end
+end

data/spec/fixtures/lib/persistence/my_mappers/user_list.rb

@@ -0,0 +1,6 @@
+module Persistence
+  module MyMappers
+    class UserList
+    end
+  end
+end

data/spec/fixtures/lib/persistence/my_relations/users.rb

@@ -0,0 +1,6 @@
+module Persistence
+  module MyRelations
+    class Users
+    end
+  end
+end

data/spec/integration/setup_spec.rb

@@ -145,4 +145,18 @@ describe 'Configuring ROM' do
         .to eql([Test::User.new(name: 'Jane')])
     end
   end
+
+  it 'allows to use a relation with a schema in multiple containers' do
+    class Test::UserRelation < ROM::Relation[:memory]
+      dataset :users
+
+      schema do
+        attribute :id, Types::Int.meta(primary_key: true)
+      end
+    end
+
+    2.times do
+      ROM.container(:memory) { |c| c.register_relation(Test::UserRelation) }
+    end
+  end
 end

data/spec/unit/rom/setup/auto_registration_spec.rb

@@ -0,0 +1,152 @@
+require 'rom/setup'
+
+RSpec.describe ROM::Setup, '#auto_registration' do
+  subject(:setup) { ROM::Setup.new }
+
+  context 'with default component_dirs' do
+    context 'with namespace turned on' do
+      before do
+        setup.auto_registration(SPEC_ROOT.join('fixtures/lib/persistence').to_s)
+      end
+
+      describe '#relations' do
+        it 'loads files and returns constants' do
+          expect(setup.relation_classes).to eql([Persistence::Relations::Users])
+        end
+      end
+
+      describe '#commands' do
+        it 'loads files and returns constants' do
+          expect(setup.command_classes).to eql([Persistence::Commands::CreateUser])
+        end
+      end
+
+      describe '#mappers' do
+        it 'loads files and returns constants' do
+          expect(setup.mapper_classes).to eql([Persistence::Mappers::UserList])
+        end
+      end
+    end
+
+    context 'with namespace turned off' do
+      before do
+        setup.auto_registration(SPEC_ROOT.join('fixtures/app'), namespace: false)
+      end
+
+      describe '#relations' do
+        it 'loads files and returns constants' do
+          expect(setup.relation_classes).to eql([Users])
+        end
+      end
+
+      describe '#commands' do
+        it 'loads files and returns constants' do
+          expect(setup.command_classes).to eql([CreateUser])
+        end
+      end
+
+      describe '#mappers' do
+        it 'loads files and returns constants' do
+          expect(setup.mapper_classes).to eql([UserList])
+        end
+      end
+    end
+  end
+
+  context 'with custom component_dirs' do
+    context 'with namespace turned on' do
+      before do
+        setup.auto_registration(
+          SPEC_ROOT.join('fixtures/lib/persistence').to_s,
+          component_dirs: {
+            relations: :my_relations,
+            mappers: :my_mappers,
+            commands: :my_commands
+          }
+        )
+      end
+
+      describe '#relations' do
+        it 'loads files and returns constants' do
+          expect(setup.relation_classes).to eql([Persistence::MyRelations::Users])
+        end
+      end
+
+      describe '#commands' do
+        it 'loads files and returns constants' do
+          expect(setup.command_classes).to eql([Persistence::MyCommands::CreateUser])
+        end
+      end
+
+      describe '#mappers' do
+        it 'loads files and returns constants' do
+          expect(setup.mapper_classes).to eql([Persistence::MyMappers::UserList])
+        end
+      end
+    end
+
+    context 'with namespace turned off' do
+      before do
+        setup.auto_registration(
+          SPEC_ROOT.join('fixtures/app'),
+          component_dirs: {
+            relations: :my_relations,
+            mappers: :my_mappers,
+            commands: :my_commands
+          },
+          namespace: false
+        )
+      end
+
+      describe '#relations' do
+        it 'loads files and returns constants' do
+          expect(setup.relation_classes).to eql([Users])
+        end
+      end
+
+      describe '#commands' do
+        it 'loads files and returns constants' do
+          expect(setup.command_classes).to eql([CreateUser])
+        end
+      end
+
+      describe '#mappers' do
+        it 'loads files and returns constants' do
+          expect(setup.mapper_classes).to eql([UserList])
+        end
+      end
+    end
+
+    context 'with custom namespace' do
+      before do
+        setup.auto_registration(
+          SPEC_ROOT.join('fixtures/custom'),
+          component_dirs: {
+            relations: :relations,
+            mappers: :mappers,
+            commands: :commands
+          },
+          namespace: 'My::Namespace'
+        )
+      end
+
+      describe '#relations' do
+        it 'loads files and returns constants' do
+          expect(setup.relation_classes).to eql([My::Namespace::Users])
+        end
+      end
+
+      describe '#commands' do
+        it 'loads files and returns constants' do
+          expect(setup.command_classes).to eql([My::Namespace::CreateUser])
+        end
+      end
+
+      describe '#mappers' do
+        it 'loads files and returns constants' do
+          expect(setup.mapper_classes).to eql([My::Namespace::UserList])
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -197,6 +197,10 @@ files:
 - lib/rom/schema/dsl.rb
 - lib/rom/setup.rb
 - lib/rom/setup/auto_registration.rb
+- lib/rom/setup/auto_registration_strategies/base.rb
+- lib/rom/setup/auto_registration_strategies/custom_namespace.rb
+- lib/rom/setup/auto_registration_strategies/no_namespace.rb
+- lib/rom/setup/auto_registration_strategies/with_namespace.rb
 - lib/rom/setup/finalize.rb
 - lib/rom/setup/finalize/finalize_commands.rb
 - lib/rom/setup/finalize/finalize_mappers.rb
@@ -211,9 +215,18 @@ files:
 - rom.gemspec
 - spec/fixtures/app/commands/create_user.rb
 - spec/fixtures/app/mappers/user_list.rb
+- spec/fixtures/app/my_commands/create_user.rb
+- spec/fixtures/app/my_mappers/user_list.rb
+- spec/fixtures/app/my_relations/users.rb
 - spec/fixtures/app/relations/users.rb
+- spec/fixtures/custom/commands/create_user.rb
+- spec/fixtures/custom/mappers/user_list.rb
+- spec/fixtures/custom/relations/users.rb
 - spec/fixtures/lib/persistence/commands/create_user.rb
 - spec/fixtures/lib/persistence/mappers/user_list.rb
+- spec/fixtures/lib/persistence/my_commands/create_user.rb
+- spec/fixtures/lib/persistence/my_mappers/user_list.rb
+- spec/fixtures/lib/persistence/my_relations/users.rb
 - spec/fixtures/lib/persistence/relations/users.rb
 - spec/integration/command_registry_spec.rb
 - spec/integration/commands/create_spec.rb
@@ -270,7 +283,6 @@ files:
 - spec/support/mutant.rb
 - spec/test/memory_repository_lint_test.rb
 - spec/unit/rom/association_set_spec.rb
-- spec/unit/rom/auto_registration_spec.rb
 - spec/unit/rom/commands/graph_spec.rb
 - spec/unit/rom/commands/lazy_spec.rb
 - spec/unit/rom/commands/result_spec.rb
@@ -300,6 +312,7 @@ files:
 - spec/unit/rom/relation/schema_spec.rb
 - spec/unit/rom/relation_spec.rb
 - spec/unit/rom/schema_spec.rb
+- spec/unit/rom/setup/auto_registration_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT

data/spec/unit/rom/auto_registration_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'rom/setup/auto_registration'
-
-RSpec.describe ROM::Setup, '#auto_registration' do
-  let(:setup) { ROM::Setup.new }
-
-  context 'with namespace turned on' do
-    before do
-      setup.auto_registration(SPEC_ROOT.join('fixtures/lib/persistence').to_s)
-    end
-
-    describe '#relations' do
-      it 'loads files and returns constants' do
-        expect(setup.relation_classes).to eql([Persistence::Relations::Users])
-      end
-    end
-
-    describe '#commands' do
-      it 'loads files and returns constants' do
-        expect(setup.command_classes).to eql([Persistence::Commands::CreateUser])
-      end
-    end
-
-    describe '#mappers' do
-      it 'loads files and returns constants' do
-        expect(setup.mapper_classes).to eql([Persistence::Mappers::UserList])
-      end
-    end
-  end
-
-  context 'with namespace turned off' do
-    before do
-      setup.auto_registration(SPEC_ROOT.join('fixtures/app'), namespace: false)
-    end
-
-    describe '#relations' do
-      it 'loads files and returns constants' do
-        expect(setup.relation_classes).to eql([Users])
-      end
-    end
-
-    describe '#commands' do
-      it 'loads files and returns constants' do
-        expect(setup.command_classes).to eql([CreateUser])
-      end
-    end
-
-    describe '#mappers' do
-      it 'loads files and returns constants' do
-        expect(setup.mapper_classes).to eql([UserList])
-      end
-    end
-  end
-end