comfortable_mexican_sofa 1.4.5 → 1.4.6

data/VERSION

@@ -1 +1 @@
-1.4.5
+1.4.6

data/app/models/cms/block.rb

@@ -1,5 +1,9 @@
 class Cms::Block < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+  
   set_table_name :cms_blocks
   
   # -- Relationships --------------------------------------------------------

data/app/models/cms/categorization.rb

@@ -1,5 +1,9 @@
 class Cms::Categorization < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+  
   set_table_name :cms_categorizations
   
   # -- Relationships --------------------------------------------------------

data/app/models/cms/category.rb

@@ -1,5 +1,9 @@
 class Cms::Category < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+  
   set_table_name :cms_categories
   
   # -- Relationships --------------------------------------------------------

data/app/models/cms/file.rb

@@ -1,5 +1,9 @@
 class Cms::File < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+    
   set_table_name :cms_files
   
   cms_is_categorized

data/app/models/cms/layout.rb

@@ -1,5 +1,9 @@
 class Cms::Layout < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+    
   set_table_name :cms_layouts
   
   cms_acts_as_tree

data/app/models/cms/page.rb

@@ -1,5 +1,9 @@
 class Cms::Page < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+    
   set_table_name :cms_pages
   
   cms_acts_as_tree :counter_cache => :children_count

data/app/models/cms/revision.rb

@@ -1,5 +1,9 @@
 class Cms::Revision < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+  
   set_table_name :cms_revisions
   
   serialize :data

data/app/models/cms/site.rb

@@ -1,5 +1,9 @@
 class Cms::Site < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+  
   set_table_name :cms_sites
   
   # -- Relationships --------------------------------------------------------

data/app/models/cms/snippet.rb

@@ -1,5 +1,9 @@
 class Cms::Snippet < ActiveRecord::Base
   
+  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+  end
+  
   set_table_name :cms_snippets
   
   cms_is_categorized

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.5"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-08-30}
+  s.date = %q{2011-08-31}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/config/database.yml

@@ -5,6 +5,13 @@ development:
   database: db/development.sqlite3
   pool: 5
   timeout: 10000
+ 
+# config.database_config = 'cms_'
+cms_development:
+  adapter: sqlite3
+  database: db/cms_development.sqlite3
+  pool: 5
+  timeout: 10000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/config/initializers/comfortable_mexican_sofa.rb

@@ -54,6 +54,12 @@ ComfortableMexicanSofa.configure do |config|
   # force it to English by setting this to `:en`
   #   config.admin_locale = nil
   
+  # Database prefix.  If you want to keep your comfortable mexican sofa tables
+  # in a location other than the default databases add a database_config.
+  # Using a prefix of `cms_` will look for a cms_#{Rails.env} definition
+  # in your database.yml file
+  #   config.database_config = nil
+  
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/db/migrate/01_create_cms.rb

@@ -1,6 +1,11 @@
 class CreateCms < ActiveRecord::Migration
   
   def self.up
+    
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
+    
     # -- Sites --------------------------------------------------------------
     create_table :cms_sites do |t|
       t.string :label
@@ -107,6 +112,11 @@ class CreateCms < ActiveRecord::Migration
   end
   
   def self.down
+    
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
+    
     drop_table :cms_sites
     drop_table :cms_layouts
     drop_table :cms_pages

data/db/migrate/upgrades/02_upgrade_to_1_1_0.rb

@@ -1,5 +1,8 @@
 class UpgradeTo110 < ActiveRecord::Migration
   def self.up
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     rename_column :cms_layouts,   :cms_site_id,   :site_id
     rename_column :cms_pages,     :cms_site_id,   :site_id
     rename_column :cms_pages,     :cms_layout_id, :layout_id
@@ -9,6 +12,9 @@ class UpgradeTo110 < ActiveRecord::Migration
   end
 
   def self.down
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     rename_column :cms_uploads,   :site_id,   :cms_site_id
     rename_column :cms_snippets,  :site_id,   :cms_site_id
     rename_column :cms_blocks,    :page_id,   :cms_page_id

data/db/migrate/upgrades/03_upgrade_to_1_2_0.rb

@@ -1,5 +1,8 @@
 class UpgradeTo120 < ActiveRecord::Migration
   def self.up
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     create_table :cms_revisions, :force => true do |t|
       t.string    :record_type
       t.integer   :record_id
@@ -10,6 +13,9 @@ class UpgradeTo120 < ActiveRecord::Migration
   end
 
   def self.down
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     drop_table :cms_revisions
   end
 end

data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb

@@ -1,5 +1,8 @@
 class UpgradeTo130 < ActiveRecord::Migration
   def self.up
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     add_column :cms_sites, :is_mirrored, :boolean, :null => false, :default => false
     add_column :cms_sites, :path, :string
     add_column :cms_sites, :locale, :string, :null => false, :default => 'en'
@@ -11,6 +14,9 @@ class UpgradeTo130 < ActiveRecord::Migration
   end
 
   def self.down
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     remove_index :cms_sites, :is_mirrored
     remove_column :cms_sites, :path
     remove_column :cms_sites, :is_mirrored

data/db/migrate/upgrades/05_upgrade_to_1_4_0.rb

@@ -1,5 +1,8 @@
 class UpgradeTo140 < ActiveRecord::Migration
   def self.up
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     rename_table :cms_uploads, :cms_files
     add_column :cms_files, :label, :string
     add_column :cms_files, :description, :string, :limit => 2048
@@ -22,6 +25,9 @@ class UpgradeTo140 < ActiveRecord::Migration
   end
   
   def self.down
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
     remove_index :cms_files, [:site_id, :label]
     remove_column :cms_files, :description
     remove_column :cms_files, :label

data/gemfiles/Gemfile.rails-3.1.x

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.1.0.rc8'
+gem 'rails',          '3.1.0'
 gem 'active_link_to', '>=1.0.0'
 gem 'paperclip',      '>=2.3.14'
 

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -43,6 +43,12 @@ class ComfortableMexicanSofa::Configuration
   # force it to English by setting this to `:en`
   attr_accessor :admin_locale
   
+  # Database prefix.  If you want to keep your comfortable mexican sofa tables
+  # in a location other than the default databases add a database_config.
+  # Setting this to `cms` will look for a cms_#{Rails.env} database definition
+  # in your database.yml file
+  attr_accessor :database_config
+  
   # Configuration defaults
   def initialize
     @cms_title              = 'ComfortableMexicanSofa MicroCMS'
@@ -59,6 +65,7 @@ class ComfortableMexicanSofa::Configuration
     @revisions_limit        = 25
     @locales                = { :en => 'English', :es => 'Español' }
     @admin_locale           = nil
+    @database_config        = nil
   end
   
 end

data/test/unit/configuration_test.rb

@@ -17,6 +17,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 25, config.revisions_limit
     assert_equal ({:en => 'English', :es => 'Español'}), config.locales
     assert_equal nil, config.admin_locale
+    assert_equal nil, config.database_config
   end
   
   def test_initialization_overrides

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000 -04:00
+date: 2011-08-31 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70196080386120 !ruby/object:Gem::Requirement
+  requirement: &70324287482620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196080386120
+  version_requirements: *70324287482620
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70196080385640 !ruby/object:Gem::Requirement
+  requirement: &70324287481220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196080385640
+  version_requirements: *70324287481220
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70196080385160 !ruby/object:Gem::Requirement
+  requirement: &70324287479860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70196080385160
+  version_requirements: *70324287479860
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1153917626965436207
+      hash: 512581774874572248
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: