rubber_ring 0.1.0 → 0.1.1

data/app/views/rubber_ring/_template_control.html.erb

@@ -1,19 +1,19 @@
-<% if @admin and not @page_caching %>
-  <div class="tbs rr-control">
-    <div class="well well-small">
-      <span>Templates for <strong><%= key %></strong></span>
-
-      <select data-cms-template="<%= key %>" data-from-db="<%= from_db %>">
-        <% template_types.sort_by(&:template).each do |t| %>
-          <option value="<%= t.template %>"><%= t.template %></option>
-        <% end %>
-      </select>
-
-      <span class='add-remove'>
-        <button data-action="add"></button>
-        <button data-action="remove"></button>
-      </span>
-      <button data-action="sort">Enable sort</button>
-    </div>
-  </div>
-<% end %>
+<% if @admin and not @page_caching %>
+  <div class="tbs rr-control">
+    <div class="well well-small">
+      <span>Templates for <strong><%= key %></strong></span>
+
+      <select data-cms-template="<%= key %>" data-from-db="<%= from_db %>">
+        <% template_types.sort_by(&:template).each do |t| %>
+          <option value="<%= t.template %>"><%= t.template %></option>
+        <% end %>
+      </select>
+
+      <span class='add-remove'>
+        <button data-action="add"></button>
+        <button data-action="remove"></button>
+      </span>
+      <button data-action="sort">Enable sort</button>
+    </div>
+  </div>
+<% end %>

data/config/routes.rb

@@ -1,20 +1,20 @@
-RubberRing::Engine.routes.draw do
-
-  get  '',       :to => 'sessions#new'
-  get  'logout', :to => 'sessions#destroy', :as => 'logout'
-  post 'login',  :to => 'sessions#create',  :as => 'login'
-
-  post 'cms/save', :to => 'cms#save', :as => 'cms_save'
-  post 'cms/remove/:key', :to => 'cms#remove', :as => 'cms_remove'
-  post 'cms/save_template', :to => 'cms#save_template', :as => 'cms_save_template'
-  post 'cms/add_template', :to => 'cms#add_template', :as => 'cms_add_template'
-  post 'cms/remove_template', :to => 'cms#remove_template', :as => 'cms_remove_template'
-
-
-  post 'cms/save_image', :to => 'attachments#save_image', :as => 'cms_save_image' # convert and set image to page content
-  post 'cms/save_attachment', :to => 'attachments#save_attachment', :as => 'cms_save_attachment'
-
-  post 'cms/attachments/add', :to => 'attachments#add', :as => 'cms_add_attachment'
-  post 'cms/attachments/remove', :to => 'attachments#remove', :as => 'cms_remove_attachment'
-
-end
+RubberRing::Engine.routes.draw do
+
+  get  '',       :to => 'sessions#new'
+  get  'logout', :to => 'sessions#destroy', :as => 'logout'
+  post 'login',  :to => 'sessions#create',  :as => 'login'
+
+  post 'cms/save', :to => 'cms#save', :as => 'cms_save'
+  post 'cms/remove/:key', :to => 'cms#remove', :as => 'cms_remove'
+  post 'cms/save_template', :to => 'cms#save_template', :as => 'cms_save_template'
+  post 'cms/add_template', :to => 'cms#add_template', :as => 'cms_add_template'
+  post 'cms/remove_template', :to => 'cms#remove_template', :as => 'cms_remove_template'
+
+
+  post 'cms/save_image', :to => 'attachments#save_image', :as => 'cms_save_image' # convert and set image to page content
+  post 'cms/save_attachment', :to => 'attachments#save_attachment', :as => 'cms_save_attachment'
+
+  post 'cms/attachments/add', :to => 'attachments#add', :as => 'cms_add_attachment'
+  post 'cms/attachments/remove', :to => 'attachments#remove', :as => 'cms_remove_attachment'
+
+end

data/db/migrate/20130520170602_create_pages.rubber_ring.rb

@@ -1,11 +1,11 @@
-class CreatePages < ActiveRecord::Migration
-  def change
-    create_table :rubber_ring_pages do |t|
-      t.string :controller
-      t.string :action
-      t.string :locale
-
-      t.timestamps
-    end
-  end
-end
+class CreatePages < ActiveRecord::Migration
+  def change
+    create_table :rubber_ring_pages do |t|
+      t.string :controller
+      t.string :action
+      t.string :locale
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130520170603_create_rubber_ring_page_contents.rubber_ring.rb

@@ -1,11 +1,11 @@
-class CreateRubberRingPageContents < ActiveRecord::Migration
-  def change
-    create_table :rubber_ring_page_contents do |t|
-      t.string :key
-      t.string :value
-      t.references :page, index: true
-
-      t.timestamps
-    end
-  end
-end
+class CreateRubberRingPageContents < ActiveRecord::Migration
+  def change
+    create_table :rubber_ring_page_contents do |t|
+      t.string :key
+      t.string :value
+      t.references :page, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130520170604_create_rubber_ring_page_templates.rubber_ring.rb

@@ -1,14 +1,14 @@
-class CreateRubberRingPageTemplates < ActiveRecord::Migration
-  def change
-    create_table :rubber_ring_page_templates do |t|
-      t.string :key
-      t.string :template
-      t.string :element
-      t.string :tclass
-      t.integer :sort
-      t.references :page, index: true
-
-      t.timestamps
-    end
-  end
-end
+class CreateRubberRingPageTemplates < ActiveRecord::Migration
+  def change
+    create_table :rubber_ring_page_templates do |t|
+      t.string :key
+      t.string :template
+      t.string :element
+      t.string :tclass
+      t.integer :sort
+      t.references :page, index: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/rubber_ring/version.rb

@@ -1,3 +1,3 @@
 module RubberRing
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/controllers/cms_controller_spec.rb

@@ -1,150 +1,150 @@
-require 'spec_helper'
-
-describe RubberRing::CmsController do
-
-  it 'should save content for the page' do
-    xhr :post, :save, {
-      page_controller: 'test',
-      page_action: 'test',
-      page_locale: 'fr',
-      content: { 'key' => 'value' }
-    }
-    response.should be_success
-
-    RubberRing::Page.all.size.should eq 1
-    RubberRing::PageContent.all.size.should eq 1
-    RubberRing::Page.first.locale.should eq 'fr'
-  end
-
-  it 'should save multiple keys' do
-    xhr :post, :save, {
-      page_controller: 'test',
-      page_action: 'test',
-      content: { 'key1' => 'value1', 'key2' => 'value2' }
-    }
-    response.should be_success
-
-    RubberRing::Page.all.size.should eq 1
-    RubberRing::PageContent.all.size.should eq 2
-    RubberRing::Page.first.locale.should eq 'en'
-  end
-
-  it 'should remove key from pages content' do
-    # create content with key = "key"
-    xhr :post, :save, {
-      page_controller: 'test',
-      page_action: 'test',
-      content: { 'key' => 'value' }
-    }
-    # try to remove this key from content
-    xhr :post, :remove, {
-      key: 'key',
-      page_controller: 'test',
-      page_action: 'test',
-    }
-
-    RubberRing::Page.all.size.should eq 1
-    RubberRing::PageContent.all.size.should eq 0
-
-    response.should be_success
-  end
-
-  describe 'templates' do
-    before do
-      xhr :post, :save_template, {
-        page_controller: 'test',
-        page_action: 'test',
-        page_locale: 'en',
-        content: {
-          '0' => {
-            'key'      => 'template_key',
-            'index'    => 0,
-            'template' => 'article',
-            'sort'     => 1,
-            'tclass'   => 'article_class',
-            'element'  => 'article'
-          }
-        }
-      }
-      response.should be_success
-
-      RubberRing::Page.all.size.should eq 1
-      RubberRing::PageContent.all.size.should eq 0
-      RubberRing::PageTemplate.all.size.should eq 1
-    end
-
-    it 'should save templates for the page' do
-      page = RubberRing::Page.first
-      page.page_templates[0].template.should eq 'article'
-      page.page_templates[0].id.should eq 1
-      page.page_templates[0].sort.should eq 1
-      page.page_templates[0].tclass.should eq 'article_class'
-      page.page_templates[0].element.should eq 'article'
-
-      xhr :post, :save_template, {
-        page_controller: 'test',
-        page_action: 'test',
-        page_locale: 'en',
-        content: {
-          '0' => {
-            'key'      => 'template_key_1',
-            'index'    => 2,
-            'sort'     => 1,
-            'template' => 'a',
-            'tclass'   => 'a',
-            'element'  => 'b'
-          },
-          '1' => {
-            'key'      => 'template_key_1',
-            'index'    => 3,
-            'sort'     => 123,
-            'template' => 'a',
-            'tclass'   => 'a',
-            'element'  => 'b'
-          }
-        }
-      }
-
-      page_template = RubberRing::PageTemplate.last
-      page_template.id.should eq 3
-      page_template.sort.should eq 123
-    end
-
-    it 'should create new template instance' do
-      # content of this post request tells which
-      # template we want to duplicate
-      xhr :post, :add_template, {
-        page_controller: 'test',
-        page_action: 'test',
-        page_locale: 'en',
-        content: {
-          'key'      => 'template_key',
-          'template' => 'article',
-          'index'    => 0,
-        }
-      }
-
-      RubberRing::PageTemplate.all.size.should eq 2
-      page_template = RubberRing::PageTemplate.last
-      page_template.sort.should eq 2
-    end
-
-    it 'should remove template instances' do
-      # content of this post request tells which
-      # template we want to remove
-      xhr :post, :remove_template, {
-        page_controller: 'test',
-        page_action: 'test',
-        page_locale: 'en',
-        content: {
-          'key'      => 'template_key',
-          'template' => 'article',
-          'index'    => 0,
-        }
-      }
-
-      RubberRing::PageTemplate.all.size.should eq 1
-    end
-  end
-
-end
+require 'spec_helper'
+
+describe RubberRing::CmsController do
+
+  it 'should save content for the page' do
+    xhr :post, :save, {
+      page_controller: 'test',
+      page_action: 'test',
+      page_locale: 'fr',
+      content: { 'key' => 'value' }
+    }
+    response.should be_success
+
+    RubberRing::Page.all.size.should eq 1
+    RubberRing::PageContent.all.size.should eq 1
+    RubberRing::Page.first.locale.should eq 'fr'
+  end
+
+  it 'should save multiple keys' do
+    xhr :post, :save, {
+      page_controller: 'test',
+      page_action: 'test',
+      content: { 'key1' => 'value1', 'key2' => 'value2' }
+    }
+    response.should be_success
+
+    RubberRing::Page.all.size.should eq 1
+    RubberRing::PageContent.all.size.should eq 2
+    RubberRing::Page.first.locale.should eq 'en'
+  end
+
+  it 'should remove key from pages content' do
+    # create content with key = "key"
+    xhr :post, :save, {
+      page_controller: 'test',
+      page_action: 'test',
+      content: { 'key' => 'value' }
+    }
+    # try to remove this key from content
+    xhr :post, :remove, {
+      key: 'key',
+      page_controller: 'test',
+      page_action: 'test',
+    }
+
+    RubberRing::Page.all.size.should eq 1
+    RubberRing::PageContent.all.size.should eq 0
+
+    response.should be_success
+  end
+
+  describe 'templates' do
+    before do
+      xhr :post, :save_template, {
+        page_controller: 'test',
+        page_action: 'test',
+        page_locale: 'en',
+        content: {
+          '0' => {
+            'key'      => 'template_key',
+            'index'    => 0,
+            'template' => 'article',
+            'sort'     => 1,
+            'tclass'   => 'article_class',
+            'element'  => 'article'
+          }
+        }
+      }
+      response.should be_success
+
+      RubberRing::Page.all.size.should eq 1
+      RubberRing::PageContent.all.size.should eq 0
+      RubberRing::PageTemplate.all.size.should eq 1
+    end
+
+    it 'should save templates for the page' do
+      page = RubberRing::Page.first
+      page.page_templates[0].template.should eq 'article'
+      page.page_templates[0].id.should eq 1
+      page.page_templates[0].sort.should eq 1
+      page.page_templates[0].tclass.should eq 'article_class'
+      page.page_templates[0].element.should eq 'article'
+
+      xhr :post, :save_template, {
+        page_controller: 'test',
+        page_action: 'test',
+        page_locale: 'en',
+        content: {
+          '0' => {
+            'key'      => 'template_key_1',
+            'index'    => 2,
+            'sort'     => 1,
+            'template' => 'a',
+            'tclass'   => 'a',
+            'element'  => 'b'
+          },
+          '1' => {
+            'key'      => 'template_key_1',
+            'index'    => 3,
+            'sort'     => 123,
+            'template' => 'a',
+            'tclass'   => 'a',
+            'element'  => 'b'
+          }
+        }
+      }
+
+      page_template = RubberRing::PageTemplate.last
+      page_template.id.should eq 3
+      page_template.sort.should eq 123
+    end
+
+    it 'should create new template instance' do
+      # content of this post request tells which
+      # template we want to duplicate
+      xhr :post, :add_template, {
+        page_controller: 'test',
+        page_action: 'test',
+        page_locale: 'en',
+        content: {
+          'key'      => 'template_key',
+          'template' => 'article',
+          'index'    => 0,
+        }
+      }
+
+      RubberRing::PageTemplate.all.size.should eq 2
+      page_template = RubberRing::PageTemplate.last
+      page_template.sort.should eq 2
+    end
+
+    it 'should remove template instances' do
+      # content of this post request tells which
+      # template we want to remove
+      xhr :post, :remove_template, {
+        page_controller: 'test',
+        page_action: 'test',
+        page_locale: 'en',
+        content: {
+          'key'      => 'template_key',
+          'template' => 'article',
+          'index'    => 0,
+        }
+      }
+
+      RubberRing::PageTemplate.all.size.should eq 1
+    end
+  end
+
+end