alchemy_cms 2.2.rc2 → 2.2.rc3

data/alchemy_cms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<authlogic>)
   s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
   s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
-  s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.1.0"])
+  s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.2.0"])
   s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.0"])
   s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
   s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])

data/app/helpers/alchemy/admin/pages_helper.rb

@@ -23,7 +23,7 @@ module Alchemy
             init.mode = 'specific_textareas';
             init.editor_selector = 'tinymce';
             init.plugins = '#{Alchemy::Tinymce.plugins.join(',')}';
-            init.language = '#{::I18n.locale}';
+            init.language = '#{::I18n.locale.to_s.split('-')[0].downcase }';
             init.init_instance_callback = function(inst) {
               jQuery('#' + inst.editorId).prev('.essence_richtext_loader').hide();
             }

data/bin/alchemy

@@ -47,7 +47,7 @@ class AlchemyInstaller < Thor
       
       if with_standard_set
         sentinel = /::Application\.configure do\s*$/
-        inject_into_file "#{@application}/environments/production.rb", "\n  config.assets.precompile += %w( alchemy/standard_set.css )\n", { :after => sentinel, :verbose => true }
+        inject_into_file "#{@application}/config/environments/production.rb", "\n  config.assets.precompile += %w( alchemy/standard_set.css )\n", { :after => sentinel, :verbose => true }
       end
       
       %x[

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc2"
+  VERSION = "2.2.rc3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc2
+  version: 2.2.rc3
   prerelease: 4
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70253002665740 !ruby/object:Gem::Requirement
+  requirement: &70340562760500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70253002665740
+  version_requirements: *70340562760500
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70253002665240 !ruby/object:Gem::Requirement
+  requirement: &70340562759060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253002665240
+  version_requirements: *70340562759060
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70253002663400 !ruby/object:Gem::Requirement
+  requirement: &70340562757580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253002663400
+  version_requirements: *70340562757580
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70253002662260 !ruby/object:Gem::Requirement
+  requirement: &70340562772820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,21 +57,21 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70253002662260
+  version_requirements: *70340562772820
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70253002830180 !ruby/object:Gem::Requirement
+  requirement: &70340562771240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70253002830180
+  version_requirements: *70340562771240
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70253002829200 !ruby/object:Gem::Requirement
+  requirement: &70340562769020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70253002829200
+  version_requirements: *70340562769020
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70253002828020 !ruby/object:Gem::Requirement
+  requirement: &70340562767580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70253002828020
+  version_requirements: *70340562767580
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70253002827120 !ruby/object:Gem::Requirement
+  requirement: &70340562766000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70253002827120
+  version_requirements: *70340562766000
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70253002826360 !ruby/object:Gem::Requirement
+  requirement: &70340562780540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70253002826360
+  version_requirements: *70340562780540
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70253002825200 !ruby/object:Gem::Requirement
+  requirement: &70340562778260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70253002825200
+  version_requirements: *70340562778260
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70253002824020 !ruby/object:Gem::Requirement
+  requirement: &70340562776060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70253002824020
+  version_requirements: *70340562776060
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70253002822820 !ruby/object:Gem::Requirement
+  requirement: &70340562774640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70253002822820
+  version_requirements: *70340562774640
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70252998873340 !ruby/object:Gem::Requirement
+  requirement: &70340562789440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70252998873340
+  version_requirements: *70340562789440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70252998872260 !ruby/object:Gem::Requirement
+  requirement: &70340562787180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,10 +167,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70252998872260
+  version_requirements: *70340562787180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70252998871700 !ruby/object:Gem::Requirement
+  requirement: &70340562786520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252998871700
+  version_requirements: *70340562786520
 - !ruby/object:Gem::Dependency
   name: jasminerice
-  requirement: &70252998870900 !ruby/object:Gem::Requirement
+  requirement: &70340562785620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,7 +189,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252998870900
+  version_requirements: *70340562785620
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -855,7 +855,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2832410516678511225
+      hash: -2870462332409198212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: