superstore 2.4.3 → 3.0.0

data/lib/superstore/types/integer_range_type.rb

@@ -0,0 +1,15 @@
+module Superstore
+  module Types
+    class IntegerRangeType < RangeType
+      self.subtype = IntegerType.new
+
+      def serialize_for_open_ended(value)
+        value&.abs == Float::INFINITY ? nil : super
+      end
+
+      def convert_min(method, value)
+        value.nil? ? -Float::INFINITY : super
+      end
+    end
+  end
+end

data/lib/superstore/types/integer_type.rb

@@ -1,19 +1,13 @@
 module Superstore
   module Types
-    class IntegerType < BaseType
-      REGEX = /\A[-+]?\d+\Z/
-      def encode(int)
-        raise ArgumentError.new("#{int.inspect} is not an Integer.") unless int.kind_of?(Integer)
-
-        int
-      end
-
-      def decode(str)
-        str.to_i unless str.empty?
-      end
-
-      def typecast(value)
-        value.to_i
+    class IntegerType < Base
+      def cast_value(value)
+        if value.is_a?(String)
+          Integer(value, 10)
+        else
+          Integer(value)
+        end
+      rescue
       end
     end
   end

data/lib/superstore/types/json_type.rb

@@ -1,6 +1,6 @@
 module Superstore
   module Types
-    class JsonType < BaseType
+    class JsonType < Base
     end
   end
 end

data/lib/superstore/types/range_type.rb

@@ -0,0 +1,58 @@
+module Superstore
+  module Types
+    class RangeType < Base
+      class_attribute :subtype
+
+      def serialize(range)
+        if range
+          [
+            serialize_for_open_ended(range.begin),
+            serialize_for_open_ended(range.end)
+          ]
+        end
+      end
+
+      def deserialize(range_tuple)
+        if range_tuple.is_a? Range
+          range_tuple
+        elsif range_tuple.is_a?(Array)
+          range = convert_min(:deserialize, range_tuple[0]) .. convert_max(:deserialize, range_tuple[1])
+          cast_value(range)
+        end
+      end
+
+      def cast_value(value)
+        if is_beginless_date_range?(value)
+          nil
+        elsif value.is_a?(Range) && (value.end.nil? || value.begin <= value.end)
+          value
+        elsif value.is_a?(Array) && value.size == 2
+          begin
+            range = convert_min(:cast_value, value[0])..convert_max(:cast_value, value[1])
+            cast_value(range)
+          rescue ArgumentError
+          end
+        end
+      end
+
+      private
+
+      def serialize_for_open_ended(value)
+        subtype.serialize(value)
+      end
+
+      def convert_min(method, value)
+        subtype.send(method, value)
+      end
+
+      def convert_max(method, value)
+        subtype.send(method, value)
+      end
+
+      def is_beginless_date_range?(value)
+        (value.is_a?(Range) && value.begin.nil? && value.end.is_a?(Date)) ||
+        (value.is_a?(Array) && value[0].nil? && value[1].is_a?(Date))
+      end
+    end
+  end
+end

data/lib/superstore/types/string_type.rb

@@ -1,8 +1,8 @@
 module Superstore
   module Types
-    class StringType < BaseType
-      def encode(str)
-        raise ArgumentError.new("#{str.inspect} is not a String") unless str.kind_of?(String)
+    class StringType < Base
+      def serialize(str)
+        return if str.nil?
 
         unless str.encoding == Encoding::UTF_8
           (str.frozen? ? str.dup : str).force_encoding('UTF-8')
@@ -11,7 +11,7 @@ module Superstore
         end
       end
 
-      def typecast(value)
+      def cast_value(value)
         value.to_s
       end
     end

data/lib/superstore/types/time_type.rb

@@ -1,16 +1,18 @@
 module Superstore
   module Types
-    class TimeType < BaseType
-      def encode(time)
-        raise ArgumentError.new("#{time.inspect} does not respond to #to_time") unless time.is_a?(Time) || time.respond_to?(:to_time)
-        time = time.to_time unless time.is_a?(Time)
-        time.utc.xmlschema(6)
+    class TimeType < Base
+      def serialize(time)
+        time.utc.xmlschema(6) if time
       end
 
-      def decode(str)
-        Time.parse(str).in_time_zone if str
-      rescue
+      def deserialize(str)
+        Time.rfc3339(str).in_time_zone if str
+      rescue ArgumentError
+        Time.parse(str).in_time_zone rescue nil
+      end
 
+      def cast_value(value)
+        value.to_time.in_time_zone rescue nil
       end
     end
   end

data/lib/superstore/types.rb

@@ -1,9 +1,11 @@
-Superstore::Type.register(:array,          Superstore::Types::ArrayType)
-Superstore::Type.register(:boolean,        Superstore::Types::BooleanType)
-Superstore::Type.register(:date,           Superstore::Types::DateType)
-Superstore::Type.register(:float,          Superstore::Types::FloatType)
-Superstore::Type.register(:geo_point,      Superstore::Types::JsonType)
-Superstore::Type.register(:integer,        Superstore::Types::IntegerType)
-Superstore::Type.register(:json,           Superstore::Types::JsonType)
-Superstore::Type.register(:time,           Superstore::Types::TimeType)
-Superstore::Type.register(:string,         Superstore::Types::StringType)
+ActiveRecord::Type.register(:superstore_array,          Superstore::Types::ArrayType)
+ActiveRecord::Type.register(:superstore_boolean,        Superstore::Types::BooleanType)
+ActiveRecord::Type.register(:superstore_date,           Superstore::Types::DateType)
+ActiveRecord::Type.register(:superstore_date_range,     Superstore::Types::DateRangeType)
+ActiveRecord::Type.register(:superstore_float,          Superstore::Types::FloatType)
+ActiveRecord::Type.register(:superstore_geo_point,      Superstore::Types::GeoPointType)
+ActiveRecord::Type.register(:superstore_integer,        Superstore::Types::IntegerType)
+ActiveRecord::Type.register(:superstore_integer_range,  Superstore::Types::IntegerRangeType)
+ActiveRecord::Type.register(:superstore_json,           Superstore::Types::JsonType)
+ActiveRecord::Type.register(:superstore_time,           Superstore::Types::TimeType)
+ActiveRecord::Type.register(:superstore_string,         Superstore::Types::StringType)

data/lib/superstore.rb

@@ -1,8 +1,6 @@
 require 'active_support/all'
 require 'active_model'
-require 'global_id/identification'
-require 'oj'
-require 'superstore/errors'
+require 'active_record'
 
 module Superstore
   extend ActiveSupport::Autoload
@@ -10,30 +8,20 @@ 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
 
   module AttributeMethods
     extend ActiveSupport::Autoload
 
     eager_autoload do
-      autoload :Definition
-      autoload :Dirty
       autoload :PrimaryKey
-      autoload :Typecasting
     end
   end
 
@@ -42,13 +30,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 +52,26 @@ module Superstore
     end
   end
 
+  module Relation
+    extend ActiveSupport::Autoload
+
+    autoload :Scrolling
+  end
+
   module Types
     extend ActiveSupport::Autoload
 
-    autoload :BaseType
+    autoload :Base
     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/superstore.gemspec

@@ -1,26 +1,24 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '2.4.3'
+  s.version = '3.0.0'
   s.description = 'ActiveModel-based JSONB document store'
   s.summary = 'ActiveModel for JSONB documents'
-  s.authors = ['Michael Koziarski', 'Infogroup']
+  s.authors = ['Michael Koziarski', 'Data Axle']
   s.email = 'developer@matthewhiggins.com'
   s.homepage = 'http://github.com/data-axle/superstore'
-  s.licenses = %w(ISC MIT)
+  s.licenses = %w[ISC MIT]
 
-  s.required_ruby_version     = '>= 2.0.0'
-  s.required_rubygems_version = '>= 1.3.5'
+  s.required_ruby_version     = '>= 3.0.0'
+  s.required_rubygems_version = '>= 3.2.0'
 
   s.extra_rdoc_files = ['README.md']
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('activemodel', '>= 3.0')
-  s.add_runtime_dependency('globalid')
-  s.add_runtime_dependency('oj')
+  s.add_runtime_dependency('activemodel', '>= 6.1')
+  s.add_runtime_dependency('activerecord', '>= 6.1')
 
   s.add_development_dependency('bundler')
+  s.add_development_dependency('rails', '~> 6.1')
 end

data/test/support/jsonb.rb

@@ -1,6 +1,8 @@
 class JsonbInitializer
   def self.initialize!
-    Superstore::Base.adapter.create_table('issues')
+    ActiveRecord::Migration.create_table :issues, id: :string do |t|
+      t.jsonb :document, null: false
+    end
   end
 end
 

data/test/support/models.rb

@@ -2,18 +2,24 @@ class User < ActiveRecord::Base
 end
 
 class Label < ActiveRecord::Base
+  belongs_to :issue
 end
 
 class Issue < Superstore::Base
-  string :description
-  string :title
+  attribute :description, type: :string
+  attribute :title, type: :string
+  attribute :parent_issue_id, type: :string
+  attribute :comments, type: :json
+  attribute :created_at, type: :time
+  attribute :updated_at, type: :time
 
   before_create { self.description ||= 'funny' }
 
-  has_many :labels
+  has_many :labels, inverse_of: :issue
+  has_many :children_issues, class_name: 'Issue', foreign_key: :parent_issue_id, inverse_of: :parent_issue, superstore: true
+  belongs_to :parent_issue, class_name: 'Issue', superstore: true
 
   def self.for_key key
     where_ids(key)
   end
 end
-

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+ENV['RAILS_ENV'] = 'test'
+require 'simplecov'
+
 require 'rails'
 
 I18n.config.enforce_available_locales = false
@@ -5,7 +8,7 @@ ActiveSupport::TestCase.test_order = :random
 
 require 'active_record'
 require 'rails/test_help'
-require 'mocha/setup'
+require 'mocha/api'
 
 require 'superstore'
 
@@ -18,7 +21,7 @@ module Superstore
     def temp_object(&block)
       Class.new(Superstore::Base) do
         self.table_name = 'issues'
-        string :force_save
+        attribute :force_save, type: :string
         before_save { self.force_save = 'junk' }
 
         def self.name
@@ -33,8 +36,9 @@ module Superstore
   module Types
     class TestCase < Superstore::TestCase
       attr_accessor :type
+
       setup do
-        @type = self.class.name.sub(/Test$/, '').constantize.new(Issue)
+        @type = self.class.name.sub(/Test$/, '').constantize.new
       end
     end
   end

data/test/unit/adapters/adapter_test.rb

@@ -1,6 +1,4 @@
 require 'test_helper'
 
 class Superstore::Adapters::AdapterTest < Superstore::TestCase
-  test 'create_table' do
-  end
-end
+end

data/test/unit/associations/belongs_to_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Superstore::Associations::BelongsTest < Superstore::TestCase
   class TestObject < Superstore::Base
     self.table_name = 'issues'
-    string :user_id
+    attribute :user_id, type: :string
     belongs_to :user, primary_key: :special_id
   end
 

data/test/unit/associations/has_many_test.rb

@@ -4,7 +4,7 @@ class Superstore::Associations::HasManyTest < Superstore::TestCase
   class TestObject < Issue
   end
 
-  test 'has_many' do
+  test 'has_many active_record association' do
     issue = TestObject.create!
     label = Label.create! name: 'important', issue_id: issue.id
 
@@ -13,10 +13,18 @@ class Superstore::Associations::HasManyTest < Superstore::TestCase
 
   test 'create supports preloaded records' do
     issue = TestObject.create!
-    issue.labels = Label.all.to_a
+    issue.labels = Label.all
 
     issue.labels.create! name: 'blue'
 
     assert_equal 1, issue.labels.size
   end
+
+  test 'has_many superstore association' do
+    parent_issue = Issue.create!
+    child_issue = Issue.create! parent_issue: parent_issue
+
+    assert_equal [child_issue], parent_issue.children_issues
+    assert_equal parent_issue.object_id, parent_issue.children_issues.first.parent_issue.object_id
+  end
 end

data/test/unit/attribute_methods/dirty_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
   test 'save clears dirty' do
     record = temp_object do
-      string :name
+      attribute :name, type: :string
     end.new name: 'foo'
 
     assert record.changed?
@@ -16,7 +16,7 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
 
   test 'reload clears dirty' do
     record = temp_object do
-      string :name
+      attribute :name, type: :string
     end.create! name: 'foo'
 
     record.name = 'bar'
@@ -27,9 +27,9 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
     assert !record.changed?
   end
 
-  test 'typecast float before dirty check' do
+  test 'cast_value float before dirty check' do
     record = temp_object do
-      float :price
+      attribute :price, type: :float
     end.create(price: 5.01)
 
     record.price = '5.01'
@@ -39,9 +39,9 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
     assert record.changed?
   end
 
-  test 'typecast boolean before dirty check' do
+  test 'cast_value boolean before dirty check' do
     record = temp_object do
-      boolean :awesome
+      attribute :awesome, type: :boolean
     end.create(awesome: false)
 
     record.awesome = false
@@ -51,20 +51,9 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
     assert record.changed?
   end
 
-  test 'unapplied_changes' do
-    record = temp_object do
-      float :price
-      string :color
-    end.create(price: 5.01, color: 'green')
-
-    record.color = 'blue'
-
-    assert_equal({'color' => 'blue'}, record.unapplied_changes)
-  end
-
   test 'write_attribute' do
     object = temp_object do
-      string :name
+      attribute :name, type: :string
     end
 
     expected = {"name"=>[nil, "foo"]}
@@ -83,7 +72,7 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
 
   test 'dirty and restore to original value' do
     object = temp_object do
-      string :name
+      attribute :name, type: :string
     end
 
     record = object.create(name: 'foo')

data/test/unit/attribute_methods/primary_key_test.rb

@@ -19,7 +19,7 @@ class Superstore::AttributeMethods::PrimaryKeyTest < Superstore::TestCase
   end
 
   test 'attributes' do
-    issue = Issue.new
+    issue = Issue.new(id: 'lol')
 
     assert_not_nil issue.attributes['id']
   end

data/test/unit/attribute_methods_test.rb

@@ -12,10 +12,6 @@ class Superstore::AttributeMethodsTest < Superstore::TestCase
     assert_equal 'foo', issue.read_attribute(:description)
   end
 
-  test 'read primary_key' do
-    refute_nil Issue.new[:id]
-  end
-
   test 'hash accessor aliases' do
     issue = Issue.new
 
@@ -34,32 +30,24 @@ class Superstore::AttributeMethodsTest < Superstore::TestCase
     assert_equal 'foo', issue.description
   end
 
-  class ChildIssue < Issue
-    def title=(val)
-      self[:title] = val + ' lol'
-    end
-  end
+  class ModelWithOverride < Superstore::Base
+    attribute :title, type: :string
 
-  test 'override' do
-    issue = ChildIssue.new(title: 'hey')
-
-    assert_equal 'hey lol', issue.title
+    def title=(v)
+      super "#{v} lol"
+    end
   end
 
-  class ReservedWord < Superstore::Base
-    self.table_name = 'issues'
-    string :system
-  end
+   test 'override' do
+    issue = ModelWithOverride.new(title: 'hey')
 
-  test 'reserved words' do
-    r = ReservedWord.new(system: 'hello')
-    assert_equal 'hello', r.system
+     assert_equal 'hey lol', issue.title
   end
 
   test 'has_attribute?' do
-    refute Issue.new.attribute_exists?(:description)
+    refute Issue.new.has_attribute?(:unknown)
+    assert Issue.new.has_attribute?(:description)
     assert Issue.new(description: nil).has_attribute?(:description)
-    assert Issue.new(description: false).has_attribute?(:description)
     assert Issue.new(description: 'hey').has_attribute?(:description)
   end
 end

data/test/unit/{attribute_methods/typecasting_test.rb → attributes_test.rb}

@@ -1,18 +1,19 @@
 require 'test_helper'
 
-class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
+class Superstore::AttributesTest < Superstore::TestCase
   class TestIssue < Superstore::Base
     self.table_name = 'issues'
 
-    boolean :enabled
-    float   :rating
-    integer :price
-    json    :orders
-    string  :name
+    attribute :enabled, type: :boolean
+    attribute :rating, type: :float
+    attribute :price, type: :integer
+    attribute :orders, type: :json
+    attribute :name, type: :string
+    attribute :age_range, type: :integer_range
   end
 
   class TestChildIssue < TestIssue
-    string :description
+    attribute :description, type: :string
   end
 
   test 'attributes not shared' do
@@ -21,15 +22,6 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
     assert_nothing_raised { TestChildIssue.new.description }
   end
 
-  test 'typecast_attribute' do
-    assert_equal 1, TestIssue.typecast_attribute('price', 1)
-    assert_equal 1, TestIssue.typecast_attribute(:price, 1)
-
-    assert_raise NoMethodError do
-      TestIssue.typecast_attribute('wtf', 1)
-    end
-  end
-
   test 'boolean attribute' do
     issue = TestIssue.create! enabled: '1'
     assert_equal true, issue.enabled
@@ -76,29 +68,11 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
     assert_equal '42', issue.name
   end
 
-  test 'multiple attributes definition' do
-    class MultipleAttributesIssue < Superstore::Base
-      self.table_name = 'issues'
-    end
+  test 'integer_range' do
+    issue = TestIssue.create! age_range: ['70', nil]
+    assert_equal 70.., issue.age_range
 
-    assert_nothing_raised {
-      MultipleAttributesIssue.string :hello, :greetings, :bye
-    }
-    issue = MultipleAttributesIssue.new :hello => 'hey', :greetings => 'how r u', :bye => 'see ya'
-
-    assert_equal 'how r u', issue.greetings
-  end
-
-  test 'multiple attributes with options' do
-    class MultipleAttributesIssue < Superstore::Base
-      self.table_name = 'issues'
-    end
-
-    MultipleAttributesIssue.expects(:attribute).with(:hello, { :unique => :true, :type => :string })
-    MultipleAttributesIssue.expects(:attribute).with(:world, { :unique => :true, :type => :string })
-
-    class MultipleAttributesIssue < Superstore::Base
-      string :hello, :world, :unique => :true
-    end
+    issue = TestIssue.find issue.id
+    assert_equal 70.., issue.age_range
   end
 end

data/test/unit/base_test.rb

@@ -17,4 +17,8 @@ class Superstore::BaseTest < Superstore::TestCase
     assert_equal 'sons', Son.table_name
     assert_equal 'sons', Grandson.table_name
   end
+
+  test 'translations' do
+    assert_equal :activerecord, Son.i18n_scope
+  end
 end

data/test/unit/caching_test.rb

@@ -16,6 +16,6 @@ class Superstore::CachingTest < Superstore::TestCase
     updated_at = Time.now
     issue = Issue.create!(id: 1, updated_at: updated_at)
 
-    assert_equal "issues/1-#{updated_at.utc.to_s(:nsec)}", issue.cache_key
+    assert_equal "issues/1-#{updated_at.utc.to_s(:usec)}", issue.cache_key
   end
 end