comfortable_mexican_sofa 1.0.29 → 1.0.30

data/VERSION

@@ -1 +1 @@
-1.0.29
+1.0.30

data/app/views/cms_admin/pages/_form.html.erb

@@ -9,7 +9,7 @@
     <%= form.text_field :slug, :id => 'slug' %>
   <% end %>
   <% if (options = CmsLayout.options_for_select(@cms_site)).present? %>
-    <%= form.select :cms_layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, 'data-path-prefix' => ComfortableMexicanSofa.config.admin_route_prefix, :label => 'Layout' %>
+    <%= form.select :cms_layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
   <% end %>
   <% if (options = CmsPage.options_for_select(@cms_site, @cms_page)).present? %>
     <%= form.select :parent_id, options %>

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.29"
+  s.version = "1.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/lib/generators/cms_generator.rb

@@ -6,7 +6,15 @@ class CmsGenerator < Rails::Generators::Base
   source_root File.expand_path('../../..', __FILE__)
   
   def generate_migration
-    migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
+    destination   = File.expand_path('db/migrate/01_create_cms.rb', self.destination_root)
+    migration_dir = File.dirname(destination)
+    destination   = self.class.migration_exists?(migration_dir, 'create_cms')
+    
+    if destination
+      puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
+    else
+      migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
+    end
   end
   
   def generate_initialization

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -1,5 +1,6 @@
 $.CMS = function(){
   var current_path = window.location.pathname;
+  var admin_path_prefix = current_path.split('/')[1]
   
   $(document).ready(function(){
     
@@ -35,7 +36,7 @@ $.CMS = function(){
     load_page_blocks: function(){
       $('select#cms_page_cms_layout_id').bind('change.cms', function() {
         $.ajax({
-          url: ['/' + $(this).attr('data-path-prefix'), 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'),
+          url: ['/' + admin_path_prefix, 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'),
           data: ({
             layout_id: $(this).val()
           }),
@@ -93,7 +94,7 @@ $.CMS = function(){
         unique_names:     true,
         multipart:        true,
         multipart_params: { authenticity_token: auth_token, format: 'js' },
-        url:              '/cms-admin/uploads'
+        url:              '/' + admin_path_prefix + '/uploads'
       });
       uploader.init();
       uploader.bind('FilesAdded', function(up, files) {

data/test/functional/cms_admin/pages_controller_test.rb

@@ -24,7 +24,6 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     
     assert_template :new
     assert_select 'form[action=/cms-admin/pages]'
-    assert_select 'select[data-path-prefix=cms-admin]'
   end
   
   def test_get_new_with_field_datetime

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 1
   - 0
-  - 29
-  version: 1.0.29
+  - 30
+  version: 1.0.30
 platform: ruby
 authors: 
 - Oleg Khabarov