state_of_the_nation 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 611580ac0c208f088555adadcd019dc5a6b424c0
-  data.tar.gz: f1d1819db563048a4b7a980dbe9db17b72989735
+SHA256:
+  metadata.gz: 97a7482f3c135b954fe912e2bb6b8948f4ba14596e282a91687aec9cbcb06b3d
+  data.tar.gz: 4577435dca22e84ded9236bc52b94cc24d02681973697623d5bca3c884034d6b
 SHA512:
-  metadata.gz: 71c4a3084eeae10dae78e09c1139132671d3d5e5bafe47f4f72deaeac8ecbcb0543d6d10f80d77166ea47ea7ec74d1b275ebf44390f1639383da1c830cb6896e
-  data.tar.gz: aec17ea9744fa0e7dc764944f4084922a4d4e2bed263892273047077a277d21936c36dc4d397057e2bbf00dff8ad2f7a0e81610a25a6bcdaf606bb3ec9402c26
+  metadata.gz: d00dd78d49cd44f1c79ad9c316d1e4843bb255f5b7728f0cb813bd656d8b3ff794c3d5dffa4013bf3d9e4805dda858f01bace09557c241e0b69d3869b06fd3f7
+  data.tar.gz: 11dbf26dbddd36bc93c408f6679c9980044c990c4ba4990298dd86ca1633687d5bfc0df9b13b38ad067d12645a3b001989e2356a175405ea3ed34a1cc354f5ed

data/.circleci/config.yml

@@ -0,0 +1,26 @@
+version: 2
+jobs:
+  build:
+    environment:
+      RAILS_ENV: test
+
+    docker:
+    - image: circleci/ruby:2.5.5
+
+    steps:
+    - checkout
+
+    - restore_cache:
+        keys:
+        - v2-dependencies-{{ .Branch }}
+        - v2-dependencies-master
+        - v2-dependencies-
+
+    - run: bundle install --path=vendor/bundle
+
+    - save_cache:
+        key: v2-dependencies-{{ .Branch }}
+        paths:
+        - vendor/bundle
+
+    - run: bundle exec rspec --format progress spec

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in state_of_the_nation.gemspec
 gemspec
-
-gem 'sqlite3', '~> 1.3.6'

data/README.md

@@ -40,7 +40,7 @@ usa.senators.create!(name: "Ron Wyden", entered_office_at: Date.new(1996, 2, 6))
 usa.senators.create!(name: "Barbara Boxer", entered_office_at: Date.new(1993, 1, 3))
 usa.senators.create!(name: "Alan Cranston", entered_office_at: Date.new(1969, 1, 3), left_office_at: Date.new(1993, 1, 3))
 
-usa.active_president(Date.new(2015))
+usa.active_president(Date.new(2015)) 
 # => President(id: 1, name: "Barack Obama", …)
 
 obama.active?
@@ -52,10 +52,9 @@ usa.active_senators(Date.new(2015))
 usa.presidents.create!(name: "Mitt Romney", entered_office_at: Date.new(2013, 1, 20))
 # => StateOfTheNation::ConflictError
 ```
-
 ## IdentityCache Support
 
-StateOfTheNation optionally supports fetching records through [IdentityCache](https://github.com/Shopify/identity_cache) instead of reading directly from the database.
+StateOfTheNation optionally supports fetching records through [IdentityCache](https://github.com/Shopify/identity_cache)  instead of reading directly from the database. 
 
 For example if the `Country` model uses IdentityCache to cache the `has_many` relationship to `President`, you can instruct StateOfTheNation to fetch from the cache by calling `.with_identity_cache` on your `has_active` or `has_uniquely_active` definitions:
 
@@ -63,7 +62,7 @@ For example if the `Country` model uses IdentityCache to cache the `has_many` re
 class Country
   include IdentityCache
   include StateOfTheNation
-
+  
   has_many(:presidents)
   cache_has_many(:presidents)
   has_uniquely_active(:president).with_identity_cache
@@ -95,3 +94,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/intercom/state_of_the_nation. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org/) code of conduct.
+

data/lib/state_of_the_nation.rb

@@ -13,9 +13,11 @@ module StateOfTheNation
   end
 
   module ClassMethods
-    attr_accessor :prevent_multiple_active, :parent_association, :start_key, :finish_key
+    attr_accessor :prevent_multiple_active, :parent_association, :start_key, :finish_key, :ignore_empty
+
+    def considered_active(ignore_empty: false)
+      @ignore_empty = ignore_empty
 
-    def considered_active
       def from(start_key)
         @start_key = start_key
         self
@@ -33,6 +35,24 @@ module StateOfTheNation
         }
       end
 
+      private def round_if_should(time)
+        return time if !should_round_timestamps?
+        time.respond_to?(:round) ? time.round : time
+      end
+
+      private def should_round_timestamps?
+        # MySQL datetime fields do not support millisecond resolution while
+        # PostgreSQL's do. To prevent issues with near identical timestamps not
+        # comparing as expected in .active? methods we'll choose the resolution
+        # appropriate for the database adapter backing the model.
+        case self.connection.adapter_name
+        when /PostgreSQL/
+          false
+        else
+          true
+        end
+      end
+
       self
     end
 
@@ -76,24 +96,6 @@ module StateOfTheNation
         single ? collection.first : collection
       end
     end
-
-    def round_if_should(time)
-      return time if !should_round_timestamps?
-      time.respond_to?(:round) ? time.round : time
-    end
-
-    def should_round_timestamps?
-      # MySQL datetime fields do not support millisecond resolution while
-      # PostgreSQL's do. To prevent issues with near identical timestamps not
-      # comparing as expected in .active? methods we'll choose the resolution
-      # appropriate for the database adapter backing the model.
-      case self.connection.adapter_name
-      when /PostgreSQL/
-        false
-      else
-        true
-      end
-    end
   end
 
   private
@@ -127,6 +129,9 @@ module StateOfTheNation
     # find competing records which *finish* being active AFTER this record *starts* being active
     # (or ones which are not set to finish being active)
 
+    records = records.where(QueryString.query_for(:start_and_finish_not_equal, self.class)) if ignore_empty
+    # exclude records where there is no difference between start and finish dates
+
     records
   end
 
@@ -167,6 +172,10 @@ module StateOfTheNation
     self.class.finish_key
   end
 
+  def ignore_empty
+    self.class.ignore_empty
+  end
+
   def should_round_timestamps?
     self.class.send(:should_round_timestamps?)
   end

data/lib/state_of_the_nation/query_string.rb

@@ -10,11 +10,13 @@ module StateOfTheNation
           active_scope: "(%{finish_key} IS NULL OR %{finish_key} > ?::timestamp) AND %{start_key} <= ?::timestamp",
           less_than: "(%{start_key} < ?::timestamp)",
           greater_than_or_null: "(%{finish_key} > ?::timestamp) OR (%{finish_key} IS NULL)",
+          start_and_finish_not_equal: "(%{start_key} != %{finish_key})",
         },
         mysql: {
           active_scope: "(%{finish_key} IS NULL OR %{finish_key} > ?) AND %{start_key} <= ?",
           less_than: "(%{start_key} < ?)",
-          greater_than_or_null: "(%{finish_key} > ?) OR (%{finish_key} IS NULL)"
+          greater_than_or_null: "(%{finish_key} > ?) OR (%{finish_key} IS NULL)",
+          start_and_finish_not_equal: "(%{start_key} != %{finish_key})"
         }
       }[appropriate_db_type(klass)]
     end

data/lib/state_of_the_nation/version.rb

@@ -1,3 +1,3 @@
 module StateOfTheNation
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/state_of_the_nation.gemspec

@@ -24,16 +24,15 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "database_cleaner"
-  # spec.add_development_dependency "mysql"
+  spec.add_development_dependency "mysql2"
   spec.add_development_dependency "pg"
-  spec.add_development_dependency "pry", "0.12.2"
-  spec.add_development_dependency "rb-readline"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "shoulda-matchers"
-  spec.add_development_dependency "sqlite3", "1.4.0"
+  spec.add_development_dependency "sqlite3"
 
-  spec.add_runtime_dependency "activesupport", ">= 5.0.0"
-  spec.add_runtime_dependency "activerecord", ">= 5.0.0"
+  spec.add_runtime_dependency "activesupport", ">= 4.0.0"
+  spec.add_runtime_dependency "activerecord", ">= 4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_of_the_nation
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Patrick O'Doherty
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,21 +54,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,44 +141,44 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.0.0
 description: State of the Nation makes modeling object history easy.
 email:
 - patrick@intercom.io
@@ -187,7 +187,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -222,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: An easy way to model state that changes over time with ActiveRecord