limesurvey_rails 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c99341c8f4c868c734bd7043ad3897d7fd7bfc
-  data.tar.gz: 2559f6e70b729d2326cd825d2a6b7eb3b99ecb49
+  metadata.gz: deff9a2b87f3e6c2db940dfdc50d7f3ee62f4835
+  data.tar.gz: 2476918b2c7cd4ed825ef009d2dcd4a11edc33c9
 SHA512:
-  metadata.gz: 22040e09763a05d23ae34fabd433f6d9d0c8adafb4242d32f5f4179f0a3b1f4f3d48937895440422c56e98949bdfa0e10c1331e87d757747c2c41fbc0ff87c77
-  data.tar.gz: 8461ed0bae5619ca2d5dbb382349126beb295f2805fefca9ebd874f1d02eb8a65b572bb3edb9d886cda70c1a853fd610b31ce00c80d2e1b7dc14ef580a3ec91b
+  metadata.gz: db6011cb81ac60051295041e94899abcb83ae35b6bec659b772c3731cd57ea23aebde8350068a95e6ed729c7852117670853b801e409cfadb63f814f363c5d3c
+  data.tar.gz: d53d732dbb60484f875b5505eb68aee5308eb43680fa6025f3a17eada77dd84121386035eb1ba6eefe246c202b9805dbc771703d5138558dcebcccf2fbc2ed92

data/lib/limesurvey_rails/limesurvey_rails.rb

@@ -28,12 +28,16 @@ module LimesurveyRails
     end
   end
 
-  def self.connected?
+  def self.connected?(verify = false)
     begin
       raise unless configured?
       raise unless session_key.present?
-      check_result = api.list_surveys(session_key)
-      raise unless check_result.is_a? Array or check_result['status'] == 'No surveys found'
+
+      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)
@@ -51,7 +55,7 @@ module LimesurveyRails
 
   def self.method_missing(method_name, *arguments, &block)
     if API_METHODS.include? method_name.to_s
-      if api # was: if connected? which is more costly
+      if connected?
         # t0=Time.now
         result = api.send(method_name, *arguments.unshift(session_key))
         # puts "#{method_name} in #{Time.now-t0}"
@@ -65,6 +69,13 @@ module LimesurveyRails
             []
           when /(left to send)|(No candidate tokens)$/
             result # get regular result
+          when /Invalid session key$/
+            arguments.shift
+            if configuration.auto_connection and connect(true)
+              self.send(method_name, *arguments, &block)
+            else
+              raise RemoteControlError, 'you are disconnected from Limesurvey: Invalid session key'
+            end
           else
             raise RemoteControlError, "#{method_name} returned a failure response status: #{result["status"]}"
           end

data/lib/limesurvey_rails/version.rb

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

data/spec/limesurvey_rails_spec.rb

@@ -80,6 +80,18 @@ describe LimesurveyRails, :main => true do
       describe ".wrong_name_method" do
         specify { expect { LimesurveyRails.wrong_name_method }.to raise_error }
       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 false }
+        end
+        it "raise RemoteControlError claiming Invalid session key" do
+          expect { LimesurveyRails.list_surveys }.to raise_error(LimesurveyRails::RemoteControlError, /Invalid session key$/)
+        end
+      end
     end
     context "when it's configurated with continuous connection" do
       before(:each) do
@@ -88,6 +100,29 @@ describe LimesurveyRails, :main => true do
         end
       end
       its(:connected?) { is_expected.to be true }
+      describe ".connected?(true)" do
+        specify { expect(LimesurveyRails.connected?(true)).to be true }
+      end
+      context "when it is connected" do
+        before(:each) do
+          LimesurveyRails.connect
+        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 }
+          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')
+            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.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails