blazer 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ac494e37f4c14e418e50320667f1b371f05190
-  data.tar.gz: 8ebadcac25cbbf06a86c16e01d4b17f3f077eac0
+  metadata.gz: d74bc946c7e95c76fa9144f6644dd1bb1000d2c7
+  data.tar.gz: 2f5b49ff2e8f20986286d08995d78641857b1140
 SHA512:
-  metadata.gz: 3437a6d97706f7a7e3b394012f9b17d5b36661fda013966e80c66bc1b279ada234a6c968a4e6f567b4c13ed5946564f581ca4835d247f740b6a08de21d9a88b2
-  data.tar.gz: d56d5300d8267dcd5f866ce25ce4e40f7e27ffe4659c893b615effd40610ccd7d3326d5fc827ac412d2feb40ddfb4494474e6ca833ad7972038e6d0168309393
+  metadata.gz: f5ba9405ba682acaad4b98ae03563c9cd0c489ec35560b856089b453f4f068b400978e3645c1a8812249b5b50edc8bec35fbe1401aeecdcd95bb262f0645cc69
+  data.tar.gz: c0254f4a628a20e960f699fb79642213293f447b794a0d1052d8af1c8f686758eb6f2ca79b1f7aa3579e5794902ecf188dcd078e45e1e00441d077055ea98e1e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.3
+
+- Fixed error with Rails 4.1 and below
+
 ## 1.3.2
 
 - Added support for Rails 5

data/app/models/blazer/audit.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Audit < ActiveRecord::Base
-    belongs_to :user, class_name: Blazer.user_class.to_s, required: false
-    belongs_to :query, required: false
+    belongs_to :user, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s)
+    belongs_to :query, Blazer::BELONGS_TO_OPTIONAL
   end
 end

data/app/models/blazer/query.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Query < ActiveRecord::Base
-    belongs_to :creator, class_name: Blazer.user_class.to_s, required: false if Blazer.user_class
+    belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
     has_many :checks, dependent: :destroy
     has_many :dashboard_queries, dependent: :destroy
     has_many :dashboards, through: :dashboard_queries

data/lib/blazer/engine.rb

@@ -22,9 +22,10 @@ module Blazer
       Blazer.check_schedules = Blazer.settings["check_schedules"] if Blazer.settings.key?("check_schedules")
 
       if Blazer.user_class
-        Blazer::Query.belongs_to :creator, class_name: Blazer.user_class.to_s
-        Blazer::Dashboard.belongs_to :creator, class_name: Blazer.user_class.to_s
-        Blazer::Check.belongs_to :creator, class_name: Blazer.user_class.to_s
+        options = Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s)
+        Blazer::Query.belongs_to :creator, options
+        Blazer::Dashboard.belongs_to :creator, options
+        Blazer::Check.belongs_to :creator, options
       end
 
       Blazer.cache ||= Rails.cache

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/lib/blazer.rb

@@ -30,6 +30,8 @@ module Blazer
     "cancelled on user's request", # redshift
     "system requested abort" # redshift
   ]
+  BELONGS_TO_OPTIONAL = {}
+  BELONGS_TO_OPTIONAL[:optional] = true if Rails::VERSION::MAJOR >= 5
 
   def self.time_zone=(time_zone)
     @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails