limesurvey_rails 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deff9a2b87f3e6c2db940dfdc50d7f3ee62f4835
-  data.tar.gz: 2476918b2c7cd4ed825ef009d2dcd4a11edc33c9
+  metadata.gz: d528206d39a75793bc0c4693dca10a77862ee58c
+  data.tar.gz: 7c17812488f1c73e7c0406a1e60e127d82d05a65
 SHA512:
-  metadata.gz: db6011cb81ac60051295041e94899abcb83ae35b6bec659b772c3731cd57ea23aebde8350068a95e6ed729c7852117670853b801e409cfadb63f814f363c5d3c
-  data.tar.gz: d53d732dbb60484f875b5505eb68aee5308eb43680fa6025f3a17eada77dd84121386035eb1ba6eefe246c202b9805dbc771703d5138558dcebcccf2fbc2ed92
+  metadata.gz: 3c305914e21e416f21b3cf9c5810a00cb5a3189985922dfb440122a20095cfecc82e496bf71007e261b66f152c9d2281321c0bc7e692dac7313bf0b8c214cff9
+  data.tar.gz: bce318fc0eb6210ab2ab44711c8a6e8edcf5556079a1253e18425ca28dd20559e91b5ef683d51e80d77a64282f5b1048b47b3bc5c101f35615a36572487755eb

data/app/models/limesurvey_rails/survey.rb

@@ -7,9 +7,93 @@ module LimesurveyRails
     GET_SUMMARY_RESPONSES_ATTRIBUTES = %w{ completed_responses incomplete_responses full_responses }
     GET_SUMMARY_TOKENS_ATTRIBUTES = %w{ token_count token_invalid token_sent token_opted_out token_completed }
     GET_SUMMARY_ATTRIBUTES = GET_SUMMARY_RESPONSES_ATTRIBUTES + GET_SUMMARY_TOKENS_ATTRIBUTES
-    GET_SURVEY_PROPERTY_ATTRIBUTES = %w{ attributedescriptions savetimings allowprev tokenanswerspersistence showgroupinfo showwelcome owner_id template printanswers assessments shownoanswer showprogress admin language ipaddr usecaptcha showqnumcode allowjumps active additional_languages refurl usetokens bouncetime navigationdelay expires datestamp datecreated bounce_email bounceprocessing nokeyboard startdate usecookie publicstatistics bounceaccounttype alloweditaftercompletion adminemail allowregister publicgraphs emailresponseto bounceaccounthost googleanalyticsstyle anonymized allowsave listpublic emailnotificationto bounceaccountpass googleanalyticsapikey faxto autonumber_start htmlemail tokenlength bounceaccountencryption format autoredirect sendconfirmation showxquestions bounceaccountuser }
-    GET_LANGUAGE_PROPERTIES_ATTRIBUTES = %w{ surveyls_survey_id surveyls_url surveyls_email_register_subj email_admin_notification_subj surveyls_language surveyls_urldescription surveyls_email_register email_admin_notification surveyls_title surveyls_email_invite_subj surveyls_email_confirm_subj email_admin_responses_subj surveyls_description surveyls_email_invite surveyls_email_confirm email_admin_responses surveyls_welcometext surveyls_email_remind_subj surveyls_dateformat surveyls_numberformat surveyls_endtext surveyls_email_remind surveyls_attributecaptions }
-    
+    GET_SURVEY_PROPERTY_ATTRIBUTES = %w{
+      attributedescriptions
+      savetimings
+      allowprev
+      tokenanswerspersistence
+      showgroupinfo
+      showwelcome
+      owner_id
+      template
+      printanswers
+      assessments
+      shownoanswer
+      showprogress
+      admin
+      language
+      ipaddr
+      usecaptcha
+      showqnumcode
+      allowjumps
+      active
+      additional_languages
+      refurl
+      usetokens
+      bouncetime
+      navigationdelay
+      expires
+      datestamp
+      datecreated
+      bounce_email
+      bounceprocessing
+      nokeyboard
+      startdate
+      usecookie
+      publicstatistics
+      bounceaccounttype
+      alloweditaftercompletion
+      adminemail
+      allowregister
+      publicgraphs
+      emailresponseto
+      bounceaccounthost
+      googleanalyticsstyle
+      anonymized
+      allowsave
+      listpublic
+      emailnotificationto
+      bounceaccountpass
+      googleanalyticsapikey
+      faxto
+      autonumber_start
+      htmlemail
+      tokenlength
+      bounceaccountencryption
+      format
+      autoredirect
+      sendconfirmation
+      showxquestions
+      bounceaccountuser
+    }
+
+    GET_LANGUAGE_PROPERTIES_ATTRIBUTES = %w{
+      surveyls_survey_id
+      surveyls_url
+      surveyls_email_register_subj
+      email_admin_notification_subj
+      surveyls_language
+      surveyls_urldescription
+      surveyls_email_register
+      email_admin_notification
+      surveyls_title
+      surveyls_email_invite_subj
+      surveyls_email_confirm_subj
+      email_admin_responses_subj
+      surveyls_description
+      surveyls_email_invite
+      surveyls_email_confirm
+      email_admin_responses
+      surveyls_welcometext
+      surveyls_email_remind_subj
+      surveyls_dateformat
+      surveyls_numberformat
+      surveyls_endtext
+      surveyls_email_remind
+      surveyls_attributecaptions
+    }
+
+     
     ALL_ATTRIBUTES = (GET_SUMMARY_ATTRIBUTES | GET_SURVEY_PROPERTY_ATTRIBUTES | GET_LANGUAGE_PROPERTIES_ATTRIBUTES ).sort.unshift('id')
 
     attr_accessor *ALL_ATTRIBUTES
@@ -21,7 +105,11 @@ module LimesurveyRails
     validates_presence_of :language
 
     def self.all(lang = nil)
-      LimesurveyRails.list_surveys(LimesurveyRails.configuration.username).map{|s| build(s['sid'],lang) }
+      all_ids.map{|id| build(id,lang) }
+    end
+
+    def self.all_ids
+      LimesurveyRails.list_surveys(LimesurveyRails.configuration.username).map{|s| s['sid'].to_i }
     end
 
     def self.find(survey_id,lang = nil)

data/lib/limesurvey_rails/limesurvey_rails.rb

@@ -6,7 +6,7 @@ module LimesurveyRails
   end
 
   def self.connect(force = false)
-    if !force and connected?
+    if !force and connected?(true)
       false
     else
       if configured?
@@ -29,23 +29,13 @@ module LimesurveyRails
   end
 
   def self.connected?(verify = false)
-    begin
-      raise unless configured?
-      raise unless session_key.present?
-
-      if verify
-        check_result = api.list_surveys(session_key)
-        raise unless check_result.is_a? Array or check_result['status'] == 'No surveys found'
-      end
-
-      true
-    rescue Exception => e
-      if configuration.try(:auto_connection)
-        connect(true)
-      else
-        false
-      end
+    return false unless configured?
+    return false unless session_key.present?
+    if verify 
+      check_result = api.list_surveys(session_key)
+      return false unless (check_result.is_a? Array or check_result['status'] == 'No surveys found')
     end
+    true
   end
 
   def self.reset
@@ -69,7 +59,7 @@ module LimesurveyRails
             []
           when /(left to send)|(No candidate tokens)$/
             result # get regular result
-          when /Invalid session key$/
+          when /Invalid session key$/ # ask for a new session key 
             arguments.shift
             if configuration.auto_connection and connect(true)
               self.send(method_name, *arguments, &block)

data/lib/limesurvey_rails/participant.rb

@@ -26,14 +26,20 @@ module LimesurveyRails
       end
 
       def surveys
-        survey_participations.map(&:survey)
+        survey__ids.map{|id| Survey.find(id) }
+      end
+
+      def survey__ids
+        survey_participations.map(&:survey_id)
       end
 
       def available_surveys
-        ids = surveys.map(&:id)
-        Survey.all.delete_if{|s| ids.include? s.id }
+        available_survey__ids.map{|id| Survey.find(id) }
       end
 
+      def available_survey__ids
+        Survey.all_ids - survey__ids
+      end
     end
 
     module ClassMethods

data/lib/limesurvey_rails/version.rb

@@ -1,3 +1,3 @@
 module LimesurveyRails
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/spec/limesurvey_rails_spec.rb

@@ -37,8 +37,8 @@ describe LimesurveyRails, :main => true do
     its(:configured?) {is_expected.to be true }
     describe 'LimesurveyRails.configuration' do
       subject { LimesurveyRails.configuration }
-      its(:username) {should eq('rails_user_test') }
-      its(:password) {should eq('limoncello') }
+      its(:username) {should eq(LIMESURVEY_USERNAME) }
+      its(:password) {should eq(LIMESURVEY_PASSWORD) }
       its(:base_url) {should eq(LIMESURVEY_BASE_URL) }
     end
     its(:connected?) { is_expected.to be false }
@@ -99,26 +99,31 @@ describe LimesurveyRails, :main => true do
           config.auto_connection = true
         end
       end
-      its(:connected?) { is_expected.to be true }
+      its(:connected?) { is_expected.to be false }
       describe ".connected?(true)" do
-        specify { expect(LimesurveyRails.connected?(true)).to be true }
+        specify { expect(LimesurveyRails.connected?(true)).to be false }
       end
       context "when it is connected" do
         before(:each) do
           LimesurveyRails.connect
         end
+        its(:connected?) { is_expected.to be true }
+        describe ".connected?(true)" do
+          specify { expect(LimesurveyRails.connected?(true)).to be true }
+        end
         context "when it's session key becomes invalid/expired" do
           before(:each) do
             LimesurveyRails.session_key = 'wrong_session_key'
           end
           its(:connected?) { is_expected.to be true }
           describe ".connected?(true)" do
-            specify { expect(LimesurveyRails.connected?(true)).to be true }
+            specify { expect(LimesurveyRails.connected?(true)).to be false }
           end
           describe ".list_surveys" do
             it "returns a correct result and LimesurveyRails gets a new session_key after reconnecting" do
               expect(LimesurveyRails.list_surveys).to be_an(Array) and
-              expect(LimesurveyRails.session_key).not_to eq('wrong_session_key')
+              expect(LimesurveyRails.session_key).not_to eq('wrong_session_key') and
+              expect(LimesurveyRails.connected?(true)).to be true
             end
           end
         end

data/spec/models/limesurvey_rails/participant_spec.rb

@@ -104,7 +104,7 @@ module LimesurveyRails
           end
         end
       end
-      describe "#surveys" do
+      describe "#surveys", :wip do
         before(:all) do
           @another_test_survey_id = get_brand_new_test_survey_id(:activate_tokens => true)
           @another_more_test_survey_id = get_brand_new_test_survey_id(:activate_tokens => true)
@@ -120,17 +120,40 @@ module LimesurveyRails
             expect(a_participant.surveys.size).to eq 1 and 
             expect(a_participant.surveys.first).to be_kind_of(Survey)
           end
-          context "when has added to another survey" do
-            before(:each) { SurveyParticipation.create(:survey_id => another_test_survey.id, :participant_id => a_participant.id ) }
-            it "returns an array with two elements" do
-              expect(a_participant.surveys.size).to eq 2
+          describe "#survey__ids" do
+            it "returns an array with the id of the survey" do
+              expect(a_participant.survey__ids.size).to eq 1 and 
+              expect(a_participant.survey__ids.first).to eq test_survey.id
+            end
+          end
+          describe "#available_survey__ids" do
+            it "returns an array with the id of the remaining surveys" do
+              expect(a_participant.available_survey__ids).to match_array [another_more_test_survey.id, another_test_survey.id]
             end
           end
           describe "#available_surveys" do
             it "returns an array with two elements" do
-              expect(a_participant.available_surveys.size).to eq 2
+              expect(a_participant.available_surveys.map(&:id)).to match_array [another_more_test_survey.id, another_test_survey.id]
+            end
+          end
+          context "when has added to another survey" do
+            before(:each) { SurveyParticipation.create(:survey_id => another_test_survey.id, :participant_id => a_participant.id ) }
+            it "returns an array with two elements" do
+              expect(a_participant.surveys.map(&:id)).to match_array [test_survey.id, another_test_survey.id]
+            end
+            describe "#survey__ids" do
+              it "returns an array with the ids of the two surveys" do
+                expect(a_participant.survey__ids).to match_array [test_survey.id, another_test_survey.id]
+              end
             end
+            describe "#available_survey__ids" do
+              it "returns an array with the id of the remaining surveys" do
+                expect(a_participant.available_survey__ids).to match_array [another_more_test_survey.id]
+              end
+            end
+
           end
+
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: limesurvey_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails