superstore 2.4.4 → 2.5.0

data/test/unit/types/geo_point_type_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class Superstore::Types::GeoPointTypeTest < Superstore::Types::TestCase
+  test 'deserialize' do
+    lat, lon = 47.604, -122.329
+    seattle = {lat: lat, lon: lon}
+
+    assert_equal seattle, type.deserialize('lat' => lat, 'lon' => lon)
+  end
+
+  test 'cast_value' do
+    lat, lon = 47.604, -122.329
+    seattle = {lat: lat, lon: lon}
+
+    assert_equal seattle, type.cast_value(lat: lat, lon: lon)
+    assert_equal seattle, type.cast_value({ "lat" => lat, "lon" => lon })
+    assert_equal seattle, type.cast_value([lat, lon])
+
+    assert_equal({lat: 0.0, lon: 0.0}, type.cast_value(lat: "cats", lon: "dogs"))
+
+    assert_nil type.cast_value([])
+    assert_nil type.cast_value('invalid')
+  end
+end

data/test/unit/types/integer_range_type_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class Superstore::Types::IntegerRangeTypeTest < Superstore::Types::TestCase
+  test 'serialize' do
+    assert_equal [4, 5], type.serialize(4..5)
+    assert_equal [4, nil], type.serialize(4..Float::INFINITY)
+    assert_equal [nil, 5], type.serialize(-Float::INFINITY..5)
+    assert_equal [nil, nil], type.serialize(-Float::INFINITY..Float::INFINITY)
+  end
+
+  test 'deserialize' do
+    assert_equal 4..5, type.deserialize([4, 5])
+    assert_nil type.deserialize([5, 4])
+    assert_equal 4..Float::INFINITY, type.deserialize([4, nil])
+    assert_equal (-Float::INFINITY..5), type.deserialize([nil, 5])
+    assert_equal (-Float::INFINITY..Float::INFINITY), type.deserialize([nil, nil])
+  end
+
+  test 'cast_value' do
+    assert_equal 1..5, type.cast_value(1..5)
+    assert_nil type.cast_value(5..1)
+    assert_equal 1..5, type.cast_value([1, 5])
+    assert_nil type.cast_value([5, 1])
+    assert_equal 1..Float::INFINITY, type.cast_value([1, nil])
+    assert_equal (-Float::INFINITY..2), type.cast_value([nil, 2])
+    assert_equal (-Float::INFINITY..Float::INFINITY), type.cast_value([nil, nil])
+  end
+end

data/test/unit/types/integer_type_test.rb

@@ -1,21 +1,12 @@
 require 'test_helper'
 
 class Superstore::Types::IntegerTypeTest < Superstore::Types::TestCase
-  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
-    test 'encode' do
-      assert_equal '3', type.encode(3)
-      assert_equal '-3', type.encode(-3)
-
-      assert_raise ArgumentError do
-        type.encode('xx')
-      end
-    end
-  end
-
-  test 'decode' do
-    assert_nil type.decode('')
-    assert_equal(0, type.decode('abc'))
-    assert_equal(3, type.decode('3'))
-    assert_equal(-3, type.decode('-3'))
+  test 'cast_value' do
+    assert_nil type.cast_value('')
+    assert_nil type.cast_value('abc')
+    assert_equal 3, type.cast_value(3)
+    assert_equal 3, type.cast_value('3')
+    assert_equal(-3, type.cast_value('-3'))
+    assert_equal 27, type.cast_value('027')
   end
 end

data/test/unit/types/string_type_test.rb

@@ -1,30 +1,26 @@
 require 'test_helper'
 
 class Superstore::Types::StringTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal 'abc', type.encode('abc')
-
-    assert_raise ArgumentError do
-      type.encode(123)
-    end
+  test 'serialize' do
+    assert_equal 'abc', type.serialize('abc')
   end
 
-  test 'encode as utf' do
+  test 'serialize as utf' do
     assert_equal(
       '123'.force_encoding('UTF-8').encoding,
-      type.encode('123'.force_encoding('ASCII-8BIT')).encoding
+      type.serialize('123'.force_encoding('ASCII-8BIT')).encoding
     )
   end
 
-  test 'encode frozen as utf' do
+  test 'serialize frozen as utf' do
     assert_equal(
       '123'.force_encoding('UTF-8').encoding,
-      type.encode('123'.force_encoding('ASCII-8BIT').freeze).encoding
+      type.serialize('123'.force_encoding('ASCII-8BIT').freeze).encoding
     )
   end
 
-  test 'typecast' do
-    assert_equal '123', type.typecast(123)
-    assert_equal '123', type.typecast('123')
+  test 'cast_value' do
+    assert_equal '123', type.cast_value(123)
+    assert_equal '123', type.cast_value('123')
   end
 end

data/test/unit/types/time_type_test.rb

@@ -1,23 +1,29 @@
 require 'test_helper'
 
 class Superstore::Types::TimeTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal '2004-12-24T01:02:03.000000Z', type.encode(Time.utc(2004, 12, 24, 1, 2, 3))
