txtblx 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f2917fbd7f77fa2bcda630ce92bbb4505633ff
-  data.tar.gz: 4bebfa38134daa57ca32a98441d96ff983920888
+  metadata.gz: 664e6521e2b4b82dffadfcaff363f8b37fc0e857
+  data.tar.gz: cd91629c4b1a4731ba055c4363bc1124b7fecefd
 SHA512:
-  metadata.gz: f397e5d7da4a75b36127d8b2fb3818a983bb65218de7478dd202f33c4ea9e4fb0fb1516de5c7a6f3d085202eb3b25473d6f747a791a9ea00936e743ed144574e
-  data.tar.gz: f0967e9be2405f8072424eef2a63a6b18170552c25c23c37ffc34111b625257b668557521dedac6d90552f73ae8d5d102206079c3383e6e7ee6c4c5113f2d8ff
+  metadata.gz: 96807fff6a9eea234586f6647a764f4f3a5a74aae0ad95442e3b96fd7c5c519c5b8169cedf40a78d391c3fecd36e9b3bad1c60795fa88813d147e2c946169d3d
+  data.tar.gz: 782d695e11ce867657f81c017b6e2f8231f15c2e85ccddb9513a21f1076ce502a8ff52af3923e547d05f5ab0342d168f0b11e511544aeb7cfa9d465aeccc129f

data/README.md

@@ -34,6 +34,12 @@ Txtblx comes with an ActiveAdmin page to manage Textblocks
 ### CanCan Integration
 
 Txtblx provides default CanCan Abilities for its model.
+
+There are two sets of abilities:
+
+   * Full
+   * Editor can only change text and may not create or delete textblocks.
+
 Use the AbilityMixin to grant them to your user model inside your Ability-class.
 
     # app/models/ability.rb
@@ -42,7 +48,11 @@ Use the AbilityMixin to grant them to your user model inside your Ability-class.
       include Txtblx::AbilityMixin
 
       def initialize(user)
-        txtblx_abilities(user)
+        txtblx_editor_abilities(user)
+
+        if user.admin?
+          txtblx_full_abilities(user)
+        end
       end
     end
 

data/config/locales/activerecord.de.yml

@@ -5,7 +5,7 @@ de:
         one: "Textblock"
         other: "Textblöcke"
     attributes:
-      textblock:
+      "txtblx/textblock":
         key: "Schlüssel"
         description: "Beschreibung"
         text: "Text"

data/lib/txtblx/ability_mixin.rb

@@ -1,11 +1,17 @@
 module Txtblx
   module AbilityMixin
     # Call this in the ability initializer of the host app
-    def txtblx_abilities(user)
+    def txtblx_full_abilities(user)
       return if user.nil?
 
       can(:manage, Textblock)
     end
+
+    def txtblx_editor_abilities(user)
+      return if user.nil?
+
+      can(:read, Textblock)
+      can(:update, Textblock)
+    end
   end
 end
-

data/lib/txtblx/admin/textblocks.rb

@@ -1,27 +1,38 @@
 module Txtblx
   if defined?(ActiveAdmin)
     ActiveAdmin.register Textblock, as: 'Textblock' do
-      actions :all, except: [:destroy]
+      actions :all
+      filter :description
+      filter :text
 
       index do
-        column :key do |textblock|
-          link_to(textblock.key, admin_textblock_path(textblock))
+        column :key if authorized?(:manage, Textblock)
+        column :description do |textblock|
+          link_to(textblock.description, admin_textblock_path(textblock))
         end
-        column :description
       end
 
-      show do |textblock|
+      show title: :description do |textblock|
         div :class => :columns do
           attributes_table_for textblock do
-            row :key
+            row :key if authorized?(:manage, textblock)
             row :description
-            row :text
+            row :text do
+              textblock.text_html
+            end
           end
         end
       end
 
-      form do |f|
-        f.inputs :key, :description, :text
+      form title: :description do |f|
+        if authorized?(:manage, f.object)
+          f.inputs :key, :description, :text
+        else
+          f.inputs do
+            li("<label>Beschreibung</label> <b>#{f.object.description}</b>".html_safe)
+            f.input  :text
+          end
+        end
         f.actions do
           f.action :submit
           f.action :cancel, as: :link, button_html: {class: 'button'}

data/lib/txtblx/version.rb

@@ -1,3 +1,3 @@
 module Txtblx
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/dummy/log/test.log

@@ -2645,3 +2645,83 @@ Completed 200 OK in 16ms (Views: 15.0ms | ActiveRecord: 0.2ms)
         AND t_published.record_type = 'Txtblx::Textblock'
         AND t_published.tag = 'published' WHERE (t_published.superseded_at IS NULL) AND "txtblx_textblocks"."key" = ? LIMIT 1  [["key", "homepage.welcome"]]
    (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Txtblx::Textblock Load (0.3ms)  SELECT  "txtblx_textblocks".* FROM "txtblx_textblocks" INNER JOIN snaps_tags t_published
+        ON txtblx_textblocks.id = t_published.record_id
+        AND t_published.record_type = 'Txtblx::Textblock'
+        AND t_published.tag = 'published' WHERE (t_published.superseded_at IS NULL) AND "txtblx_textblocks"."key" = ? LIMIT 1  [["key", "homepage.welcome"]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "txtblx_textblocks" ("perma_id", "key", "description", "text", "text_html", "path", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["perma_id", 1], ["key", "homepage.welcome"], ["description", ""], ["text", ""], ["text_html", "Welcome to Dummy App"], ["path", "MyString"], ["created_at", "2015-04-09 14:19:19.799075"], ["updated_at", "2015-04-09 14:19:19.799075"]]
+  SQL (0.2ms)  UPDATE "snaps_tags" SET "superseded_at" = '2015-04-09 14:19:19.814796' WHERE "snaps_tags"."id" IN (SELECT "snaps_tags"."id" FROM "snaps_tags" INNER JOIN txtblx_textblocks
+        ON txtblx_textblocks.id = snaps_tags.record_id
+        AND snaps_tags.record_type = 'Txtblx::Textblock'
+        AND perma_id = 1 WHERE "snaps_tags"."tag" = ? AND "snaps_tags"."superseded_at" IS NULL)  [["tag", "draft"]]
+  SQL (0.1ms)  INSERT INTO "snaps_tags" ("record_id", "record_type", "tag", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["record_id", 1], ["record_type", "Txtblx::Textblock"], ["tag", "draft"], ["created_at", "2015-04-09 14:19:19.815809"], ["updated_at", "2015-04-09 14:19:19.815809"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "txtblx_textblocks" ("perma_id", "key", "description", "text", "text_html", "path", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["perma_id", 1], ["key", "homepage.welcome"], ["description", ""], ["text", ""], ["text_html", "Welcome to Dummy App"], ["path", "MyString"], ["created_at", "2015-04-09 14:19:19.799075"], ["updated_at", "2015-04-09 14:19:19.818111"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  UPDATE "snaps_tags" SET "superseded_at" = '2015-04-09 14:19:19.820326' WHERE "snaps_tags"."id" IN (SELECT "snaps_tags"."id" FROM "snaps_tags" INNER JOIN txtblx_textblocks
+        ON txtblx_textblocks.id = snaps_tags.record_id
+        AND snaps_tags.record_type = 'Txtblx::Textblock'
+        AND perma_id = 1 WHERE "snaps_tags"."tag" = ? AND "snaps_tags"."superseded_at" IS NULL)  [["tag", "published"]]
+  SQL (0.1ms)  INSERT INTO "snaps_tags" ("record_id", "record_type", "tag", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["record_id", 2], ["record_type", "Txtblx::Textblock"], ["tag", "published"], ["created_at", "2015-04-09 14:19:19.820928"], ["updated_at", "2015-04-09 14:19:19.820928"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  Txtblx::Textblock Load (0.1ms)  SELECT  "txtblx_textblocks".* FROM "txtblx_textblocks" INNER JOIN snaps_tags t_published
+        ON txtblx_textblocks.id = t_published.record_id
+        AND t_published.record_type = 'Txtblx::Textblock'
+        AND t_published.tag = 'published' WHERE (t_published.superseded_at IS NULL) AND "txtblx_textblocks"."key" = ? LIMIT 1  [["key", "homepage.welcome"]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "txtblx_textblocks" ("perma_id", "key", "description", "text", "text_html", "path", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["perma_id", 1], ["key", "homepage.welcome"], ["description", ""], ["text", ""], ["text_html", "Welcome to Dummy App"], ["path", "MyString"], ["created_at", "2015-04-09 14:19:19.827632"], ["updated_at", "2015-04-09 14:19:19.827632"]]
+  SQL (0.1ms)  UPDATE "snaps_tags" SET "superseded_at" = '2015-04-09 14:19:19.830000' WHERE "snaps_tags"."id" IN (SELECT "snaps_tags"."id" FROM "snaps_tags" INNER JOIN txtblx_textblocks
+        ON txtblx_textblocks.id = snaps_tags.record_id
+        AND snaps_tags.record_type = 'Txtblx::Textblock'
+        AND perma_id = 1 WHERE "snaps_tags"."tag" = ? AND "snaps_tags"."superseded_at" IS NULL)  [["tag", "draft"]]
+  SQL (0.1ms)  INSERT INTO "snaps_tags" ("record_id", "record_type", "tag", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["record_id", 1], ["record_type", "Txtblx::Textblock"], ["tag", "draft"], ["created_at", "2015-04-09 14:19:19.830719"], ["updated_at", "2015-04-09 14:19:19.830719"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "txtblx_textblocks" ("perma_id", "key", "description", "text", "text_html", "path", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["perma_id", 1], ["key", "homepage.welcome"], ["description", ""], ["text", ""], ["text_html", "Welcome to Dummy App"], ["path", "MyString"], ["created_at", "2015-04-09 14:19:19.827632"], ["updated_at", "2015-04-09 14:19:19.832566"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  UPDATE "snaps_tags" SET "superseded_at" = '2015-04-09 14:19:19.834603' WHERE "snaps_tags"."id" IN (SELECT "snaps_tags"."id" FROM "snaps_tags" INNER JOIN txtblx_textblocks
+        ON txtblx_textblocks.id = snaps_tags.record_id
+        AND snaps_tags.record_type = 'Txtblx::Textblock'
+        AND perma_id = 1 WHERE "snaps_tags"."tag" = ? AND "snaps_tags"."superseded_at" IS NULL)  [["tag", "published"]]
+  SQL (0.1ms)  INSERT INTO "snaps_tags" ("record_id", "record_type", "tag", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["record_id", 2], ["record_type", "Txtblx::Textblock"], ["tag", "published"], ["created_at", "2015-04-09 14:19:19.835201"], ["updated_at", "2015-04-09 14:19:19.835201"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Started GET "/" for 127.0.0.1 at 2015-04-09 16:19:19 +0200
+Processing by DummiesController#index as HTML
+  Txtblx::Textblock Load (0.1ms)  SELECT  "txtblx_textblocks".* FROM "txtblx_textblocks" INNER JOIN snaps_tags t_published
+        ON txtblx_textblocks.id = t_published.record_id
+        AND t_published.record_type = 'Txtblx::Textblock'
+        AND t_published.tag = 'published' WHERE (t_published.superseded_at IS NULL) AND "txtblx_textblocks"."key" = ? LIMIT 1  [["key", "homepage.welcome"]]
+  Rendered dummies/index.html.erb within layouts/application (2.8ms)
+Completed 200 OK in 14ms (Views: 13.3ms | ActiveRecord: 0.1ms)
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT MAX("txtblx_textblocks"."perma_id") FROM "txtblx_textblocks"
+  SQL (0.2ms)  INSERT INTO "txtblx_textblocks" ("key", "text", "text_html", "perma_id", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["key", "some key"], ["text", "some text inlcuding http://example.com"], ["text_html", "<p>some text inlcuding <a href=\"http://example.com\" target=\"_blank\" rel=\"nofollow\">http://example.com</a></p>"], ["perma_id", 1], ["created_at", "2015-04-09 14:19:19.969315"], ["updated_at", "2015-04-09 14:19:19.969315"]]
+  SQL (0.1ms)  UPDATE "snaps_tags" SET "superseded_at" = '2015-04-09 14:19:19.971289' WHERE "snaps_tags"."id" IN (SELECT "snaps_tags"."id" FROM "snaps_tags" INNER JOIN txtblx_textblocks
+        ON txtblx_textblocks.id = snaps_tags.record_id
+        AND snaps_tags.record_type = 'Txtblx::Textblock'
+        AND perma_id = 1 WHERE "snaps_tags"."tag" = ? AND "snaps_tags"."superseded_at" IS NULL)  [["tag", "draft"]]
+  SQL (0.1ms)  INSERT INTO "snaps_tags" ("record_id", "record_type", "tag", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["record_id", 1], ["record_type", "Txtblx::Textblock"], ["tag", "draft"], ["created_at", "2015-04-09 14:19:19.971990"], ["updated_at", "2015-04-09 14:19:19.971990"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT MAX("txtblx_textblocks"."perma_id") FROM "txtblx_textblocks"
+  SQL (0.1ms)  INSERT INTO "txtblx_textblocks" ("key", "text", "text_html", "perma_id", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["key", "some key"], ["text", "some text"], ["text_html", "<p>some text</p>"], ["perma_id", 1], ["created_at", "2015-04-09 14:19:19.975534"], ["updated_at", "2015-04-09 14:19:19.975534"]]
+  SQL (0.1ms)  UPDATE "snaps_tags" SET "superseded_at" = '2015-04-09 14:19:19.976940' WHERE "snaps_tags"."id" IN (SELECT "snaps_tags"."id" FROM "snaps_tags" INNER JOIN txtblx_textblocks
+        ON txtblx_textblocks.id = snaps_tags.record_id
+        AND snaps_tags.record_type = 'Txtblx::Textblock'
+        AND perma_id = 1 WHERE "snaps_tags"."tag" = ? AND "snaps_tags"."superseded_at" IS NULL)  [["tag", "draft"]]
+  SQL (0.1ms)  INSERT INTO "snaps_tags" ("record_id", "record_type", "tag", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["record_id", 1], ["record_type", "Txtblx::Textblock"], ["tag", "draft"], ["created_at", "2015-04-09 14:19:19.977601"], ["updated_at", "2015-04-09 14:19:19.977601"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txtblx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails