Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/survey/attempt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Survey::Attempt < ActiveRecord::Base
scope :for_survey, ->(survey) { where(:survey_id => survey.id) }
scope :exclude_survey, ->(survey) { where("NOT survey_id = #{survey.id}") }
scope :for_participant, ->(participant) {
where(:participant_id => participant.try(:id), :participant_type => participant.class.base_class)
where(:participant_id => participant.try(:id), :participant_type => participant.class.base_class.to_s)
}

# callbacks
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/templates/migration.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateSurvey < ActiveRecord::Migration
class CreateSurvey < ActiveRecord::Migration[4.2]
def self.up

# survey surveys logic
Expand Down
8 changes: 6 additions & 2 deletions lib/survey.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
module ::Kernel
def rails5?
return defined?(Rails) && Rails::VERSION::MAJOR == 5
end

def rails4?
return defined?(Rails) && Rails::VERSION::MAJOR == 4
end

def in_rails_3(&block)
yield if block_given? unless rails4?
yield if block_given? unless rails4? || rails5?
end
end

require 'survey/engine'
require 'survey/version'
require 'survey/active_record'

ActiveRecord::Base.send(:include, Survey::ActiveRecord)
ActiveRecord::Base.send(:include, Survey::ActiveRecord)
4 changes: 2 additions & 2 deletions survey.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Gem::Specification.new do |s|
s.authors = %Q{Runtime Revolution}
s.require_paths = %w(lib)

s.add_dependency("rails", [">= 3.2.6", "< 5"])
s.add_dependency("railties", ">= 3.2.6", "< 5")
s.add_dependency("rails", [">= 3.2.6", "< 6"])
s.add_dependency("railties", ">= 3.2.6", "< 6")
s.add_development_dependency("mocha")
s.add_development_dependency("faker")
s.add_development_dependency("rake")
Expand Down