Skip to content

Pull this too #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k1mmeh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pull this too #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c72a556
[v0.4] Adding base bcms site to this plugin repo, for easy testing an…
k1mmeh Sep 8, 2010
2c60b74
[v0.4] re-enabling validation for presence of in text and string inpu…
k1mmeh Sep 9, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
db/schema.rb
db/*.sqlite3
log/*
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Form Buider module

Version 0.3
Version 0.4
Kimmy Chirnside
kimmy.chirnside@gmail.com

Expand Down
10 changes: 10 additions & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require(File.join(File.dirname(__FILE__), 'config', 'boot'))

require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'

require 'tasks/rails'
20 changes: 16 additions & 4 deletions app/models/custom_form_element.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
class CustomFormElement < ActiveRecord::Base
require 'pp'
include FormBuilder::Helpers

belongs_to :custom_form
Expand Down Expand Up @@ -131,16 +132,27 @@ def self.build_batch(elements_hash, parent)
# building of validations on this element via #build_validations
def attributes=(attribute_hash)
validations = attribute_hash.delete(:custom_form_element_validations)
if validations
logger.debug("Validation options passed: #{validations}")
# if the _validations value is set - then we are updating the validations, so if none are submitted
# that means that we want none. Else submitting none means no change
if attribute_hash[:_validations] == '1'
logger.debug("Validation options passed: #{pp(validations)}")
self.build_validations(validations)
end
self.build_validations(validations)

new_name = attribute_hash.delete(:name)
self.name = new_name if new_name

logger.debug("Building #{self.class} attribute for form element")
self.custom_form_element_attributes = CustomFormElementAttribute.build_input_attributes(attribute_hash, self.class.config)
CustomFormElementAttribute.build_input_attributes(attribute_hash, self.class.config).each do |new_attribute|
if existing = custom_form_element_attributes.detect {|att| att.key == new_attribute.key}
existing.key = new_attribute.key
existing.value = new_attribute.value
existing.save
else
new_attribute.custom_form_element = self
new_attribute.save
end
end
end

# load_element
Expand Down
2 changes: 1 addition & 1 deletion app/views/cms/custom_form_elements/forms/_radio_button_custom_form_element.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

<%= f.cms_options_collection :options, :element_type => 'radio_button' %>

<%#= f.cms_validation_options :validations %>
<%= f.cms_validation_options :validations %>
5 changes: 1 addition & 4 deletions app/views/cms/custom_form_elements/forms/_string_custom_form_element.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
<%= f.cms_check_box :disabled %>
<%= f.cms_check_box :exclude_from_results, :label => 'Discard data' %>
<%= f.cms_check_box :password, :label => 'Password field' %>
<%#= render(:partial => 'cms/form_builder/cms_check_box', :locals => {:f => f, :method => :disabled}) %>
<%#= render(:partial => 'cms/form_builder/cms_check_box', :locals => {:f => f, :method => :exclude_from_results, :cms_options => {:label => 'Discard data'}}) %>
<%#= render(:partial => 'cms/form_builder/cms_check_box', :locals => {:f => f, :method => :password, :cms_options => {:label => 'Password field'}}) %>

<%= f.cms_text_field :classes, :instructions => 'Separate values with commas or spaces.' %>

<%#= f.cms_validation_options :validations %>
<%= f.cms_validation_options :validations %>
2 changes: 1 addition & 1 deletion app/views/cms/custom_form_elements/forms/_text_custom_form_element.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

<%= f.cms_text_field :classes, :instructions => 'Separate values with commas or spaces.' %>

<%#= f.cms_validation_options :validations %>
<%= f.cms_validation_options :validations %>
3 changes: 2 additions & 1 deletion app/views/cms/form_builder/_cms_validation_options.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<% existing_validations = @form_element.custom_form_element_validations -%>
<% if validations.length > 0 -%>
<div class="fields text_fields">
<input type="hidden" name="<%= block_form %>[_validations]" value="1" />
<% if cms_options[:label] %>
<%= f.label method, cms_options[:label] %>
<% else %>
Expand All @@ -12,4 +13,4 @@
<span class="label"><%=h value[:display_name] %></span>
<% end -%>
</div>
<% end %>
<% end %>
6 changes: 3 additions & 3 deletions bcms_form_builder.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

Gem::Specification.new do |s|
s.name = %q{bcms_form_builder}
s.version = "0.3"
s.version = "0.4"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["3months - Kim Chirnside"]
s.date = %q{2010-04-12}
s.date = %q{2010-09-09}
s.description = %q{Custom form builder for public BCMS pages}
s.email = %q{kimmy.chirnside@gmail.com}
s.extra_rdoc_files = [
Expand Down Expand Up @@ -90,7 +90,7 @@ Gem::Specification.new do |s|
"rails/init.rb"
]
s.has_rdoc = true
s.homepage = %q{http://github.com/3months/bcms_form_builder}
s.homepage = %q{http://github.com/k1mmeh/bcms_form_builder}
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.5}
Expand Down
110 changes: 110 additions & 0 deletions config/boot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
# Don't change this file!
# Configure your app in config/environment.rb and config/environments/*.rb

RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)

module Rails
class << self
def boot!
unless booted?
preinitialize
pick_boot.run
end
end

def booted?
defined? Rails::Initializer
end

def pick_boot
(vendor_rails? ? VendorBoot : GemBoot).new
end

def vendor_rails?
File.exist?("#{RAILS_ROOT}/vendor/rails")
end

def preinitialize
load(preinitializer_path) if File.exist?(preinitializer_path)
end

def preinitializer_path
"#{RAILS_ROOT}/config/preinitializer.rb"
end
end

class Boot
def run
load_initializer
Rails::Initializer.run(:set_load_path)
end
end

class VendorBoot < Boot
def load_initializer
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
Rails::Initializer.run(:install_gem_spec_stubs)
Rails::GemDependency.add_frozen_gem_path
end
end

class GemBoot < Boot
def load_initializer
self.class.load_rubygems
load_rails_gem
require 'initializer'
end

def load_rails_gem
if version = self.class.gem_version
gem 'rails', version
else
gem 'rails'
end
rescue Gem::LoadError => load_error
$stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
exit 1
end

class << self
def rubygems_version
Gem::RubyGemsVersion rescue nil
end

def gem_version
if defined? RAILS_GEM_VERSION
RAILS_GEM_VERSION
elsif ENV.include?('RAILS_GEM_VERSION')
ENV['RAILS_GEM_VERSION']
else
parse_gem_version(read_environment_rb)
end
end

def load_rubygems
min_version = '1.3.2'
require 'rubygems'
unless rubygems_version >= min_version
$stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
exit 1
end

rescue LoadError
$stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
exit 1
end

def parse_gem_version(text)
$1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
end

private
def read_environment_rb
File.read("#{RAILS_ROOT}/config/environment.rb")
end
end
end
end

# All that for this:
Rails.boot!
22 changes: 22 additions & 0 deletions config/database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: sqlite3
database: db/test.sqlite3
pool: 5
timeout: 5000

production:
adapter: sqlite3
database: db/production.sqlite3
pool: 5
timeout: 5000
42 changes: 42 additions & 0 deletions config/environment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Be sure to restart your server when you modify this file

# Specifies gem version of Rails to use when vendor/rails is not present
RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION

# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')

Rails::Initializer.run do |config|
config.gem 'browsercms', :version => '3.1.0'
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.

# Add additional load paths for your own custom dirs
# config.load_paths += %W( #{RAILS_ROOT}/extras )

# Specify gems that this application depends on and have them installed with rake gems:install
# config.gem "bj"
# config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
# config.gem "sqlite3-ruby", :lib => "sqlite3"
# config.gem "aws-s3", :lib => "aws/s3"

# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]

# Skip frameworks you're not going to use. To use Rails without a database,
# you must remove the Active Record framework.
# config.frameworks -= [ :active_record, :active_resource, :action_mailer ]

# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector, :forum_observer

# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names.
config.time_zone = 'UTC'

# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
# config.i18n.default_locale = :de
end
18 changes: 18 additions & 0 deletions config/environments/development.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Settings specified here will take precedence over those in config/environment.rb

# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
# since you don't have to restart the webserver when you make code changes.
config.cache_classes = false

# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true

# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false

# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
SITE_DOMAIN="localhost:3000"
31 changes: 31 additions & 0 deletions config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Settings specified here will take precedence over those in config/environment.rb

# The production environment is meant for finished, "live" apps.
# Code is not reloaded between requests
config.cache_classes = true

# Full error reports are disabled and caching is turned on
config.action_controller.consider_all_requests_local = false
config.action_controller.perform_caching = true
config.action_view.cache_template_loading = true

# See everything in the log (default is :info)
# config.log_level = :debug

# Use a different logger for distributed setups
# config.logger = SyslogLogger.new

# Use a different cache store in production
# config.cache_store = :mem_cache_store

# Enable serving of images, stylesheets, and javascripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"

# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false

# Enable threaded mode
# config.threadsafe!
SITE_DOMAIN="localhost:3000"
config.action_view.cache_template_loading = false
config.action_controller.page_cache_directory = RAILS_ROOT + "/public/cache/"
29 changes: 29 additions & 0 deletions config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Settings specified here will take precedence over those in config/environment.rb

# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!
config.cache_classes = true

# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true

# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = false
config.action_view.cache_template_loading = true

# Disable request forgery protection in test environment
config.action_controller.allow_forgery_protection = false

# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test

# Use SQL instead of Active Record's schema dumper when creating the test database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
SITE_DOMAIN="localhost:3000"
7 changes: 7 additions & 0 deletions config/initializers/backtrace_silencers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Be sure to restart your server when you modify this file.

# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }

# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
# Rails.backtrace_cleaner.remove_silencers!
Loading