activeadmin_cms 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI0ODY2M2M0OWQwZTBhYmIzZmEyMmZiNTQzNjU4NzYzOTU3ZTQyZg==
+    M2QxNWQzOTJmMjc5NzhmZWU1YThkNDhiODYyYjUzNDBlZGIyYzViMA==
   data.tar.gz: !binary |-
-    NWY3MmM0N2EzOGM4MDBkNDRlMDY1MzBkZDJhNjJhZWE4YWQ0ODI1OA==
+    ZDQxZTRiNjRhNmQ4MGYwMzNjOGRjYTExMmFiMTdjYzAyMjdmOTE0Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjI3NzVjOTNmNjk2M2Y4MTBlN2JmNGFhZWIyMjA2MzA2YmM4OWNhNWM5MmU1
-    ZDY0N2ZlN2YwMzNmZmExOWVkM2UxZjMyNTBjYTE1NWZkNzdjYWUxODljMjY1
-    ZjMzOTYyMmNhMjJhZjYzYzQxMjE0NzA5OGE3Y2MzOGRmMTUwZDU=
+    NzkzOWUwNTg0NmRlYWE2ZmU5ZjJiYzM5NTVlYWQ4MTdhMWU5YjNmYjkyYTZk
+    MTI1MjQ2NjcwY2QzYWU3MjliNmE0MjMxN2ViNWFjYzdjNjIxNzU5N2U0YzBj
+    NWQzNmI2OWNlYTkzZWRmYzZhODQxYTA3OGQwNGFmODBhMGUwNDU=
   data.tar.gz: !binary |-
-    MzlmY2VmMjliNjVkOWY2ZGNlMjc5N2NlMDUxODM1YWEwYmYyN2FiY2Q1MjY4
-    YzdkZWY3YjBmN2M2NmE0ZWEyMzU5MjM2M2Q3YTA5ZTM5MzJiMjc0MWZjMjlj
-    ZjU5OGM4NGJlN2FlODI1OGMyNmUyZDdlYTg5Mzg1ZjNkYWY5YTM=
+    YTNkM2JlM2E0YTIwYmRlZGRkMjljZDhmNDRjMDExMjVhNWYwODZmN2Q4MGFl
+    MTM5Mjg2ZWM1MGQ3MGVlMjk3MTFlZGQxMGVkNTY3ZDM2NzdiMDk2MTExYmRj
+    YTViNTU3MGNhYmRkYTc1ZDBhMTljMGZhNzZjOGE2Y2VlMWUwNTk=

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.0.6
+* Added liquid processor with menu builder
+
 == 0.0.4 - 0.0.5
 * Small fixes
 

data/app/services/activeadmin_cms/composer_service.rb

@@ -0,0 +1,44 @@
+module ActiveadminCms
+  class ComposerService < Cyrax::Base
+    class << self
+      def render(html, &block)
+        self.new(html).render(&block)
+      end
+    end
+
+    def initialize(html = nil)
+      @html = html
+      @options = {}
+      @processors = []
+    end
+
+    def render(&block)
+      block.call(self) if block_given?
+      render!
+    end
+
+    def render!
+      processor_classes.each do |processor_class|
+        @html = processor_class.new(@html, @options).process!
+      end
+      @html
+    end
+
+    def process_with(processor)
+      @processors << processor
+    end
+    alias_method :process, :process_with
+
+    def assign(option, value)
+      @options[option.to_sym] = value
+    end
+
+    private
+
+    def processor_classes
+      @processors.map do |processor|
+        "ActiveadminCms::Processors::#{processor.to_s.camelize}".constantize
+      end
+    end
+  end
+end

data/app/services/activeadmin_cms/menu_builder_service.rb

@@ -0,0 +1,12 @@
+module ActiveadminCms
+  class MenuBuilderService
+    def initialize
+      ActiveadminCms::Engine.config.page_categories.each do |category|
+        self.define_singleton_method :"#{category}_pages" do
+          ActiveadminCms::Page.where(category: category)
+        end
+        self.class.liquid_methods :"#{category}_pages"
+      end
+    end
+  end
+end

data/app/services/activeadmin_cms/pages_service.rb

@@ -19,6 +19,19 @@ module ActiveadminCms
       def find_by_slug(slug)
         ActiveadminCms::Page.find_by_slug(slug)
       end
+
+      def menu_builder
+        ActiveadminCms::MenuBuilderService.new
+      end
+
+      def render(page)
+        ActiveadminCms::ComposerService.render page.content do |service|
+          service.assign :page, page
+          service.assign :menu, menu_builder
+          service.process_with :parse_menu
+          service.process_with :parse_template
+        end
+      end 
     end
   end
 end

