activeadmin_cms 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZiMDg1M2U0NWNhODljNTdkYjhhMjdjOTk0ODc1ODY5NWZmNjdiZQ==
+    NDI0ODY2M2M0OWQwZTBhYmIzZmEyMmZiNTQzNjU4NzYzOTU3ZTQyZg==
   data.tar.gz: !binary |-
-    ZDNmOTBjMjc1ZDZlMWU2ZmEzMDFiZmJlMzFjNWM2Zjk0ODNkNTk1Zg==
+    NWY3MmM0N2EzOGM4MDBkNDRlMDY1MzBkZDJhNjJhZWE4YWQ0ODI1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDMyYTQ0MjQ2OWUxNjdmZjBjN2U5MjAzMGY5NjUwYTVlMWY2MjVlMGI0OTI3
-    MTM3YzFmNzg2MWYyMWE2ZWU4YzAxMjVjZDU2MjhkMmQ5MjRmNDM4MWM5NmNi
-    NTEzM2NlZjc4MzIwYWI4MDRkZDY1ZWY5MzBkYTA5OGNkMmY0YTU=
+    MjI3NzVjOTNmNjk2M2Y4MTBlN2JmNGFhZWIyMjA2MzA2YmM4OWNhNWM5MmU1
+    ZDY0N2ZlN2YwMzNmZmExOWVkM2UxZjMyNTBjYTE1NWZkNzdjYWUxODljMjY1
+    ZjMzOTYyMmNhMjJhZjYzYzQxMjE0NzA5OGE3Y2MzOGRmMTUwZDU=
   data.tar.gz: !binary |-
-    ZTc5ODA2ZDllZTc2ZGZkNmZhY2M3MWE2ZTY1YWNiZGQyYWY4ZDAzNzZmOWQw
-    MTQzYWNlOTE3ODAxMGUyZDI0OGFmZTFlMTZiZWM2MWQ5NzJmMTU5NTQ3Mjhh
-    NDIxZDIzMzk1ZTllNTE1MThmMzE2M2VlOGJiMzk0ZTIzMzk5ODc=
+    MzlmY2VmMjliNjVkOWY2ZGNlMjc5N2NlMDUxODM1YWEwYmYyN2FiY2Q1MjY4
+    YzdkZWY3YjBmN2M2NmE0ZWEyMzU5MjM2M2Q3YTA5ZTM5MzJiMjc0MWZjMjlj
+    ZjU5OGM4NGJlN2FlODI1OGMyNmUyZDdlYTg5Mzg1ZjNkYWY5YTM=

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.0.4 - 0.0.5
+* Small fixes
+
 == 0.0.3
 * Published & Draft pages
 * Make compatible only with rails 4

data/app/admin/manage_pages.rb

@@ -3,7 +3,7 @@ ActiveAdmin.register ActiveadminCms::Page, as: 'Page' do
   filter :title
 
   action_item only: :show do
-    if page.has_changed_content? || !page.published?
+    if page.has_unpublished_changes? || !page.published?
       link_to "Publish", publish_admin_page_path, method: :put
     elsif page.published?
       link_to "Move draft", draft_admin_page_path, method: :put
@@ -13,7 +13,7 @@ ActiveAdmin.register ActiveadminCms::Page, as: 'Page' do
   index do
     column :id
     column :title do |page|
-      if page.has_changed_content?
+      if page.has_unpublished_changes?
         "* #{page.title}"
       else
         page.title
@@ -26,18 +26,11 @@ ActiveAdmin.register ActiveadminCms::Page, as: 'Page' do
   show do
     panel "Post Details" do
       attributes_table_for page do
-        row(:title) do |page|
-          if page.has_changed_content?
-            "* #{page.title}"
-          else
-            page.title
-          end
+        row(:url) do |page|
+          link_to "/#{page.slug}", "/#{page.slug}", target: '_blank'
         end
-        if page.has_changed_content?
-          row(:draft_content) { page.draft_content.html_safe } 
-        end
-        row(:content) { page.content.html_safe } 
         row(:published?)
+        row(:has_unpublished_changes?)
         row(:created_at)
       end
     end
@@ -66,7 +59,7 @@ ActiveAdmin.register ActiveadminCms::Page, as: 'Page' do
       if config.page_categories.any?
         f.input :category, collection: config.page_categories, include_blank: false
       end
-      f.input :draft_content, label: 'Content'
+      f.input :draft_content, label: false
       if config.page_editor_backend = 'ace_editor'
         f.form_buffers.last << content_tag(:div, page.draft_content, id: 'editor')
       end

data/app/assets/javascripts/activeadmin_cms/editor/ace.js

@@ -7,8 +7,9 @@ $(function (){
   $content = $('#page_draft_content')
   $content.hide()
   var editor = ace.edit("editor")
-  editor.setTheme("ace/theme/twilight");
+  editor.setTheme("ace/theme/tomorrow");
   editor.getSession().setMode("ace/mode/html");
+  editor.getSession().setUseWrapMode(true);
   editor.setFontSize("16px");
   editor.on('change', function (e) {
     $content.val(editor.getValue())

data/app/assets/stylesheets/activeadmin_cms/editor/ace.css

@@ -5,5 +5,4 @@
   width: 100%;
   height: 500px;
   position: relative;
-  top: 8px;
 }

data/app/models/activeadmin_cms/page.rb

@@ -3,7 +3,7 @@ module ActiveadminCms
     validates :slug, presence: true, uniqueness: true
     validates :title, presence: true
     
-    def has_changed_content?
+    def has_unpublished_changes?
       content != draft_content
     end
 

data/lib/activeadmin_cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminCms
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/dummy/log/test.log

@@ -693,3 +693,58 @@ ActiveadminCmsTest: test_truth
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.0ms)  rollback transaction
+   (3.2ms)  DELETE FROM "activeadmin_cms_posts";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.3ms)  DELETE FROM sqlite_sequence where name = 'activeadmin_cms_posts';
+   (7.0ms)  DELETE FROM "activeadmin_cms_pages";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'activeadmin_cms_pages';
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+#publish: test_0001_should change status to published
+-----------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (5.7ms)  INSERT INTO "activeadmin_cms_posts" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "Foo content"], ["created_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00], ["title", "Foo post"], ["updated_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00]]
+  SQL (0.2ms)  UPDATE "activeadmin_cms_posts" SET "published" = ?, "updated_at" = ? WHERE "activeadmin_cms_posts"."id" = 1  [["published", true], ["updated_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00]]
+  ActiveadminCms::Post Load (0.1ms)  SELECT "activeadmin_cms_posts".* FROM "activeadmin_cms_posts" WHERE "activeadmin_cms_posts"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+#publish: test_0001_should change status to published
+-----------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  ActiveadminCms::Page Exists (0.1ms)  SELECT 1 AS one FROM "activeadmin_cms_pages" WHERE "activeadmin_cms_pages"."slug" = 'slug-1' LIMIT 1
+  SQL (0.5ms)  INSERT INTO "activeadmin_cms_pages" ("content", "created_at", "slug", "title", "updated_at") VALUES (?, ?, ?, ?, ?)  [["content", "Foo content"], ["created_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00], ["slug", "slug-1"], ["title", "Foo page"], ["updated_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00]]
+  ActiveadminCms::Page Exists (0.1ms)  SELECT 1 AS one FROM "activeadmin_cms_pages" WHERE ("activeadmin_cms_pages"."slug" = 'slug-1' AND "activeadmin_cms_pages"."id" != 1) LIMIT 1
+  SQL (0.2ms)  UPDATE "activeadmin_cms_pages" SET "content" = ?, "published" = ?, "updated_at" = ? WHERE "activeadmin_cms_pages"."id" = 1  [["content", nil], ["published", true], ["updated_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00]]
+  ActiveadminCms::Page Load (0.1ms)  SELECT "activeadmin_cms_pages".* FROM "activeadmin_cms_pages" WHERE "activeadmin_cms_pages"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.5ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------
+#publish: test_0002_should move content from draft
+--------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  ActiveadminCms::Page Exists (0.2ms)  SELECT 1 AS one FROM "activeadmin_cms_pages" WHERE "activeadmin_cms_pages"."slug" = 'slug-2' LIMIT 1
+  SQL (0.4ms)  INSERT INTO "activeadmin_cms_pages" ("content", "created_at", "slug", "title", "updated_at") VALUES (?, ?, ?, ?, ?)  [["content", "Foo content"], ["created_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00], ["slug", "slug-2"], ["title", "Foo page"], ["updated_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00]]
+  ActiveadminCms::Page Exists (0.1ms)  SELECT 1 AS one FROM "activeadmin_cms_pages" WHERE ("activeadmin_cms_pages"."slug" = 'slug-2' AND "activeadmin_cms_pages"."id" != 1) LIMIT 1
+  SQL (0.2ms)  UPDATE "activeadmin_cms_pages" SET "draft_content" = ?, "content" = ?, "published" = ?, "updated_at" = ? WHERE "activeadmin_cms_pages"."id" = 1  [["draft_content", "new content"], ["content", "new content"], ["published", true], ["updated_at", Sun, 20 Oct 2013 19:55:16 UTC +00:00]]
+  ActiveadminCms::Page Load (0.1ms)  SELECT "activeadmin_cms_pages".* FROM "activeadmin_cms_pages" WHERE "activeadmin_cms_pages"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.4ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------
+ActiveadminCmsTest: test_truth
+------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Iskander Haziev