flounder 0.18.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 000e2bacbb00518bad55beff484a34fddf2bad90
-  data.tar.gz: cef0c32ba9086ebf32fae131b99747c19a58839a
+  metadata.gz: 147eda5bed1bdaba30729f559e90632dcc127004
+  data.tar.gz: 658f4e9765bf292d36ff6966c56679a4d4e8d20f
 SHA512:
-  metadata.gz: 7f2cf21c18f09391606b9c00110eab5534ccc6a9ec18b3a507a68cf567b9f6e909dd658408568391bf748474fce45502debb6ac579cde1f32b884f850481a9f6
-  data.tar.gz: ab0b21e881cadd1caeec275b75f91f7386fa1e673eab24ac1495562a7d7f4161f52f6fdd02258ac9d146af39852a8937f7c69584e17e1222b8f68c043a2c2fe0
+  metadata.gz: 56487164cc91a3a6614f70a5a5142ad98309f2b05aef756fd192bb9c641cd32348f79be04a85ad98fa99b3f2d02ab923fdd3332390cba43235f57eb64310cc33
+  data.tar.gz: e630f8f88801e8abee286a1ac3654f41ec7b9a5564e8168815ebd5ac9c74be54f74151005f75caf3036f92167002092d45df514b2d8aeda3ea8e2e3650739208

data/Gemfile

@@ -3,6 +3,12 @@ source "https://rubygems.org"
 group :test do
   gem 'qed'
   gem 'ae'
+  gem 'flexmock'
+  gem 'rspec'
+end
+
+group :benchmark do
+  gem 'ruby-prof'
 end
 
 gemspec

data/Gemfile.lock

@@ -1,15 +1,12 @@
 PATH
   remote: .
   specs:
-    flounder (0.18.1)
+    flounder (0.18.3)
       aggregate (~> 0.2, >= 0.2.2)
       arel (~> 5, > 5.0.1)
-      blankslate
       connection_pool (~> 2)
-      hashie (~> 3, >= 3.2)
       pg (~> 0.17)
       pg-hstore (~> 1.2, >= 1.2.0)
-      virtus
 
 GEM
   remote: https://rubygems.org/
@@ -19,24 +16,11 @@ GEM
     aggregate (0.2.2)
     ansi (1.4.3)
     arel (5.0.1.20140414130214)
-    axiom-types (0.0.5)
-      descendants_tracker (~> 0.0.1)
-      ice_nine (~> 0.9)
-    backports (3.6.3)
-    blankslate (3.1.3)
     brass (1.2.1)
-    coercible (0.2.0)
-      backports (~> 3.0, >= 3.1.0)
-      descendants_tracker (~> 0.0.1)
     connection_pool (2.0.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    equalizer (0.0.9)
     facets (2.9.3)
     flexmock (1.3.3)
-    hashie (3.3.1)
-    ice_nine (0.11.0)
     pg (0.17.1)
     pg-hstore (1.2.0)
     qed (2.9.1)
@@ -56,12 +40,6 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     ruby-prof (0.15.2)
-    thread_safe (0.3.4)
-    virtus (1.0.0)
-      axiom-types (~> 0.0.5)
-      coercible (~> 0.2)
-      descendants_tracker (~> 0.0.1)
-      equalizer (~> 0.0.7)
 
 PLATFORMS
   ruby

data/HISTORY

@@ -1,3 +1,15 @@
+# 1.0
+
+  * Return type from all queries is now not a Hashie::Mash, but a custom row
+    type. The interface it supports is a lot more restricted. This has two 
+    benefits: 
+
+      a) Speed increase for queries that return many rows
+      b) Maintenance is easier
+
+    In fact, Hashie::Mash is very tolerant with regards to access to keys that
+    do not exist. The new code is not, so expect breakage. 
+
 # 0.18
   + Allows usage of relation names in where clauses.
   + Remaps entity oids automatically if a mismatch exists.

data/README

@@ -19,8 +19,8 @@ SYNOPSIS
 
 STATUS
 
-Heavily volatile alpha, but feature stable for most of what we already have. 
-We welcome feedback! (flounder at technologyastronauts dot ch)
+Somewhat cooled off beta phase - Most features are stable now and the API
+doesn't change radically anymore.
 
 LICENSE
 

