rom-sql 0.3.2 → 0.4.0.beta1

data/spec/unit/relation_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe ROM::Relation do
   include_context 'users and tasks'
 
-  subject(:users) { rom.relations.users }
+  let(:users) { rom.relations.users }
+  let(:tasks) { rom.relations.tasks }
 
   before do
     setup.relation(:users) do
@@ -13,6 +14,39 @@ describe ROM::Relation do
     end
   end
 
+  describe '#map' do
+    it 'yields tuples' do
+      result = []
+      users.map { |tuple| result << tuple }
+      expect(result).to eql([{ id: 1, name: 'Piotr' }])
+    end
+  end
+
+  describe '#inner_join' do
+    it 'joins relations using inner join' do
+      conn[:users].insert(id: 2, name: 'Jane')
+
+      result = users.inner_join(:tasks, user_id: :id).select(:name, :title)
+
+      expect(result.to_a).to match_array([
+        { name: 'Piotr', title: 'Finish ROM' }
+      ])
+    end
+  end
+
+  describe '#left_join' do
+    it 'joins relations using left outer join' do
+      conn[:users].insert(id: 2, name: 'Jane')
+
+      result = users.left_join(:tasks, user_id: :id).select(:name, :title)
+
+      expect(result.to_a).to match_array([
+        { name: 'Piotr', title: 'Finish ROM' },
+        { name: 'Jane', title: nil }
+      ])
+    end
+  end
+
   describe '#project' do
     it 'projects the dataset using new column names' do
       projected = users.sorted.project(:name)
@@ -59,9 +93,21 @@ describe ROM::Relation do
   end
 
   describe '#inspect' do
-    it 'includes dataset and header' do
-      expect(users.inspect).to include('header')
+    it 'includes dataset' do
       expect(users.inspect).to include('dataset')
     end
   end
+
+  describe '#unique?' do
+    before { tasks.delete }
+
+    it 'returns true when there is only one tuple matching criteria' do
+      expect(tasks.unique?(title: 'Task One')).to be(true)
+    end
+
+    it 'returns true when there are more than one tuple matching criteria' do
+      tasks.insert(title: 'Task One')
+      expect(tasks.unique?(title: 'Task One')).to be(false)
+    end
+  end
 end

data/spec/unit/repository_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+require 'rom/lint/spec'
+
+describe ROM::SQL::Repository do
+  include_context 'users and tasks'
+
+  let(:repository) { rom.repositories[:default] }
+
+  it_behaves_like 'a rom repository' do
+    let(:identifier) { :sql }
+    let(:repository) { ROM::SQL::Repository }
+    let(:uri) { 'postgres://localhost/rom' }
+  end
+
+  describe '#dataset?' do
+    it 'returns true if a table exists' do
+      expect(repository.dataset?(:users)).to be(true)
+    end
+
+    it 'returns false if a table does not exist' do
+      expect(repository.dataset?(:not_here)).to be(false)
+    end
+  end
+
+  describe '#disconnect' do
+    it 'disconnects via sequel connection' do
+      # FIXME: no idea how to test it in a different way
+      expect(repository.connection).to receive(:disconnect)
+      repository.disconnect
+    end
+  end
+end

data/spec/unit/schema_spec.rb

@@ -1,32 +1,20 @@
 require 'spec_helper'
 
 describe 'Inferring schema from database' do
-  let(:setup) { ROM.setup(postgres: "postgres://localhost/rom") }
+  include_context 'database setup'
 
   context "when database schema exists" do
-    after { rom.postgres.connection.drop_table?(:people) }
-
-    let(:rom) { setup.finalize }
-
     it "infers the schema from the database relations" do
-      setup.postgres.connection.create_table :people do
-        primary_key :id
-        String :name
-      end
-
-      schema = rom.schema
-
-      expect(schema.people.to_a).to eql(rom.postgres.people.to_a)
-      expect(schema.people.header).to eql([:id, :name])
+      expect(rom.relations.users.to_a)
+        .to eql(rom.repositories[:default][:users].to_a)
     end
   end
 
   context "for empty database schemas" do
     it "returns an empty schema" do
-      rom = setup.finalize
-      schema = rom.schema
+      drop_tables
 
