surveyor 0.14.3 → 0.14.4

data/README.md

@@ -100,7 +100,7 @@ DSL question maps to the resulting rendered view of the question.
 
 Surveyor's controller, models, and views may be customized via classes in your app/models, app/helpers and app/controllers directories. To generate a sample custom controller and layout, run:
 
-    script/rails generate surveyor:custom
+    script/generate extend_surveyor
 
 and check out surveys/README\_FOR\_CUSTOM\_SURVEYOR.md
 
@@ -114,6 +114,12 @@ To work on the plugin code (for enhancements, and bug fixes, etc...) fork this g
 
 # Changes
 
+0.14.4
+
+* explicity require surveyor models and helper. update sweeper syntax. closes #77
+* cleanup and requires
+* fixing instructions for extending surveyor. closes #76
+
 0.14.3
 
 * remove manual numbering until it works. refactoring to use common methods.

data/VERSION

@@ -1 +1 @@
-0.14.3
+0.14.4

data/app/models/survey_section_sweeper.rb

@@ -1,15 +1,15 @@
 class SurveySectionSweeper < ActionController::Caching::Sweeper
-  observer SurveySection
-
+  observe :survey_section
+  
   def after_save(section)
     expire_cache(section)
   end
-
+  
   def after_destroy(section)
     expire_cache(section)
   end
-
+  
   def expire_cache(section)
     expire_fregment "section_#{section.id}"
   end
-end
+end

data/init.rb

@@ -1 +1 @@
-# Init hook code here
+require 'surveyor'

data/lib/surveyor.rb

@@ -1,3 +1,6 @@
-require File.dirname(__FILE__) + '/surveyor/acts_as_response'
-module Surveyor
-end
+require 'surveyor/common'
+require 'surveyor/acts_as_response'
+
+
+Dir.glob(File.join(File.dirname(__FILE__),'..','app','models','*.rb')).each{|f| require f}
+Dir.glob(File.join(File.dirname(__FILE__),'..','app','helpers','*.rb')).each{|f| require f}

data/lib/surveyor/common.rb

@@ -1,24 +1,29 @@
 module Surveyor
   class Common
     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
+    
+    class << self
+      def 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
-    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("_")
+      def 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
+      
+      alias :normalize :to_normalized_string
+      
     end
   end
 end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.14.3"
+  s.version = "0.14.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2010-08-24}
+  s.date = %q{2010-08-31}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -147,7 +147,6 @@ Gem::Specification.new do |s|
      "lib/surveyor/common.rb",
      "lib/surveyor/surveyor_controller_methods.rb",
      "lib/tasks/surveyor_tasks.rake",
-     "lib/xml_formatter.rb",
      "rails/init.rb",
      "script/surveyor/answer.rb",
      "script/surveyor/base.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 14
-  - 3
-  version: 0.14.3
+  - 4
+  version: 0.14.4
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -05:00
+date: 2010-08-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -188,7 +188,6 @@ files:
 - lib/surveyor/common.rb
 - lib/surveyor/surveyor_controller_methods.rb
 - lib/tasks/surveyor_tasks.rake
-- lib/xml_formatter.rb
 - rails/init.rb
 - script/surveyor/answer.rb
 - script/surveyor/base.rb

data/lib/xml_formatter.rb

@@ -1,12 +0,0 @@
-module XmlFormatter
-  def to_xml(options = {})
-    options[:indent] ||= 2
-    xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
-    xml.instruct! unless options[:skip_instruct]
-    xml.tag!(self.class.name.downcase.to_sym, self.attributes) do
-      self.class.reflect_on_all_associations.to_a.each do |assoc|
-        xml.tag!(assoc.name)
-      end
-    end
-  end
-end