rom 0.4.2 → 0.5.0

data/spec/unit/rom/registry_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ROM::Registry do
+  subject(:registry) { registry_class.new(mars: mars) }
+
+  let(:mars) { double('mars') }
+
+  let(:registry_class) do
+    Class.new(ROM::Registry) do
+      def self.name
+        'Candy'
+      end
+    end
+  end
+
+  describe '#fetch' do
+    it 'returns registered elemented identified by name' do
+      expect(registry[:mars]).to be(mars)
+    end
+
+    it 'raises error when element is not found' do
+      expect { registry[:twix] }.to raise_error(
+        ROM::Registry::ElementNotFoundError,
+        ":twix doesn't exist in Candy registry"
+      )
+    end
+  end
+
+  describe '.element_name' do
+    it 'returns registered elemented identified by element_name' do
+      expect(registry[:mars]).to be(mars)
+    end
+
+    it 'raises no-method error when element is not there' do
+      expect { registry.twix }.to raise_error(NoMethodError)
+    end
+  end
+end

data/spec/unit/rom/relation_spec.rb

@@ -30,5 +30,4 @@ describe ROM::Relation do
       expect(relation.each).to be_instance_of(Enumerator)
     end
   end
-
 end

data/spec/unit/rom/setup_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe ROM::Setup do
+  describe '#finalize' do
+    context 'with an adapter that supports schema inferring' do
+      it 'builds relation from inferred schema' do
+        adapter = double('adapter').as_null_object
+        repo = double('repo', adapter: adapter).as_null_object
+        dataset = double('dataset')
+
+        allow(repo).to receive(:schema).and_return([
+          [:users, dataset, [:name, :email]]
+        ])
+
+        setup = ROM::Setup.new(memory: repo)
+        env = setup.finalize
+
+        users = env.relations.users
+
+        expect(users.dataset).to be(dataset)
+        expect(users.header).to eql([:name, :email])
+      end
+    end
+  end
+
+  describe '#method_missing' do
+    it 'returns a repository if it is defined' do
+      repo = double('repo')
+      setup = ROM::Setup.new(repo: repo)
+
+      expect(setup.repo).to be(repo)
+    end
+
+    it 'raises error if repo is not defined' do
+      setup = ROM::Setup.new({})
+
+      expect { setup.not_here }.to raise_error(NoMethodError, /not_here/)
+    end
+  end
+
+  describe '#[]' do
+    it 'returns a repository if it is defined' do
+      repo = double('repo')
+      setup = ROM::Setup.new(repo: repo)
+
+      expect(setup[:repo]).to be(repo)
+    end
+
+    it 'raises error if repo is not defined' do
+      setup = ROM::Setup.new({})
+
+      expect { setup[:not_here] }.to raise_error(KeyError, /not_here/)
+    end
+  end
+end

data/spec/unit/rom_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe ROM do
+  describe '.setup' do
+    it 'creates a boot instance using a database config hash' do
+      boot = ROM.setup(
+        adapter: 'memory', database: 'test', hostname: 'localhost'
+      )
+
+      expect(boot[:default]).to be(boot.repositories[:default])
+      expect(boot.default.adapter.uri.to_s).to eql("memory://localhost/test")
+    end
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Solnica
-- piotr.solnica@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -25,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: transproc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +146,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -155,11 +182,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.devtools
 - Guardfile
 - LICENSE
 - README.md
@@ -170,35 +197,39 @@ files:
 - lib/rom/adapter/memory/commands.rb
 - lib/rom/adapter/memory/dataset.rb
 - lib/rom/adapter/memory/storage.rb
-- lib/rom/boot.rb
-- lib/rom/boot/base_relation_dsl.rb
-- lib/rom/boot/command_dsl.rb
-- lib/rom/boot/dsl.rb
-- lib/rom/boot/mapper_dsl.rb
-- lib/rom/boot/relation_dsl.rb
-- lib/rom/boot/schema_dsl.rb
 - lib/rom/command_registry.rb
 - lib/rom/commands.rb
 - lib/rom/commands/create.rb
 - lib/rom/commands/delete.rb
+- lib/rom/commands/result.rb
 - lib/rom/commands/update.rb
 - lib/rom/commands/with_options.rb
+- lib/rom/config.rb
 - lib/rom/env.rb
+- lib/rom/global.rb
 - lib/rom/header.rb
+- lib/rom/header/attribute.rb
 - lib/rom/mapper.rb
 - lib/rom/mapper_builder.rb
+- lib/rom/mapper_builder/mapper_dsl.rb
+- lib/rom/mapper_builder/model_dsl.rb
+- lib/rom/mapper_registry.rb
 - lib/rom/model_builder.rb
-- lib/rom/ra.rb
-- lib/rom/ra/operation/group.rb
-- lib/rom/ra/operation/join.rb
-- lib/rom/ra/operation/wrap.rb
+- lib/rom/processor.rb
+- lib/rom/processor/transproc.rb
 - lib/rom/reader.rb
 - lib/rom/reader_builder.rb
 - lib/rom/relation.rb
 - lib/rom/relation_builder.rb
 - lib/rom/repository.rb
