limesurvey_rails 1.6.0 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d528206d39a75793bc0c4693dca10a77862ee58c
-  data.tar.gz: 7c17812488f1c73e7c0406a1e60e127d82d05a65
+  metadata.gz: 51dc20014d97dda7b00575a9f788ed495e19ae9d
+  data.tar.gz: 7d5cb5afb2ac7ebfa5a63c49e3b398f3857f2800
 SHA512:
-  metadata.gz: 3c305914e21e416f21b3cf9c5810a00cb5a3189985922dfb440122a20095cfecc82e496bf71007e261b66f152c9d2281321c0bc7e692dac7313bf0b8c214cff9
-  data.tar.gz: bce318fc0eb6210ab2ab44711c8a6e8edcf5556079a1253e18425ca28dd20559e91b5ef683d51e80d77a64282f5b1048b47b3bc5c101f35615a36572487755eb
+  metadata.gz: 9e083aebd9b247cfc7587980fa91347f0c212b0c8cb0fbe989f6edbd9089813c2991029b9207314da87f495d9e05fe62f1ad2235e94fa58295dfd9d59da1eab3
+  data.tar.gz: 9649919723f39e22afb96f322774aca290e15f439b02247c06a5659477ef5e43a8d703fcf9c53be5c590a4cdb33b86cd81b80a460c30d1b0593311ac29e54834

data/app/models/limesurvey_rails/survey.rb

@@ -4,97 +4,7 @@ module LimesurveyRails
 
     LIST_SURVEYS_ATTRIBUTES = %w{ sid surveyls_title startdate expires active }
 
-    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
-    }
-
-     
-    ALL_ATTRIBUTES = (GET_SUMMARY_ATTRIBUTES | GET_SURVEY_PROPERTY_ATTRIBUTES | GET_LANGUAGE_PROPERTIES_ATTRIBUTES ).sort.unshift('id')
+    ALL_ATTRIBUTES = LIST_SURVEYS_ATTRIBUTES.sort.unshift('id')
 
     attr_accessor *ALL_ATTRIBUTES
 
@@ -104,16 +14,15 @@ module LimesurveyRails
     validates_presence_of :surveyls_title
     validates_presence_of :language
 
-    def self.all(lang = nil)
-      all_ids.map{|id| build(id,lang) }
-    end
-
-    def self.all_ids
-      LimesurveyRails.list_surveys(LimesurveyRails.configuration.username).map{|s| s['sid'].to_i }
+    def self.all
+      LimesurveyRails.list_surveys.map do |s|
+        id = s.delete('sid').to_i
+        new({id: id}.merge(s))
+      end
     end
 
-    def self.find(survey_id,lang = nil)
-      build(survey_id,lang)
+    def self.find(survey_id)
+      self.all.find{|s| s.id == survey_id.to_i} or raise(RemoteControlError,"Invalid survey ID")
     end
 
     def self.add(title,lang)
@@ -216,24 +125,11 @@ module LimesurveyRails
     end
 
     def reload
-      Survey.build(id)
+      self.class.find(id)
     end
 
     private
 
-    def self.build(survey_id, lang = nil)
-      all_attributes = {id: survey_id.to_i}
-      all_attributes.merge!(LimesurveyRails.get_survey_properties(survey_id,GET_SURVEY_PROPERTY_ATTRIBUTES))
-      
-      # if all_attributes['active'] == 'Y'
-        all_attributes.merge!(LimesurveyRails.get_summary(survey_id,'all')) 
-      # else
-      #   GET_SUMMARY_TOKENS_ATTRIBUTES.each{|a| all_attributes[a] = LimesurveyRails.get_summary(survey_id,a) rescue nil }
-      # end
-      all_attributes.merge!(LimesurveyRails.get_language_properties(survey_id,GET_LANGUAGE_PROPERTIES_ATTRIBUTES,lang || all_attributes['language']))
-      new(all_attributes)
-    end
-
   end
 
 end

data/lib/limesurvey_rails/participant.rb

@@ -26,7 +26,7 @@ module LimesurveyRails
       end
 
       def surveys
-        survey__ids.map{|id| Survey.find(id) }
+        Survey.all.find_all{|s| survey__ids.include?(s.id)}
       end
 
       def survey__ids
@@ -34,11 +34,11 @@ module LimesurveyRails
       end
 
       def available_surveys
-        available_survey__ids.map{|id| Survey.find(id) }
+        Survey.all.find_all{|s| !survey__ids.include?(s.id)}
       end
 
       def available_survey__ids
-        Survey.all_ids - survey__ids
+        Survey.all.map(&:id) - survey__ids
       end
     end
 

data/lib/limesurvey_rails/version.rb

@@ -1,3 +1,3 @@
 module LimesurveyRails
-  VERSION = "1.6.0"
+  VERSION = "2.0.0.beta"
 end

data/spec/models/limesurvey_rails/survey_spec.rb

@@ -203,8 +203,6 @@ module LimesurveyRails
             describe "survey"  do
               before(:each) { test_survey.invite_participants! }
               subject { test_survey.reload }
-              its(:token_count) { is_expected.to eq '3' }
-              its(:token_sent) { is_expected.to eq '2' }
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: limesurvey_rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - masciugo
@@ -220,9 +220,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5