data/benchmark/001.rb

@@ -0,0 +1,12 @@
+
+# First benchmark just tests loading of data into array format. 
+# Run with 
+#   ruby -r profile benchmark/001.rb
+
+require_relative 'lib/connection'
+
+domain = Benchmark.domain
+perf01 = domain[:perf01]
+
+a = perf01.all.to_a
+

data/benchmark/002.rb

@@ -0,0 +1,18 @@
+
+# First benchmark just tests loading of data into array format. 
+
+require_relative 'lib/connection'
+require 'ruby-prof'
+
+domain = Benchmark.domain
+perf01 = domain[:perf01]
+
+r = perf01.all.to_a
+RubyProf.start
+a = r.map(&:foo).inject(0) { |sum, el| sum + el }
+result = RubyProf.stop
+
+# p a
+
+printer = RubyProf::DotPrinter.new(result)
+printer.print(STDOUT, min_percent: 2)

data/benchmark/lib/connection.rb

@@ -0,0 +1,19 @@
+
+# To get this to work, please run the qed tests first, since those load the
+# database structure. 
+
+require 'flounder'
+
+module Benchmark
+
+module_function 
+  def domain
+    @domain ||= begin
+      connection = Flounder.connect(dbname: 'flounder')
+      Flounder.domain(connection) do |dom|
+        dom.entity(:perf01, :perf01, 'perf01')
+      end
+    end
+  end
+end
+

data/benchmark/lib/random.rb

@@ -0,0 +1,15 @@
+
+module Benchmark
+
+module_function
+  def rand_string min_len, max_len
+    len = min_len + rand(max_len-min_len)
+
+    s = ''
+    len.times do
+      s << (?a.ord + rand(27)).chr
+    end
+
+    s
+  end
+end

data/benchmark/load.rb

@@ -0,0 +1,23 @@
+
+require_relative 'lib/connection'
+require_relative 'lib/random'
+
+domain = Benchmark.domain
+perf01 = domain[:perf01]
+
+n = 1000
+puts "Loading perf01 with #{n} records..."
+n.times do |n|
+  perf01.insert(
+    foo: n, 
+    bar: rand(100000), 
+    baz: rand(1000), 
+    when: Time.now, 
+    count: n,
+    iif: rand() < 0.5, 
+    type: Benchmark.rand_string(5, 25), 
+    bemerkung: Benchmark.rand_string(5, 200)).kick
+end
+
+
+p perf01.all.to_a

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.18.3'
+  s.version  = '1.0.0'
   s.summary  = "Flounder is a way to write SQL simply in Ruby. It deals with everything BUT object relational mapping. "
   s.email    = "kaspar.schiess@technologyastronauts.ch"
   s.homepage = "https://bitbucket.org/technologyastronauts/oss_flounder"
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'arel', '~> 5', '> 5.0.1'
   s.add_runtime_dependency 'pg', '~> 0.17'
-  s.add_runtime_dependency 'hashie', '~> 3', '>= 3.2'
   s.add_runtime_dependency 'connection_pool', '~> 2'
   s.add_runtime_dependency 'pg-hstore', '~> 1.2', '>= 1.2.0'
   s.add_runtime_dependency 'aggregate', '~> 0.2', '>= 0.2.2'

data/lib/flounder.rb

@@ -1,6 +1,5 @@
 require 'pg'
 require 'arel'
-require 'hashie/mash'
 
 require 'flounder/symbol_extensions'
 
@@ -23,6 +22,9 @@ require 'flounder/exceptions'
 
 require 'flounder/expression'
 
+require 'flounder/result/descriptor'
+require 'flounder/result/row'
+
 module Flounder
 module_function
   def connect opts={}

data/lib/flounder/connection.rb

@@ -35,7 +35,7 @@ module Flounder
           name = result.fname(idx)
           type_oid = result.ftype(idx)
           mod  = result.fmod(idx)
-          typesym = type_oid_to_sym(type_oid)
+          typesym = type_oid_to_sym(self, type_oid)
 
           unless typesym
             type_string = type_name(type_oid, mod)