data/app/services/activeadmin_cms/processors/base.rb

@@ -0,0 +1,17 @@
+class ActiveadminCms::Processors::Base
+  attr_accessor :html
+
+  def initialize(html, options = {})
+    @html = html
+    @options = options
+  end
+
+  def process!
+    process
+    html
+  end
+
+  def option(opt)
+    @options[opt.to_sym]
+  end
+end

data/app/services/activeadmin_cms/processors/parse_menu.rb

@@ -0,0 +1,25 @@
+class ActiveadminCms::Processors::ParseMenu < ActiveadminCms::Processors::Base
+  def process
+    @html.scan(menu_regexp).each do |data|
+      html_original = data[0]
+      html_processed = wrap(data[2], data[1])
+      html_processed.gsub!(/\{\{([a-z]\s)?(?!#{stop_tags})([^\%\/]*?)\}\}/) { "{{menu_item.#{$2}}}" }
+      @html.gsub!(html_original, html_processed)
+    end
+  end
+
+  private
+    def menu_regexp
+      /(\{\{\s*menu\s*\:([a-z]*)\s*\}\}(.*?)\{\{\s*\/\s?menu\s*\}\})/m
+    end
+
+    def wrap(content, category)
+      content.prepend "{% for menu_item in menu.#{category}_pages %}"
+      content.concat "{% endfor %}"
+    end
+
+    def stop_tags
+      /\s*menu_item\s*|\s*menu\s*\:[a-z]*/
+    end
+end
+

data/app/services/activeadmin_cms/processors/parse_template.rb

@@ -0,0 +1,9 @@
+class ActiveadminCms::Processors::ParseTemplate < ActiveadminCms::Processors::Base
+  def process
+    variables = {
+      'page' => option(:page),
+      'menu' => option(:menu)
+    }
+    @html = Liquid::Template.parse(@html).render(variables)
+  end
+end

data/lib/activeadmin_cms/engine.rb

@@ -1,6 +1,7 @@
 require 'activeadmin'
 require 'ace-rails-ap'
 require 'jquery-rails'
+require 'liquid'
 begin
   require 'acts-as-taggable-on'
 rescue LoadError

data/lib/activeadmin_cms/version.rb

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

data/test/dummy/log/test.log

@@ -748,3 +748,58 @@ ActiveadminCmsTest: test_truth
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  rollback transaction
+   (1.2ms)  DELETE FROM "activeadmin_cms_posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'activeadmin_cms_posts';
+   (1.0ms)  DELETE FROM "activeadmin_cms_pages";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  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 (25.8ms)  INSERT INTO "activeadmin_cms_posts" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "Foo content"], ["created_at", Sun, 20 Oct 2013 21:42:16 UTC +00:00], ["title", "Foo post"], ["updated_at", Sun, 20 Oct 2013 21:42: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 21:42: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.4ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------
+#publish: test_0001_should change status to published
+-----------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  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 21:42:16 UTC +00:00], ["slug", "slug-1"], ["title", "Foo page"], ["updated_at", Sun, 20 Oct 2013 21:42: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 21:42: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.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  ActiveadminCms::Page Exists (0.1ms)  SELECT 1 AS one FROM "activeadmin_cms_pages" WHERE "activeadmin_cms_pages"."slug" = 'slug-2' LIMIT 1
+  SQL (0.3ms)  INSERT INTO "activeadmin_cms_pages" ("content", "created_at", "slug", "title", "updated_at") VALUES (?, ?, ?, ?, ?)  [["content", "Foo content"], ["created_at", Sun, 20 Oct 2013 21:42:16 UTC +00:00], ["slug", "slug-2"], ["title", "Foo page"], ["updated_at", Sun, 20 Oct 2013 21:42: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.1ms)  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 21:42:16 UTC +00:00]]
+  ActiveadminCms::Page Load (0.0ms)  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.0ms)  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.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Iskander Haziev
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -180,8 +194,13 @@ files:
 - app/controllers/activeadmin_cms/application_controller.rb
 - app/models/activeadmin_cms/page.rb
 - app/models/activeadmin_cms/post.rb
+- app/services/activeadmin_cms/composer_service.rb
+- app/services/activeadmin_cms/menu_builder_service.rb
 - app/services/activeadmin_cms/pages_service.rb
 - app/services/activeadmin_cms/posts_service.rb
+- app/services/activeadmin_cms/processors/base.rb
+- app/services/activeadmin_cms/processors/parse_menu.rb
+- app/services/activeadmin_cms/processors/parse_template.rb
 - app/views/layouts/activeadmin_cms/application.html.erb
 - config/routes.rb
 - db/migrate/20131020140024_create_activeadmin_cms_posts.rb