limesurvey_rails 1.1.1 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2QwZWVmM2Y4YTRkMTExNTA3NGFiYmI3ZGE0YzY0OTFiYTdjMWM2ZA==
-  data.tar.gz: !binary |-
-    NTIyNTA1MDdjOTA3YzQ3ZjFkMTg4ZTZiZmI4YTA4NDhjMDUxMWZmNg==
+SHA1:
+  metadata.gz: 351602763701027dc6e423683355a693202c5e9b
+  data.tar.gz: 5f1e7ed4ac34354d4e40d0aed5a64c731b13b1f8
 SHA512:
-  metadata.gz: !binary |-
-    YzFhMTkyZWY5YTY5Y2Q5NzQ4Mzc2ODJhMmM0Yjk0ZjdlY2YyMDcxYWY4OWMw
-    M2JkZDUxZmVlMGQxZDhlZDdiZTVkMzJiZTZjYTY3YWUzYWQ0MjU5ZTIyYjEz
-    NGNlZmU3NTVhODY5YmZmYWU5NWJhMWNjMzIyNzQzNDM3ZTdjMzE=
-  data.tar.gz: !binary |-
-    OGI1ZmFkZDU1MDA5NDlkMTM4YWZiODFmZDg3NjlhYzJlMTJmZjlkZjIwM2Y2
-    ZDI5ZTRmMDM4M2I5MDgxODJhZWNmYzI0YjI3YjBjY2FmNmZmNTkzMzUxOTVm
-    Yzc3YTFjMjAzZTg1YzA0N2MzMTY1YjVkNGU5N2FiMzk1NTA5ZWE=
+  metadata.gz: 662be940c3c502bd8b0182faa73f030c0a5f64900603760c16bb76f896c54bbbf5936c852171f4b011176c47721afbcd52aa5afc76eb69ba007f15101c97ed33
+  data.tar.gz: 7f8a2623bb2f34e3629c71d6c1e394f1f6f924fbf36dec0f3eb4cf31af06f8a4e4ef8985935a6bd3cf4ac455a27f06adbb8687b83d7124563e086a2e1db5baef

data/.gitignore

@@ -21,3 +21,6 @@ tmp
 *.a
 mkmf.log
 .ruby-version
+spec/dummy/db/test.sqlite3
+spec/dummy/log/development.log
+spec/dummy/log/test.log

data/README.md

@@ -22,12 +22,26 @@ Or install it yourself as:
 
 ## Usage
 
-In your participant model simply add
+In your participant model simply execute from your model class
 
-  is_a_limesurvey_participant
+    is_a_limesurvey_participant
 
 but there are many options ..
 
+## Test
+
+Because of [this](http://stackoverflow.com/posts/27786703) it's better run test separately (in a real scenario the *participant model* is expected to be initialized only once):
+
+    rake spec[main]
+    rake spec[survey]
+    rake spec[participant]
+    rake spec[participation]
+
+Reminder for further bug investigation:
+
+    rake spec[,25280] #failing test
+    rake spec[survey,25280] #passing test
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/limesurvey_rails/fork )

data/Rakefile

@@ -27,6 +27,7 @@ RSpec::Core::RakeTask.new(:spec, :tag, :seed) do |t, task_args|
   t.rspec_opts = ''
   t.rspec_opts += " --tag #{task_args[:tag]}" unless task_args[:tag].blank?
   t.rspec_opts += " --seed #{task_args[:seed]}" unless task_args[:seed].blank?
+  t.rspec_opts += " --no-fail-fast"
 end
 
 desc "Run specfiles specified by pattern with optional seed"

data/lib/limesurvey_rails/participant.rb

@@ -2,6 +2,40 @@ module LimesurveyRails
   
   module Participant
 
+    extend ActiveSupport::Concern
+
+    included do
+      # I put this here because I want limesurvey_participant class attribute to be available as soon as you include the gem
+      class_attribute :limesurvey_participant
+      self.limesurvey_participant = false
+      # instance methods
+      def add_to_survey(survey)
+        if survey.is_a? Survey
+          survey.add_participant(self)
+        else
+          raise WrongArgumentError, "expexted Survey object, got #{survey.class}"
+        end
+      end
+
+      def remove_from_survey(survey)
+        if survey.is_a? Survey
+          survey.remove_participant(self)
+        else
+          raise WrongArgumentError, "expexted Survey object, got #{survey.class}"
+        end
+      end
+
+      def surveys
+        survey_participations.map(&:survey)
+      end
+
+      def available_surveys
+        ids = surveys.map(&:id).map(&:to_s)
+        Survey.all.delete_if{|s| ids.include? s.id }
+      end
+
+    end
+
     module ClassMethods
       
       def is_a_limesurvey_participant(opts = {})
@@ -19,7 +53,7 @@ module LimesurveyRails
 
         has_many :survey_participations, :class_name => "LimesurveyRails::SurveyParticipation", :foreign_key => "participant_id", :dependent => limesurvey_participant_dependent_participations  do
           def for_survey(survey_id)
-            res = where("survey_id == #{survey_id}")
+            res = where("survey_id = #{survey_id}")
             raise MultipleParticipationsToSurveyError if res.size > 1
             res.first
           end
@@ -41,46 +75,7 @@ module LimesurveyRails
         limesurvey_participant
       end
     end
-    
-    module InstanceMethods
-      
-      def add_to_survey(survey)
-        if survey.is_a? Survey
-          survey.add_participant(self)
-        else
-          raise WrongArgumentError, "expexted Survey object, got #{survey.class}"
-        end
-      end
-
-      def remove_from_survey(survey)
-        if survey.is_a? Survey
-          survey.remove_participant(self)
-        else
-          raise WrongArgumentError, "expexted Survey object, got #{survey.class}"
-        end
-      end
-
-      def surveys
-        survey_participations.map(&:survey)
-      end
-
-      def available_surveys
-        ids = surveys.map(&:id).map(&:to_s)
-        Survey.all.delete_if{|s| ids.include? s.id }
-      end
-
-    end
-    
-    def self.included(receiver)
       
-      # I put this here because I want limesurvey_participant class attribute to be available as soon as you include the gem
-      receiver.class_attribute :limesurvey_participant
-      receiver.limesurvey_participant = false
-
-      receiver.extend         ClassMethods
-      receiver.send :include, InstanceMethods
-    end
-  
   end
 
   ActiveRecord::Base.send :include, Participant

data/lib/limesurvey_rails/version.rb

@@ -1,3 +1,3 @@
 module LimesurveyRails
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/limesurvey_rails.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency(%q<rails>, ["~> 3.2.16"])
-  spec.add_runtime_dependency(%q<limesurvey>, [">= 0"])
+  spec.add_runtime_dependency(%q<limesurvey>, ["~> 1.0"])
 
-  spec.add_development_dependency(%q<rspec-rails>, [">= 0"])
-  spec.add_development_dependency(%q<rspec-its>, [">= 0"])
+  spec.add_development_dependency(%q<rspec-rails>, ["~> 3.0"])
+  spec.add_development_dependency(%q<rspec-its>, ["~> 1.0"])
   spec.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
   spec.add_development_dependency(%q<sqlite3>, [">= 0"])
-  spec.add_development_dependency(%q<debugger>, [">= 0"])
-  spec.add_development_dependency(%q<awesome_print>, [">= 0"])
+  spec.add_development_dependency(%q<byebug>, [">= 3.0"])
+  spec.add_development_dependency('gem-release')
 end

data/spec/models/limesurvey_rails/participant_spec.rb

@@ -1,12 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module LimesurveyRails
-  describe TestModel, :participant  do
+  describe TestModel, :participant do
 
     before(:all) do
       configure_and_connect
       remove_all_test_surveys
-      reset_models
+      # reset_models # uncomment to run all suite test in one single run
       @test_survey_id = get_brand_new_test_survey_id(:activate_tokens => true)
     end 
     after(:all) { remove_all_test_surveys }
@@ -21,10 +21,10 @@ module LimesurveyRails
       its(:is_a_limesurvey_participant_class?) { is_expected.to be false }
     end
     
-    describe ".is_a_limesurvey_participant" do
-      before(:each) { reset_models }
+    describe ".is_a_limesurvey_participant", :wip do
       context "with no options" do
-        before(:each) do
+        before(:all) do
+          reset_models
           TestModel.is_a_limesurvey_participant
         end
         it "has many survey_participations" do
@@ -37,19 +37,22 @@ module LimesurveyRails
         its(:limesurvey_participant_lastname_attr) { is_expected.to be_nil }
       end
       context "with options :attribute_1_attr => 'other_id' " do
-        before(:each) do
+        before(:all) do
+          reset_models
           TestModel.is_a_limesurvey_participant(:attribute_1_attr => 'other_id')
         end
         its(:is_a_limesurvey_participant_class?) { is_expected.to be true }
         its(:limesurvey_participant_attribute_1_attr) { is_expected.to eq 'other_id' }
       end
       context "with options :email_attr => 'email_address', :firstname_attr => 'name', :lastname_attr => 'surname'  " do
-        before(:each) do
+        before(:all) do
+          reset_models
           TestModel.is_a_limesurvey_participant(:email_attr => 'email_address', :firstname_attr => 'name', :lastname_attr => 'surname')
         end
         its(:limesurvey_participant_email_attr) { is_expected.to eq 'email_address' }
         its(:limesurvey_participant_firstname_attr) { is_expected.to eq 'name' }
         its(:limesurvey_participant_lastname_attr) { is_expected.to eq 'surname' }
+        its(:limesurvey_participant_attribute_1_attr) { is_expected.to eq 'id' }
       end
     end
 

data/spec/models/limesurvey_rails/survey_participations_spec.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module LimesurveyRails
-  describe SurveyParticipation, :participation => true do
+  describe SurveyParticipation, :participation do
     
     subject { SurveyParticipation }
 
     before(:all) do
       configure_and_connect
       @test_survey_id = get_brand_new_test_survey_id(:activate_tokens => true)
