sequel_mapper 0.0.1 → 0.0.3

data/spec/support/sequel_persistence_setup.rb

@@ -0,0 +1,19 @@
+require "support/sequel_test_support"
+
+RSpec.shared_context "sequel persistence setup" do
+  include SequelMapper::SequelTestSupport
+
+  before { truncate_tables }
+
+  let(:datastore) {
+    db_connection.tap { |db|
+      # The query_counter will let us make assertions about how efficiently
+      # the database is being used
+      db.loggers << query_counter
+    }
+  }
+
+  let(:query_counter) {
+    SequelMapper::SequelTestSupport::QueryCounter.new
+  }
+end

data/spec/support/sequel_test_support.rb

@@ -0,0 +1,159 @@
+require "sequel"
+
+module SequelMapper
+  module SequelTestSupport
+    def create_database
+      `psql postgres --command "CREATE DATABASE $PGDATABASE;"`
+    end
+    module_function :create_database
+
+    def drop_database
+      `psql postgres --command "DROP DATABASE $PGDATABASE;"`
+    end
+    module_function :drop_database
+
+    def drop_tables
+      db_connection.tables.each do |table_name|
+        db_connection.drop_table(table_name)
+      end
+    end
+    module_function :drop_tables
+
+    def truncate_tables
+      db_connection.tables.each do |table_name|
+        db_connection[table_name].truncate
+      end
+    end
+    module_function :truncate_tables
+
+    def db_connection
+      Sequel.default_timezone = :utc
+      @db_connection ||= Sequel.postgres(
+        host: ENV.fetch("PGHOST"),
+        user: ENV.fetch("PGUSER"),
+        database: ENV.fetch("PGDATABASE"),
+      )
+    end
+    module_function :db_connection
+
+    def create_tables(schema)
+      options_map = {
+        id: { primary_key: true },
+      }
+
+      schema.each do |table_name, fields|
+
+        db_connection.create_table(table_name) do
+          fields.each do |field|
+            type = field.fetch(:type)
+            name = field.fetch(:name)
+            options = options_map.fetch(name, {})
+
+            send(type, name, options)
+          end
+        end
+      end
+    end
+    module_function :create_tables
+
+    def insert_records(datastore, records)
+      records.each { |(namespace, record)|
+        datastore[namespace].insert(record)
+      }
+    end
+
+    class QueryCounter
+      def initialize
+        reset
+      end
+
+      def read_count
+        read_count_with_describes -
+          list_tables_query_count -
+          describe_table_queries_count
+      end
+
+      def delete_count
+        @info.count { |query|
+          /\A\([0-9\.]+s\) DELETE/i === query
+        }
+      end
+
+      def read_count_with_describes
+        @info.count { |query|
+          /\A\([0-9\.]+s\) SELECT/i === query
+        }
+      end
+
+      def update_count
+        @info.count { |query|
+          /\A\([0-9\.]+s\) UPDATE/i === query
+        }
+      end
+
+      def show_queries
+        puts @info.join("\n")
+      end
+
+      def info(message)
+        @info.push(message)
+      end
+
+      def error(message)
+        @error.push(message)
+      end
+
+      def warn(message)
+        @warn.push(message)
+      end
+
+      def reset
+        @described_table_queries = []
+        @info = []
+        @error = []
+        @warn = []
+      end
+
+      private
+
+      def list_tables_query_count
+        @info.count { |query| list_tables_query_pattern.match(query) }
+      end
+
+      def describe_table_queries_count
+        describe_table_queries.count
+      end
+
+      def describe_table_queries
+        # TODO this could probably be better solved with finite automata
+        described_table_queries = []
+
+        queries_without_table_list
+          .take_while { |query|
+            described_table_queries.push(query)
+            described_table_query_pattern.match(query) &&
+              described_table_queries.length == described_table_queries.uniq.length
+          }
+      end
+
+      def queries_without_table_list
+        @info
+          .drop_while { |query|
+            !list_tables_query_pattern.match(query)
+          }
+          .drop_while { |query|
+            list_tables_query_pattern.match(query)
+          }
+      end
+
+
+      def list_tables_query_pattern
+        /\A\([0-9\.]+s\) SELECT "relname" FROM "pg_class"/
+      end
+
+      def described_table_query_pattern
+        /\A\([0-9\.]+s\) SELECT \* FROM "[^"]+" LIMIT 1/i
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_mapper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephen Best
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.16'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: fetchable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ''
 email:
 - bestie@gmail.com
@@ -104,31 +146,74 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- MissingFeatures.md
 - README.md
 - Rakefile
 - TODO.md
+- features/env.rb
+- features/example.feature
+- features/step_definitions/example_steps.rb
 - lib/sequel_mapper.rb
-- lib/sequel_mapper/association_proxy.rb
-- lib/sequel_mapper/belongs_to_association_proxy.rb
-- lib/sequel_mapper/graph.rb
-- lib/sequel_mapper/queryable_association_proxy.rb
+- lib/sequel_mapper/abstract_record.rb
+- lib/sequel_mapper/association_loaders.rb
+- lib/sequel_mapper/collection_mutability_proxy.rb
+- lib/sequel_mapper/configurations/conventional_association_configuration.rb
+- lib/sequel_mapper/configurations/conventional_configuration.rb
+- lib/sequel_mapper/dataset.rb
+- lib/sequel_mapper/deleted_record.rb
+- lib/sequel_mapper/dirty_map.rb
+- lib/sequel_mapper/graph_loader.rb
+- lib/sequel_mapper/graph_serializer.rb
+- lib/sequel_mapper/identity_map.rb
+- lib/sequel_mapper/lazy_object_proxy.rb
+- lib/sequel_mapper/many_to_many_association.rb
+- lib/sequel_mapper/many_to_one_association.rb
+- lib/sequel_mapper/mapper_facade.rb
+- lib/sequel_mapper/one_to_many_association.rb
+- lib/sequel_mapper/public_conveniencies.rb
+- lib/sequel_mapper/query_order.rb
+- lib/sequel_mapper/queryable_lazy_dataset_loader.rb
+- lib/sequel_mapper/relation_mapping.rb
+- lib/sequel_mapper/serializer.rb
+- lib/sequel_mapper/short_inspection_string.rb
 - lib/sequel_mapper/struct_factory.rb
+- lib/sequel_mapper/subset_queries_proxy.rb
+- lib/sequel_mapper/upserted_record.rb
 - lib/sequel_mapper/version.rb
 - sequel_mapper.gemspec
+- spec/config_override_spec.rb
+- spec/custom_serializers_spec.rb
+- spec/deletion_spec.rb
 - spec/graph_persistence_spec.rb
 - spec/graph_traversal_spec.rb
+- spec/new_graph_persistence_spec.rb
+- spec/object_identity_spec.rb
 - spec/ordered_association_spec.rb
+- spec/persistence_efficiency_spec.rb
+- spec/predefined_queries_spec.rb
 - spec/proxying_spec.rb
 - spec/querying_spec.rb
-- spec/sequel_mapper/association_proxy_spec.rb
-- spec/sequel_mapper/belongs_to_association_proxy_spec.rb
+- spec/readme_examples_spec.rb
+- spec/sequel_mapper/abstract_record_spec.rb
+- spec/sequel_mapper/collection_mutability_proxy_spec.rb
+- spec/sequel_mapper/deleted_record_spec.rb
+- spec/sequel_mapper/lazy_object_proxy_spec.rb
+- spec/sequel_mapper/public_conveniencies_spec.rb
+- spec/sequel_mapper/queryable_lazy_dataset_loader_spec.rb
+- spec/sequel_mapper/upserted_record_spec.rb
 - spec/spec_helper.rb
-- spec/support/graph_fixture.rb
+- spec/support/blog_schema.rb
+- spec/support/have_persisted_matcher.rb
+- spec/support/mapper_setup.rb
 - spec/support/mock_sequel.rb
-- spec/support/query_counter.rb
+- spec/support/object_graph_setup.rb
+- spec/support/seed_data_setup.rb
+- spec/support/sequel_persistence_setup.rb
+- spec/support/sequel_test_support.rb
 homepage: https://github.com/bestie/sequel_mapper
 licenses:
 - MIT
@@ -149,19 +234,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A data mapper built on top of the Sequel database toolkit
 test_files:
+- features/env.rb
+- features/example.feature
+- features/step_definitions/example_steps.rb
+- spec/config_override_spec.rb
+- spec/custom_serializers_spec.rb
+- spec/deletion_spec.rb
 - spec/graph_persistence_spec.rb
 - spec/graph_traversal_spec.rb
+- spec/new_graph_persistence_spec.rb
+- spec/object_identity_spec.rb
 - spec/ordered_association_spec.rb
+- spec/persistence_efficiency_spec.rb
+- spec/predefined_queries_spec.rb
 - spec/proxying_spec.rb
 - spec/querying_spec.rb
-- spec/sequel_mapper/association_proxy_spec.rb
-- spec/sequel_mapper/belongs_to_association_proxy_spec.rb
+- spec/readme_examples_spec.rb
+- spec/sequel_mapper/abstract_record_spec.rb
+- spec/sequel_mapper/collection_mutability_proxy_spec.rb
+- spec/sequel_mapper/deleted_record_spec.rb
+- spec/sequel_mapper/lazy_object_proxy_spec.rb
+- spec/sequel_mapper/public_conveniencies_spec.rb
+- spec/sequel_mapper/queryable_lazy_dataset_loader_spec.rb
+- spec/sequel_mapper/upserted_record_spec.rb
 - spec/spec_helper.rb
-- spec/support/graph_fixture.rb
+- spec/support/blog_schema.rb
+- spec/support/have_persisted_matcher.rb
+- spec/support/mapper_setup.rb
 - spec/support/mock_sequel.rb
-- spec/support/query_counter.rb
+- spec/support/object_graph_setup.rb
+- spec/support/seed_data_setup.rb
+- spec/support/sequel_persistence_setup.rb
+- spec/support/sequel_test_support.rb

data/lib/sequel_mapper/association_proxy.rb

@@ -1,54 +0,0 @@
-require "forwardable"
-
-module SequelMapper
-  class AssociationProxy
-    def initialize(assoc_enum)
-      @assoc_enum = assoc_enum
-      @added_nodes = []
-      @removed_nodes = []
-    end
-
-    attr_reader :assoc_enum, :removed_nodes, :added_nodes
-    private     :assoc_enum
-
-    include Enumerable
-    def each(&block)
-      enum = Enumerator.new do |yielder|
-        assoc_enum.each do |element|
-          yielder.yield(element) unless removed?(element)
-        end
-
-        @added_nodes.each do |node|
-          yielder.yield(node)
-        end
-      end
-
-      if block
-        enum.each(&block)
-        self
-      else
-        enum
-      end
-    end
-
-    def remove(node)
-      @removed_nodes.push(node)
-      self
-    end
-
-    def push(node)
-      @added_nodes.push(node)
-    end
-
-    def where(criteria)
-      @assoc_enum.where(criteria)
-      self
-    end
-
-    private
-
-    def removed?(node)
-      @removed_nodes.include?(node)
-    end
-  end
-end

data/lib/sequel_mapper/belongs_to_association_proxy.rb

@@ -1,27 +0,0 @@
-require "delegate"
-
-class BelongsToAssociationProxy < SimpleDelegator
-  def initialize(object_loader)
-    @object_loader = object_loader
-    @loaded = false
-  end
-
-  def method_missing(method_id, *args, &block)
-    __load_object__
-
-    super
-  end
-
-  def __getobj__
-    __load_object__
-    super
-  end
-
-  private
-
-  def __load_object__
-    __setobj__(@object_loader.call).tap {
-      @loaded = true
-    } unless @loaded
-  end
-end