sequel-tstzrange-fields 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ed468cd261b95f2381b6f90c5e1b8afa2318aa406ce06fbec30e8fdb85b89e
-  data.tar.gz: f501a551e2decbcc47ea133a0527921c182049a48248692ae0d0dea205b04471
+  metadata.gz: 602f1c9282af7052d0c4b5131a2f9872a383a51783f8f43bfd601066c5121136
+  data.tar.gz: 9d3594a668a50adb1ab8f88a33db59d4fc779d4012f281f01791f98ae74c302d
 SHA512:
-  metadata.gz: 9d8fe7ed1837254fa1cc6a183f780d29af01e27367dbbe56e2a7380446ff7aa36808ead45bbf65e562a5e8aff849d8e04f9019a2db40f79f75d709495c1da160
-  data.tar.gz: 0b94430bb0c3cc0eec9e37309493f08c76fceda6277d71d9918ff12d0ee1b0aaafd5cae364c2eb6530ac72f1f245f1f2ce9c3f698544f0a58dc3c445c604459b
+  metadata.gz: 327f56f8a6e62c01fd7c86620859a375fa3243f2019ce20e466f9e0651277803070618f4573f3272571c23b1defbee1a599826d2406507358e50e7c1d58c47b0
+  data.tar.gz: 18b71bc1c26e4913d4fb9f81f88ca2368c12f5bc9ff38ae483f8482566d67a9a080f7109abd4d8e36863897132a02c9cc5e7a28af09d6a690c20e205e0aa2a00

data/lib/sequel/plugins/tstzrange_fields.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'sequel'
-require 'sequel/model'
-require 'yajl'
+require "sequel"
+require "sequel/model"
+
+require_relative "../../sequel_tstzrange_fields/version"
 
 # Plugin for adding methods for working with time ranges.
 #
@@ -32,12 +33,12 @@ require 'yajl'
 module Sequel
   module Plugins
     module TstzrangeFields
-      VERSION = '0.1.1'
+      VERSION = SequelTstzrangeFields::VERSION
 
       def self.configure(model, *args)
         unless model.db.schema_type_class(:tstzrange)
-          msg = 'tstzrange_fields plugin requires pg_range db extension to be installed. ' \
-                ' Use db.extension(:pg_range) after the db = Sequel.connect call.'
+          msg = "tstzrange_fields plugin requires pg_range db extension to be installed. " \
+                "Use db.extension(:pg_range) after the db = Sequel.connect call."
           raise msg
         end
         args << :period if args.empty?
@@ -81,17 +82,17 @@ module Sequel
 
         model.define_method(set_column_method) do |value|
           case value
-          when Sequel::Postgres::PGRange
-            self[column] = value
-          when Float::INFINITY
-            range = Sequel::Postgres::PGRange.new(nil, nil, empty: false, db_type: :tstzrange)
-            self[column] = range
-          when 'empty'
-            self[column] = Sequel::Postgres::PGRange.empty(:tstzrange)
+            when Sequel::Postgres::PGRange
+              self[column] = value
+            when Float::INFINITY
+              range = Sequel::Postgres::PGRange.new(nil, nil, empty: false, db_type: :tstzrange)
+              self[column] = range
+            when "empty"
+              self[column] = Sequel::Postgres::PGRange.empty(:tstzrange)
           else
-            beg = value.respond_to?(:begin) ? value.begin : (value[:begin] || value['begin'])
-            en = value.respond_to?(:end) ? value.end : (value[:end] || value['end'])
-            self[column] = self.class.new_tstzrange(beg, en)
+              beg = value.respond_to?(:begin) ? value.begin : (value[:begin] || value["begin"])
+              en = value.respond_to?(:end) ? value.end : (value[:end] || value["end"])
+              self[column] = self.class.new_tstzrange(beg, en)
           end
         end
 
@@ -106,7 +107,7 @@ module Sequel
 
         model.define_method(get_end_method) do
           r = send(get_column_method)
