qwester 0.0.8 → 0.0.9

data/README.rdoc

@@ -180,3 +180,36 @@ initializer:
     Qwester.active_admin_menu = 'none'
 
 See test/dummy/config/initializers/qwester.rb for an example
+
+You will also need to add the following to your config/routes so that you can
+reorder items:
+
+    namespace :admin do
+      resources :questionnaires do
+        resources :questions, :only => [:move_up, :move_down] do
+          member do
+            get :move_up
+            get :move_down
+          end
+        end
+      end
+
+      resources :questions do
+        resources :answers, :only => [:move_up, :move_down, :remove] do
+          member do
+            get :move_up
+            get :move_down
+            get :remove
+          end
+        end
+      end
+
+      resources :rule_sets do
+        resources :answers, :only => [:add, :delete] do
+          member do
+            put :add
+            put :delete
+          end
+        end
+      end
+    end

data/app/models/qwester/answer_store.rb

@@ -39,7 +39,7 @@ module Qwester
 
     def generate_session_id
       if !self.session_id or self.session_id.empty?
-        self.session_id = RandomString.new(15)
+        self.session_id = session_id_not_in_database
       end
     end
     
@@ -49,5 +49,15 @@ module Qwester
       copy.questionnaires = questionnaires
       return copy if copy.save
     end
+    
+    def session_id_not_in_database
+      session_ids = get_session_ids
+      random_string = RandomString.new(15) until random_string and !session_ids.include?(random_string)
+      return random_string
+    end
+  
+    def get_session_ids
+      self.class.select(:session_id).collect(&:session_id)
+    end
   end
 end

data/app/models/qwester/rule_set.rb

@@ -27,7 +27,7 @@ module Qwester
 
 
     def self.matching(answers)
-      all.collect{|rule_set| rule_set if rule_set.match(answers)}.compact
+      all.select{|rule_set| rule_set.match(answers)}
     end
 
     def match(answers_to_check = nil)

data/db/migrate/20121122130930_add_position_to_answers.rb

@@ -0,0 +1,11 @@
+class AddPositionToAnswers < ActiveRecord::Migration
+  def change
+    # Adds unless clause, because original version of migration added another field
+    # and file name was changed when this field was removed. This can cause this
+    # migration to appear a second time if rake qwester:install:migrations is
+    # run again in an app created before the change was made.
+    unless column_exists?(:qwester_answers, :position)
+      add_column :qwester_answers, :position, :integer
+    end 
+  end
+end

data/lib/qwester/version.rb

@@ -1,10 +1,14 @@
 module Qwester
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end
 
 # History
 # =======
 # 
+# 0.0.9 - maintenance update
+#   Removes cope_index from migrations.
+#   Ensures answer_store#session_id is unique
+# 
 # 0.0.8 - add facility to preserve answer stores
 #   This allows snaps shots to be taken, and redundant answer stores to be 
 #   removed during routine maintenance.

data/test/dummy/app/models/admin_user.rb

@@ -8,13 +8,4 @@ class AdminUser < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable,
-  # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, 
-         :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  # attr_accessible :title, :body
 end

data/test/dummy/db/migrate/{20130111112926_create_rule_sets.qwester.rb → 20130314103647_create_rule_sets.qwester.rb}

@@ -3,7 +3,7 @@ class CreateRuleSets < ActiveRecord::Migration
   def change
     create_table :qwester_rule_sets do |t|
       t.string :title
-      t.string :description
+      t.text :description
       t.string :url
       t.timestamps
     end

data/test/dummy/db/migrate/{20130111121500_add_ids_to_questionnaires_questions.qwester.rb → 20130314103655_add_ids_to_questionnaires_questions.qwester.rb}

@@ -9,7 +9,7 @@ class AddIdsToQuestionnairesQuestions < ActiveRecord::Migration
     execute "UPDATE #{qq_table} SET created_at = '#{Time.now.to_s(:db)}', updated_at = '#{Time.now.to_s(:db)}';"
 
     puts "=============================================="
-    puts "Now run 'rake data:reset_positions RAILS_ENV=#{Rails.env}' to set the positions"
+    puts "Now run 'rake qwester:reset_positions RAILS_ENV=#{Rails.env}' to set the positions"
     puts "=============================================="
   end
   

data/test/dummy/db/migrate/20130314103656_add_position_to_answers.qwester.rb

@@ -0,0 +1,12 @@
+# This migration comes from qwester (originally 20121122130930)
+class AddPositionToAnswers < ActiveRecord::Migration
+  def change
+    # Adds unless clause, because original version of migration added another field
+    # and file name was changed when this field was removed. This can cause this
+    # migration to appear a second time if rake qwester:install:migrations is
+    # run again in an app created before the change was made.
+    unless column_exists?(:qwester_answers, :position)
+      add_column :qwester_answers, :position, :integer
+    end 
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130306115340) do
+ActiveRecord::Schema.define(:version => 20130314103662) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -65,10 +65,9 @@ ActiveRecord::Schema.define(:version => 20130306115340) do
   create_table "qwester_answers", :force => true do |t|
     t.integer  "question_id"
     t.string   "value"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "position"
-    t.integer  "cope_index",  :default => 0
   end
 
   create_table "qwester_answers_rule_sets", :id => false, :force => true do |t|