data/lib/flounder/postgres_utils.rb

@@ -16,14 +16,16 @@ module Flounder
     OID_TIME = 1083
     OID_TIMESTAMPTZ = 1184
 
-    def typecast type_oid, value
+    def typecast connection, type_oid, value
+      raise ArgumentError, "AF: type_oid must not be nil" unless type_oid
+
       return nil unless value
 
       # hstore extension
-      if oid_hstore && type_oid == oid_hstore
+      if type_oid == oid_hstore(connection)
         return PgHstore.load(value) 
       end
-      
+
       # assert: value is not nil
       case type_oid
         when OID_TIMESTAMPTZ
@@ -47,12 +49,12 @@ module Flounder
       end
     end
 
-    def oid_hstore
+    def oid_hstore connection
       unless @oid_hstore_initialized
         @oid_hstore_initialized = true
 
         @oid_hstore = begin 
-          result = exec("SELECT oid FROM pg_type WHERE typname='hstore'")
+          result = connection.exec("SELECT oid FROM pg_type WHERE typname='hstore'")
           row = result.first
 
           row && row.values.first.to_i
@@ -62,8 +64,10 @@ module Flounder
       @oid_hstore
     end
 
-    def type_oid_to_sym oid
-      return :hash if oid_hstore && oid==oid_hstore
+    def type_oid_to_sym connection, oid
+      raise ArgumentError, "AF: oid must not be nil" unless oid
+
+      return :hash if oid==oid_hstore(connection)
 
       case oid
         when OID_TIMESTAMP, OID_TIMESTAMPTZ
@@ -85,22 +89,35 @@ module Flounder
       end
     end
     
-    def each_field entity, result, row_idx
+    # Yields header information for each column in the given result in turn. 
+    # 
+    # @yieldparam idx [Integer] column index
+    # @yieldparam entity [Flounder::Entity] entity as resolved by table OID
+    # @yieldparam field_name [String] field name as present in the SQL result
+    # @yieldparam type [Integer] type OID
+    # @yieldparam binary [Boolean] is this a binary field?
+    #
+    def each_field entity, result
       domain = entity.domain
 
       result.nfields.times do |field_idx|
         table_oid = result.ftable(field_idx)
         entity = domain.by_oid(table_oid)
 
-        yield entity, 
+        yield(
+          field_idx, 
+          entity,
           result.fname(field_idx),
-          result.getvalue(row_idx, field_idx),
           result.ftype(field_idx), 
-          result.fformat(field_idx) == 1, 
-          field_idx 
+          result.fformat(field_idx) == 1)
       end
     end
 
+    def access_value connection, result, type_oid, row_idx, col_idx
+      value = result.getvalue(row_idx, col_idx)
+      typecast(connection, type_oid, value)
+    end
+
     # Helper function for debugging
     def type_name ftype, fmod
       pg.

data/lib/flounder/query/base.rb

@@ -52,31 +52,38 @@ module Flounder::Query
       manager.to_sql.tap { |sql| 
         domain.log_sql(sql) }
     end
-
+    
     # Returns all rows of the query result as an array. Individual rows are
     # mapped to objects using the row mapper. 
     #
     def kick connection=nil
       all = nil
+      connection ||= engine
 
       measure do
-        (connection || engine).exec(self.to_sql, bind_values) do |result|
-          all = Array.new(result.ntuples, nil)
-          result.ntuples.times do |row_idx|
-            all[row_idx] = engine.connection.
-              objectify_result_row(entity, result, row_idx) do |name|
-                column_name_to_entity(name)
-              end
-          end
+        result = connection.exec(self.to_sql, bind_values) 
+
+        descriptor = ::Flounder::Result::Descriptor.new(
+          connection, entity, result, &method(:column_name_to_entity))
+
+        all = Array.new(result.ntuples, nil)
+        result.ntuples.times do |row_idx|
+          all[row_idx] = descriptor.row(row_idx)
         end
       end
 
       all
     end
+
+    # Implement this if your column names in the query allow inferring
+    # the entity and the column name. Return them as a tuple <entity, name>.
+    #
     def column_name_to_entity name
-      # Implement this if your column names in the query allow inferring
-      # the entity and the column name. Return them as a tuple <entity, name>.
     end
+
+    # Measures the block given to it and logs time spent in the block to the
+    # domain. 
+    #
     def measure
       measure = Benchmark.measure {
         yield        
@@ -233,8 +240,8 @@ module Flounder::Query
       end
     end
 
-    # Called on each key/value pair of an update clause, this returns a 
-    # hash that can be passed to Arel #update. 
+    # Called on each key/value pair of an update clause, this returns a hash
+    # that can be passed to Arel #update.
     #
     def transform_tuple_for_set field, value
       if value.kind_of? Hash

data/lib/flounder/query/select.rb

@@ -161,7 +161,7 @@ module Flounder::Query
     # 
     def size
       manager.projections = []
-      project 'count(*) as count'
+      project 'count(*)::int as count'
 
       all.first.count
     end

data/lib/flounder/result/accessor/field.rb

@@ -0,0 +1,18 @@
+
+module Flounder::Result::Accessor
+  class Field
+    attr_reader :descriptor
+    attr_reader :col_idx
+    attr_reader :type_oid
+
+    def initialize descriptor, col_idx, type_oid
+      @descriptor = descriptor
+      @col_idx = col_idx
+      @type_oid = type_oid
+    end
+
+    def produce_value(row_idx)
+      descriptor.value(type_oid, row_idx, col_idx)
+    end
+  end
+end

data/lib/flounder/result/accessor/node.rb

@@ -0,0 +1,36 @@
+
+require_relative 'field'
+
+module Flounder::Result::Accessor
+  class Node 
+    attr_reader :children_by_name
+
+    def initialize 
+      @children_by_name = Hash.new do |hash, name|
+        hash[name.to_sym] = Node.new
+      end
+    end
+
+    def [] name
+      children_by_name[name.to_sym]
+    end
+    def has_obj? name
+      children_by_name.has_key? name.to_sym
+    end
+    def names
+      children_by_name.keys
+    end
+
+    def add_field name, *a
+      children_by_name[name.to_sym] = Field.new(*a)
+    end
+
+    def size
+      children_by_name.size
+    end
+
+    def produce_value *_
+      yield self
+    end
+  end
+end

data/lib/flounder/result/descriptor.rb

@@ -0,0 +1,70 @@
+
+module Flounder::Result
+  class Descriptor
+    include ::Flounder::PostgresUtils
+
+    # Result obtained from the connection
+    attr_reader :pg_result
+
+    attr_reader :connection
+  
+    # Entity to use for field resolution
+    attr_reader :entity
+
+    # Root of the accessor tree. 
+    # @api private
+    attr_reader :accessor_root
+
+    # @api private
+    attr_reader :name_resolver
+
+    def initialize connection, entity, pg_result, &name_resolver
+      @entity = entity
+      @pg_result = pg_result
+      @connection = connection
+      @name_resolver = name_resolver || -> (name) {}
+
+      build_accessors
+    end
+
+    def row idx
+      Row.new(accessor_root, idx)
+    end
+
+    def value type, row_idx, col_idx
+      access_value(connection, pg_result, type, row_idx, col_idx)
+    end
+
+    # Parses and builds accessor structure for the result stored here. 
+    #
+    # @api private
+    #
+    def build_accessors
+      @accessor_root = Accessor::Node.new
+      each_field(entity, pg_result) do |idx, entity, field, type, binary|
+        processed_entity, processed_name = name_resolver.call(field)
+        entity = processed_entity if processed_entity
+        field  = processed_name if processed_name
+
+        # JOIN tables are available from the result using their singular names.
+        if entity
+          accessor_root[entity.singular].add_field(field, self, idx, type)
+        end
+
+        # The main entity and custom fields (AS something) are available on the
+        # top-level of the result. 
+        if field && (!entity || entity == self.entity)
+          raise ::Flounder::DuplicateField, 
+            "#{field.inspect} already defined in result set, aliasing occurs." \
+            if accessor_root.has_obj? field
+
+          accessor_root.add_field(field, self, idx, type)
+        end
+
+      end
+    end
+  end
+end
+
+require 'flounder/result/accessor/node'
+

data/lib/flounder/result/row.rb

@@ -0,0 +1,97 @@
+module Flounder::Result
+  class Row
+    def initialize node, row_idx
+      @root = node
+      @row_idx = row_idx
+      @attributes = {}
+    end
+
+    # Primary resolution mechanism: Lazy lookup of fields. 
+
+    def method_missing sym, *args, &block
+      if @root.has_obj?(sym)
+        return cache_attribute(sym)
+      end
+
+      if sym.to_s.end_with?(??)
+        stripped = sym.to_s[0..-2]
+        return @root.has_obj?(stripped) && !value_for(stripped).nil?
+      end
+
+      super
+    end
+    def respond_to? sym, include_all=false
+      @attributes.has_key?(sym) ||
+        @root.has_obj?(sym) || 
+        super
+    end
+    def methods regular=true
+      (__columns__ + super).uniq
+    end
+
+    def inspect
+      "flounder/Row(#{__columns__.inspect})"
+    end
+
+    def == other
+      if other.kind_of?(Row)
+        other_root = other.instance_variable_get('@root')
+
+        __columns__ == other.__columns__ && 
+          __columns__.all? { |name| 
+            my_value = self[name]
+            other_value = other[name]
+            my_value == other_value }
+      else
+        super
+      end
+    end
+
+    def [] name
+      if @root.has_obj?(name)
+        value_for(name)
+      end
+    end
+
+    # Returns values of given keys as an array. 
+    #
+    def values_at *keys
+      keys.map { |key| self[key] }
+    end
+
+    # Returns all column names. 
+    #
+    def __columns__
+      @root.names
+    end
+
+    # Turns this row into a hash, performing deep conversion of all field names.
+    # Use this to go into the Hash world and never come back. 
+    #
+    def to_h
+      __columns__.map { |name| [name, value_for(name)] }.to_h
+    end
+
+  private 
+
+    def value_for name
+      if @attributes.has_key?(name)
+        return @attributes[name]
+      end
+
+      node = @root[name]
+      @attributes[name] = node && node.produce_value(@row_idx) { |node|
+        Row.new(node, @row_idx)
+      }
+    end
+
+    def cache_attribute name
+      value = value_for(name)
+
+      # Produce a local accessor via Virtus
+      self.define_singleton_method(name) { value }
+
+      value
+    end
+  end
+end

data/qed/flounder.sql

@@ -41,6 +41,24 @@ BEGIN;
 INSERT INTO "comments" (post_id, text, author_id) VALUES (1, 'A silly comment.', 1); 
 COMMIT; 
 
+BEGIN; 
+-- A table with structure to do performance measurements.
+DROP TABLE IF EXISTS "perf01" CASCADE;
+CREATE TABLE "perf01" (
+  "id" serial not null primary key,
+  "foo" int4,
+  "bar" int4,
+  "baz" int2 not null,
+  "when" time(6),
+  "count" int4,
+  "iif" bool DEFAULT true,
+  "type" varchar(255),
+  "created_at" timestamp(6) not NULL default(now()),
+  "updated_at" timestamp(6) not NULL default(now()),
+  "bemerkung" text
+);
+COMMIT; 
+
 -- import using
 --
 --    cat qed/flounder.sql | psql flounder

data/qed/projection.md

@@ -18,7 +18,11 @@ When projecting, all result data will be toplevel and only the projected data is
   result = posts.join(users).on(:user_id => :id).
     project(users[:name]).first
 
-  result.id.assert == nil # Not loaded.
+  result.refute.respond_to?(:id) # Not loaded.
+
+  result.refute.id? # Synonymous to obj.respond_to?(:id) && !obj.id.nil?
+  result.user.assert.name?
+  
   result.user.name.assert == 'John Snow'
 ~~~
 

data/spec/lib/entity_alias_spec.rb

@@ -0,0 +1,27 @@
+
+
+require 'spec_helper'
+
+describe Flounder::EntityAlias do
+  class Table
+    def alias *a
+      self
+    end
+
+    def [] name
+      "field #{name}"
+    end
+  end
+
+  let(:table) { Table.new }
+  let(:entity) { flexmock('entity', 
+    table: table, name: 'entity', table_name: 'table') }
+
+  let(:ea) { Flounder::EntityAlias.new(entity, :aliases, :alias) }
+
+  describe '#fields' do
+    it 'returns a list of fields' do
+      ea.fields(:a, :b).assert == [ea[:a], ea[:b]]
+    end
+  end
+end

data/spec/lib/result/row_spec.rb

@@ -0,0 +1,70 @@
+
+# Run tests using
+#   ruby -Ilib:test TEST_FILE
+
+require 'spec_helper'
+
+describe Flounder::Result::Row do
+  class DescriptorStub
+    def initialize hash
+      @hash = hash
+    end
+
+    def has_obj? name
+      @hash.has_key?(name)
+    end
+
+    def [] name
+      val = @hash.fetch(name)
+
+      if val.kind_of? Hash
+      else
+        ValueStub.new(val)
+      end
+    end
+
+    def names
+      @hash.keys
+    end
+  end
+  class ValueStub
+    def initialize value
+      @value = value
+    end
+    def produce_value *a
+      @value
+    end
+  end
+
+  let(:descriptor) { DescriptorStub.new(:foo => :bar, :bar => :baz) }
+  let(:row) { Flounder::Result::Row.new(descriptor, 1) }
+
+  it 'allows field access through methods' do
+    row.foo.assert == :bar
+  end
+  it 'raises when accessing fields that don\'t exist' do
+    NoMethodError.raised? do
+      row.bar
+    end
+  end
+  it 'has a useful inspect' do
+    row.inspect.assert == "flounder/Row([:foo, :bar])"
+  end
+
+  describe 'hash-like features' do
+    it 'has [] accessor' do
+      row[:foo].assert == :bar
+    end
+    it 'has __columns__ list' do
+      row.__columns__.assert == [:foo, :bar]
+    end
+
+    it 'converts to a hash (#to_h)' do
+      row.to_h.assert == {:foo => :bar, :bar => :baz}
+    end
+
+    it 'has #values_at accessor' do
+      row.values_at(:foo, :bar).assert == [:bar, :baz]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+
+
+require 'rspec'
+require 'flexmock'
+require 'ae/adapters/rspec'
+
+RSpec.configure do |config|
+  config.mock_with :flexmock
+end
+
+require 'flounder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,114 +9,94 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: pg-hstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: aggregate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
 description: "    Flounder is the missing piece between the database and your Ruby
@@ -127,11 +107,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- flounder.gemspec
 - Gemfile
 - Gemfile.lock
 - HACKING
 - HISTORY
+- LICENSE
+- README
+- benchmark/001.rb
+- benchmark/002.rb
+- benchmark/lib/connection.rb
+- benchmark/lib/random.rb
+- benchmark/load.rb
+- flounder.gemspec
+- lib/flounder.rb
 - lib/flounder/connection.rb
 - lib/flounder/connection_pool.rb
 - lib/flounder/domain.rb
@@ -151,9 +139,11 @@ files:
 - lib/flounder/query/select.rb
 - lib/flounder/query/update.rb
 - lib/flounder/relation.rb
+- lib/flounder/result/accessor/field.rb
+- lib/flounder/result/accessor/node.rb
+- lib/flounder/result/descriptor.rb
+- lib/flounder/result/row.rb
 - lib/flounder/symbol_extensions.rb
-- lib/flounder.rb
-- LICENSE
 - qed/applique/ae.rb
 - qed/applique/flounder.rb
 - qed/applique/setup_domain.rb
@@ -172,7 +162,9 @@ files:
 - qed/projection.md
 - qed/selects.md
 - qed/updates.md
-- README
+- spec/lib/entity_alias_spec.rb
+- spec/lib/result/row_spec.rb
+- spec/spec_helper.rb
 homepage: https://bitbucket.org/technologyastronauts/oss_flounder
 licenses:
 - MIT
@@ -183,17 +175,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flounder is a way to write SQL simply in Ruby. It deals with everything BUT
@@ -217,3 +209,4 @@ test_files:
 - qed/projection.md
 - qed/selects.md
 - qed/updates.md
+has_rdoc: