surveyor 0.14.2 → 0.14.3

data/README.md

@@ -114,6 +114,10 @@ To work on the plugin code (for enhancements, and bug fixes, etc...) fork this g
 
 # Changes
 
+0.14.3
+
+* remove manual numbering until it works. refactoring to use common methods.
+
 0.14.2
 
 * lowercase localization. feature instead of story in cucumber feature

data/VERSION

@@ -1 +1 @@
-0.14.2
+0.14.3

data/app/models/survey.rb

@@ -29,7 +29,7 @@ class Survey < ActiveRecord::Base
   end
   
   def title=(value)
-    self.access_code = Survey.to_normalized_string(value)
+    self.access_code = Surveyor::Common.to_normalized_string(value)
     super
   end
   

data/app/views/partials/_question.html.haml

@@ -2,8 +2,6 @@
 - case renderer
 - when :label
   - div_for question, :class => "label #{question.css_class(response_set)}" do
-    - if question.survey_section.survey.manual_numbering
-      .number= question.number||' '
     %span.text= question.text
     %span.help= question.help_text
 - when :image

data/lib/surveyor.rb

@@ -1,37 +1,3 @@
 require File.dirname(__FILE__) + '/surveyor/acts_as_response'
 module Surveyor
-  RAND_CHARS = [('a'..'z'), ('A'..'Z'), (0..9)].map{|r| r.to_a}.flatten.to_s
-
-  def self.make_tiny_code(len = 10)
-    if RUBY_VERSION < "1.8.7"
-      (1..len).to_a.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.to_s
-    else
-      len.times.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.to_s
-    end
-  end
-
-  def self.to_normalized_string(text)
-    words_to_omit = %w(a be but has have in is it of on or the to when)
-    col_text = text.gsub(/(<[^>]*>)|\n|\t/s, ' ') # Remove html tags
-    col_text.downcase!                            # Remove capitalization
-    col_text.gsub!(/\"|\'/, '')                   # Remove potential problem characters
-    col_text.gsub!(/\(.*?\)/,'')                  # Remove text inside parens
-    col_text.gsub!(/\W/, ' ')                     # Remove all other non-word characters      
-    cols = (col_text.split(' ') - words_to_omit)
-    (cols.size > 5 ? cols[-5..-1] : cols).join("_")
-  end
-end
-
-# From http://guides.rubyonrails.org/plugins.html#controllers
-# Fix for:
-# ArgumentError in SurveyorController#edit 
-# A copy of ApplicationController has been removed from the module tree but is still active!
-# Equivalent of using "unloadable" in SurveyorController (unloadable has been deprecated)
-
-%w{models controllers}.each do |dir|
-  path = File.expand_path(File.join(File.dirname(__FILE__), '../app', dir))
-  # $LOAD_PATH << path # already here
-  # ActiveSupport::Dependencies.load_paths << path # already here too
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-  # [$LOAD_PATH, ActiveSupport::Dependencies.load_paths, ActiveSupport::Dependencies.load_once_paths].each{|x| Rails.logger.info x}
-end
+end

data/script/surveyor/answer.rb

@@ -28,7 +28,7 @@ module SurveyParser
     end
   
     def text_args(text = "Answer")
-      {:text => text.to_s, :short_text => text, :data_export_identifier => Surveyor.to_normalized_string(text)}
+      {:text => text.to_s, :short_text => text, :data_export_identifier => Surveyor::Common.to_normalized_string(text)}
     end
     def hash_from(arg)
       arg.is_a?(Symbol) ? {:response_class => arg.to_s} : arg.is_a?(Hash) ? arg : {}

data/script/surveyor/question.rb

@@ -24,7 +24,7 @@ module SurveyParser
     
     def parse_args(args)
       text = args[0] || "Question"
-      {:text => text, :short_text => text, :data_export_identifier => Surveyor.to_normalized_string(text)}.merge(args[1] || {})
+      {:text => text, :short_text => text, :data_export_identifier => Surveyor::Common.to_normalized_string(text)}.merge(args[1] || {})
     end
     
     def correct_answer=(a)

data/script/surveyor/survey.rb

@@ -10,7 +10,7 @@ module SurveyParser
   
     def parse_args(args)
       title = args[0]
-      {:title => title, :access_code => Surveyor.to_normalized_string(title)}.merge(args[1] || {})
+      {:title => title, :access_code => Surveyor::Common.to_normalized_string(title)}.merge(args[1] || {})
     end
 
     def find_question_by_reference(ref_id)

data/script/surveyor/survey_section.rb

@@ -9,7 +9,7 @@ module SurveyParser
 
     def parse_args(args)
       title = args[0]
-      {:title => title, :data_export_identifier => Surveyor.to_normalized_string(title)}.merge(args[1] || {})
+      {:title => title, :data_export_identifier => Surveyor::Common.to_normalized_string(title)}.merge(args[1] || {})
     end
 
     # Used to find questions for dependency linking

data/spec/lib/surveyor_spec.rb

@@ -38,7 +38,7 @@ describe Surveyor do
               "you_would_say_your_health" ]
     
     strings.each_with_index do |s, i|
-      Surveyor.to_normalized_string(s).should == codes[i]
+      Surveyor::Common.to_normalized_string(s).should == codes[i]
     end
   end
 end

data/surveyor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.14.2"
+  s.version = "0.14.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
@@ -145,7 +145,6 @@ Gem::Specification.new do |s|
      "lib/surveyor.rb",
      "lib/surveyor/acts_as_response.rb",
      "lib/surveyor/common.rb",
-     "lib/surveyor/config.rb",
      "lib/surveyor/surveyor_controller_methods.rb",
      "lib/tasks/surveyor_tasks.rake",
      "lib/xml_formatter.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
   - 14
-  - 2
-  version: 0.14.2
+  - 3
+  version: 0.14.3
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -186,7 +186,6 @@ files:
 - lib/surveyor.rb
 - lib/surveyor/acts_as_response.rb
 - lib/surveyor/common.rb
-- lib/surveyor/config.rb
 - lib/surveyor/surveyor_controller_methods.rb
 - lib/tasks/surveyor_tasks.rake
 - lib/xml_formatter.rb

data/lib/surveyor/config.rb

@@ -1,45 +0,0 @@
-module Surveyor
-  #
-  # The Surveyor::Config object emulates a hash with simple bracket methods
-  # which allow you to get and set values in the configuration table:
-  #
-  #   Surveyor::Config['setting.name'] = 'value'
-  #   Surveyor::Config['setting.name'] #=> "value"
-  #
-  # Currently, there is not a way to edit configuration through the admin
-  # system so it must be done manually. The console script is probably the
-  # easiest way to this:
-  #
-  #   % script/console production
-  #   Loading production environment.
-  #   >> Surveyor::Config['setting.name'] = 'value'
-  #   => "value"
-  #   >>
-  #
-  # Surveyor currently uses the following settings:
-  #
-  # defaults.title               :: the title of the survey system
-  # defaults.layout              :: the layout used by the survey system
-
-  class Config
-    @@config_hash = {}
-
-    class << self
-      def [](key)
-        @@config_hash[key]
-      end
-
-      def []=(key, value)
-        @@config_hash[key] = value
-      end
-
-      def to_hash
-        @@config_hash
-      end
-      
-      def run
-        yield self if block_given?
-      end
-    end
-  end
-end