rom-repository 1.4.0 → 2.0.0.beta1

data/lib/rom/repository/root.rb

@@ -57,9 +57,9 @@ module ROM
       end
 
       # @see Repository#initialize
-      def initialize(container, opts = EMPTY_HASH)
+      def initialize(container, options = EMPTY_HASH)
         super
-        @root = relations[self.class.root]
+        @root = set_relation(self.class.root)
       end
 
       # Compose a relation aggregate from the root relation
@@ -97,63 +97,7 @@ module ROM
       #
       # @api public
       def aggregate(*args)
-        if args.all? { |arg| arg.is_a?(Symbol) }
-          root.combine(*args)
-        else
-          args.reduce(root) { |a, e| a.combine(e) }
-        end
-      end
-
-      # @overload changeset(name, *args)
-      #   Delegate to Repository#changeset
-      #
-      #   @see Repository#changeset
-      #
-      # @overload changeset(data)
-      #   Builds a create changeset for the root relation
-      #
-      #   @example
-      #     user_repo.changeset(name: "Jane")
-      #
-      #   @param data [Hash] New data
-      #
-      #   @return [Changeset::Create]
-      #
-      # @overload changeset(primary_key, data)
-      #   Builds an update changeset for the root relation
-      #
-      #   @example
-      #     user_repo.changeset(1, name: "Jane Doe")
-      #
-      #   @param primary_key [Object] Primary key for restricting relation
-      #
-      #   @return [Changeset::Update]
-      #
-      # @overload changeset(changeset_class)
-      #   Return a changeset prepared for repo's root relation
-      #
-      #   @example
-      #     changeset = user_repo.changeset(MyChangeset)
-      #
-      #     changeset.relation == user_repo.root
-      #     # true
-      #
-      #   @param [Class] changeset_class Your custom changeset class
-      #
-      #   @return [Changeset]
-      #
-      # @see Repository#changeset
-      #
-      # @api public
-      def changeset(*args)
-        if args.first.is_a?(Symbol) && relations.key?(args.first)
-          super
-        elsif args.first.is_a?(Class)
-          klass, *rest = args
-          super(klass[klass.relation || self.class.root], *rest)
-        else
-          super(root.name, *args)
-        end
+        root.combine(*args)
       end
     end
   end

data/lib/rom/repository/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Repository
-    VERSION = '1.4.0'.freeze
+    VERSION = '2.0.0.beta1'.freeze
   end
 end

metadata

@@ -1,63 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rom
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: dry-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -100,77 +66,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-description: rom-repository adds support for auto-mapping and commands on top of rom-rb
-  relations
+description: Repository abstraction for rom-rb
 email: piotr.solnica+oss@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
-- Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
 - lib/rom-repository.rb
-- lib/rom/open_struct.rb
 - lib/rom/repository.rb
-- lib/rom/repository/changeset.rb
-- lib/rom/repository/changeset/associated.rb
-- lib/rom/repository/changeset/create.rb
-- lib/rom/repository/changeset/delete.rb
-- lib/rom/repository/changeset/pipe.rb
-- lib/rom/repository/changeset/restricted.rb
-- lib/rom/repository/changeset/stateful.rb
-- lib/rom/repository/changeset/update.rb
 - lib/rom/repository/class_interface.rb
-- lib/rom/repository/command_compiler.rb
-- lib/rom/repository/command_proxy.rb
-- lib/rom/repository/header_builder.rb
-- lib/rom/repository/mapper_builder.rb
-- lib/rom/repository/relation_proxy.rb
-- lib/rom/repository/relation_proxy/combine.rb
-- lib/rom/repository/relation_proxy/wrap.rb
+- lib/rom/repository/relation_reader.rb
 - lib/rom/repository/root.rb
 - lib/rom/repository/session.rb
-- lib/rom/repository/struct_builder.rb
 - lib/rom/repository/version.rb
-- lib/rom/struct.rb
-- log/.gitkeep
-- rom-repository.gemspec
-- spec/integration/changeset_spec.rb
-- spec/integration/command_macros_spec.rb
-- spec/integration/command_spec.rb
-- spec/integration/multi_adapter_spec.rb
-- spec/integration/repository/aggregate_spec.rb
-- spec/integration/repository_spec.rb
-- spec/integration/root_repository_spec.rb
-- spec/integration/typed_structs_spec.rb
-- spec/shared/database.rb
-- spec/shared/mappers.rb
-- spec/shared/models.rb
-- spec/shared/plugins.rb
-- spec/shared/relations.rb
-- spec/shared/repo.rb
-- spec/shared/seeds.rb
-- spec/shared/structs.rb
-- spec/spec_helper.rb
-- spec/support/mapper_registry.rb
-- spec/support/mutant.rb
-- spec/unit/changeset/associate_spec.rb
-- spec/unit/changeset/map_spec.rb
-- spec/unit/changeset_spec.rb
-- spec/unit/relation_proxy_spec.rb
-- spec/unit/repository/changeset_spec.rb
-- spec/unit/repository/inspect_spec.rb
-- spec/unit/repository/session_spec.rb
-- spec/unit/repository/transaction_spec.rb
-- spec/unit/session_spec.rb
-- spec/unit/struct_builder_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -186,9 +97,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12

data/.gitignore

@@ -1,3 +0,0 @@
-Gemfile.lock
-log/*.log
-doc

data/.rspec

@@ -1,3 +0,0 @@
---color
---order random
---require ./spec/spec_helper

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-dist: trusty
-sudo: required
-cache: bundler
-bundler_args: --without yard guard benchmarks tools
-before_script:
-  - psql -c 'create database rom_repository' -U postgres
-  - rvm get master
-script: "bundle exec rake ci"
-after_success:
-  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.8.0
-env:
-  global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-    - COVERAGE='true'
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/39e1225f489f38b0bd09
-    on_success: change
-    on_failure: always
-    on_start: false

data/.yardopts

@@ -1,2 +0,0 @@
---query '@api.text != "private"'
---embed-mixins

data/Gemfile

@@ -1,38 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'inflecto'
-
-group :development do
-  gem 'dry-equalizer', '~> 0.2'
-  gem 'sqlite3', platforms: [:mri, :rbx]
-  gem 'jdbc-sqlite3', platforms: :jruby
-end
-
-group :test do
-  gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'release-3.0'
-  gem 'rom-sql', git: 'https://github.com/rom-rb/rom-sql.git', branch: 'release-1.0'
-  gem 'rspec'
-  gem 'dry-struct'
-  gem 'byebug', platforms: :mri
-  gem 'pg', platforms: [:mri, :rbx]
-  gem 'jdbc-postgres', platforms: :jruby
-
-  platform :mri do
-    gem 'codeclimate-test-reporter', require: false
-    gem 'simplecov'
-  end
-end
-
-group :benchmarks do
-  gem 'hotch', platforms: :mri
-  gem 'benchmark-ips'
-  gem 'activerecord', '~> 5.0'
-end
-
-group :tools do
-  gem 'pry'
-  gem 'mutant'
-  gem 'mutant-rspec'
-end

data/Rakefile

@@ -1,19 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-task default: [:ci]
-
-desc "Run CI tasks"
-task ci: [:spec]
-
-begin
-  require "rubocop/rake_task"
-
-  Rake::Task[:default].enhance [:rubocop]
-
-  RuboCop::RakeTask.new do |task|
-    task.options << "--display-cop-names"
-  end
-rescue LoadError
-end

data/lib/rom/open_struct.rb

@@ -1,35 +0,0 @@
-module ROM
-  # ROM's open structs are used for relations with empty schemas.
-  # Such relations may exist in cases like using raw SQL strings
-  # where schema was not explicitly defined using `view` DSL.
-  #
-  # @api public
-  class OpenStruct
-    IVAR = -> v { :"@#{v}" }
-
-    # @api private
-    def initialize(attributes)
-      attributes.each do |key, value|
-        instance_variable_set(IVAR[key], value)
-      end
-    end
-
-    # @api private
-    def respond_to_missing?(meth, include_private = false)
-      super || instance_variables.include?(IVAR[meth])
-    end
-
-    private
-
-    # @api private
-    def method_missing(meth, *args, &block)
-      ivar = IVAR[meth]
-
-      if instance_variables.include?(ivar)
-        instance_variable_get(ivar)
-      else
-        super
-      end
-    end
-  end
-end

data/lib/rom/repository/changeset.rb

@@ -1,155 +0,0 @@
-require 'dry/core/class_attributes'
-require 'dry/core/cache'
-
-require 'rom/initializer'
-
-module ROM
-  # Abstract Changeset class
-  #
-  # If you inherit from this class you need to configure additional settings
-  #
-  # @example define a custom changeset using :upsert command
-  #   class NewTag < ROM::Changeset[:tags]
-  #     command_type :upsert
-  #   end
-  #
-  # @abstract
-  class Changeset
-    DEFAULT_COMMAND_OPTS = { mapper: false }.freeze
-
-    extend Initializer
-    extend Dry::Core::Cache
-    extend Dry::Core::ClassAttributes
-
-    # @!method self.command_type
-    #   Get or set changeset command type
-    #
-    #   @overload command_type
-    #     Return configured command_type
-    #     @return [Symbol]
-    #
-    #   @overload command_type(identifier)
-    #     Set relation identifier for this changeset
-    #     @param [Symbol] identifier The command type identifier
-    #     @return [Symbol]
-    defines :command_type
-
-    # @!method self.relation
-    #   Get or set changeset relation identifier
-    #
-    #   @overload relation
-    #     Return configured relation identifier for this changeset
-    #     @return [Symbol]
-    #
-    #   @overload relation(identifier)
-    #     Set relation identifier for this changeset
-    #     @param [Symbol] identifier The relation identifier from the ROM container
-    #     @return [Symbol]
-    defines :relation
-
-    # @!attribute [r] relation
-    #   @return [Relation] The changeset relation
-    param :relation
-
-    # @!attribute [r] command_compiler
-    #   @return [Proc] a proc that can compile a command (typically provided by a repo)
-    option :command_compiler, optional: true
-
-    # @!attribute [r] command_type
-    #   @return [Symbol] a custom command identifier
-    option :command_type, default: -> { self.class.command_type }
-
-    # Create a changeset class preconfigured for a specific relation
-    #
-    # @example
-    #   class NewUserChangeset < ROM::Changeset::Create[:users]
-    #   end
-    #
-    #   user_repo.changeset(NewUserChangeset).data(name: 'Jane')
-    #
-    # @api public
-    def self.[](relation_name)
-      fetch_or_store([relation_name, self]) {
-        Class.new(self) { relation(relation_name) }
-      }
-    end
-
-    # Return a new changeset with updated options
-    #
-    # @example
-    #   class NewUser < ROM::Changeset::Create[:users]
-    #     option :token_generator
-    #   end
-    #
-    #   changeset = user_repo.changeset(NewUser).with(token_generator: my_token_gen)
-    #
-    # @param [Hash] new_options The new options
-    #
-    # @return [Changeset]
-    #
-    # @api public
-    def with(new_options)
-      self.class.new(relation, options.merge(new_options))
-    end
-
-    # Return a new changeset with provided relation
-    #
-    # New options can be provided too
-    #
-    # @param [Relation] relation
-    # @param [Hash] options
-    #
-    # @return [Changeset]
-    #
-    # @api public
-    def new(relation, new_options = EMPTY_HASH)
-      self.class.new(relation, new_options.empty? ? options : options.merge(new_options))
-    end
-
-    # Persist changeset
-    #
-    # @example
-    #   changeset = user_repo.changeset(name: 'Jane')
-    #   changeset.commit
-    #   # => { id: 1, name: 'Jane' }
-    #
-    # @return [Hash, Array]
-    #
-    # @api public
-    def commit
-      command.call
-    end
-
-    # Return string representation of the changeset
-    #
-    # @return [String]
-    #
-    # @api public
-    def inspect
-      %(#<#{self.class} relation=#{relation.name.inspect}>)
-    end
-
-    # Return a command for this changeset
-    #
-    # @return [ROM::Command]
-    #
-    # @api private
-    def command
-      command_compiler.(command_type, relation_identifier, DEFAULT_COMMAND_OPTS)
-    end
-
-    private
-
-    # @api private
-    def relation_identifier
-      relation.name.relation
-    end
-  end
-end
-
-require 'rom/repository/changeset/stateful'
-require 'rom/repository/changeset/associated'
-
-require 'rom/repository/changeset/create'
-require 'rom/repository/changeset/update'
-require 'rom/repository/changeset/delete'