-    assert_equal '2004-12-24T01:02:03.000000Z', type.encode(DateTime.new(2004, 12, 24, 1, 2, 3))
-    assert_raise ArgumentError do
-      type.encode 123
-    end
+  test 'serialize' do
+    assert_equal '2004-12-24T01:02:03.000000Z', type.serialize(Time.utc(2004, 12, 24, 1, 2, 3))
+    assert_nil type.serialize(nil)
   end
 
-  test 'decode' do
-    assert_nil type.decode(nil)
-    assert_nil type.decode('bad format')
-    assert_equal Time.utc(2004, 12, 24, 1, 2, 3), type.decode('2004-12-24T01:02:03.000000Z')
+  test 'deserialize' do
+    assert_nil type.deserialize(nil)
+    assert_nil type.deserialize('bad format')
+    assert_equal Time.utc(2004, 12, 24, 1, 2, 3), type.deserialize('2004-12-24T01:02:03.000000Z')
+    assert_equal Time.utc(2004, 12, 24, 12, 13, 45), type.deserialize('2004-12-24 12:13:45 -0000')
 
     Time.use_zone 'Central Time (US & Canada)' do
-      with_zone = type.decode('2013-07-18 13:12:46 -0700')
+      with_zone = type.deserialize('2013-07-18T13:12:46-07:00')
       assert_equal Time.utc(2013, 07, 18, 20, 12, 46), with_zone
       assert_equal 'CDT', with_zone.zone
     end
   end
+
+  test 'cast_value' do
+    assert_nil type.cast_value(1000)
+    assert_nil type.cast_value(1000.0)
+
+    my_date = Date.new
+    assert_equal my_date.to_time, type.cast_value(my_date)
+  end
 end

data/test/unit/validations_test.rb

@@ -7,7 +7,7 @@ class Superstore::ValidationsTest < Superstore::TestCase
 
       Issue.create!(description: 'lol')
 
-      assert_raise(Superstore::RecordInvalid) { Issue.create!(description: '') }
+      assert_raise(ActiveRecord::RecordInvalid) { Issue.create!(description: '') }
     ensure
       Issue.reset_callbacks(:validate)
     end
@@ -19,7 +19,7 @@ class Superstore::ValidationsTest < Superstore::TestCase
 
       Issue.new(description: 'lol').save!
 
-      assert_raise(Superstore::RecordInvalid) { Issue.new(description: '').save! }
+      assert_raise(ActiveRecord::RecordInvalid) { Issue.new(description: '').save! }
     ensure
       Issue.reset_callbacks(:validate)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,14 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -40,13 +54,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,7 +92,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile-rails4.2
+- Gemfile.rails6
 - LICENSE
 - MIT-LICENSE
 - README.md
@@ -88,6 +102,7 @@ files:
 - lib/superstore/adapters/jsonb_adapter.rb
 - lib/superstore/associations.rb
 - lib/superstore/associations/association.rb
+- lib/superstore/associations/association_scope.rb
 - lib/superstore/associations/belongs_to.rb
 - lib/superstore/associations/builder/association.rb
 - lib/superstore/associations/builder/belongs_to.rb
@@ -96,41 +111,31 @@ files:
 - lib/superstore/associations/has_many.rb
 - lib/superstore/associations/has_one.rb
 - lib/superstore/associations/reflection.rb
+- lib/superstore/attribute_assignment.rb
 - lib/superstore/attribute_methods.rb
-- lib/superstore/attribute_methods/definition.rb
-- lib/superstore/attribute_methods/dirty.rb
 - lib/superstore/attribute_methods/primary_key.rb
-- lib/superstore/attribute_methods/typecasting.rb
+- lib/superstore/attributes.rb
 - lib/superstore/base.rb
-- lib/superstore/caching.rb
-- lib/superstore/callbacks.rb
-- lib/superstore/connection.rb
 - lib/superstore/core.rb
-- lib/superstore/errors.rb
 - lib/superstore/identity.rb
-- lib/superstore/inspect.rb
-- lib/superstore/model.rb
+- lib/superstore/model_schema.rb
 - lib/superstore/persistence.rb
 - lib/superstore/railtie.rb
-- lib/superstore/schema.rb
-- lib/superstore/scope.rb
-- lib/superstore/scope/batches.rb
-- lib/superstore/scope/finder_methods.rb
-- lib/superstore/scope/query_methods.rb
-- lib/superstore/scoping.rb
-- lib/superstore/timestamps.rb
-- lib/superstore/type.rb
+- lib/superstore/relation/scrolling.rb
+- lib/superstore/timestamp.rb
 - lib/superstore/types.rb
 - lib/superstore/types/array_type.rb
-- lib/superstore/types/base_type.rb
 - lib/superstore/types/boolean_type.rb
+- lib/superstore/types/date_range_type.rb
 - lib/superstore/types/date_type.rb
 - lib/superstore/types/float_type.rb
+- lib/superstore/types/geo_point_type.rb
+- lib/superstore/types/integer_range_type.rb
 - lib/superstore/types/integer_type.rb
 - lib/superstore/types/json_type.rb
+- lib/superstore/types/range_type.rb
 - lib/superstore/types/string_type.rb
 - lib/superstore/types/time_type.rb
-- lib/superstore/validations.rb
 - superstore.gemspec
 - test/support/jsonb.rb
 - test/support/models.rb
@@ -142,31 +147,27 @@ files:
 - test/unit/associations/has_many_test.rb
 - test/unit/associations/has_one_test.rb
 - test/unit/associations/reflection_test.rb
-- test/unit/attribute_methods/definition_test.rb
 - test/unit/attribute_methods/dirty_test.rb
 - test/unit/attribute_methods/primary_key_test.rb
-- test/unit/attribute_methods/typecasting_test.rb
 - test/unit/attribute_methods_test.rb
+- test/unit/attributes_test.rb
 - test/unit/base_test.rb
 - test/unit/caching_test.rb
 - test/unit/callbacks_test.rb
 - test/unit/connection_test.rb
 - test/unit/core_test.rb
 - test/unit/identity_test.rb
-- test/unit/inspect_test.rb
 - test/unit/persistence_test.rb
-- test/unit/schema_test.rb
-- test/unit/scope/batches_test.rb
-- test/unit/scope/finder_methods_test.rb
-- test/unit/scope/query_methods_test.rb
-- test/unit/scoping_test.rb
+- test/unit/relation/scrolling_test.rb
 - test/unit/serialization_test.rb
-- test/unit/timestamps_test.rb
+- test/unit/timestamp_test.rb
 - test/unit/types/array_type_test.rb
-- test/unit/types/base_type_test.rb
 - test/unit/types/boolean_type_test.rb
+- test/unit/types/date_range_type_test.rb
 - test/unit/types/date_type_test.rb
 - test/unit/types/float_type_test.rb
+- test/unit/types/geo_point_type_test.rb
+- test/unit/types/integer_range_type_test.rb
 - test/unit/types/integer_type_test.rb
 - test/unit/types/json_type_test.rb
 - test/unit/types/string_type_test.rb
@@ -192,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveModel for JSONB documents

data/lib/superstore/attribute_methods/definition.rb

@@ -1,17 +0,0 @@
-module Superstore
-  module AttributeMethods
-    class Definition
-      attr_reader :name, :type
-      def initialize(model, name, type_class, options)
-        @name = name.to_s
-        @type = type_class.new(model, options)
-      end
-
-      def instantiate(value)
-        return if value.nil?
-
-        value.kind_of?(String) ? type.decode(value) : type.typecast(value)
-      end
-    end
-  end
-end

data/lib/superstore/attribute_methods/dirty.rb

@@ -1,52 +0,0 @@
-module Superstore
-  module AttributeMethods
-    module Dirty
-      extend ActiveSupport::Concern
-      include ActiveModel::Dirty
-
-      # Attempts to +save+ the record and clears changed attributes if successful.
-      def save(*) #:nodoc:
-        if status = super
-          @previously_changed = changes
-          @changed_attributes = {}
-        end
-        status
-      end
-
-      # <tt>reload</tt> the record and clears changed attributes.
-      def reload
-        super.tap do
-          @previously_changed.try :clear
-          @changed_attributes.try :clear
-        end
-      end
-
-      def unapplied_changes
-        result = {}
-        changed_attributes.each_key { |attr| result[attr] = read_attribute(attr) }
-        result
-      end
-
-      def old_attribute_value(attr)
-        if attribute_changed?(attr)
-          changed_attributes[attr]
-        else
-          read_attribute attr
-        end
-      end
-
-      def write_attribute(name, value)
-        name = name.to_s
-        old = old_attribute_value(name)
-
-        super
-
-        if old == read_attribute(name)
-          changed_attributes.delete(name)
-        else
-          changed_attributes[name] = old
-        end
-      end
-    end
-  end
-end

data/lib/superstore/attribute_methods/typecasting.rb

@@ -1,53 +0,0 @@
-module Superstore
-  module AttributeMethods
-    module Typecasting
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :attribute_definitions
-        self.attribute_definitions = {}
-
-        %w(array boolean date float integer json string time).each do |type|
-          instance_eval <<-EOV, __FILE__, __LINE__ + 1
-            def #{type}(*args)
-              options = args.extract_options!
-              args.each do |name|
-                attribute(name, options.merge(:type => :#{type}))
-              end
-            end
-          EOV
-        end
-      end
-
-      module ClassMethods
-        def inherited(child)
-          super
-          child.attribute_definitions = attribute_definitions.dup
-        end
-
-        #
-        # attribute :name, type: :string
-        # attribute :ammo, type: :integer
-        #
-        def attribute(name, options)
-          type_name  = options[:type]
-          type_class = Superstore::Type.get_type_class(type_name) || (raise "Unknown type #{type_name}")
-
-          attribute_definitions[name.to_s] = AttributeMethods::Definition.new(self, name, type_class, options)
-        end
-
-        def typecast_attribute(name, value)
-          if attribute_definition = attribute_definitions[name.to_s]
-            attribute_definition.instantiate(value)
-          else
-            raise NoMethodError, "Unknown attribute #{name.inspect}"
-          end
-        end
-
-        def type_for(attribute)
-          attribute_definitions[attribute.to_s].type
-        end
-      end
-    end
-  end
-end