-          return r.nil? ? nil : r.end # &.end is invalid syntax
+          return r&.end
         end
 
         model.define_method(set_end_method) do |new_time|

data/lib/sequel_tstzrange_fields/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SequelTstzrangeFields
+  VERSION = "0.2.1"
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sequel-tstzrange-fields
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Lithic Tech
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,44 +70,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: rubocop-sequel
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +94,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 'Gem for enabling time ranges when working with postgres
+
+  '
 email:
 - hello@lithic.tech
 executables: []
@@ -158,12 +104,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sequel/plugins/tstzrange_fields.rb
-- spec/sequel/plugins/tstzrange_fields_spec.rb
-- spec/spec_helper.rb
-homepage:
+- lib/sequel_tstzrange_fields/version.rb
+homepage: https://github.com/lithictech/sequel-tstzrange-fields
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -172,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Gem for enabling time ranges when working with postgres

data/spec/sequel/plugins/tstzrange_fields_spec.rb

@@ -1,179 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/integer/time'
-require 'sequel'
-require 'sequel/model'
-require 'sequel/extensions/pg_range'
-require 'sequel/plugins/tstzrange_fields'
-
-RSpec.describe Sequel::Plugins::TstzrangeFields do
-  before(:each) do
-    @db = Sequel.connect('postgres://sequel_tstzrange:sequel_tstzrange@localhost:18101/sequel_tstzrange_test')
-    @db.extension(:pg_range)
-  end
-  after(:each) do
-    @db.disconnect
-  end
-
-  it 'errors if the db does not have pg_range registered' do
-    db = Sequel.connect('postgres://sequel_tstzrange:sequel_tstzrange@localhost:18101/sequel_tstzrange_test')
-    db.create_table(:tstzrange_fields_test, temp: true) do
-      primary_key :id
-    end
-    expect do
-      mc = Class.new(Sequel::Model(db[:tstzrange_fields_test]))
-      mc.plugin(:tstzrange_fields)
-    end.to raise_error(/tstzrange_fields plugin requires/)
-  end
-
-  context 'with no fields given' do
-    let(:model_class) do
-      @db.create_table(:tstzrange_fields_test, temp: true) do
-        primary_key :id
-        tstzrange :period
-      end
-      mc = Class.new(Sequel::Model(@db[:tstzrange_fields_test]))
-      mc.class_eval do
-        def initialize(*)
-          super
-          self[:period] ||= self.class.new_tstzrange(nil, nil)
-        end
-      end
-      mc.plugin(:tstzrange_fields)
-      mc
-    end
-
-    let(:model_object) { model_class.new }
-
-    it 'uses :period as the high-level accessor' do
-      expect(model_object).to respond_to(:period, :period=, :period_begin, :period_begin=, :period_end, :period_end=)
-    end
-
-    it 'sets a default empty range' do
-      expect(model_object.period).to be_empty
-    end
-  end
-
-  context 'for the given field' do
-    let(:model_class) do
-      @db.create_table(:tstzrange_fields_test, temp: true) do
-        primary_key :id
-        tstzrange :range
-      end
-      mc = Class.new(Sequel::Model(@db[:tstzrange_fields_test]))
-      mc.plugin(:tstzrange_fields, :range)
-      mc.class_eval do
-        def initialize(*)
-          super
-          self[:range] ||= self.class.new_tstzrange(nil, nil)
-        end
-      end
-      mc
-    end
-
-    let(:model_object) { model_class.new }
-
-    let(:t) { Time.at(3.years.ago.to_i) }
-    let(:ts) { t.to_s }
-
-    it 'sets a default empty range' do
-      expect(model_object.range).to be_empty
-    end
-
-    it 'can set an infinite range by assigning the field to Float::INFINITY' do
-      expect(model_object.range).to be_empty
-
-      model_object.range = Float::INFINITY
-      expect(model_object.range_begin).to be_nil
-      expect(model_object.range_end).to be_nil
-      expect(model_object.range).not_to be_empty
-      model_object.save_changes
-      expect(model_class.where(Sequel.function(:lower_inf, :range)).count).to eq(1)
-      expect(model_class.where(Sequel.function(:upper_inf, :range)).count).to eq(1)
-    end
-
-    it 'can set an empty range by assigning the field to the string "empty"' do
-      model_object.range_begin = t
-      model_object.range_end = t + 1.day
-      expect(model_object.range).not_to be_empty
-
-      model_object.range = 'empty'
-      expect(model_object.range).to be_empty
-      expect(model_object.range_begin).to be_nil
-      expect(model_object.range_end).to be_nil
-      model_object.save_changes
-      expect(model_class.where(Sequel.function(:lower_inf, :range)).count).to eq(0)
-      expect(model_class.where(Sequel.function(:upper_inf, :range)).count).to eq(0)
-    end
-
-    it 'can get/set the start' do
-      model_object.range_begin = t
-      expect(model_object.range_begin).to eq(t)
-      expect(model_object.save_changes.refresh.range_begin).to eq(t)
-
-      model_object.range_begin = ts
-      expect(model_object.range_begin).to eq(t)
-      expect(model_object.save_changes.refresh.range_begin).to eq(t)
-
-      model_object.range_begin = nil
-      expect(model_object.range_begin).to be_nil
-      expect(model_object.save_changes.refresh.range_begin).to be_nil
-    end
-
-    it 'can get/set the end' do
-      model_object.range_end = t
-      expect(model_object.range_end).to eq(t)
-      expect(model_object.save_changes.refresh.range_end).to eq(t)
-
-      model_object.range_end = ts
-      expect(model_object.range_end).to eq(t)
-      expect(model_object.save_changes.refresh.range_end).to eq(t)
-
-      model_object.range_end = nil
-      expect(model_object.range_end).to be_nil
-      expect(model_object.save_changes.refresh.range_end).to be_nil
-    end
-
-    it 'can initialize an instance using accessors' do
-      o = model_class.create(range_begin: nil, range_end: nil)
-      expect(o.range).to be_empty
-
-      o = model_class.create(range_begin: Time.now, range_end: 1.hour.from_now)
-      expect(o.range).not_to be_cover(30.minutes.ago)
-      expect(o.range).to be_cover(30.minutes.from_now)
-      expect(o.range).not_to be_cover(90.minutes.from_now)
-
-      o = model_class.create(range_begin: nil, range_end: Time.now)
-      expect(o.range).to be_cover(30.minutes.ago)
-      expect(o.range).not_to be_cover(30.minutes.from_now)
-
-      o = model_class.create(range_begin: Time.now, range_end: nil)
-      expect(o.range).not_to be_cover(30.minutes.ago)
-      expect(o.range).to be_cover(30.minutes.from_now)
-    end
-
-    it 'can be assigned to directly with an object with begin/end methods or keys' do
-      early = 1.day.ago
-      late = 2.days.from_now
-
-      forms = [
-        early...late,
-        OpenStruct.new(begin: early, end: late),
-        { begin: early, end: late },
-        { 'begin' => early, 'end' => late }
-      ]
-
-      forms.each do |value|
-        model_object.range = value
-        model_object.save_changes.refresh
-        expect(model_object.range_begin).to be_within(1).of(early)
-        expect(model_object.range_end).to be_within(1).of(late)
-      end
-
-      model_object.range = {}
-      expect(model_object.range).to be_empty
-
-      expect { model_object.range = 1 }.to raise_error(TypeError)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'sequel/plugins/tstzrange_fields'
-
-RSpec.configure do |config|
-  # config.full_backtrace = true
-
-  # RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 600
-
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.order = :random
-  Kernel.srand config.seed
-
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-  config.disable_monkey_patching!
-  config.default_formatter = 'doc' if config.files_to_run.one?
-end