has_safe_dates 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 09e7e0114f7bec91cc9be6ff8f33ee7ddec8e264
-  data.tar.gz: f5a0d4558cfcb08a58318f7a54410df7566125ae
+SHA256:
+  metadata.gz: 195d8193d691b1db2ec7e1225078bff421e67791ebcd3cc5e1f0c1fe1624190e
+  data.tar.gz: c32c3bb5dd25ca84ee3d3ee3f8ed8a52deea8ce1d54ee51fdedf79d79c953e7f
 SHA512:
-  metadata.gz: 46beb748f43e66edb3381fe32b3e83d6b4864cf9d890a40cb46f19ad52130dbbba9e8994f83868972a78c2a59d24bd5c3c82088c2833c2818d63faa5c52b08fd
-  data.tar.gz: 77a14996a6e15f1765da6bf7853d5a75ee01d17c1a5e8a93eb061352ee524ba2f08e72e74c90342caad3906b6e93cbf26480fd13e2be5cda51dac20e68f5785e
+  metadata.gz: 9c04b378bd6c3396db1448244d418acb02c67766b4442ff00e2edd1892f8a586500cc0a09e8ca75b63feeae70dc0ffa3773684947081f6207112b353fba6c7aa
+  data.tar.gz: d8086a3e2a9989d5629f1477eaec546abca7894b6ee42cdf466001ba49ea8b76307b7df337bb14ebdf056673196cf6db1c5cdcda603a58f1db82592cf26596cc

data/.circleci/config.yml

@@ -0,0 +1,116 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+defaults: &defaults
+  working_directory: ~/repo
+  docker:
+    - image: circleci/ruby:2.3.6-stretch-node
+      environment:
+        - RACK_ENV: test
+        - RAILS_ENV: test
+
+version: 2
+jobs:
+  run_specs:
+    <<: *defaults
+
+    steps:
+      - run:
+          name: Set up environment
+          command: |
+            sudo apt-get update && sudo apt-get install -y apt-transport-https apt-utils
+
+      - checkout
+
+      - restore_cache:
+          keys:
+          - has_safe_dates-dependencies-v1-{{ checksum "has_safe_dates.gemspec" }}
+          - has_safe_dates-dependencies-v1-
+
+      - run:
+          name: Install dependencies
+          command: |
+            bundle check --path=./vendor/bundle || bundle install --path=./vendor/bundle --jobs=4 --retry=3
+
+      - save_cache:
+          key: has_safe_dates-dependencies-v1-{{ checksum "has_safe_dates.gemspec" }}
+          paths:
+            - ./vendor/bundle
+
+      - run:
+          name: Run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            bundle exec rspec --format progress --format RspecJunitFormatter --out /tmp/test-results/rspec.xml $TEST_FILES
+
+      - store_test_results:
+          path: /tmp/test-results
+
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
+
+  build_gem:
+    <<: *defaults
+
+    steps:
+      - run:
+          name: Set up environment
+          command: |
+            sudo apt-get update && sudo apt-get install -y apt-transport-https apt-utils
+
+      - checkout
+
+      - restore_cache:
+          keys:
+          - has_safe_dates-dependencies-v1-{{ checksum "has_safe_dates.gemspec" }}
+          - has_safe_dates-dependencies-v1-
+
+      - run:
+          name: Install dependencies
+          command: |
+            gem install gemfury
+            bundle check --path=./vendor/bundle || bundle install --path=./vendor/bundle --jobs=4 --retry=3
+
+      - save_cache:
+          key: has_safe_dates-dependencies-v1-{{ checksum "has_safe_dates.gemspec" }}
+          paths:
+            - ./vendor/bundle
+
+      - run:
+          name: Build gem
+          command: |
+            gem build has_safe_dates.gemspec
+
+      - run:
+          name: Push gem
+          command: |
+            if [[ "${CIRCLE_PROJECT_USERNAME}" == "OneHQ" && "${CIRCLE_BRANCH}" == "master" && -n "${GEMFURY_USERNAME}" && -n "${GEMFURY_PASSWORD}" ]]; then
+              echo -e "machine api.fury.io\n  login ${GEMFURY_USERNAME}\n  password ${GEMFURY_PASSWORD}" >> ~/.netrc
+              chmod 600 ~/.netrc
+              version=$(ruby -e 'load "lib/has_safe_dates/version.rb"; puts HasSafeDates::VERSION')
+              grep -q "${version}" <(fury versions has_safe_dates) || EXIT_CODE=$? && true
+              if [[ $EXIT_CODE == 1 ]]; then
+                fury push has_safe_dates-${version}.gem
+                git tag ${version}
+                git push --tags
+
+                [[ -n "$SLACK_TOKEN" ]] && curl -s -d "has_safe_dates ($version) released." "https://onehq.slack.com/services/hooks/slackbot?token=${SLACK_TOKEN}&channel=%23machines"
+              fi
+            fi
+
+workflows:
+  version: 2
+  build-deploy:
+    jobs:
+      - run_specs
+      - build_gem:
+          requires:
+            - run_specs
+          filters:
+            branches:
+              only:
+                - master
+                - staging

data/.gitignore

@@ -0,0 +1,6 @@
+.rvmrc
+*.sqlite3
+pkg
+Gemfile.lock
+*.gem
+Gemfile.lock

data/Gemfile

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec
 
-# gem 'ruby-debug19'
-
-gem "byebug"
+gem "byebug"

data/Rakefile

@@ -1,8 +1,9 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
-require 'rubygems'
-require 'rake'
-require 'bundler'
+require "rubygems"
+require "rake"
+require "bundler"
 
 begin
   Bundler.setup(:default, :development)
@@ -16,4 +17,4 @@ task :spec do
   sh("bundle exec rspec spec") { |ok, res| }
 end
 
-task :default => :spec
+task default: :spec

data/has_safe_dates.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
@@ -8,57 +10,45 @@ Gem::Specification.new do |s|
   s.name        = "has_safe_dates"
   s.version     = HasSafeDates::VERSION
   s.authors     = ["kylejginavan"]
-  s.date        = %q{2012-02-24}
-  s.description = %q{Uses Chronic to parse incoming dates and does not raise errors on invalid multi parameter settings}
-  s.email       = %q{kylejginavan@gmail.com}
+  s.date        = "2012-02-24"
+  s.description = "Uses Chronic to parse incoming dates and does not raise errors on invalid multi parameter settings"
+  s.email       = "kylejginavan@gmail.com"
 
   s.extra_rdoc_files = [
     "MIT-LICENSE.txt",
     "README.md"
   ]
-  s.files = [
-    "Gemfile",
-    "Rakefile",
-    "MIT-LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "has_safe_dates.gemspec",
-    "lib/has_safe_dates/core_ext.rb",
-    "lib/has_safe_dates/version.rb",
-    "lib/has_safe_dates.rb",
-    "spec/db/database.yml",
-    "spec/db/schema.rb",
-    "spec/has_safe_dates_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/kylejginavan/has_safe_dates}
+  s.files = `git ls-files`.split("\n")
+  s.homepage = "http://github.com/kylejginavan/has_safe_dates"
   s.require_paths = ["lib"]
-  s.summary = %q{Chronic based date setting for ActiveRecord models}
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.summary = "Chronic based date setting for ActiveRecord models"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency("activerecord", ['~> 4.0.0'])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.2.0") then
+      s.add_development_dependency("activerecord", ["~> 6.0"])
+      s.add_development_dependency("bundler", ["~> 1.0"])
       s.add_dependency("chronic")
-      s.add_development_dependency("rspec", [">= 0", "< 3"])
+      s.add_development_dependency("database_cleaner")
       s.add_development_dependency("rdoc", ["~> 3.12"])
-      s.add_development_dependency("bundler", ["~> 1.0"])
+      s.add_development_dependency("rspec", [">= 0", "< 3"])
+      s.add_development_dependency("rspec_junit_formatter", ["~> 0.3", ">= 0.3.0"])
       s.add_development_dependency("sqlite3")
-      s.add_development_dependency('database_cleaner')
-      s.add_development_dependency('debugger')
     else
-      s.add_dependency("activerecord", ['>= 3.1.0'])
+      s.add_dependency("activerecord", [">= 3.1.0"])
+      s.add_dependency("bundler", ["~> 1.0.0"])
       s.add_dependency("chronic")
-      s.add_dependency("rspec", [">= 0"])
       s.add_dependency("rdoc", ["~> 3.12"])
-      s.add_dependency("bundler", ["~> 1.0.0"])
+      s.add_dependency("rspec", [">= 0"])
     end
   else
-    s.add_dependency('activerecord', ['>= 3.1.0'])
-    s.add_dependency('chronic')
-    s.add_dependency("rspec", [">= 0"])
-    s.add_dependency("rdoc", ["~> 3.12"])
+    s.add_dependency("activerecord", [">= 3.1.0"])
     s.add_dependency("bundler", ["~> 1.0.0"])
+    s.add_dependency("chronic")
+    s.add_dependency("rdoc", ["~> 3.12"])
+    s.add_dependency("rspec", [">= 0"])
   end
 end

data/lib/has_safe_dates.rb

@@ -1,4 +1,6 @@
-require 'has_safe_dates/core_ext'
+# frozen_string_literal: true
+
+require "has_safe_dates/core_ext"
 
 module HasSafeDates
 end

data/lib/has_safe_dates/core_ext.rb

@@ -1,7 +1,8 @@
-require 'chronic'
+# frozen_string_literal: true
 
-module HasSafeDates
+require "chronic"
 
+module HasSafeDates
   module CoreExt
     extend ActiveSupport::Concern
 
@@ -17,7 +18,7 @@ module HasSafeDates
         if options[:error_message].present?
           has_safe_fields_config[self][:error_message] = options[:error_message]
         else
-          has_safe_fields_config[self][:error_message] = I18n.translate('activerecord.errors.messages')[:invalid] || 'is invalid'
+          has_safe_fields_config[self][:error_message] = I18n.translate("activerecord.errors.messages")[:invalid] || "is invalid"
         end
 
         if args.blank?
@@ -26,7 +27,7 @@ module HasSafeDates
         has_safe_fields_config[self][:fields] = args.map(&:to_s)
 
         has_safe_fields_config[self][:fields].each do |field|
-          define_method "#{field.to_s}=" do |value|
+          define_method "#{field}=" do |value|
             if value.present?
               value = Chronic.parse(value.to_s)
               if value.blank? && self.class.has_safe_fields_config[self.class.base_class][:error_message].present?
@@ -54,28 +55,28 @@ module HasSafeDates
     end
   end
 
-  module MultiparameterAttributeExt
-    # Overrides #read_date when has_safe_dates is enabled for the current field the multiparameter.
-    # Otherwise the original #read_date method is invoked.
-    def read_date
-      if ActiveRecord::Base.has_safe_fields_config[object.class.base_class] && ActiveRecord::Base.has_safe_fields_config[object.class.base_class][:fields].include?(name)
-        values.values_at(1,2,3).join("-")  # Convert multiparameter parts into a Date string, e.g. "2011-4-23", return it, and allow CoreExt methods handle the result.
-      else
-        super  # has_safe_dates is not enabled for the current field, so invoke the super method (original #read_date method).
-      end
-    end
+  module DateTimeExt
+    def execute_callstack_for_multiparameter_attributes(callstack)
+      if ::ActiveRecord::Base.has_safe_fields_config[self.class.base_class]
+        callstack.each do |name, values_with_empty_parameters|
+          if ActiveRecord::Base.has_safe_fields_config[self.class.base_class][:fields].include?(name)
+            date = values_with_empty_parameters.values_at(1, 2, 3).join("-")
+            time = values_with_empty_parameters.values_at(4, 5).join(":")
+            datetime_string = "#{date}#{time.blank? ? "" : " #{time}"}"
 
-    # Overrides #read_time when has_safe_dates is enabled for the current field the multiparameter.
-    # Otherwise the original #read_date method is invoked.
-    def read_time
-      if ActiveRecord::Base.has_safe_fields_config[object.class.base_class] && ActiveRecord::Base.has_safe_fields_config[object.class.base_class][:fields].include?(name)
-        "#{ values.values_at(1,2,3).join("-")} #{ values.values_at(4,5).join(":") }"  # Convert multiparameter parts into a Time string, e.g. "2011-4-23 12:34", return it, and allow CoreExt methods handle the result.
+            # Convert multiparameter parts into a Date string, e.g. "2011-4-23",
+            # and pass it through so that CoreExt methods handle the result.
+            send("#{name}=", datetime_string)
+          else
+            super({ name => values_with_empty_parameters })
+          end
+        end
       else
-        super  # has_safe_dates is not enabled for the current field, so invoke the super method (original #read_time method).
+        super(callstack)  # has_safe_dates is not enabled for the current field, so invoke the super method
       end
     end
   end
 end
 
-ActiveRecord::Base.send :include, HasSafeDates::CoreExt
-ActiveRecord::AttributeAssignment::MultiparameterAttribute.send :prepend, HasSafeDates::MultiparameterAttributeExt
+::ActiveRecord::Base.send :include, ::HasSafeDates::CoreExt
+::ActiveRecord::Base.send :prepend, ::HasSafeDates::DateTimeExt

data/lib/has_safe_dates/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HasSafeDates
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/spec/has_safe_dates_spec.rb

@@ -78,21 +78,21 @@ describe "HasSafeDates" do
       invalid_post_attributes = {'published_date(1i)' => "2001", 'published_date(2i)' => "12", 'published_date(3i)' => "abc"}
       invalid_comment_attributes = {'approved_at(1i)' => "2001", 'approved_at(2i)' => "15", 'approved_at(3i)' => "17"}
       expect {
-        @post.update_attributes(invalid_post_attributes)
-        @comment.update_attributes(invalid_comment_attributes)
+        @post.update(invalid_post_attributes)
+        @comment.update(invalid_comment_attributes)
       }.to_not raise_error
     end
 
     it "does not interfere with a date column that it has not been told to make safe" do
       invalid_attributes = {'unsafe_date(1i)' => "2001", 'unsafe_date(2i)' => "12", 'unsafe_date(3i)' => "abc"}
       expect {
-        @post.update_attributes(invalid_attributes)
+        @post.update(invalid_attributes)
       }.to raise_error(ActiveRecord::MultiparameterAssignmentErrors)
     end
 
     it "adds an error when Chronic returns nil" do
       invalid_post_attributes = {'published_date(1i)' => "2014", 'published_date(2i)' => "12", 'published_date(3i)' => "abc"}
-      @post.update_attributes(invalid_post_attributes)
+      @post.update(invalid_post_attributes)
       @post.errors[:published_date].should == ['is not a real date']
     end
 
@@ -100,7 +100,7 @@ describe "HasSafeDates" do
       it "works" do
         invalid_comment_attributes = {'published_at(1i)' => "2014", 'published_at(2i)' => "12", 'published_at(3i)' => "22", 'published_at(4i)' => "12", 'published_at(5i)' => "34"}
         expect {
-          @comment.update_attributes(invalid_comment_attributes)
+          @comment.update(invalid_comment_attributes)
         }.to_not raise_error
         expect(@comment.published_at.utc.strftime("%FT%T%:z")).to eq(Time.new(2014, 12, 22, 12, 34).utc.strftime("%FT%T%:z"))
       end
@@ -109,24 +109,24 @@ describe "HasSafeDates" do
         invalid_post_attributes = {'published_date(1i)' => "2001", 'published_date(2i)' => "12", 'published_date(3i)' => "17", 'published_date(4i)' => "12", 'published_date(5i)' => "34"}
         invalid_comment_attributes = {'published_at(1i)' => "2001", 'published_at(2i)' => "15", 'published_at(3i)' => "17", 'published_at(4i)' => "12", 'published_at(5i)' => "34"}
         expect {
-          @post.update_attributes(invalid_post_attributes)
-          @comment.update_attributes(invalid_comment_attributes)
+          @post.update(invalid_post_attributes)
+          @comment.update(invalid_comment_attributes)
         }.to_not raise_error
       end
 
       it "does not interfere with a date column that it has not been told to make safe" do
         invalid_attributes = {'unsafe_date(1i)' => "2011", 'unsafe_date(2i)' => "9", 'unsafe_date(3i)' => "83", 'unsafe_date(4i)' => "12", 'unsafe_date(5i)' => "34"}
         expect {
-          @post.update_attributes(invalid_attributes)
+          @post.update(invalid_attributes)
         }.to raise_error(ActiveRecord::MultiparameterAssignmentErrors)
       end
 
       it "adds an error when Chronic returns nil" do
         invalid_comment_attributes = {'published_at(1i)' => "2009", 'published_at(2i)' => "12", 'published_at(3i)' => "90", 'published_at(4i)' => "12", 'published_at(5i)' => "34"}
-        @comment.update_attributes(invalid_comment_attributes)
+        @comment.update(invalid_comment_attributes)
         @comment.errors[:published_at].should == ['is not a real date']
       end
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_safe_dates
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - kylejginavan
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -39,15 +53,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -73,26 +81,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,22 +97,31 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,6 +143,8 @@ extra_rdoc_files:
 - MIT-LICENSE.txt
 - README.md
 files:
+- ".circleci/config.yml"
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE.txt
 - README.md
@@ -167,9 +175,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: Chronic based date setting for ActiveRecord models
-test_files: []
+test_files:
+- spec/db/database.yml
+- spec/db/schema.rb
+- spec/has_safe_dates_spec.rb
+- spec/spec_helper.rb