-      expect { schema.postgres }.to raise_error(NoMethodError)
+      expect { rom.not_here }.to raise_error(NoMethodError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.17'
+        version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.17'
+        version: '4.18'
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -50,20 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.28.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.28.0
 description: SQL databases support for ROM
 email:
 - piotr.solnica@gmail.com
@@ -116,22 +96,35 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/rom-sql.rb
 - lib/rom/sql.rb
-- lib/rom/sql/adapter.rb
 - lib/rom/sql/commands.rb
+- lib/rom/sql/commands/create.rb
+- lib/rom/sql/commands/delete.rb
+- lib/rom/sql/commands/transaction.rb
+- lib/rom/sql/commands/update.rb
+- lib/rom/sql/commands_ext/postgres.rb
 - lib/rom/sql/header.rb
-- lib/rom/sql/relation_inclusion.rb
+- lib/rom/sql/migration.rb
+- lib/rom/sql/plugin/pagination.rb
+- lib/rom/sql/rake_task.rb
+- lib/rom/sql/relation.rb
+- lib/rom/sql/relation/associations.rb
+- lib/rom/sql/relation/class_methods.rb
+- lib/rom/sql/relation/inspection.rb
+- lib/rom/sql/repository.rb
 - lib/rom/sql/spec/support.rb
 - lib/rom/sql/support/active_support_notifications.rb
 - lib/rom/sql/support/rails_log_subscriber.rb
-- lib/rom/sql/support/sequel_dataset_ext.rb
+- lib/rom/sql/tasks/migration_tasks.rake
 - lib/rom/sql/version.rb
 - log/.gitkeep
 - rom-sql.gemspec
@@ -144,14 +137,16 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_support_notifications_spec.rb
 - spec/support/rails_log_subscriber_spec.rb
-- spec/unit/adapter_spec.rb
 - spec/unit/combined_associations_spec.rb
-- spec/unit/config_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/many_to_many_spec.rb
 - spec/unit/many_to_one_spec.rb
+- spec/unit/migration_spec.rb
+- spec/unit/migration_tasks_spec.rb
 - spec/unit/one_to_many_spec.rb
+- spec/unit/plugin/pagination_spec.rb
 - spec/unit/relation_spec.rb
+- spec/unit/repository_spec.rb
 - spec/unit/schema_spec.rb
 homepage: http://rom-rb.org
 licenses:
@@ -168,9 +163,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.2.2
@@ -187,13 +182,15 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/active_support_notifications_spec.rb
 - spec/support/rails_log_subscriber_spec.rb
-- spec/unit/adapter_spec.rb
 - spec/unit/combined_associations_spec.rb
-- spec/unit/config_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/many_to_many_spec.rb
 - spec/unit/many_to_one_spec.rb
+- spec/unit/migration_spec.rb
+- spec/unit/migration_tasks_spec.rb
 - spec/unit/one_to_many_spec.rb
+- spec/unit/plugin/pagination_spec.rb
 - spec/unit/relation_spec.rb
+- spec/unit/repository_spec.rb
 - spec/unit/schema_spec.rb
 has_rdoc: 

data/lib/rom/sql/adapter.rb

@@ -1,100 +0,0 @@
-require 'logger'
-
-require 'rom/sql/commands'
-
-module ROM
-  module SQL
-    class Adapter < ROM::Adapter
-      attr_reader :logger
-
-      def self.schemes
-        [:ado, :amalgalite, :cubrid, :db2, :dbi, :do, :fdbsql, :firebird,
-         :ibmdb, :informix, :jdbc, :mysql, :mysql2, :odbc, :openbase, :oracle,
-         :postgres, :sqlanywhere, :sqlite, :sqlite3, :swift, :tinytds]
-      end
-
-      def self.normalize_scheme(input)
-        scheme = input.dup
-        scheme = 'sqlite' if scheme == 'sqlite3'
-
-        if RUBY_ENGINE == 'jruby' && scheme != 'postgres'
-          scheme.prepend('jdbc:')
-        end
-
-        scheme
-      end
-
-      def self.database_file?(scheme)
-        scheme.to_s.include?('sqlite')
-      end
-
-      def initialize(*args)
-        super
-        @connection = ::Sequel.connect(uri.to_s, options)
-      end
-
-      def disconnect
-        connection.disconnect
-      end
-
-      def [](name)
-        connection[name]
-      end
-
-      def logger=(logger)
-        @logger = logger
-        connection.loggers << logger
-      end
-
-      def schema
-        tables.map { |table| [table, dataset(table), columns(table)] }
-      end
-
-      def dataset?(name)
-        tables.include?(name)
-      end
-
-      def extend_relation_class(klass)
-        klass.send(:include, RelationInclusion)
-      end
-
-      def extend_relation_instance(relation)
-        model = relation.model
-        model.set_dataset(relation.dataset)
-        model.dataset.naked!
-      end
-
-      def command_namespace
-        SQL::Commands
-      end
-
-      private
-
-      def tables
-        connection.tables
-      end
-
-      def columns(table)
-        dataset(table).columns
-      end
-
-      def dataset(table)
-        connection[table]
-      end
-
-      def attributes(table)
-        map_attribute_types connection.schema(table)
-      end
-
-      def map_attribute_types(attrs)
-        attrs.map do |column, opts|
-          [column, { type: map_schema_type(opts[:type]) }]
-        end.to_h
-      end
-
-      def map_schema_type(type)
-        connection.class::SCHEMA_TYPE_CLASSES.fetch(type)
-      end
-    end
-  end
-end

data/lib/rom/sql/relation_inclusion.rb

@@ -1,149 +0,0 @@
-module ROM
-  module SQL
-    # Sequel-specific relation extensions
-    #
-    module RelationInclusion
-      def self.included(klass)
-        klass.extend(AssociationDSL)
-
-        klass.send(:undef_method, :select)
-        klass.send(:attr_reader, :model)
-
-        klass.class_eval do
-          class << self
-            attr_accessor :model
-          end
-
-          self.model = Class.new(Sequel::Model)
-        end
-      end
-
-      def initialize(*args)
-        super
-        @model = self.class.model
-        @header = dataset.header
-      end
-
-      # Join configured association.
-      #
-      # Uses INNER JOIN type.
-      #
-      # @example
-      #
-      #   setup.relation(:tasks)
-      #
-      #   setup.relations(:users) do
-      #     one_to_many :tasks, key: :user_id
-      #
-      #     def with_tasks
-      #       association_join(:tasks, select: [:title])
-      #     end
-      #   end
-      #
-      # @api public
-      def association_join(name, options = {})
-        graph_join(name, :inner, options)
-      end
-
-      # Join configured association
-      #
-      # Uses LEFT JOIN type.
-      #
-      # @example
-      #
-      #   setup.relation(:tasks)
-      #
-      #   setup.relations(:users) do
-      #     one_to_many :tasks, key: :user_id
-      #
-      #     def with_tasks
-      #       association_left_join(:tasks, select: [:title])
-      #     end
-      #   end
-      #
-      # @api public
-      def association_left_join(name, options = {})
-        graph_join(name, :left_outer, options)
-      end
-
-      # @api private
-      def primary_key
-        model.primary_key
-      end
-
-      # @api private
-      def graph_join(name, join_type, options = {})
-        assoc = model.association_reflection(name)
-
-        key = assoc[:key]
-        type = assoc[:type]
-
-        if type == :many_to_many
-          select = options[:select] || {}
-
-          l_select, r_select =
-            if select.is_a?(Hash)
-              [select[assoc[:join_table]] || [], select[name]]
-            else
-              [[], select]
-            end
-
-          l_graph = graph(
-            assoc[:join_table],
-            { assoc[:left_key] => primary_key },
-            select: l_select, implicit_qualifier: self.name
-          )
-
-          l_graph.graph(
-            name, { primary_key => assoc[:right_key] }, select: r_select
-          )
-        else
-          join_keys =
-            if type == :many_to_one
-              { primary_key => key }
-            else
-              { key => primary_key }
-            end
-
-          graph(
-            name,
-            join_keys,
-            options.merge(join_type: join_type, implicit_qualifier: self.name)
-          )
-        end
-      end
-
-      module AssociationDSL
-        def one_to_many(name, options)
-          associations << [__method__, name, options.merge(relation: name)]
-        end
-
-        def many_to_many(name, options = {})
-          associations << [__method__, name, options.merge(relation: name)]
-        end
-
-        def many_to_one(name, options = {})
-          new_options = options.merge(relation: Inflecto.pluralize(name).to_sym)
-          associations << [__method__, name, new_options]
-        end
-
-        def finalize(relations, relation)
-          associations.each do |*args, options|
-            model = relation.model
-            other = relations[options.fetch(:relation)].model
-
-            model.public_send(*args, options.merge(class: other))
-          end
-
-          model.freeze
-
-          super
-        end
-
-        def associations
-          @associations ||= []
-        end
-      end
-    end
-  end
-end