only edge paperclip works

holli · May 30, 2011 · 636fe40 · 636fe40
2 parents ed95e60 + ddb46ea
commit 636fe40
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 89 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ rdoc
 public/cms-css/
 public/cms-js/
 Gemfile.lock
+.rvmrc
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '>=3.0.0'
+gem 'rails',          :git => 'https://github.com/rails/rails.git'
 gem 'active_link_to', '>=0.0.7'
-gem 'paperclip',      '>=2.3.8'
+gem 'paperclip',      :git => 'https://github.com/thoughtbot/paperclip.git'
 
 group :development do
   gem 'sqlite3'

diff --git a/README.md b/README.md
@@ -144,13 +144,15 @@ You can put this module in /config/initializers/comfortable\_mexican\_sofa.rb an
 
 Working with Fixtures
 ---------------------
-Sofa allows you to build entire site using files instead of updating database via admin area. This significantly speeds up initial content population. To enable fixtures go to the initializer and set this: `config.enable_fixtures = true`. You may also change the folder that is used to store fixtures.
+Sofa allows you to build entire site using files instead of updating database via admin area. This significantly speeds up initial content population. Go to the initializer and set this to enable fixtures in development environment: `config.enable_fixtures = Rails.env.development?`. You may also change the folder that is used to store fixtures.
 
-If you run `rails g cms` you should find an example set of fixtures in [/db/cms\_fixtures](https://github.com/twg/comfortable-mexican-sofa/blob/master/db/cms_fixtures). If you run multiple sites, each set of fixtures should be inside a folder named as the hostname of the site. It's optional if you only have one site.
+If you run `rails g cms` you should find an example set of fixtures in [/db/cms\_fixtures](https://github.com/twg/comfortable-mexican-sofa/blob/master/db/cms_fixtures).
 
 When fixtures are enabled, database is updated with each request, but only if fixture file is newer than the database entry. Database is also purged of items that are not defined in fixtures. So be careful not to clear out your database by mistake.
 
-When deploying to a production server don't forget to turn off fixtures. To load them into the database just run this rake task: `rake comfortable_mexican_sofa:fixtures:import`. When running multiple sites specify which one by passing argument like this: `SITE=example.com`.
+To load fixtures into the database just run this rake task: `rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=example.com`. `from` indicates folder the fixtures are in and `to` is the Site hostname you have defined in the database.
+
+If you need to dump database contents into fixture files run: `rake comfortable_mexican_sofa:fixtures:export FROM=example.com TO=example.local`. This will create example.local folder and dump all content from example.com Site.
 
 Active Components
 -----------------

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   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-05-26}
+  s.date = %q{2011-05-30}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -23,7 +23,16 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif",
+    "app/assets/images/comfortable_mexican_sofa/arrow_right.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_layout.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_move.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_regular.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_snippet.gif",
     "app/assets/javascripts/comfortable_mexican_sofa/application.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/jquery.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/rails.js",
     "app/assets/stylesheets/comfortable_mexican_sofa/application.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/content.css",
     "app/assets/stylesheets/comfortable_mexican_sofa/form.css",
@@ -143,76 +152,9 @@ Gem::Specification.new do |s|
     "lib/generators/README",
     "lib/generators/cms_generator.rb",
     "lib/tasks/comfortable_mexican_sofa.rake",
-    "public/404.html",
     "public/422.html",
     "public/500.html",
     "public/favicon.ico",
-    "public/images/comfortable_mexican_sofa/arrow_bottom.gif",
-    "public/images/comfortable_mexican_sofa/arrow_right.gif",
-    "public/images/comfortable_mexican_sofa/icon_layout.gif",
-    "public/images/comfortable_mexican_sofa/icon_move.gif",
-    "public/images/comfortable_mexican_sofa/icon_regular.gif",
-    "public/images/comfortable_mexican_sofa/icon_snippet.gif",
-    "public/javascripts/comfortable_mexican_sofa/cms.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror_base.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_css.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_html_mixed.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_js.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_xml.js",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_222222_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_2e83ff_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_454545_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_888888_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_cd0a0a_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.css",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.js",
-    "public/javascripts/comfortable_mexican_sofa/jquery.js",
-    "public/javascripts/comfortable_mexican_sofa/plupload/plupload.full.min.js",
-    "public/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.min.js",
-    "public/javascripts/comfortable_mexican_sofa/plupload/plupload.min.js",
-    "public/javascripts/comfortable_mexican_sofa/rails.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/jquery.tinymce.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/langs/en.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/about.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/anchor.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/charmap.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/color_picker.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/editor_template.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/image.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/img/colorpicker.jpg",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/img/icons.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/about.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/anchor.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/charmap.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/color_picker.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/image.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/link.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/source_editor.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/langs/en.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/langs/en_dlg.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/link.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/content.css",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/dialog.css",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/buttons.png",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/items.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/menu_check.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/progress.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/tabs.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/ui.css",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/source_editor.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/tiny_mce.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/tiny_mce_popup.js",
     "public/robots.txt",
     "script/rails",
     "test/fixtures/cms/blocks.yml",
@@ -275,18 +217,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
       s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.7"])
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.8"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
       s.add_dependency(%q<paperclip>, [">= 2.3.8"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
     s.add_dependency(%q<paperclip>, [">= 2.3.8"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

diff --git a/lib/tasks/comfortable_mexican_sofa.rake b/lib/tasks/comfortable_mexican_sofa.rake
@@ -6,24 +6,25 @@ end
 namespace :comfortable_mexican_sofa do
   namespace :fixtures do
 
-    desc 'Import Fixture data into database (options: FOLDER=example.local SITE=example.com)'
+    desc 'Import Fixture data into database (options: FROM=example.local TO=example.com)'
     task :import => :environment do |task, args|
-      hostname = args[:site] || args[:folder]
-      site = Cms::Site.find_by_hostname(hostname)
-      abort "Site with hostname [#{hostname}] not found. Aborting." if !site
+      to    = args[:to] || args[:from]
+      from  = args[:from]
 
-      puts "Importing for #{site.hostname}"
-      ComfortableMexicanSofa::Fixtures.import_all(site.hostname, (args[:site] || site.hostname))
+      abort "Site with hostname [#{to}] not found. Aborting." if !Cms::Site.find_by_hostname(to)
+      puts "Importing from Folder [#{from}] to Site [#{to}] ..."
+      ComfortableMexicanSofa::Fixtures.import_all(to, from)
       puts 'Done!'
     end
 
-    desc 'Export database data into Fixtures (options: SITE=example.com FOLDER=example.local)'
+    desc 'Export database data into Fixtures (options: FROM=example.com TO=example.local)'
     task :export => :environment do |task, args|
-      site = Cms::Site.find_by_hostname(args[:folder])
-      abort "Site with hostname [#{hostname}] not found. Aborting." if !site
+      to    = args[:to] || args[:from]
+      from  = args[:from]
 
-      puts "Exporting for #{site.hostname}"
-      ComfortableMexicanSofa::Fixtures.export_all((args[:site] || site.hostname), site.hostname)
+      abort "Site with hostname [#{from}] not found. Aborting." if !Cms::Site.find_by_hostname(from)
+      puts "Exporting from Site [#{from}] to Folder [#{to}] ..."
+      ComfortableMexicanSofa::Fixtures.export_all(from, to)
       puts 'Done!'
     end
   end