comatose-rubyisbeautiful 3.0.2 → 3.0.3

data/app/controllers/comatose/application_controller.rb

@@ -13,10 +13,10 @@ module Comatose
       locale_language, locale_country = params[:locale].to_s.split('-')
       locale_language ||= 'en'
       locale_country  ||= 'US'
-      locale_language.downcase.to_sym
+      locale_language.downcase!
       locale_country.upcase!
-      I18n.locale = locale_language
-      logger.debug "Locale set to #{locale_language} from param #{params[:locale]}"
+      I18n.locale = "#{locale_language}-#{locale_country}"
+      logger.debug "Locale set to #{I18n.locale} from param #{params[:locale]}"
     end
 
 

data/app/views/comatose/admin/_form.html.erb

@@ -1,5 +1,13 @@
 <%- # TODO error_messages_for :page %>
 
+  3 <% if @page.new_record? %>
+  4   @_form_url = "/#{I18n.locale}/comatose/pages"
+  5 <% else %>
+  6   @_form_url = comatose_page_path(@page, :locale => I18n.locale)
+  7 <% end %>
+  8
+  9 <% form_for @page, :url => @_form_url, :as => :page do |f| %>
+
 <% form_for @page, :url => comatose_page_path(@page), :as  =>  :page do |f| %>
 <table class="page-form" cellpadding="0" cellspacing="0">
 

data/comatose-rubyisbeautiful.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comatose-rubyisbeautiful}
-  s.version = "3.0.2"
+  s.version = "3.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.4") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Bryan Taylor, Matt McCray, Michael Kovacs}]
   s.cert_chain = [%q{/Users/bryan/.gem_credentials/gem-public_cert.pem}]
-  s.date = %q{2011-08-19}
+  s.date = %q{2011-09-01}
   s.description = %q{Web Content Management in Rails 3.}
   s.email = %q{ artofobjects at gmail dot com }
   s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README}, %q{README.markdown}, %q{lib/comatose.rb}, %q{lib/comatose/configuration.rb}, %q{lib/comatose/drop.rb}, %q{lib/comatose/engine.rb}, %q{lib/comatose/filters/inline_filter.rb}, %q{lib/comatose/filters/timeago_filter.rb}, %q{lib/comatose/filters/translation_filter.rb}, %q{lib/comatose/locale_constraint.rb}, %q{lib/comatose/logger.rb}, %q{lib/comatose/page_wrapper.rb}, %q{lib/comatose/processing_context.rb}, %q{lib/comatose/routes.rb}, %q{lib/comatose/tasks/admin.rb}, %q{lib/comatose/tasks/data.rb}, %q{lib/comatose/tasks/setup.rb}, %q{lib/comatose/text_filters.rb}, %q{lib/comatose/version.rb}, %q{lib/generators/comatose/USAGE}, %q{lib/generators/comatose/comatose_generator.rb}, %q{lib/generators/comatose/templates/comatose.rb}, %q{lib/generators/comatose/templates/migration.erb}, %q{lib/generators/comatose/templates/seeds.erb}, %q{lib/support/class_options.rb}, %q{lib/support/inline_rendering.rb}, %q{lib/support/route_mapper.rb}, %q{lib/tasks/comatose.rake}, %q{lib/text_filters/markdown.rb}, %q{lib/text_filters/markdown_smartypants.rb}, %q{lib/text_filters/none.rb}, %q{lib/text_filters/rdoc.rb}, %q{lib/text_filters/simple.rb}, %q{lib/text_filters/textile.rb}]
@@ -31,7 +31,7 @@ From here you'll want to run:
   s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Comatose-rubyisbeautiful}, %q{--main}, %q{README}]
   s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{comatose-rubyisbeautiful}
-  s.rubygems_version = %q{1.8.5}
+  s.rubygems_version = %q{1.8.6}
   s.signing_key = %q{/Users/bryan/.gem_credentials/gem-private_key.pem}
   s.summary = %q{Micro CMS - resurrected for Rails 3}
   s.test_files = [%q{test/functional/comatose_admin_controller_test.rb}, %q{test/functional/comatose_controller_test.rb}, %q{test/integration/comatose_routing_test.rb}, %q{test/performance/browsing_test.rb}, %q{test/test_helper.rb}, %q{test/unit/class_options_test.rb}, %q{test/unit/comatose_page_test.rb}, %q{test/unit/processing_context_test.rb}, %q{test/unit/text_filters_test.rb}]

data/lib/comatose/version.rb

@@ -1,5 +1,5 @@
 module Comatose
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
   VERSION_STRING = "#{VERSION}  (beta)"
 
   def self.version

metadata

@@ -1,111 +1,128 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comatose-rubyisbeautiful
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.3
   prerelease: 
-  version: 3.0.2
 platform: ruby