+- lib/rom/setup.rb
+- lib/rom/setup/base_relation_dsl.rb
+- lib/rom/setup/command_dsl.rb
+- lib/rom/setup/finalize.rb
+- lib/rom/setup/mapper_dsl.rb
+- lib/rom/setup/relation_dsl.rb
+- lib/rom/setup/schema_dsl.rb
 - lib/rom/support/registry.rb
-- lib/rom/transformer.rb
 - lib/rom/version.rb
 - rom.gemspec
 - spec/integration/adapters/extending_relations_spec.rb
@@ -208,12 +239,15 @@ files:
 - spec/integration/commands/error_handling_spec.rb
 - spec/integration/commands/try_spec.rb
 - spec/integration/commands/update_spec.rb
+- spec/integration/mappers/deep_embedded_spec.rb
 - spec/integration/mappers/definition_dsl_spec.rb
+- spec/integration/mappers/embedded_spec.rb
+- spec/integration/mappers/group_spec.rb
 - spec/integration/mappers/prefixing_attributes_spec.rb
 - spec/integration/mappers/renaming_attributes_spec.rb
-- spec/integration/ra/group_spec.rb
-- spec/integration/ra/join_spec.rb
-- spec/integration/ra/wrap_spec.rb
+- spec/integration/mappers/symbolizing_attributes_spec.rb
+- spec/integration/mappers/wrap_spec.rb
+- spec/integration/multi_repo_spec.rb
 - spec/integration/relations/reading_spec.rb
 - spec/integration/relations/registry_dsl_spec.rb
 - spec/integration/schema_spec.rb
@@ -221,16 +255,22 @@ files:
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
 - spec/support/mutant.rb
+- spec/unit/config_spec.rb
+- spec/unit/rom/adapter/memory/dataset_spec.rb
 - spec/unit/rom/adapter_spec.rb
 - spec/unit/rom/env_spec.rb
 - spec/unit/rom/header_spec.rb
+- spec/unit/rom/mapper_builder_spec.rb
+- spec/unit/rom/mapper_registry_spec.rb
 - spec/unit/rom/mapper_spec.rb
 - spec/unit/rom/model_builder_spec.rb
-- spec/unit/rom/ra/operation/group_spec.rb
-- spec/unit/rom/ra/operation/wrap_spec.rb
+- spec/unit/rom/processor/transproc_spec.rb
+- spec/unit/rom/reader_spec.rb
+- spec/unit/rom/registry_spec.rb
 - spec/unit/rom/relation_spec.rb
 - spec/unit/rom/repository_spec.rb
-- spec/unit/rom/transformer_spec.rb
+- spec/unit/rom/setup_spec.rb
+- spec/unit/rom_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT

data/Gemfile.devtools

@@ -1,71 +0,0 @@
-# encoding: utf-8
-
-group :development do
-  gem 'rake',       '~> 10.3.2'
-  gem 'rspec',      '~> 3.1.0'
-  gem 'rspec-its',  '~> 1.0.1'
-  gem 'yard',       '~> 0.8.7.4'
-
-  platform :rbx do
-    gem 'rubysl-singleton', '~> 2.0.0'
-  end
-end
-
-group :yard do
-  gem 'kramdown', '~> 1.3.3'
-end
-
-group :guard do
-  gem 'guard',         '~> 2.6.1'
-  gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.9'
-  gem 'guard-rubocop', '~> 1.1.0'
-
-  # file system change event handling
-  gem 'listen',     '~> 2.7.7'
-  gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.4', require: false
-  gem 'rb-inotify', '~> 0.9.5', require: false
-
-  # notification handling
-  gem 'libnotify',               '~> 0.8.3', require: false
-  gem 'rb-notifu',               '~> 0.0.4', require: false
-  gem 'terminal-notifier-guard', '~> 1.5.3', require: false
-end
-
-group :metrics do
-  gem 'coveralls', '~> 0.7.0'
-  gem 'flay',      '~> 2.5.0'
-  gem 'flog',      '~> 4.2.1'
-  gem 'reek',      '~> 1.3.7'
-  gem 'rubocop',   '~> 0.23.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.9'
-
-  platforms :mri do
-    gem 'mutant',       '~> 0.6.3'
-    gem 'mutant-rspec', '~> 0.6.3'
-  end
-
-  platforms :ruby_19, :ruby_20 do
-    gem 'yard-spellcheck', '~> 0.1.5'
-  end
-
-  platform :rbx do
-    gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.11'
-    gem 'rubysl-logger',      '~> 2.0.0'
-    gem 'rubysl-open-uri',    '~> 2.0.0'
-    gem 'rubysl-prettyprint', '~> 2.0.3'
-  end
-end
-
-group :benchmarks do
-  gem 'rbench', '~> 0.2.3'
-end
-
-platform :jruby do
-  group :jruby do
-    gem 'jruby-openssl', '~> 0.9.4'
-  end
-end

data/lib/rom/boot.rb

@@ -1,197 +0,0 @@
-require 'rom/boot/dsl'
-require 'rom/relation_builder'
-require 'rom/reader_builder'
-require 'rom/command_registry'
-
-module ROM
-
-  # Exposes DSL for defining schema, relations and mappers
-  #
-  # @api public
-  class Boot
-    include Equalizer.new(:repositories, :env)
-
-    attr_reader :repositories, :adapter_relation_map, :env
-
-    # @api private
-    def initialize(repositories)
-      @repositories = repositories
-      @schema = {}
-      @relations = {}
-      @mappers = []
-      @commands = {}
-      @adapter_relation_map = {}
-      @env = nil
-    end
-
-    # Schema definition DSL
-    #
-    # @example
-    #
-    #   setup.schema do
-    #     base_relation(:users) do
-    #       repository :sqlite
-    #
-    #       attribute :id
-    #       attribute :name
-    #     end
-    #   end
-    #
-    # @api public
-    def schema(&block)
-      base_relations = DSL.new(self).schema(&block)
-      base_relations.each do |repo, relations|
-        (@schema[repo] ||= []).concat(relations)
-      end
-      self
-    end
-
-    # Relation definition DSL
-    #
-    # @example
-    #
-    #   setup.relation(:users) do
-    #     def names
-    #       project(:name)
-    #     end
-    #   end
-    #
-    # @api public
-    def relation(name, &block)
-      @relations.update(name => block)
-      self
-    end
-
-    # Mapper definition DSL
-    #
-    # @example
-    #
-    #   setup.mappers do
-    #     define(:users) do
-    #       model name: 'User'
-    #     end
-    #
-    #     define(:names, parent: :users) do
-    #       exclude :id
-    #     end
-    #   end
-    #
-    # @api public
-    def mappers(&block)
-      @mappers.concat(DSL.new(self).mappers(&block))
-      self
-    end
-
-    def commands(name, &block)
-      @commands.update(name => DSL.new(self).commands(&block))
-    end
-
-    # Finalize the setup
-    #
-    # @return [Env] frozen env with access to repositories, schema, relations and mappers
-    #
-    # @api public
-    def finalize
-      raise EnvAlreadyFinalizedError if env
-
-      schema = load_schema
-      relations = load_relations(schema)
-      readers = load_readers(relations)
-      commands = load_commands(relations)
-
-      @env = Env.new(repositories, schema, relations, readers, commands)
-    end
-
-    # @api private
-    def [](name)
-      repositories.fetch(name)
-    end
-
-    # @api private
-    def respond_to_missing?(name, include_context = false)
-      repositories.key?(name)
-    end
-
-    private
-
-    # @api private
-    def method_missing(name, *args)
-      repositories.fetch(name)
-    end
-
-    # @api private
-    def load_schema
-      repositories.values.each do |repo|
-        (@schema[repo] ||= []).concat(repo.schema)
-      end
-
-      base_relations = @schema.each_with_object({}) do |(repo, schema), h|
-        schema.each do |name, dataset, header|
-          adapter_relation_map[name] = repo.adapter
-          h[name] = Relation.new(dataset, header)
-        end
-      end
-
-      Schema.new(base_relations)
-    end
-
-    # @api private
-    def load_relations(schema)
-      return RelationRegistry.new unless adapter_relation_map.any?
-
-      builder = RelationBuilder.new(schema)
-
-      relations = @relations.each_with_object({}) do |(name, block), h|
-        adapter = adapter_relation_map[name]
-
-        relation = builder.call(name) { |klass|
-          adapter.extend_relation_class(klass)
-          klass.class_eval(&block) if block
-        }
-
-        adapter.extend_relation_instance(relation)
-
-        h[name] = relation
-      end
-
-      relations.each_value { |relation| relation.class.finalize(relations, relation) }
-
-      RelationRegistry.new(relations)
-    end
-
-    # @api private
-    def load_readers(relations)
-      return ReaderRegistry.new unless adapter_relation_map.any?
-
-      reader_builder = ReaderBuilder.new(relations)
-
-      readers = @mappers.each_with_object({}) do |(name, options, block), h|
-        h[name] = reader_builder.call(name, options, &block)
-      end
-
-      ReaderRegistry.new(readers)
-    end
-
-    def load_commands(relations)
-      return Registry.new unless relations.elements.any?
-
-      commands = @commands.each_with_object({}) do |(name, definitions), h|
-        adapter = adapter_relation_map[name]
-
-        rel_commands = {}
-
-        definitions.each do |command_name, definition|
-          rel_commands[command_name] = adapter.command(
-            command_name, relations[name], definition
-          )
-        end
-
-        h[name] = CommandRegistry.new(rel_commands)
-      end
-
-      Registry.new(commands)
-    end
-
-  end
-
-end