noodall-form-builder 0.3.3 → 0.4.0

data/Gemfile

@@ -16,10 +16,10 @@ gem 'faker', '~> 0.3.1'
 gem 'defensio'
 gem 'email_spec'
 gem 'fastercsv'
-gem 'system_timer'
 gem 'bson_ext'
 
 if RUBY_VERSION < '1.9'
+  gem 'system_timer'
   gem "ruby-debug", ">= 0.10.3"
 end
 

data/app/models/contact_form.rb

@@ -3,8 +3,6 @@ class ContactForm < Noodall::Component
 
   has_one :form, :class => Noodall::Form
 
-  allowed_positions :wide
-
   module ClassMethods
     def form_options
       lists = Noodall::Form.all(:fields => [:id, :title], :order => 'title ASC')

data/app/models/noodall/form_response.rb

@@ -11,7 +11,8 @@ module Noodall
     key :defensio_signature, String
     key :spaminess, Float, :default => 0
 
-    before_save :check_for_spam
+    before_save :check_for_spam, :if => :defensio_configuired?
+
     attr_protected :approved
 
     timestamps!
@@ -21,7 +22,7 @@ module Noodall
     def required_fields
       self.form.fields.select{ |f| f.required? }
     end
-    
+
     def correct_fields?
       self.form.fields.each do |f|
         return false unless self.respond_to?(f.name.downcase.parameterize("_").to_sym)
@@ -57,6 +58,10 @@ module Noodall
     end
 
   protected
+    def defensio_configuired?
+      defined?(Defensio) && !self.class.defensio_config.blank?
+    end
+
     def check_for_spam
       if self.defensio_signature.blank?
         status, response = self.class.defensio.post_document(self.defensio_attributes)
@@ -66,7 +71,7 @@ module Noodall
         self.spaminess = response['spaminess']
         self.approved = response['allow']
       end
-      return true 
+      return true
     end
 
     def self.defensio
@@ -78,8 +83,12 @@ module Noodall
     end
 
     def self.defensio_config
-      logger.info "No Defensio config found" unless FileTest.exists?(File.join(Rails.root, 'config', 'defensio.yml'))
-      @defensio_config ||= YAML::load(File.open(File.join(Rails.root, 'config', 'defensio.yml')))
+      begin
+        @defensio_config ||= YAML::load(File.open(File.join(Rails.root, 'config', 'defensio.yml')))
+      rescue Exception => e
+        puts "Failed to load Defensio config: #{e}"
+        @defensio_config = {}
+      end
     end
 
     def defensio_attributes
@@ -103,17 +112,17 @@ module Noodall
       required_fields.each do |field|
         self.errors.add(field.underscored_name.to_sym, "can't be empty") if self.send(field.underscored_name).blank?
       end
-      return true if self.errors.empty? 
+      return true if self.errors.empty?
     end
-    
+
     def method_missing(method)
-      # If the form doesn't have a field that matches this method, act normally. Otherwise, return nil to show the field is empty. 
-      if form.fields.select{|f| f.underscored_name.to_sym == method}.empty? 
+      # If the form doesn't have a field that matches this method, act normally. Otherwise, return nil to show the field is empty.
+      if form.fields.select{|f| f.underscored_name.to_sym == method}.empty?
         super
       else
         return nil
       end
     end
-    
+
   end
 end

data/lib/noodall/form_builder/engine.rb

@@ -11,9 +11,16 @@ module Noodall
         Noodall::UI.menu_items['Forms'] = :noodall_admin_forms_path
       end
 
-      initializer "static assets" do |app|
-        app.middleware.use ::ActionDispatch::Static, "#{root}/public"
+      if Rails::VERSION::MINOR == 0 # if rails 3.0.x
+        initializer "static assets" do |app|
+          app.middleware.use ::ActionDispatch::Static, "#{root}/app/assets"
+        end
+      else
+        initializer "Add noodall assets to precomiler" do |app|
+          app.config.assets.precompile += %w( admin/formbuilder.js )
+        end
       end
+
     end
   end
 end

data/lib/noodall/form_builder/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module FormBuilder
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

data/spec/dummy/config/defensio.yml

@@ -1,16 +1,2 @@
-defaults: &defaults
-  api_key: 6cd604f9b2765b05c5ac729b3594fc49
-  spam_threshold: 0.75
-  
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults
-
-staging:
-  <<: *defaults
+api_key: 6cd604f9b2765b05c5ac729b3594fc49
 

metadata

@@ -1,70 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: noodall-form-builder
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Steve England
 - Daniel Craig
 - Alex Heaton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-19 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &13067740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *13067740
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &13067280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id002
+  version_requirements: *13067280
 description: Functionality for building custom forms
 email: []
-
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/images/admin/spam-flag.png
+- app/assets/javascripts/admin/formbuilder.js
 - app/controllers/noodall/admin/fields_controller.rb
 - app/controllers/noodall/admin/form_responses_controller.rb
 - app/controllers/noodall/admin/forms_controller.rb
@@ -127,8 +110,6 @@ files:
 - lib/noodall/form_builder/routes.rb
 - lib/noodall/form_builder/version.rb
 - noodall-form-builder.gemspec
-- public/images/admin/spam-flag.png
-- public/javascripts/admin/formbuilder.js
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -174,41 +155,31 @@ files:
 - spec/integration/navigation_spec.rb
 - spec/noodall_form_builder_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/noodall-form-builder
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2077469177402188089
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Noodall Form Builder
 test_files: []
-