-      reset_models
+      # reset_models # uncomment to run all suite test in one single run
       TestModel.is_a_limesurvey_participant :attribute_1_attr => "extra_id", :email_attr => 'email_address', :firstname_attr => 'name', :lastname_attr => 'surname'
     end 
     after(:all) { remove_all_test_surveys }

data/spec/models/limesurvey_rails/survey_spec.rb

@@ -2,10 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module LimesurveyRails
 
-  describe Survey, :survey => true do
+  describe Survey, :survey do
     before(:all) do
       configure_and_connect
-      reset_models
+      # reset_models # uncomment to run all suite test in one single run
       TestModel.is_a_limesurvey_participant :attribute_1_attr => "extra_id", :email_attr => 'email_address', :firstname_attr => 'name', :lastname_attr => 'surname'
     end
     after(:all) { remove_all_test_surveys }
@@ -90,7 +90,7 @@ module LimesurveyRails
             FactoryGirl.create_list(:test_model,3)
             TestModel.all.each{ |tm| FactoryGirl.create(:limesurvey_rails_survey_participation, :survey_id => test_survey.id, :participant_id => tm.id ) }
           end
-          it "its survey participations are deleted", :wip do
+          it "its survey participations are deleted" do
             test_survey.destroy
             expect(SurveyParticipation.for_survey(test_survey.id)).to be_empty
           end
@@ -98,11 +98,6 @@ module LimesurveyRails
       end
 
       describe "participants instance methods"  do
-        # before(:all) { reset_models; TestModel.is_a_limesurvey_participant :attribute_1_attr => "extra_id", :email_attr => 'email_address', :firstname_attr => 'name', :lastname_attr => 'surname'}
-        # before(:each) do
-        #   instances = FactoryGirl.create_list(:test_model,3)
-        #   instances.each{ |tm| FactoryGirl.create(:limesurvey_rails_survey_participation, :survey_id => test_survey.id, :participant_id => tm.id ) }
-        # end
 
         let(:a_participant) { FactoryGirl.create(:test_model) }
 

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'rspec/its'
 require 'factory_girl_rails'
+require 'byebug'
 
 Rails.backtrace_cleaner.remove_silencers!
 

data/spec/support/utils.rb

@@ -22,26 +22,41 @@ end
 # reload test model to reuse it among tests (mostly to reset variable classes...)
 # http://stackoverflow.com/questions/14063395/rspec-class-variable-testing    
 def reset_models
-  # puts "resetting TestModel ..."
-  
+  # puts "resetting constants ..."
+  if LimesurveyRails.const_defined? :Participant
+    LimesurveyRails.send(:remove_const,:Participant)
+    load File.join(ENGINE_RAILS_ROOT,'lib','limesurvey_rails','participant.rb')
+  end
+
   if Object.const_defined? :TestModel
-    Object.constants Object.send(:remove_const,:TestModel) 
+    Object.send(:remove_const,:TestModel) 
     load File.join(ENGINE_RAILS_ROOT,'spec','dummy','app','models','test_model.rb')
     # puts ">>>> TestModel.object_id: #{TestModel.object_id}"
   end
   
-
-  # if LimesurveyRails.const_defined? :Participant
-  #   LimesurveyRails.send(:remove_const,:Participant)
-  #   load File.join(ENGINE_RAILS_ROOT,'lib','limesurvey_rails','participant.rb')
-  # end
-
   if LimesurveyRails.const_defined? :SurveyParticipation
     LimesurveyRails.send(:remove_const,:SurveyParticipation)
     load File.join(ENGINE_RAILS_ROOT,'app','models','limesurvey_rails','survey_participation.rb')
     # puts ">>>> LimesurveyRails::SurveyParticipation.object_id: #{LimesurveyRails::SurveyParticipation.object_id}"
   end
 
+
+  # puts "before LimesurveyRails::Participant         #{LimesurveyRails::Participant.object_id}"
+  # puts "before TestModel                            #{TestModel.object_id}"
+  # puts "before LimesurveyRails::SurveyParticipation #{LimesurveyRails::SurveyParticipation.object_id}"
+  # ActiveSupport::Dependencies.remove_constant("LimesurveyRails::Participant")
+  # ActiveSupport::Dependencies.remove_constant("LimesurveyRails::SurveyParticipation")
+  # ActiveSupport::Dependencies.remove_constant("TestModel")
+  # load File.join(ENGINE_RAILS_ROOT,'lib','limesurvey_rails','participant.rb')
+  # load File.join(ENGINE_RAILS_ROOT,'app','models','limesurvey_rails','survey_participation.rb')
+  # load File.join(ENGINE_RAILS_ROOT,'spec','dummy','app','models','test_model.rb')
+  # puts "after LimesurveyRails::Participant         #{LimesurveyRails::Participant.object_id}"
+  # puts "after TestModel                            #{TestModel.object_id}"
+  # puts "after LimesurveyRails::SurveyParticipation #{LimesurveyRails::SurveyParticipation.object_id}"
+
   FactoryGirl.reload
+
+  # puts "constants resetted"
+
 end
 

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: limesurvey_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: limesurvey
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An ORM-like layer to Limesurvey
@@ -129,7 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -222,17 +222,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An ORM-like layer to Limesurvey