From 1be6d7f2da21c9905dc0f7fef6ad17f8067a185f Mon Sep 17 00:00:00 2001
From: Tao Huang <taohms@gmail.com>
Date: Tue, 18 Feb 2020 23:12:07 +0800
Subject: [PATCH] fix: use default scope

---
 lib/surveyable/acts_as_survey.rb | 2 +-
 lib/surveyable/question.rb       | 2 ++
 lib/surveyable/version.rb        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/surveyable/acts_as_survey.rb b/lib/surveyable/acts_as_survey.rb
index d032ac5..3822456 100644
--- a/lib/surveyable/acts_as_survey.rb
+++ b/lib/surveyable/acts_as_survey.rb
@@ -5,7 +5,7 @@ module Surveyable
     end
     module ClassMethods
       def acts_as_survey(options = {})
-        has_many :questions, as: :survey, class_name: 'Surveyable::Question', order: "position ASC, id ASC"
+        has_many :questions, as: :survey, class_name: 'Surveyable::Question'
         send :include, InstanceMethods
       end
     end
diff --git a/lib/surveyable/question.rb b/lib/surveyable/question.rb
index 69a825c..3708f78 100644
--- a/lib/surveyable/question.rb
+++ b/lib/surveyable/question.rb
@@ -9,6 +9,8 @@ module Surveyable
     validates_presence_of :text
     validates_presence_of :type
 
+    default_scope order: "position ASC, id ASC"
+
     scope :required, -> { where(required:true)}
     def field_type
       'text'
diff --git a/lib/surveyable/version.rb b/lib/surveyable/version.rb
index 2dd8c23..d1c89f0 100644
--- a/lib/surveyable/version.rb
+++ b/lib/surveyable/version.rb
@@ -1,3 +1,3 @@
 module Surveyable
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end
--
libgit2 0.21.0