annex-cms 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06eae7e782cfc394312c7c91a2303b91d7192fa5
-  data.tar.gz: 8493a1a55b4b26c159c58d42ecf29f58ed2bf848
+  metadata.gz: e53ab40749b572e54d4e1c076bcb17a541ec2b79
+  data.tar.gz: a8ebc3d23c04e76f38c7ffd4a6aba4980e54b1ef
 SHA512:
-  metadata.gz: 168e7ad0a45e7d4f64afd7ee6153d625e824670402a3400a39d712d9f203d9c0f190628ae21c42bb912a100295749e38a5383481e75e84e317284fbfd7f39c48
-  data.tar.gz: cd6cdfe13109dbcf892062b6a1c0f9db105c8758aaf2adaef8565adbc80fbef068c75ddee0207fa81d38c0f9ca7154cf85b26e8e562355e7300e9780b03be7bb
+  metadata.gz: 43b5bcffaa71cffce6d65d9ee0a6226a620c0e9e8e03d9500e1bc24ce6583742a7dc3202cea362a47dd83791fca3beabf57abc4c6f423d38558656fa501eb482
+  data.tar.gz: 0b672162d4d7c79259a981e00ada87ded35d2fd7e52a7460953a7b7d35238fc87b90b10588c6193a4ac6c7ae163a41ec1b0c5f9bb2b961e2dc1a437fd5b73c06

data/app/views/annex/_block.html.haml

@@ -1,2 +1,2 @@
-.redactor{ { :data => { :identifier => identifier, :route => route } }.deep_merge(opts) }
+.redactor{ { data: { identifier: identifier, route: route }.deep_merge(opts) } }
   = content.html_safe if content

data/lib/annex/version.rb

@@ -2,5 +2,5 @@
 # Annex
 #
 module Annex
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/annex/view_helpers.rb

@@ -1,26 +1,24 @@
 require 'active_support/hash_with_indifferent_access'
 
 module Annex
+  #
+  # Create global view helpers
+  #
   module ViewHelpers
+    #
+    # annex_block is a universal helper to render content from
+    # mongodb and display it on the page
+    #
+    # @TODO: implement caching
+    #
     def annex_block(identifier, opts = {})
-      opts[:default] ||= ''
+      opts[:route] ||= current_route
 
-      if opts.try(:route)
-        route = opts[:route]
-        opts[:route].delete
-      else
-        route = current_route
-      end
+      doc = Annex::Block.where(route: opts[:route]).first_or_create
 
-      doc = Annex::Block.where(:route => route.to_s).first_or_create
+      content = doc.content.try(:[], identifier.to_s) || opts[:default]
 
-      if doc.content
-        content = doc.content[identifier.to_s] || opts[:default]
-      else
-        content = opts[:default]
-      end
-
-      render partial: 'annex/block', locals: { content: content, route: route, identifier: identifier, opts: opts }
+      render partial: 'annex/block', locals: { content: content, route: opts[:route], identifier: identifier, opts: opts }
     end
 
     def annex_clips(clip)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annex-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Clay McIlrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails