superstore 2.4.3 → 3.0.0

data/test/unit/callbacks_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Superstore::CallbacksTest < Superstore::TestCase
   class TestIssue < Superstore::Base
     self.table_name = 'issues'
-    string :description
+    attribute :description, type: :string
 
     %w(
       before_validation
@@ -35,8 +35,8 @@ class Superstore::CallbacksTest < Superstore::TestCase
       before_validation
       after_validation
       before_save
-      after_save
       after_create
+      after_save
     )
     assert_equal expected, issue.callback_history
   end
@@ -47,7 +47,7 @@ class Superstore::CallbacksTest < Superstore::TestCase
 
     issue.update_attribute :description, 'foo'
 
-    assert_equal %w(before_save after_save after_update), issue.callback_history
+    assert_equal %w(before_save after_update after_save), issue.callback_history
   end
 
   test 'destroy' do
@@ -62,7 +62,7 @@ class Superstore::CallbacksTest < Superstore::TestCase
   test 'new_record during callbacks' do
     class NewRecordTestClass < Superstore::Base
       self.table_name = 'issues'
-      string :description
+      attribute :description, type: :string
 
       before_create :expect_new_record
       before_save   :expect_new_record

data/test/unit/core_test.rb

@@ -1,30 +1,13 @@
 require 'test_helper'
 
 class Superstore::CoreTest < Superstore::TestCase
-  test 'initialiaze' do
+  test 'initialize' do
     issue = Issue.new
 
     assert issue.new_record?
     assert !issue.destroyed?
   end
 
-  test 'initialize yields self' do
-    issue = Issue.new { |i| i.description = 'bar' }
-    assert_equal 'bar', issue.description
-  end
-
-  test 'dup' do
-    issue = Issue.create description: 'foo'
-
-    dup_issue = issue.dup
-
-    assert dup_issue.new_record?
-    assert_not_equal issue.id, dup_issue.id
-    assert_nil dup_issue.created_at
-    assert_nil dup_issue.updated_at
-    assert_equal 'foo', issue.description
-  end
-
   test 'equality of new records' do
     assert_not_equal Issue.new, Issue.new
   end
@@ -45,11 +28,23 @@ class Superstore::CoreTest < Superstore::TestCase
 
   test 'hash' do
     issue = Issue.create
-    assert_equal issue.id.hash, issue.hash
+    issue2 = Issue.create
+    refute_equal issue.hash, issue2.hash
+
+    issue3 = Issue.new(id: issue.id)
+    assert_equal issue.hash, issue3.hash
+
+    user = User.new(id: issue.id)
+    refute_equal issue.hash, user.hash
   end
 
   test 'inspect' do
     issue = Issue.create
-    assert issue.inspect =~ /^#<Issue id: \"\w+\", created_at: \".+\", updated_at: \".+\", description: \".+\">$/
+    assert issue.inspect =~ /^#<Issue id: \"\w+\", description: \".+\", created_at: \".+\", updated_at: \".+\">$/
+  end
+
+  test 'inspect class' do
+    expected = "Issue(id: string, description: string, title: string, parent_issue_id: string, comments: json, created_at: time, updated_at: time)"
+    assert_equal expected, Issue.inspect
   end
 end

data/test/unit/persistence_test.rb

@@ -4,47 +4,37 @@
 require 'test_helper'
 
 class Superstore::PersistenceTest < Superstore::TestCase
-  test 'instantiate removes unknowns' do
-    assert_nil Issue.instantiate('theid', 'z' => 'nooo').attributes['z']
-  end
+  class Parent < Superstore::Base
+    self.inheritance_column = 'document_type'
+    attribute :document_type, type: :string
 
-  test 'encode_attributes' do
-    klass = temp_object do
-      string :description
+    def self.find_sti_class(type)
+      Child
     end
+  end
 
-    assert_equal(
-      {},
-      klass.encode_attributes({})
-    )
+  class Child < Parent
+    attribute :eye_color, type: :string
+  end
 
-    assert_equal(
-      {'description' => nil},
-      klass.encode_attributes({'description' => nil})
-    )
+  test 'instantiate with unknowns' do
+    issue = Issue.instantiate('id' => 'theid', 'document' => {'z' => 'nooo', 'title' => 'Krazy'}.to_json)
 
-    assert_equal(
-      {'description' => 'lol'},
-      klass.encode_attributes({'description' => 'lol'})
-    )
+    refute issue.attributes.key?('z')
+    assert_equal 'Krazy', issue.attributes['title']
   end
 
-  test "batch" do
-    first_issue = second_issue = nil
-
-    Issue.batch do
-      assert Issue.batching?
+  test 'instantiate with an inheritance column' do
+    child = Parent.instantiate('id' => 'theid', 'document' => {'document_type' => 'child', 'eye_color' => 'blue'}.to_json)
 
-      first_issue = Issue.create
-      second_issue = Issue.create
+    assert_kind_of Child, child
+    assert_equal 'blue', child.eye_color
+  end
 
-      assert_raise(Superstore::RecordNotFound) { Issue.find(first_issue.id) }
-      assert_raise(Superstore::RecordNotFound) { Issue.find(second_issue.id) }
-    end
+  test 'instantiate when an inheritance column is expected but is nil' do
+    child = Parent.instantiate('id' => 'theid', 'document' => { }.to_json)
 
-    assert !Issue.batching?
-    assert_nothing_raised { Issue.find(first_issue.id) }
-    assert_nothing_raised { Issue.find(second_issue.id) }
+    assert_kind_of Child, child
   end
 
   test 'persistence inquiries' do
@@ -81,14 +71,14 @@ class Superstore::PersistenceTest < Superstore::TestCase
 
   test 'save!' do
     klass = temp_object do
-      string :description
+      attribute :description, type: :string
       validates :description, presence: true
     end
 
     record = klass.new(description: 'bad')
     record.save!
 
-    assert_raise Superstore::RecordInvalid do
+    assert_raise ActiveRecord::RecordInvalid do
       record = klass.new
       record.save!
     end
@@ -126,7 +116,7 @@ class Superstore::PersistenceTest < Superstore::TestCase
       issue = Issue.new(description: 'bad')
       issue.save!
 
-      assert_raise Superstore::RecordInvalid do
+      assert_raise ActiveRecord::RecordInvalid do
         issue.update! description: ''
       end
     ensure
@@ -151,7 +141,7 @@ class Superstore::PersistenceTest < Superstore::TestCase
 
   test 'becomes includes changed_attributes' do
     klass = temp_object do
-      string :title
+      attribute :title, type: :string
     end
 
     issue = Issue.new(title: 'Something is wrong')
@@ -171,14 +161,9 @@ class Superstore::PersistenceTest < Superstore::TestCase
     assert_equal persisted_issue, reloaded_issue
   end
 
-  test 'quote_columns' do
-    klass = Class.new { include Superstore::Persistence }
-    assert_equal %w{'a' 'b'}, klass.__send__(:quote_columns, %w{a b})
-  end
-
   test 'delete' do
     klass = temp_object do
-      string :name
+      attribute :name, type: :string
     end
 
     record = klass.new(name: 'cool')
@@ -189,14 +174,14 @@ class Superstore::PersistenceTest < Superstore::TestCase
 
     klass.delete(id)
 
-    assert_raise Superstore::RecordNotFound do
+    assert_raise ActiveRecord::RecordNotFound do
       klass.find(id)
     end
   end
 
   test 'delete multiple' do
     klass = temp_object do
-      string :name
+      attribute :name, type: :string
     end
 
     ids = []
@@ -207,7 +192,14 @@ class Superstore::PersistenceTest < Superstore::TestCase
 
     klass.delete(ids)
 
-    assert_equal [], klass.find(ids)
+    assert_equal [], klass.where(id: ids)
   end
 
+  test 'find_by_id' do
+    Issue.create.tap do |issue|
+      assert_equal issue, Issue.find_by_id(issue.id)
+    end
+
+    assert_nil Issue.find_by_id('what')
+  end
 end

data/test/unit/{scope/batches_test.rb → relation/scrolling_test.rb}

@@ -1,25 +1,29 @@
 require 'test_helper'
 
-class Superstore::BatchesTest < Superstore::TestCase
-  test 'find_each' do
+class Superstore::ScrollingTest < Superstore::TestCase
+  ActiveRecord::Relation.class_eval do
+    include Superstore::Relation::Scrolling
+  end
+  
+  test 'scroll_each' do
     Issue.create
     Issue.create
 
     issues = []
-    Issue.find_each do |issue|
+    Issue.all.scroll_each do |issue|
       issues << issue
     end
 
     assert_equal Issue.all.to_set, issues.to_set
   end
 
-  test 'find_in_batches' do
+  test 'scroll_in_batches' do
     Issue.create
     Issue.create
     Issue.create
 
     issue_batches = []
-    Issue.find_in_batches(batch_size: 2) do |issues|
+    Issue.all.scroll_in_batches(batch_size: 2) do |issues|
       issue_batches << issues
     end
 

data/test/unit/serialization_test.rb

@@ -3,8 +3,16 @@ require 'test_helper'
 class Superstore::SerializationTest < Superstore::TestCase
   test 'as_json' do
     issue = Issue.new
-    expected = {"id" => issue.id}
+    expected = {
+      "id"          => issue.id,
+      "created_at"  => nil,
+      "updated_at"  => nil,
+      "description" => nil,
+      "title"       => nil,
+      "parent_issue_id" => nil,
+      "comments"    => nil
+    }
 
     assert_equal expected, issue.as_json
   end
-end
+end

data/test/unit/{timestamps_test.rb → timestamp_test.rb}

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class Superstore::TimestampsTest < Superstore::TestCase
+class Superstore::TimestampTest < Superstore::TestCase
   test 'timestamps set on create' do
-    issue = Issue.create
+    issue = Issue.create#issue.created_at.to_i = #{issue.created_at.to_i}
 
     assert_in_delta Time.now.to_i, issue.created_at.to_i, 3
     assert_in_delta Time.now.to_i, issue.updated_at.to_i, 3
@@ -30,13 +30,13 @@ class Superstore::TimestampsTest < Superstore::TestCase
     time = 5.days.ago
     issue = Issue.create created_at: time
 
-    assert_equal time, issue.created_at
+    assert_in_delta time.to_i, issue.created_at.to_i, 3
   end
 
   test 'updated_at sets only if nil' do
-    time = 5.days.ago
+    time = 5.days.ago.utc
     issue = Issue.create updated_at: time
 
-    assert_equal time, issue.updated_at
+    assert_in_delta time.to_i, issue.updated_at.to_i, 3
   end
 end

data/test/unit/types/array_type_test.rb

@@ -1,23 +1,8 @@
 require 'test_helper'
 
 class Superstore::Types::ArrayTypeTest < Superstore::Types::TestCase
-  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
-    test 'encode' do
-      assert_equal ['1', '2'].to_json, type.encode(['1', '2'])
-
-      assert_raise ArgumentError do
-        type.encode('wtf')
-      end
-    end
-
-    test 'decode' do
-      assert_equal ['1', '2'], type.decode(['1', '2'].to_json)
-      assert_equal nil, type.decode(nil)
-      assert_equal nil, type.decode('')
-    end
-  end
-
-  test 'typecast' do
-    assert_equal ['x', 'y'], type.typecast(['x', 'y'].to_set)
+  test 'cast_value' do
+    assert_equal ['x', 'y'], type.cast_value(['x', 'y'].to_set)
+    assert_equal ['x'], type.cast_value('x')
   end
 end

data/test/unit/types/boolean_type_test.rb

@@ -1,26 +1,12 @@
 require 'test_helper'
 
 class Superstore::Types::BooleanTypeTest < Superstore::Types::TestCase
-  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
-    test 'encode' do
-      assert_equal '1', type.encode(true)
-      assert_equal '1', type.encode('true')
-      assert_equal '1', type.encode('1')
-
-      assert_equal '0', type.encode(false)
-      assert_equal '0', type.encode('false')
-      assert_equal '0', type.encode('0')
-      assert_equal '0', type.encode('')
-
-      assert_raise ArgumentError do
-        type.encode('wtf')
-      end
-    end
-  end
-
-  test 'decode' do
-    assert_equal true, type.decode('1')
-    assert_equal false, type.decode('0')
-    # assert_nil type.decode(nil)
+  test 'cast_value' do
+    assert_equal true, type.cast_value('1')
+    assert_equal true, type.cast_value('true')
+    assert_equal true, type.cast_value('true')
+    assert_equal false, type.cast_value('0')
+    assert_equal false, type.cast_value(false)
+    assert_nil type.cast_value('')
   end
 end

data/test/unit/types/date_range_type_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class Superstore::Types::DateRangeTypeTest < Superstore::Types::TestCase
+  test 'serialize' do
+    assert_equal ["2004-04-25", "2004-05-15"], type.serialize(Date.new(2004, 4, 25) .. Date.new(2004, 5, 15))
+  end
+
+  test 'deserialize' do
+    assert_equal Date.new(2004, 4, 25)..Date.new(2004, 5, 15), type.deserialize(["2004-04-25", "2004-05-15"])
+    assert_nil type.deserialize(["2004-05-15", "2004-04-25"])
+
+    # decode returns argument if already a Range
+    range = Date.new(2019, 1, 1)..Date.new(2019, 2, 1)
+    assert_equal range, type.deserialize(range)
+  end
+
+  test 'cast_value' do
+    assert_equal Date.new(2004, 4, 25)..Date.new(2004, 5, 15), type.cast_value(Date.new(2004, 4, 25)..Date.new(2004, 5, 15))
+    assert_equal Date.new(2004, 4, 25)..Date.new(2004, 5, 15), type.cast_value([Date.new(2004, 4, 25), Date.new(2004, 5, 15)])
+    assert_equal Date.new(2004, 4, 25)..Date.new(2004, 5, 15), type.cast_value(["2004-04-25", "2004-05-15"])
+    assert_equal Date.new(2004, 4, 25)..Date.new(2004, 4, 25), type.cast_value(["2004-04-25", "2004-04-25"])
+    assert_equal Date.new(2004, 4, 25)..,                      type.cast_value(["2004-04-25", nil])
+
+    assert_nil type.cast_value( Date.new(2004, 5, 15)..Date.new(2004, 4, 25))
+    assert_nil type.cast_value([Date.new(2004, 5, 15), Date.new(2004, 4, 25)])
+    assert_nil type.cast_value([nil, "2004-05-15"])
+    assert_nil type.cast_value(["xx", "2004-05-15"])
+  end
+end

data/test/unit/types/date_type_test.rb

@@ -1,15 +1,24 @@
 require 'test_helper'
 
 class Superstore::Types::DateTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal '2004-04-25', type.encode(Date.new(2004, 4, 25))
+  test 'serialize' do
+    assert_equal '2004-04-25', type.serialize(Date.new(2004, 4, 25))
   end
 
-  test 'decode' do
-    assert_equal Date.new(2004, 4, 25), type.decode('2004-04-25')
+  test 'deserialize' do
+    assert_equal Date.new(2004, 4, 25), type.deserialize('2004-04-25')
   end
 
-  test 'decoding a blank dates' do
-    assert_nil type.decode('')
+  test 'cast_value' do
+    assert_nil type.cast_value(1000)
+    assert_nil type.cast_value(1000.0)
+    assert_nil type.cast_value('')
+    assert_nil type.cast_value('nil')
+    assert_nil type.cast_value('bad format')
+    assert_equal Date.new(2004, 4, 25), type.cast_value('2004-04-25')
+    assert_equal Date.new(2017, 5, 1), type.cast_value('2017-05-01T21:39:06.796897Z')
+
+    my_time = Time.current
+    assert_equal my_time.to_date, type.cast_value(my_time)
   end
 end

data/test/unit/types/float_type_test.rb

@@ -1,24 +1,9 @@
 require 'test_helper'
 
 class Superstore::Types::FloatTypeTest < Superstore::Types::TestCase
-  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
-    test 'encode' do
-      assert_equal '5.01', type.encode(5.01)
-
-      assert_raise ArgumentError do
-        type.encode('x')
-      end
-    end
-  end
-
-  test 'decode' do
-    assert_equal 0.0, type.decode('xyz')
-    assert_equal 3.14, type.decode('3.14')
-    assert_equal 5, type.decode('5')
-  end
-
-  test 'typecast' do
-    assert_equal 1.1, type.typecast('1.1')
-    assert_equal 42.0, type.typecast(42)
+  test 'cast_value' do
+    assert_nil type.cast_value('xyz')
+    assert_equal 1.1, type.cast_value('1.1')
+    assert_equal 42.0, type.cast_value(42)
   end
 end

data/test/unit/types/geo_point_type_test.rb

@@ -0,0 +1,28 @@
+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
+
+  test 'type' do
+    assert_equal 'geo_point', type.type
+  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..)
+    assert_equal [nil, 5], type.serialize(-Float::INFINITY..5)
+    assert_equal [nil, nil], type.serialize(-Float::INFINITY..)
+  end
+
+  test 'deserialize' do
+    assert_equal 4..5, type.deserialize([4, 5])
+    assert_nil type.deserialize([5, 4])
+    assert_equal 4.., type.deserialize([4, nil])
+    assert_equal (-Float::INFINITY..5), type.deserialize([nil, 5])
+    assert_equal (-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.., type.cast_value([1, nil])
+    assert_equal (-Float::INFINITY..2), type.cast_value([nil, 2])
+    assert_equal (-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