superstore 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10f632d358dc01cd4a01250b5834f563fee086f4
-  data.tar.gz: 34ebd6d23f8d47d320bf002f9ec4b4ac8066a197
+SHA256:
+  metadata.gz: 69f3fe9607d8df59438f381a38fa0068f7a7435666bc1a79588cbe5914896b59
+  data.tar.gz: 7da54acc35f5126576c35e6574e41b7cffd0eca9221ce5784948471eababe617
 SHA512:
-  metadata.gz: aa43c12d476a6d7c2a66f51be01218d00374d91e992a73c019d0fc3a9248fda4a0aa2000d4ef52004b1e382331895f728eeb161a33ada001461e7a365bbfd19c
-  data.tar.gz: d01463ac21d6f220a773450122b1df2b920d5eae3af50608ef60ec6b95b1b5de79968dc6521af578c2fc04d1322db5e79e2b77643d1e654835522ba66b4f5420
+  metadata.gz: c7dcb613c89611211e5610bd991156e6ee4fb5f5e0f87f4f0b820ca1ed6555a26de8d618c7da14efa5b10dce9ae5b43aa732ee51d81ca8603be88bd231e63052
+  data.tar.gz: db48bc7c88e0ab91dcc376f212b866556f0189b52841aa6491ff5a71dba83b4eaaae4e9b74c57ff759d42b6a20954571265979ea7d854de118dff589803a59e4

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
-rvm:
-- 2.3.1
-sudo: required
-dist: trusty
+rvm: 2.6.3
+dist: xenial
 cache: bundler
 gemfile:
 - Gemfile
-- Gemfile-rails4.2
+- Gemfile.rails6
 addons:
-  postgresql: 9.5
+  postgresql: 9.6
 services:
 - postgresql

data/Gemfile

@@ -1,11 +1,10 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
+gem 'rails', '~> 5.2.3'
 gem 'rake'
 
 group :test do
-  gem 'rails'
   gem 'pg'
-  gem 'activerecord', '~> 5.0.0'
   gem 'mocha', require: false
 end

data/{Gemfile-rails4.2 → Gemfile.rails6}

@@ -1,11 +1,10 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
+gem 'rails', '~> 6.0.0.rc1'
 gem 'rake'
 
 group :test do
-  gem 'rails'
   gem 'pg'
-  gem 'activerecord', '~> 4.2.0'
   gem 'mocha', require: false
 end

data/README.md

@@ -1,5 +1,5 @@
 # Superstore
-[![Build Status](https://secure.travis-ci.org/data-axle/superstore.png?rvm=2.0.0)](http://travis-ci.org/data-axle/superstore)
+[![Build Status](https://travis-ci.org/data-axle/superstore.svg?branch=master)](http://travis-ci.org/data-axle/superstore)
 [![Code Climate](https://codeclimate.com/github/data-axle/superstore/badges/gpa.svg)](https://codeclimate.com/github/data-axle/superstore)
 [![Gem](https://img.shields.io/gem/v/superstore.svg?maxAge=2592000)](https://rubygems.org/gems/superstore)
 
@@ -15,27 +15,18 @@ Superstore requires PostgreSQL 9.5 or above.
 Add the following to the `Gemfile`:
 
 ```ruby
-gem 'pg'
 gem 'superstore'
 ```
 
-Add a `config/superstore.yml`:
-
-```yaml
-development:
-  adapter: jsonb
-```
-
 Superstore will share the existing ActiveRecord database connection.
 
 ## Defining Models
 
 ```ruby
 class Widget < Superstore::Base
-  string :name
-  string :description
-  integer :price
-  array :colors, unique: true
+  attribute :name, type: :string
+  attribute :price, type: :integer
+  attribute :colors, type: :array
 
   validates :name, presence: :true
 
@@ -69,24 +60,3 @@ widget.price_was
 widget.save
 widget.save!
 ```
-
-## Finding records
-
-```ruby
-widget = Widget.find(uuid)
-widget = Widget.first
-widgets = Widget.all
-Widget.find_each do |widget|
-  # Codez
-end
-```
-
-## Scoping
-
-Some lightweight scoping features are available:
-
-```ruby
-Widget.where('color' => 'red')
-Widget.select(['name', 'color'])
-Widget.limit(10)
-```

data/lib/superstore.rb

@@ -1,8 +1,7 @@
 require 'active_support/all'
 require 'active_model'
+require 'active_record'
 require 'global_id/identification'
-require 'oj'
-require 'superstore/errors'
 
 module Superstore
   extend ActiveSupport::Autoload
@@ -10,30 +9,21 @@ module Superstore
   autoload :AttributeMethods
   autoload :Base
   autoload :Associations
-  autoload :Caching
-  autoload :Callbacks
+  autoload :AttributeAssignment
+  autoload :Attributes
   autoload :Connection
   autoload :Core
   autoload :Identity
-  autoload :Inspect
-  autoload :Model
+  autoload :Inheritance
+  autoload :ModelSchema
   autoload :Persistence
-  autoload :Schema
-  autoload :CassandraSchema
-  autoload :Scope
-  autoload :Scoping
-  autoload :Timestamps
-  autoload :Type
-  autoload :Validations
+  autoload :Timestamp
 
   module AttributeMethods
     extend ActiveSupport::Autoload
 
     eager_autoload do
-      autoload :Definition
-      autoload :Dirty
       autoload :PrimaryKey
-      autoload :Typecasting
     end
   end
 
@@ -42,13 +32,13 @@ module Superstore
 
     autoload :AbstractAdapter
     autoload :JsonbAdapter
-    autoload :CassandraAdapter
   end
 
   module Associations
     extend ActiveSupport::Autoload
 
     autoload :Association
+    autoload :AssociationScope
     autoload :Reflection
     autoload :BelongsTo
     autoload :HasMany
@@ -64,16 +54,25 @@ module Superstore
     end
   end
 
+  module Relation
+    extend ActiveSupport::Autoload
+
+    autoload :Scrolling
+  end
+
   module Types
     extend ActiveSupport::Autoload
 
-    autoload :BaseType
     autoload :ArrayType
     autoload :BooleanType
     autoload :DateType
+    autoload :DateRangeType
     autoload :FloatType
+    autoload :GeoPointType
     autoload :IntegerType
+    autoload :IntegerRangeType
     autoload :JsonType
+    autoload :RangeType
     autoload :StringType
     autoload :TimeType
   end

data/lib/superstore/adapters/abstract_adapter.rb

@@ -1,10 +1,7 @@
 module Superstore
   module Adapters
     class AbstractAdapter
-      attr_reader :config
-      def initialize(config)
-        @config = config
-        @batch_statements = nil
+      def initialize
       end
 
       # Read records from a instance of Superstore::Scope
@@ -22,29 +19,6 @@ module Superstore
       # Delete rows by an array of ids
       def delete(table, ids) # abstract
       end
-
-      def execute_batch(statements) # abstract
-      end
-
-      def batching?
-        !@batch_statements.nil?
-      end
-
-      def batch
-        @batch_statements = []
-        yield
-        execute_batch(@batch_statements) if @batch_statements.any?
-      ensure
-        @batch_statements = nil
-      end
-
-      def execute_batchable(statement)
-        if @batch_statements
-          @batch_statements << statement
-        else
-          execute statement
-        end
-      end
     end
   end
 end

data/lib/superstore/adapters/jsonb_adapter.rb

@@ -4,86 +4,6 @@ require 'pg'
 module Superstore
   module Adapters
     class JsonbAdapter < AbstractAdapter
-      class QueryBuilder
-        def initialize(adapter, scope)
-          @adapter  = adapter
-          @scope    = scope
-        end
-
-        def to_query
-          [
-            "SELECT #{select_string}",
-            from_string,
-            where_string,
-            order_string,
-            limit_string
-          ].delete_if(&:blank?) * ' '
-        end
-
-        def from_string
-          "FROM #{@scope.klass.table_name}"
-        end
-
-        def select_string
-          if @scope.select_values.empty?
-            '*'
-          elsif @scope.select_values == [@adapter.primary_key_column]
-            @adapter.primary_key_column
-          else
-            selects = @scope.select_values.map { |key| "#{@adapter.quote(key)},document->#{@adapter.quote(key)}" }
-            "#{@adapter.primary_key_column}, json_build_object(#{selects * ','}) as document"
-          end
-        end
-
-        def where_string
-          wheres = where_values_as_strings
-
-          if @scope.id_values.any?
-            wheres << @adapter.create_ids_where_clause(@scope.id_values)
-          end
-
-          if wheres.any?
-            "WHERE #{wheres * ' AND '}"
-          end
-        end
-
-        def order_string
-          if @scope.order_values.any?
-            orders = @scope.order_values.join(', ')
-            "ORDER BY #{orders}"
-          elsif @scope.id_values.many?
-            id_orders = @scope.id_values.map { |id| "ID=#{@adapter.quote(id)} DESC" }.join(',')
-            "ORDER BY #{id_orders}"
-          end
-        end
-
-        def limit_string
-          if @scope.limit_value
-            "LIMIT #{@scope.limit_value}"
-          end
-        end
-
-        def where_values_as_strings
-          @scope.where_values.map do |where_value|
-            if where_value.is_a?(Hash)
-              key = where_value.keys.first
-              value = where_value.values.first
-
-              if value.nil?
-                "(document->>'#{key}') IS NULL"
-              elsif value.is_a?(Array)
-                typecasted_values = value.map { |v| "'#{v}'" }.join(',')
-                "document->>'#{key}' IN (#{typecasted_values})"
-              else
-                "document->>'#{key}' = '#{value}'"
-              end
-            else
-              where_value
-            end
-          end
-        end
-      end
-
       PRIMARY_KEY_COLUMN = 'id'.freeze
       def primary_key_column
         PRIMARY_KEY_COLUMN
@@ -105,39 +25,10 @@ module Superstore
         connection.execute statement
       end
 
-      def to_ids(scope)
-        statement = QueryBuilder.new(self, scope.select(primary_key_column)).to_query
-        connection.select_values(statement)
-      end
-
-      def select(scope)
-        statement = QueryBuilder.new(self, scope).to_query
-
-        connection.execute(statement).each do |result|
-          yield result[primary_key_column], Oj.compat_load(result['document'])
-        end
-      end
-
-      def scroll(scope, batch_size)
-        statement   = QueryBuilder.new(self, scope).to_query
-        cursor_name = "cursor_#{SecureRandom.hex(6)}"
-        fetch_sql   = "FETCH FORWARD #{batch_size} FROM #{cursor_name}"
-
-        connection.transaction do
-          connection.execute "DECLARE #{cursor_name} NO SCROLL CURSOR FOR (#{statement})"
-
-          while (batch = connection.execute(fetch_sql)).any?
-            batch.each do |result|
-              yield result[primary_key_column], Oj.compat_load(result['document'])
-            end
-          end
-        end
-      end
-
       def insert(table, id, attributes)
         not_nil_attributes = attributes.reject { |key, value| value.nil? }
         statement = "INSERT INTO #{table} (#{primary_key_column}, document) VALUES (#{quote(id)}, #{to_quoted_jsonb(not_nil_attributes)})"
-        execute_batchable statement
+        execute statement
       end
 
       def update(table, id, attributes)
@@ -157,31 +48,13 @@ module Superstore
 
         statement = "UPDATE #{table} SET document = #{value_update} WHERE #{primary_key_column} = #{quote(id)}"
 
-        execute_batchable statement
+        execute statement
       end
 
       def delete(table, ids)
         statement = "DELETE FROM #{table} WHERE #{create_ids_where_clause(ids)}"
 
-        execute_batchable statement
-      end
-
-      def execute_batch(statements)
-        connection.transaction do
-          execute(statements * ";\n")
-        end
-      end
-
-      def create_table(table_name, options = {})
-        ActiveRecord::Migration.create_table table_name, id: false do |t|
-          t.string :id, null: false
-          t.jsonb :document, null: false
-        end
-        connection.execute "ALTER TABLE \"#{table_name}\" ADD CONSTRAINT #{table_name}_pkey PRIMARY KEY (id)"
-      end
-
-      def drop_table(table_name)
-        ActiveRecord::Migration.drop_table table_name
+        execute statement
       end
 
       def create_ids_where_clause(ids)
@@ -204,9 +77,8 @@ module Superstore
         "ARRAY[#{quoted_fields}]"
       end
 
-      OJ_OPTIONS = {mode: :compat}
       def to_quoted_jsonb(data)
-        "#{quote(Oj.dump(data, OJ_OPTIONS))}::JSONB"
+        "#{quote(JSON.generate(data))}::JSONB"
       end
     end
   end

data/lib/superstore/associations.rb

@@ -2,7 +2,12 @@ module Superstore
   module Associations
     extend ActiveSupport::Concern
 
-    module ClassMethods
+    included do
+      include ActiveRecord::Associations
+      extend ClassOverrides
+    end
+
+    module ClassOverrides
       # === Options
       # [:class_name]
       #   Use if the class cannot be inferred from the association

data/lib/superstore/associations/association.rb

@@ -7,6 +7,7 @@ module Superstore
       def initialize(owner, reflection)
         @owner = owner
         @reflection = reflection
+        reset
       end
 
       def association_class
@@ -33,6 +34,11 @@ module Superstore
       def loaded!
         @loaded = true
       end
+
+      def reset
+        @loaded = false
+        @target = nil
+      end
     end
   end
 end