rom-repository 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae5380662bd3fb3fb249bf893a491bb0accbb35
-  data.tar.gz: 43da8d866c970abe7d471a19ccee12d9882d6d87
+  metadata.gz: ddf55be4802e4f11c814bf9452e1fcb6e02a71a6
+  data.tar.gz: 9de11b947549b756500724055a45e73723d4cab6
 SHA512:
-  metadata.gz: c9fb3246025ba68d17f37e4364263975dba15776c9e516ea9caabb982a22b54555c9ab1ca8fb1eeaebae767b75c514b5aa2e06b3a550675e3cd4f7d23724b0f2
-  data.tar.gz: 0cde9b16532c6ab85b063480af8bacba6e05f668710752a3f94b07f4685ea0250a203dde2019565019dd3df6a258872085ebfb0fd16dc0ae49fc29356a501c75
+  metadata.gz: 155c3435da829762d9d10a15f5baf688f6bb4313ffef93ffee9b4d7e9d341c667c4d49dbb41145e6e53efa44e0cfbe592bac6522e08da457b95f16200703a3cd
+  data.tar.gz: a4c944bf075bbb56f3afaa74bfd5e53c5393b38261c191af05ce69dc12f42e4c0ae19e4e3a805dacab1d8fcfb5625bca2a1d618f141018ad5bf0eb2d7ca64929

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 gem 'rom', github: 'rom-rb/rom', branch: 'master'
 gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
+
 gem 'inflecto'
 
 group :test do
@@ -13,3 +14,5 @@ group :test do
   gem 'pg_jruby', platforms: :jruby
   gem "codeclimate-test-reporter", require: nil
 end
+
+gem 'benchmark-ips'

data/lib/rom-repository.rb

@@ -1,2 +1,20 @@
 require 'rom'
+
+require 'rom/plugins/relation/view'
+require 'rom/plugins/relation/key_inference'
+
+require 'rom/plugins/relation/sql/base_view'
+require 'rom/plugins/relation/sql/auto_combine'
+require 'rom/plugins/relation/sql/auto_wrap'
+
 require 'rom/repository/base'
+
+if defined?(ROM::SQL)
+  class ROM::SQL::Relation < ROM::Relation
+    use :key_inference
+    use :view
+    use :base_view
+    use :auto_combine
+    use :auto_wrap
+  end
+end

data/lib/rom/plugins/relation/key_inference.rb

@@ -0,0 +1,31 @@
+module ROM
+  module Plugins
+    module Relation
+      module KeyInference
+        # Infer foreign_key name for this relation
+        #
+        # TODO: this should be configurable and handled by an injected policy
+        #
+        # @return [Symbol]
+        #
+        # @api private
+        def foreign_key
+          :"#{Inflector.singularize(name)}_id"
+        end
+
+        # Return base name which defaults to name attribute
+        #
+        # @return [Symbol]
+        #
+        # @api private
+        def base_name
+          name
+        end
+      end
+    end
+  end
+
+  plugins do
+    register :key_inference, Plugins::Relation::KeyInference, type: :relation
+  end
+end

data/lib/rom/plugins/relation/sql/auto_combine.rb

@@ -0,0 +1,45 @@
+module ROM
+  module Plugins
+    module Relation
+      module SQL
+        module AutoCombine
+          # @api private
+          def self.included(klass)
+            super
+            klass.class_eval do
+              include(InstanceInterface)
+              extend(ClassInterface)
+            end
+          end
+
+          module ClassInterface
+            def inherited(klass)
+              super
+              klass.auto_curry :for_combine
+            end
+          end
+
+          module InstanceInterface
+            # Default methods for fetching combined relation
+            #
+            # This method is used by default by `combine`
+            #
+            # @return [SQL::Relation]
+            #
+            # @api private
+            def for_combine(keys, relation)
+              pk, fk = keys.to_a.flatten
+              where(fk => relation.map { |tuple| tuple[pk] })
+            end
+          end
+        end
+      end
+    end
+  end
+
+  plugins do
+    adapter :sql do
+      register :auto_combine, Plugins::Relation::SQL::AutoCombine, type: :relation
+    end
+  end
+end

data/lib/rom/plugins/relation/sql/auto_wrap.rb

@@ -0,0 +1,48 @@
+module ROM
+  module Plugins
+    module Relation
+      module SQL
+        module AutoWrap
+          # @api private
+          def self.included(klass)
+            super
+            klass.class_eval do
+              include(InstanceInterface)
+              extend(ClassInterface)
+            end
+          end
+
+          module ClassInterface
+            def inherited(klass)
+              super
+              klass.auto_curry :for_wrap
+            end
+          end
+
+          module InstanceInterface
+            # Default methods for fetching wrapped relation
+            #
+            # This method is used by default by `wrap` and `wrap_parents`
+            #
+            # @return [SQL::Relation]
+            #
+            # @api private
+            def for_wrap(keys, name)
+              other = __registry__[name]
+
+              inner_join(name, keys)
+                .select(*qualified.header.columns)
+                .select_append(*other.prefix(other.name).qualified.header)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  plugins do
+    adapter :sql do
+      register :auto_wrap, Plugins::Relation::SQL::AutoWrap, type: :relation
+    end
+  end
+end

data/lib/rom/plugins/relation/sql/base_view.rb

@@ -0,0 +1,29 @@
+module ROM
+  module Plugins
+    module Relation
+      module SQL
+        module BaseView
+          # @api private
+          def self.included(klass)
+            super
+            klass.class_eval do
+              def self.inherited(other)
+                super
+                other.view(:base) do
+                  header { dataset.columns }
+                  relation { select(*attributes(:base)).order(primary_key) }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  plugins do
+    adapter :sql do
+      register :base_view, Plugins::Relation::SQL::BaseView, type: :relation
+    end
+  end
+end

data/lib/rom/plugins/relation/view.rb

@@ -0,0 +1,75 @@
+require 'rom/plugins/relation/view/dsl'
+
+module ROM
+  module Plugins
+    module Relation
+      module View
+        def self.included(klass)
+          super
+
+          klass.class_eval do
+            extend ClassInterface
+
+            def self.attributes
+              @__attributes__ ||= {}
+            end
+          end
+        end
+
+        # Return column names that will be selected for this relation
+        #
+        # By default we use dataset columns but first we look at configured
+        # attributes by `view` DSL
+        #
+        # @return [Array<Symbol>]
+        #
+        # @api private
+        def attributes(view_name = name)
+          header = self.class.attributes
+            .fetch(view_name, self.class.attributes.fetch(:base))
+
+          if header.is_a?(Proc)
+            instance_exec(&header)
+          else
+            header
+          end
+        end
+
+        module ClassInterface
+          # Define a relation view with a specific header
+          #
+          # With headers defined all the mappers will be inferred automatically
+          #
+          # @example
+          #   class Users < ROM::Relation[:sql]
+          #     view(:by_name, [:id, :name]) do |name|
+          #       where(name: name)
+          #     end
+          #
+          #     view(:listing, [:id, :name, :email]) do
+          #       select(:id, :name, :email).order(:name)
+          #     end
+          #   end
+          #
+          # @api public
+          def view(*args, &block)
+            name, names, relation_block =
+              if block.arity == 0
+                DSL.new(*args, &block).call
+              else
+                [*args, block]
+              end
+
+            attributes[name] = names
+
+            define_method(name, &relation_block)
+          end
+        end
+      end
+    end
+  end
+
+  plugins do
+    register :view, Plugins::Relation::View, type: :relation
+  end
+end

data/lib/rom/plugins/relation/view/dsl.rb

@@ -0,0 +1,32 @@
+module ROM
+  module Plugins
+    module Relation
+      module View
+        class DSL
+          attr_reader :name
+
+          attr_reader :attributes
+
+          attr_reader :relation_block
+
+          def initialize(name, &block)
+            @name = name
+            instance_eval(&block)
+          end
+
+          def header(*args, &block)
+            @attributes = args.size > 0 ? args.first : block
+          end
+
+          def relation(&block)
+            @relation_block = lambda(&block)
+          end
+
+          def call
+            [name, attributes, relation_block]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rom/repository/ext/relation.rb

@@ -1,124 +1,10 @@
-require 'rom/repository/ext/relation/view_dsl'
+require 'rom/relation/curried'
 
 module ROM
-  module SQL
-    # A bunch of extensions that will be ported to other adapters
-    #
-    # @api public
-    class Relation < ROM::Relation
-      # @api private
-      def self.inherited(klass)
-        super
-        klass.class_eval do
-          exposed_relations.merge(Set[:columns, :for_combine, :for_wrap])
-
-          defines :attributes
-          attributes({})
-
-          option :attributes, reader: true, default: -> relation { relation.class.attributes }
-        end
-      end
-
-      # Define a relation view with a specific header
-      #
-      # With headers defined all the mappers will be inferred automatically
-      #
-      # @example
-      #   class Users < ROM::Relation[:sql]
-      #     view(:by_name, [:id, :name]) do |name|
-      #       where(name: name)
-      #     end
-      #
-      #     view(:listing, [:id, :name, :email]) do
-      #       select(:id, :name, :email).order(:name)
-      #     end
-      #   end
-      #
-      # @api public
-      def self.view(*args, &block)
-        name, names, relation_block =
-          if block.arity == 0
-            ViewDSL.new(*args, &block).call
-          else
-            [*args, block]
-          end
-
-        attributes[name] = names
-
-        define_method(name, &relation_block)
-      end
-
-      # Return column names that will be selected for this relation
-      #
-      # By default we use dataset columns but first we look at configured
-      # attributes by `view` DSL
-      #
-      # @return [Array<Symbol>]
-      #
-      # @api private
-      def columns
-        self.class.attributes.fetch(name, dataset.columns)
-      end
-
-      # Default methods for fetching combined relation
-      #
-      # This method is used by default by `combine`
-      #
-      # @return [SQL::Relation]
-      #
-      # @api private
-      def for_combine(keys, relation)
-        pk, fk = keys.to_a.flatten
-        where(fk => relation.map { |tuple| tuple[pk] })
-      end
-
-      # Default methods for fetching wrapped relation
-      #
-      # This method is used by default by `wrap` and `wrap_parents`
-      #
-      # @return [SQL::Relation]
-      #
-      # @api private
-      def for_wrap(name, keys)
-        other = __registry__[name]
-
-        inner_join(name, keys)
-          .select(*qualified.header.columns)
-          .select_append(*other.prefix(other.name).qualified.header)
-      end
-
-      # Infer foreign_key name for this relation
-      #
-      # TODO: this should be configurable and handled by an injected policy
-      #
-      # @return [Symbol]
-      #
-      # @api private
-      def foreign_key
-        :"#{Inflector.singularize(name)}_id"
-      end
-    end
-  end
-
-  # TODO: remove this once Relation::Lazy is gone
   class Relation
-    class Lazy
-      def base_name
-        relation.name
-      end
-
-      def primary_key
-        relation.primary_key
-      end
-
-      def foreign_key
-        relation.foreign_key
-      end
-    end
-
-    class Curried < Lazy
-      def columns
-        relation.attributes.fetch(options[:name], relation.columns)
+    class Curried
+      def attributes(view_name = name)
+        relation.attributes(view_name)
       end
     end
   end

data/lib/rom/repository/loading_proxy.rb

@@ -11,8 +11,8 @@ module ROM
     #
     # @api public
     class LoadingProxy
-      include Relation::Materializable
       include Options
+      include Relation::Materializable
 
       include LoadingProxy::Combine
       include LoadingProxy::Wrap
@@ -55,13 +55,13 @@ module ROM
       #
       # @api private
       def to_ast
-        attr_ast = columns.map { |name| [:attribute, name] }
+        attr_ast = attributes.map { |name| [:attribute, name] }
 
         node_ast = nodes.map(&:to_ast)
         wrap_ast = wraps.map(&:to_ast)
 
         wrap_attrs = wraps.flat_map { |wrap|
-          wrap.columns.map { |c| [:attribute, :"#{wrap.base_name}_#{c}"] }
+          wrap.attributes.map { |c| [:attribute, :"#{wrap.base_name}_#{c}"] }
         }
 
         meta = options[:meta].merge(base_name: relation.base_name)
@@ -120,6 +120,15 @@ module ROM
         options[:meta]
       end
 
+      # Return all nodes that this relation combines
+      #
+      # @return [Array<LoadingProxy>]
+      #
+      # @api private
+      def nodes
+        relation.respond_to?(:nodes) ? relation.nodes : []
+      end
+
       private
 
       # Return a new instance with another relation and options
@@ -131,15 +140,6 @@ module ROM
         self.class.new(relation, options.merge(new_options))
       end
 
-      # Return all nodes that this relation combines
-      #
-      # @return [Array<LoadingProxy>]
-      #
-      # @api private
-      def nodes
-        relation.is_a?(Relation::Graph) ? relation.nodes : []
-      end
-
       # Return all nodes that this relation wraps
       #
       # @return [Array<LoadingProxy>]
@@ -159,7 +159,7 @@ module ROM
         if relation.respond_to?(meth)
           result = relation.__send__(meth, *args)
 
-          if result.is_a?(Relation::Lazy) || result.is_a?(Relation::Graph) || result.is_a?(Relation::Composite)
+          if result.kind_of?(Relation::Materializable) && !result.is_a?(Relation::Loaded)
             __new__(result)
           else
             result

data/lib/rom/repository/loading_proxy/wrap.rb

@@ -21,7 +21,7 @@ module ROM
           }
 
           relation = wraps.reduce(self) { |a, e|
-            a.relation.for_wrap(e.base_name, e.meta.fetch(:keys))
+            a.relation.for_wrap(e.meta.fetch(:keys), e.base_name)
           }
 
           __new__(relation, meta: { wraps: wraps })

data/lib/rom/repository/version.rb

@@ -4,6 +4,6 @@ module ROM
   end
 
   class Repository < Gateway
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
   end
 end

data/rom-repository.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'anima', '~> 0.2', '>= 0.2'
-  gem.add_runtime_dependency 'rom', '~> 0.8', '>= 0.8.1'
-  gem.add_runtime_dependency 'rom-sql', '~> 0.5', '>= 0.5.3'
+  gem.add_runtime_dependency 'rom', '~> 0.9.0.beta1'
+  gem.add_runtime_dependency 'rom-support', '~> 0.1', '>= 0.1.0'
+  gem.add_runtime_dependency 'rom-mapper', '~> 0.2', '>= 0.2.0'
 
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec', '~> 3.3'

data/spec/spec_helper.rb

@@ -9,8 +9,8 @@ if RUBY_ENGINE == "rbx"
   CodeClimate::TestReporter.start
 end
 
-require 'rom-repository'
 require 'rom-sql'
+require 'rom-repository'
 
 begin
   require 'byebug'
@@ -41,3 +41,5 @@ RSpec.configure do |config|
 
   config.include(MapperRegistry)
 end
+
+ROM.use :auto_registration

data/spec/unit/sql/relation_spec.rb

@@ -5,14 +5,10 @@ RSpec.describe 'SQL Relation extensions' do
     let(:users) { rom.relation(:users) }
 
     it 'has valid column names' do
-      expect(users.columns).to eql([:id, :name])
+      expect(users.attributes).to eql([:id, :name])
 
-      expect(users.by_id.columns).to eql([:name])
-      expect(users.by_id(1).columns).to eql([:name])
-    end
-
-    it 'defines a valid method with correct arity' do
-      expect(users.relation.method(:by_id).arity).to be(1)
+      expect(users.by_id.attributes).to eql([:name])
+      expect(users.by_id(1).attributes).to eql([:name])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anima
@@ -36,40 +36,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0.beta1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0.beta1
+- !ruby/object:Gem::Dependency
+  name: rom-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: rom-sql
+  name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,12 @@ files:
 - README.md
 - Rakefile
 - lib/rom-repository.rb
+- lib/rom/plugins/relation/key_inference.rb
+- lib/rom/plugins/relation/sql/auto_combine.rb
+- lib/rom/plugins/relation/sql/auto_wrap.rb
+- lib/rom/plugins/relation/sql/base_view.rb
+- lib/rom/plugins/relation/view.rb
+- lib/rom/plugins/relation/view/dsl.rb
 - lib/rom/repository/base.rb
 - lib/rom/repository/ext/relation.rb
 - lib/rom/repository/ext/relation/view_dsl.rb