-authors: 
+authors:
 - Bryan Taylor, Matt McCray, Michael Kovacs
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
+cert_chain:
+- ! '-----BEGIN CERTIFICATE-----
+
   MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MRIwEAYDVQQDDAlidGF5
+
   bG9yMzkxEzARBgoJkiaJk/IsZAEZFgNjc2MxEzARBgoJkiaJk/IsZAEZFgNjb20w
+
   HhcNMTEwMjE2MTI1MzQzWhcNMTIwMjE2MTI1MzQzWjA+MRIwEAYDVQQDDAlidGF5
+
   bG9yMzkxEzARBgoJkiaJk/IsZAEZFgNjc2MxEzARBgoJkiaJk/IsZAEZFgNjb20w
+
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDid0W3CiAzCKP+H70D/FFq
+
   RnwfMdTqsIGK6pKZVHIqqcZxntJw1r3zHwvDwwjh67/iysB0mum6Palizm0xtBqZ
+
   wTHO+GXNsTz/+zfihkJMSVhSY8Y58SNuV5m1CmzdVSyVrTyOlkc6+IpHTlpaCpf4
+
   r3mGtZbsuEpLvU/A3iC778k8Bm9hoKhI/3CoMWQjSTHYfrMDWetuGhu8NbdGK3BN
+
   E1dgEBdQLAjf8yeY3pmmUE88cr9EvrFVdx7mnI5lzOwZMuFSgEBw5AsB6+vvlTW3
+
   i75Q4pJwjeM41i2B1u7T4kskmOogfZl3YAulPXrEaTCKHDEQb/Jp4WtTy2v8m+79
+
   AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBS36r/0
+
   ouuKO1EVrbluXYEBlANxODANBgkqhkiG9w0BAQUFAAOCAQEAgNN7J2bWCZDSQQm8
+
   7PfoCViUKWIcWEZB+C05R0JDpFue0lL5s6aAt61rPXL6k5UiLtj8QkGSe0vasC9G
+
   f8eBWU5l3g/HDvsFZ5cIBWk0saF7xlIZC3E98LF8Vcfl9WFibHCuwApxzzcAQvdU
+
   ocHFXaTM2tz8iRO5pW+Do3GC7Mjbo2mvAGN0H5f4tZkZ+Ttm25bAPpnHfXaWPxKq
+
   RL48Oo1H6iw8nmjm8YrQC6UdtW8ogetCkJwwFmK/U5YQQsE0NnUSG5Ii5R32ZdaY
+
   eMvMROg/ZYJZzMayO+XXWYgXhy2UDEP/hNhNzM3E+XJUilcA4dZ/fdX57vL0Qpvn
+
   NK5lPw==
+
   -----END CERTIFICATE-----
 
-date: 2011-08-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+'
+date: 2011-09-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156116860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156116860
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2156116240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: acts_as_versioned
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156116240
+- !ruby/object:Gem::Dependency
+  name: acts_as_versioned
+  requirement: &2156115640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: acts_as_list-rails3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156115640
+- !ruby/object:Gem::Dependency
+  name: acts_as_list-rails3
+  requirement: &2156114940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: acts_as_tree_rails3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156114940
+- !ruby/object:Gem::Dependency
+  name: acts_as_tree_rails3
+  requirement: &2156114320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156114320
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &2156090380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *2156090380
 description: Web Content Management in Rails 3.
-email: " artofobjects at gmail dot com "
+email: ! ' artofobjects at gmail dot com '
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README
@@ -142,7 +159,7 @@ extra_rdoc_files:
 - lib/text_filters/rdoc.rb
 - lib/text_filters/simple.rb
 - lib/text_filters/textile.rb
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -327,40 +344,38 @@ files:
 - test/unit/text_filters_test.rb
 homepage: http://comatose-rubyisbeautiful.github.com/comatose-rubyisbeautiful/
 licenses: []
-
-post_install_message: "\n\
-  ======================\n Welcome to Comatose!\n\
-  ======================\n\n\
-  From here you'll want to run:\n\n  $ rails generate comatose\n  $ rake db:migrate\n\n  Add the default comatose routes to the top of your routes.rb file:\n\n  routes_for_comatose\n  admin_routes_for_comatose\n"
-rdoc_options: 
+post_install_message: ! "\n======================\n Welcome to Comatose!\n======================\n\nFrom
+  here you'll want to run:\n\n  $ rails generate comatose\n  $ rake db:migrate\n\n
+  \ Add the default comatose routes to the top of your routes.rb file:\n\n  routes_for_comatose\n
+  \ admin_routes_for_comatose\n"
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Comatose-rubyisbeautiful
 - --main
 - README
-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 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.4
 requirements: []
-
 rubyforge_project: comatose-rubyisbeautiful
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Micro CMS - resurrected for Rails 3
-test_files: 
+test_files:
 - test/functional/comatose_admin_controller_test.rb
 - test/functional/comatose_controller_test.rb
 - test/integration/comatose_routing_test.rb