Permalink
Browse files

Merge branch 'rails-3-1' of github.com:resolve/refinerycms-portfolio …

…into rails-3-1
  • Loading branch information...
2 parents a585646 + c3038cc commit ffa1a27012058b85b82df72de11bb721d6d62ef6 @robyurkowski robyurkowski committed Mar 14, 2012
View
20 config/database.yml.mysql
@@ -1,20 +0,0 @@
-development: &development
- adapter: mysql2
- host: localhost
- username: root
- password:
- database: your_local_database
-
-test: &test
- adapter: mysql2
- host: localhost
- username: root
- password:
- database: your_test_database
-
-production: &production
- adapter: mysql2
- host: localhost
- database: your_production_database
- username: your_production_database_login
- password: your_production_database_password
View
55 config/database.yml.postgresql
@@ -1,55 +0,0 @@
-# PostgreSQL. Versions 7.4 and 8.x are supported.
-#
-# Install the pg driver:
-# gem install pg
-# On Mac OS X with macports:
-# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-# gem install pg
-# Choose the win32 build.
-# Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-development:
- adapter: postgresql
- encoding: unicode
- database: refinery_database_development
- pool: 5
- username: postgres
- password: postgres
-
- # Connect on a TCP socket. Omitted by default since the client uses a
- # domain socket that doesn't need configuration. Windows does not have
- # domain sockets, so uncomment these lines.
- #host: localhost
- #port: 5432
-
- # Schema search path. The server defaults to $user,public
- #schema_search_path: myapp,sharedapp,public
-
- # Minimum log levels, in increasing order:
- # debug5, debug4, debug3, debug2, debug1,
- # log, notice, warning, error, fatal, and panic
- # The server defaults to notice.
- #min_messages: warning
-
-# 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: postgresql
- encoding: unicode
- database: refinery_database_test
- pool: 5
- username: postgres
- password: postgres
-
-production:
- adapter: postgresql
- encoding: unicode
- database: refinery_database_production
- pool: 5
- username: postgres
- password: postgres
View
18 config/database.yml.sqlite3
@@ -1,18 +0,0 @@
-# SQLite version 3.x
-development:
- adapter: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
- database: db/development.sqlite3
- 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: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
- database: db/test.sqlite3
- timeout: 5000
-
-production:
- adapter: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
- database: db/production.sqlite3
- timeout: 5000
View
227 config/initializers/devise.rb
@@ -1,227 +0,0 @@
-require 'devise'
-
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
- # ==> Mailer Configuration
- # Configure the e-mail address which will be shown in Devise::Mailer,
- # note that it will be overwritten if you use your own mailer class with default "from" parameter.
- # config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
-
- # Configure the class responsible to send e-mails.
- # config.mailer = "Devise::Mailer"
-
- # Automatically apply schema changes in tableless databases
- config.apply_schema = false
-
- # ==> ORM configuration
- # Load and configure the ORM. Supports :active_record (default) and
- # :mongoid (bson_ext recommended) by default. Other ORMs may be
- # available as additional gems.
- require 'devise/orm/active_record'
-
- # ==> Configuration for any authentication mechanism
- # Configure which keys are used when authenticating a user. The default is
- # just :email. You can configure it to use [:username, :subdomain], so for
- # authenticating a user, both parameters are required. Remember that those
- # parameters are used only when authenticating and not when retrieving from
- # session. If you need permissions, you should implement that in a before filter.
- # You can also supply a hash where the value is a boolean determining whether
- # or not authentication should be aborted when the value is not present.
- config.authentication_keys = [ :login ]
-
- # Configure parameters from the request object used for authentication. Each entry
- # given should be a request method and it will automatically be passed to the
- # find_for_authentication method and considered in your model lookup. For instance,
- # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
- # The same considerations mentioned for authentication_keys also apply to request_keys.
- # config.request_keys = []
-
- # Configure which authentication keys should be case-insensitive.
- # These keys will be downcased upon creating or modifying a user and when used
- # to authenticate or find a user. Default is :email.
- config.case_insensitive_keys = []
-
- # Configure which authentication keys should have whitespace stripped.
- # These keys will have whitespace before and after removed upon creating or
- # modifying a user and when used to authenticate or find a user. Default is :email.
- # config.strip_whitespace_keys = [ :email ]
-
- # Tell if authentication through request.params is enabled. True by default.
- # It can be set to an array that will enable params authentication only for the
- # given stratragies, for example, `config.params_authenticatable = [:database]` will
- # enable it only for database (email + password) authentication.
- # config.params_authenticatable = true
-
- # Tell if authentication through HTTP Basic Auth is enabled. False by default.
- # It can be set to an array that will enable http authentication only for the
- # given stratragies, for example, `config.http_authenticatable = [:token]` will
- # enable it only for token authentication.
- # config.http_authenticatable = false
-
- # If http headers should be returned for AJAX requests. True by default.
- # config.http_authenticatable_on_xhr = true
-
- # The realm used in Http Basic Authentication. "Application" by default.
- # config.http_authentication_realm = "Application"
-
- # It will change confirmation, password recovery and other workflows
- # to behave the same regardless if the e-mail provided was right or wrong.
- # Does not affect registerable.
- # config.paranoid = true
-
- # By default Devise will store the user in session. You can skip storage for
- # :http_auth and :token_auth by adding those symbols to the array below.
- # Notice that if you are skipping storage for all authentication paths, you
- # may want to disable generating routes to Devise's sessions controller by
- # passing :skip => :sessions to `devise_for` in your config/routes.rb
- config.skip_session_storage = [:http_auth]
-
- # ==> Configuration for :database_authenticatable
- # For bcrypt, this is the cost for hashing the password and defaults to 10. If
- # using other encryptors, it sets how many times you want the password re-encrypted.
- #
- # Limiting the stretches to just one in testing will increase the performance of
- # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
- # a value less than 10 in other environments.
- config.stretches = Rails.env.test? ? 1 : 10
-
- # Setup a pepper to generate the encrypted password.
- # config.pepper = <%= SecureRandom.hex(64).inspect %>
-
- # ==> Configuration for :confirmable
- # A period that the user is allowed to access the website even without
- # confirming his account. For instance, if set to 2.days, the user will be
- # able to access the website for two days without confirming his account,
- # access will be blocked just in the third day. Default is 0.days, meaning
- # the user cannot access the website without confirming his account.
- # config.allow_unconfirmed_access_for = 2.days
-
- # If true, requires any email changes to be confirmed (exctly the same way as
- # initial account confirmation) to be applied. Requires additional unconfirmed_email
- # db field (see migrations). Until confirmed new email is stored in
- # unconfirmed email column, and copied to email column on successful confirmation.
- # config.reconfirmable = true
-
- # Defines which key will be used when confirming an account
- # config.confirmation_keys = [ :email ]
-
- # ==> Configuration for :rememberable
- # The time the user will be remembered without asking for credentials again.
- # config.remember_for = 2.weeks
-
- # If true, extends the user's remember period when remembered via cookie.
- # config.extend_remember_period = false
-
- # If true, uses the password salt as remember token. This should be turned
- # to false if you are not using database authenticatable.
- config.use_salt_as_remember_token = true
-
- # Options to be passed to the created cookie. For instance, you can set
- # :secure => true in order to force SSL only cookies.
- # config.cookie_options = {}
-
- # ==> Configuration for :validatable
- # Range for password length. Default is 6..128.
- config.password_length = 4..20
-
- # Email regex used to validate email formats. It simply asserts that
- # an one (and only one) @ exists in the given string. This is mainly
- # to give user feedback and not to assert the e-mail validity.
- # config.email_regexp = /\A[^@]+@[^@]+\z/
-
- # ==> Configuration for :timeoutable
- # The time you want to timeout the user session without activity. After this
- # time the user will be asked for credentials again. Default is 30 minutes.
- # config.timeout_in = 30.minutes
-
- # ==> Configuration for :lockable
- # Defines which strategy will be used to lock an account.
- # :failed_attempts = Locks an account after a number of failed attempts to sign in.
- # :none = No lock strategy. You should handle locking by yourself.
- # config.lock_strategy = :failed_attempts
-
- # Defines which key will be used when locking and unlocking an account
- # config.unlock_keys = [ :email ]
-
- # Defines which strategy will be used to unlock an account.
- # :email = Sends an unlock link to the user email
- # :time = Re-enables login after a certain amount of time (see :unlock_in below)
- # :both = Enables both strategies
- # :none = No unlock strategy. You should handle unlocking by yourself.
- # config.unlock_strategy = :both
-
- # Number of authentication tries before locking an account if lock_strategy
- # is failed attempts.
- # config.maximum_attempts = 20
-
- # Time interval to unlock the account if :time is enabled as unlock_strategy.
- # config.unlock_in = 1.hour
-
- # ==> Configuration for :recoverable
- #
- # Defines which key will be used when recovering the password for an account
- # config.reset_password_keys = [ :email ]
-
- # Time interval you can reset your password with a reset password key.
- # Don't put a too small interval or your users won't have the time to
- # change their passwords.
- config.reset_password_within = 6.hours
-
- # ==> Configuration for :encryptable
- # Allow you to use another encryption algorithm besides bcrypt (default). You can use
- # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
- # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
- # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
- # REST_AUTH_SITE_KEY to pepper)
- # config.encryptor = :sha512
-
- # ==> Configuration for :token_authenticatable
- # Defines name of the authentication token params key
- # config.token_authentication_key = :auth_token
-
- # ==> Scopes configuration
- # Turn scoped views on. Before rendering "sessions/new", it will first check for
- # "users/sessions/new". It's turned off by default because it's slower if you
- # are using only default views.
- # config.scoped_views = false
-
- # Configure the default scope given to Warden. By default it's the first
- # devise role declared in your routes (usually :user).
- # config.default_scope = :user
-
- # Configure sign_out behavior.
- # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
- # The default is true, which means any logout action will sign out all active scopes.
- # config.sign_out_all_scopes = true
-
- # ==> Navigation configuration
- # Lists the formats that should be treated as navigational. Formats like
- # :html, should redirect to the sign in page when the user does not have
- # access, but formats like :xml or :json, should return 401.
- #
- # If you have any extra navigational formats, like :iphone or :mobile, you
- # should add them to the navigational formats lists.
- #
- # The "*/*" below is required to match Internet Explorer requests.
- # config.navigational_formats = ["*/*", :html]
-
- # The default HTTP method used to sign out a resource. Default is :delete.
- config.sign_out_via = :delete
-
- # ==> OmniAuth
- # Add a new OmniAuth provider. Check the wiki for more information on setting
- # up on your models and hooks.
- # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
- # ==> Warden configuration
- # If you want to use other strategies, that are not supported by Devise, or
- # change the failure app, you can configure them inside the config.warden block.
- #
- # config.warden do |manager|
- # manager.intercept_401 = false
- # manager.default_strategies(:scope => :user).unshift :some_external_strategy
- # end
-
- config.router_name = :refinery
-end
View
45 config/initializers/refinery/core.rb
@@ -1,45 +0,0 @@
-Refinery::Core.configure do |config|
- # When true will rescue all not found errors and display a friendly error page
- config.rescue_not_found = Rails.env.production?
-
- # When true will use Amazon's Simple Storage Service instead of
- # the default file system for storing resources and images
- config.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
-
- # Whenever Refinery caches anything and can set a cache key, it will add
- # a prefix to the cache key containing the string you set here.
- # config.base_cache_key = :refinery
-
- # Site name
- # config.site_name = "Company Name"
-
- # This activates Google Analytics tracking within your website. If this
- # config is left blank or set to UA-xxxxxx-x then no remote calls to
- # Google Analytics are made.
- # config.google_analytics_page_code = "UA-xxxxxx-x"
-
- # Enable/disable authenticity token on frontend
- # config.authenticity_token_on_frontend = true
-
- # Hide/show child pages in menu
- # config.menu_hide_children = false
-
- # Should set this if concerned about DOS attacks. See
- # http://markevans.github.com/dragonfly/file.Configuration.html#Configuration
- # config.dragonfly_secret = "6f5e72ccc80d040d71c6433ce54f950c6995bbe33b5436df"
-
- # Show/hide IE6 upgrade message in the backend
- # config.ie6_upgrade_message_enabled = true
-
- # Show/hide browser update message in the backend
- # config.show_internet_explorer_upgrade_message = false
-
- # Add extra tags to the wymeditor whitelist e.g. = {'tag' => {'attributes': '1': 'href'}} or just {'tag' => {}}
- # config.wymeditor_whitelist_tags = {}
-
- # Register extra javascript for backend
- # config.register_javascript "prototype-rails"
-
- # Register extra stylesheet for backend (optional options)
- # config.register_stylesheet "custom", :media => 'screen'
-end
View
41 config/initializers/refinery/images.rb
@@ -1,41 +0,0 @@
-Refinery::Images.configure do |config|
- # Configures the maximum allowed upload size (in bytes) for an image
- # config.max_image_size = 5242880
-
- # Configure how many images per page should be displayed when a dialog is presented that contains images
- # config.pages_per_dialog = 18
-
- # Configure how many images per page should be displayed when a dialog is presented that
- # contains images and image resize options
- # config.pages_per_dialog_that_have_size_options = 12
-
- # Configure how many images per page should be displayed in the list of images in the admin area
- # config.pages_per_admin_index = 20
-
- # Configure image sizes
- # config.user_image_sizes = {:small=>"110x110>", :medium=>"225x255>", :large=>"450x450>"}
-
- # Configure image view options
- # config.image_views = [:grid, :list]
-
- # Configure default image view
- # config.preferred_image_view = :grid
-
- # Configure S3 (you can also use ENV for this)
- # The s3_backend setting by default defers to the core setting for this but can be set just for images.
- # config.s3_backend = Refinery::Core.s3_backend
- # config.s3_bucket_name = ENV['S3_BUCKET']
- # config.s3_access_key_id = ENV['S3_KEY']
- # config.s3_secret_access_key = ENV['S3_SECRET']
- # config.s3_region = ENV['S3_REGION]
-
- # Configure Dragonfly
- # This is where in the middleware stack to insert the Dragonfly middleware
- # config.dragonfly_insert_before = "ActionDispatch::Callbacks"
- # config.dragonfly_secret = "6f5e72ccc80d040d71c6433ce54f950c6995bbe33b5436df"
- # If you decide to trust file extensions replace :ext below with :format
- # config.dragonfly_url_format = "/system/images/:job/:basename.:ext"
- # config.datastore_root_path = "/Users/rob/Sites/p/portfolio/spec/dummy/public/system/refinery/images"
- # config.trust_file_extensions = false
-
-end
View
44 config/initializers/refinery/pages.rb
@@ -1,44 +0,0 @@
-Refinery::Pages.configure do |config|
- # Configure specific page templates
- # config.types.register :home do |home|
- # home.parts = %w[intro body]
- # end
-
- # Configure global page default parts
- # config.default_parts = ["Body", "Side Body"]
-
- # Configure how many pages per page should be displayed when a dialog is presented that contains a links to pages
- # config.pages_per_dialog = 14
-
- # Configure how many pages per page should be displayed in the list of pages in the admin area
- # config.pages_per_admin_index = 20
-
- # Configure whether to strip diacritics from Western characters
- # config.approximate_ascii = false
-
- # Configure whether to strip non-ASCII characters from the friendly_id string
- # config.strip_non_ascii = false
-
- # Set this to true if you want to override slug which automatically gets generated
- # when you create a page
- # config.use_custom_slugs = false
-
- # Set this to true if you want backend pages to be cached
- # config.cache_pages_backend = false
-
- # Set this to true to activate full-page-cache
- # config.cache_pages_full = false
-
- # Set this to true to fully expand the page hierarchy in the admin
- # config.auto_expand_admin_tree = true
-
- # config.layout_template_whitelist = ["application"]
-
- # config.view_template_whitelist = ["home", "show"]
-
- # config.use_layout_templates = false
-
- # config.use_view_templates = false
-
- # config.absolute_page_links = false
-end
View
26 config/initializers/refinery/resources.rb
@@ -1,26 +0,0 @@
-Refinery::Resources.configure do |config|
- # Configures the maximum allowed upload size (in bytes) for a file upload
- # config.max_file_size = 52428800
-
- # Configure how many resources per page should be displayed when a dialog is presented that contains resources
- # config.pages_per_dialog = 12
-
- # Configure how many resources per page should be displayed in the list of resources in the admin area
- # config.pages_per_admin_index = 20
-
- # Configure S3 (you can also use ENV for this)
- # The s3_backend setting by default defers to the core setting for this but can be set just for resources.
- # config.s3_backend = Refinery::Core.s3_backend
- # config.s3_bucket_name = ENV['S3_BUCKET']
- # config.s3_access_key_id = ENV['S3_KEY']
- # config.s3_secret_access_key = ENV['S3_SECRET']
- # config.s3_region = ENV['S3_REGION]
-
- # Configure Dragonfly
- # This is where in the middleware stack to insert the Dragonfly middleware
- # config.dragonfly_insert_before = "ActionDispatch::Callbacks"
- # config.dragonfly_secret = "6f5e72ccc80d040d71c6433ce54f950c6995bbe33b5436df"
- # config.dragonfly_url_format = "/system/resources/:job/:basename.:format"
- # config.datastore_root_path = "/Users/rob/Sites/p/portfolio/spec/dummy/public/system/refinery/resources"
-
-end
View
4 spec/spec_helper.rb
@@ -4,7 +4,6 @@ def self.just_raise(*args)
end
end
-
def setup_environment
# Configure Rails Environment
ENV["RAILS_ENV"] ||= 'test'
@@ -24,9 +23,6 @@ def setup_environment
config.run_all_when_everything_filtered = true
end
- # set javascript driver for capybara
- Capybara.javascript_driver = :selenium
-
::I18n.exception_handler = :just_raise
end

0 comments on commit ffa1a27

Please sign in to comment.