client_pages 0.0.3.beta → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651585c4dbeab42b84039c22aec54878b9f54426
-  data.tar.gz: df24efef446ba402721bf025295c0d978103dfd4
+  metadata.gz: d193fa65ba3d80471b486aff88d4ab9392ef39e2
+  data.tar.gz: 9ca9c1d6e184188d711b08f04e32f6788b01b264
 SHA512:
-  metadata.gz: 4f859d580c6ba704bec2fd9dcbb05baa4208bae91c355c6c8618f55d9a46ce32bceeaa0b4bab8622ca4b2279dcd7a6d577908a33bfc664e39e4b391b122071d6
-  data.tar.gz: 9812ecd03067ce9907d6fe3d0c1fd58d6625877fb1f2d44a67af5ec5535e373187abc1aa4313cb82db0184968cf472ffa59c32d0d4b14a459988942aecad49f2
+  metadata.gz: 782054588bfe71e9483a492e95e1ace9b51fd37839f507796fb5a560136cfd123f14274fd68780bcae2edb9aed7289b9cc07f0bf853b6fc693e7e3b20835eaee
+  data.tar.gz: fa2bb9d7498d84aa797089b1cbb6faae58d89da9061cc3094b4470e46730e41ac35a642a64203a8b9740605946f7ac6fab82414b3428e290fe659b2faf980a80

data/README.md

@@ -72,7 +72,7 @@ no framework? pure rack?
   for convenience you can add ``` include ClientPages::MarkdownContent ``` to your application controller/view_helper/presenter/... or something which is responsible for building html
   so that you can call ```render_content``` there.
 
-  or if you're riding the real blank slate, just call ```ClientPages::MarkdownContent.render_content``` directly. **WRONG!!!**
+  or if you're riding the real blank slate, just call ```ClientPages.render_content``` directly.
 
 sinatra?
 
@@ -106,9 +106,10 @@ sinatra?
   - by default...
   - content_path
   - if you go the full remote path without fallback, you might consider to turn on caching.
+  - s3 ?
 
   ```
-  ClientPages.config do |c|
+  ClientPages.configure do |c|
     c.remote = true
     c.remote_content_path = 'https://dl.dropboxusercontent.com/u/363312/rackedy_rack'
     c.content_path = 'content'

data/client_pages.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage      = ''
   s.license       = 'MIT'
 
-  s.files         = `git ls-files`.split($/)
+  s.files         = `git ls-files`.split($/) - Dir['examples/**/*'] - %w(.gitignore)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '~> 1.5.3'
   s.add_development_dependency 'rake', '~> 10.1.1'
   s.add_development_dependency 'rspec', '~> 2.14.1'
-  s.add_development_dependency 'webmock', '~> 1.17.3'
+  s.add_development_dependency 'webmock', '~> 1.17.4'
   s.add_development_dependency 'pry-plus', '~> 1.0.0'
   s.add_development_dependency 'rubocop', '~> 0.18.1'
   s.add_development_dependency 'flog', '~> 4.2.0'

data/lib/client_pages/configuration.rb

@@ -1,6 +1,6 @@
 module ClientPages
   class Configuration
-    attr_accessor :content_path, :remote, :remote_content_path, :caching, :fallback, :i18n, :raw_markdown
+    attr_accessor :content_path, :remote, :remote_content_path, :caching, :raw_markdown
     attr_reader :render_options, :markdown_extensions
 
     def initialize
@@ -10,20 +10,15 @@ module ClientPages
     end
 
     def render_options=(options)
-      @render_options.merge!(options)
+      render_options.merge!(options)
     end
 
     def markdown_extensions=(options)
-      @markdown_extensions.merge!(options)
+      markdown_extensions.merge!(options)
     end
 
     def to_hash
-      # TODO: instance vars get
-      {
-        content_path: content_path,
-        render_options: render_options,
-        markdown_extensions: markdown_extensions
-      }
+      Hash[instance_variables.map { |name| [name[1..-1].to_sym, instance_variable_get(name)] }]
     end
   end
 end

data/lib/client_pages/markdown_content/content_builder.rb

@@ -41,7 +41,7 @@ module ClientPages
 
       def conditions(tag, line, condition)
         return yield if condition.nil?
-        if condition.respond_to?(:call) && condition.call(Matcher.new(tag, line))
+        if condition.respond_to?(:call) && Matcher.new(tag, line).instance_exec(&condition)
           yield
         elsif condition.is_a?(Hash) && Matcher.new(tag, line).match_all?(condition)
           yield

data/lib/client_pages/markdown_content/renderer.rb

@@ -2,9 +2,9 @@ module ClientPages
   module MarkdownContent
     class Renderer
       class << self
-        def render_content(file, options = {})
+        def render_content(file, options = {}, &block)
           html = new(file, options).html
-          block_given? ? yield(ContentBuilder.new(html)) : html.strip
+          block_given? ? ContentBuilder.new(html).instance_eval(&block) : html.strip
         rescue OpenURI::HTTPError
           "404: could not find '#{file}'"
         rescue Errno::ENOENT
@@ -22,7 +22,7 @@ module ClientPages
 
       def html
         html = html_from_markdown
-        html = template.call(ContentBuilder.new(html)) if options.key?(:template)
+        html = template(html) if options.key?(:template)
         html
       end
 
@@ -40,8 +40,8 @@ module ClientPages
         Redcarpet::Markdown.new(html_renderer, extensions).render(markdown)
       end
 
-      def template
-        ClientPages.template[options[:template]]
+      def template(html)
+        ContentBuilder.new(html).instance_eval(&Template[options[:template]])
       end
 
       def markdown

data/lib/client_pages/template.rb

@@ -1,7 +1,21 @@
 module ClientPages
   class Template
-    def set(name, &settings)
-      ClientPages.template[name] = Proc.new(&settings)
+    class << self
+      def templates
+        @templates ||= {}
+      end
+
+      def template(name, &settings)
+        templates[name] = Proc.new(&settings)
+      end
+
+      def [](template)
+        templates[template]
+      end
+
+      def templating(&block)
+        instance_eval(&block)
+      end
     end
   end
 end

data/lib/client_pages/version.rb

@@ -1,3 +1,3 @@
 module ClientPages
-  VERSION = '0.0.3.beta'
+  VERSION = '0.0.5'
 end

data/lib/client_pages.rb

@@ -14,19 +14,18 @@ module ClientPages
   end
 
   class << self
+    extend Forwardable
     attr_accessor :configuration
 
+    def_delegator MarkdownContent::Renderer, :render_content
+    def_delegator Template, :templating
+
     def config
       self.configuration ||= Configuration.new
-      block_given? ? yield(configuration) : configuration
-    end
-
-    def template
-      @template ||= {}
     end
 
-    def templates(&block)
-      yield Template.new
+    def configure
+      yield(config)
     end
 
     def cache

data/spec/integration/client_pages_spec.rb

@@ -2,25 +2,25 @@ require 'spec_helper'
 
 module ClientPages
   describe 'MarkdownContent' do
-    subject { ClientPages::MarkdownContent::Renderer }
+    subject { ClientPages }
 
     describe 'invalid path' do
-      before { ClientPages.config { |c| c.content_path = 'not_there' } }
+      before { ClientPages.configure { |c| c.content_path = 'not_there' } }
       it { expect(subject.render_content(:bar)).to eql('No such file or directory - bar') }
     end
 
     describe 'valid path' do
-      before { ClientPages.config { |c| c.content_path = 'spec/fixtures/foo' } }
+      before { ClientPages.configure { |c| c.content_path = 'spec/fixtures/foo' } }
       it { expect(subject.render_content(:bar)).to eql("<h1>foo</h1>\n\n<p>bar</p>") }
     end
 
     it 'blends' do
       expect(
-        subject.render_content(:test_content) do |c|
-          c.modify :h1, with: { class: 'mycss_class', 'data-foo' => 'bar' }, if: ->(m) { m.includes?('Content') }
-          c.modify :a, with: { class: 'fancy', title: 'woah' }, if: { href: 'http://somewhere.com' }
-          c.wrap :h1, :div, with: { id: 'my-id', class: 'foo' }
-          c.replace :p, :span, with: { class: 'bar', 'data-p' => 'no-more' }
+        subject.render_content(:test_content) do
+          modify :h1, with: { class: 'mycss_class', 'data-foo' => 'bar' }, if: -> { includes?('Content') }
+          modify :a, with: { class: 'fancy', title: 'woah' }, if: { href: 'http://somewhere.com' }
+          wrap :h1, :div, with: { id: 'my-id', class: 'foo' }
+          replace :p, :span, with: { class: 'bar', 'data-p' => 'no-more' }
         end
       ).to eql(
         "<div id=\"my-id\" class=\"foo\"><h1 class=\"mycss_class\" data-foo=\"bar\">Content from "\
@@ -35,7 +35,7 @@ module ClientPages
       let(:markdown) { fixture('test_content') }
 
       before do
-        ClientPages.config do |c|
+        ClientPages.configure do |c|
           c.remote = true
           c.caching = false
           c.remote_content_path = 'http://somewhere.com'
@@ -53,7 +53,7 @@ module ClientPages
 
         describe 'raw markdown' do
           before do
-            ClientPages.config { |c| c.raw_markdown = true }
+            ClientPages.configure { |c| c.raw_markdown = true }
           end
 
           it 'renders HTML content for given markdown' do
@@ -78,9 +78,9 @@ module ClientPages
 
         it 'modifies tags and html attributes' do
           expect(
-            subject.render_content(:test_content) do |c|
-              c.modify :h1, with: { class: 'mycss_class', 'data-foo' => 'bar' }
-              c.modify :a, with: { class: 'fancy', title: 'woah' }
+            subject.render_content(:test_content) do
+              modify :h1, with: { class: 'mycss_class', 'data-foo' => 'bar' }
+              modify :a, with: { class: 'fancy', title: 'woah' }
             end
           ).to include(
             '<h1 class="mycss_class" data-foo="bar">'\
@@ -91,9 +91,9 @@ module ClientPages
 
         it 'adds attributes conditionally' do
           expect(
-            subject.render_content(:test_content) do |c|
-              c.modify :h1, with: { class: 'add_me cool' }, if: true
-              c.modify :a, with: { class: 'add_me_not' }, if: false
+            subject.render_content(:test_content) do
+              modify :h1, with: { class: 'add_me cool' }, if: true
+              modify :a, with: { class: 'add_me_not' }, if: false
             end
           ).to include(
             '<h1 class="add_me cool">Content from <a href="http://somewhere.com">somewhere</a></h1>'
@@ -102,10 +102,10 @@ module ClientPages
 
         it 'adds any attribute conditionally and selective' do
           expect(
-            subject.render_content(:link_list) do |c|
-              c.modify :li, with: { class: 'yay' }, if: ->(m) { m.match_any?(:href, '/link1') }
-              c.modify :a, with: { class: 'active' }, if: { href: '/link2' }
-              c.modify :a, with: { class: 'important', 'data-foo' => 'bar' }, if: { title: 'i haz title' }
+            subject.render_content(:link_list) do
+              modify :li, with: { class: 'yay' }, if: -> { match_any?(:href, '/link1') }
+              modify :a, with: { class: 'active' }, if: { href: '/link2' }
+              modify :a, with: { class: 'important', 'data-foo' => 'bar' }, if: { title: 'i haz title' }
             end
           ).to include(
             "<li class=\"yay\"><a href=\"/link1\">link1</a></li>\n"\
@@ -116,9 +116,9 @@ module ClientPages
 
         it 'wraps multiple tags with container' do
           expect(
-            subject.render_content(:text_list) do |c|
-              c.wrap :ul, :div, with: { class: 'wrapper foo' }
-              c.wrap :em, :span, with: { class: 'special' }, if: ->(m) { m.includes?('Bar') }
+            subject.render_content(:text_list) do
+              wrap :ul, :div, with: { class: 'wrapper foo' }
+              wrap :em, :span, with: { class: 'special' }, if: -> { includes?('Bar') }
             end
           ).to eql(
             "<div class=\"wrapper foo\"><ul>\n"\
@@ -130,9 +130,9 @@ module ClientPages
 
         it 'wraps and modifies tags' do
           expect(
-            subject.render_content(:text_list) do |c|
-              c.wrap :ul, :div, with: { class: 'container' }
-              c.modify :em, with: { style: 'color: #c0ffee' }
+            subject.render_content(:text_list) do
+              wrap :ul, :div, with: { class: 'container' }
+              modify :em, with: { style: 'color: #c0ffee' }
             end
           ).to eql(
             "<div class=\"container\"><ul>\n"\
@@ -144,9 +144,9 @@ module ClientPages
 
         it 'replaces tags and adds class' do
           expect(
-            subject.render_content(:test_content) do |c|
-              c.replace :p, :div, with: { class: 'byebye' }
-              c.replace :em, :span, with: { id: 'i-am', class: 'cool', 'data-u' => 'r-not' }
+            subject.render_content(:test_content) do
+              replace :p, :div, with: { class: 'byebye' }
+              replace :em, :span, with: { id: 'i-am', class: 'cool', 'data-u' => 'r-not' }
             end
           ).to eql(
             "<h1>Content from <a href=\"http://somewhere.com\">somewhere</a></h1>\n\n"\
@@ -159,10 +159,10 @@ module ClientPages
 
         it 'wraps and replaces conditionally' do
           expect(
-            subject.render_content(:test_content) do |c|
-              c.wrap :a, :span, with: { class: 'btn' }, if: { href: 'http://somewhere.com' }
-              c.replace :p, :div, if: ->(m) { m.includes?('Lorem') }
-              c.replace :em, :span, with: { class: 'replaced' }, if: ->(m) { m.includes?('incididunt') }
+            subject.render_content(:test_content) do
+              wrap :a, :span, with: { class: 'btn' }, if: { href: 'http://somewhere.com' }
+              replace :p, :div, if: -> { includes?('Lorem') }
+              replace :em, :span, with: { class: 'replaced' }, if: -> { includes?('incididunt') }
             end
           ).to eql(
             "<h1>Content from <span class=\"btn\"><a href=\"http://somewhere.com\">somewhere</a></span></h1>\n\n"\
@@ -174,11 +174,11 @@ module ClientPages
 
       describe 'with caching' do
         before(:each) { ClientPages.cache.clear }
-        after { ClientPages.config { |c| c.caching = false } }
+        after { ClientPages.configure { |c| c.caching = false } }
 
         context 'enabled' do
           before do
-            ClientPages.config do |c|
+            ClientPages.configure do |c|
               c.caching = true
               c.remote = true
               c.remote_content_path = 'http://c.ly'
@@ -203,7 +203,7 @@ module ClientPages
 
         context 'disabled' do
           before do
-            ClientPages.config do |c|
+            ClientPages.configure do |c|
               c.caching = false
               c.remote = true
               c.remote_content_path = 'http://c.ly'
@@ -226,19 +226,19 @@ module ClientPages
 
       describe 'default templates' do
         before do
-          ClientPages.templates do |t|
-            t.set(:basic) do |c|
-              c.modify :h1, with: { class: 'headers' }
-              c.wrap :a, :span, with: { class: 'links' }, if: ->(m) { m.includes?('somewhere') }
-              c.replace :p, :div
+          ClientPages.templating do
+            template :basic do
+              modify :h1, with: { class: 'headers' }
+              wrap :a, :span, with: { class: 'links' }, if: -> { includes?('somewhere') }
+              replace :p, :div
             end
           end
         end
 
         it 'uses templates and accepts additional block' do
           expect(
-            subject.render_content(:test_content, template: :basic) do |c|
-              c.modify :h1, with: { 'data-foo' => 'bar' }
+            subject.render_content(:test_content, template: :basic) do
+              modify :h1, with: { 'data-foo' => 'bar' }
             end
           ).to eql(
             "<h1 class=\"headers\" data-foo=\"bar\">Content from <span class=\"links\">"\
@@ -256,7 +256,7 @@ module ClientPages
 
       it 'is configurable with a block' do
         expect {
-          subject.config do |c|
+          subject.configure do |c|
             c.content_path = 'somewhere'
             c.render_options = { foo: 'bar' }
             c.markdown_extensions = { bam: true }

data/spec/spec_helper.rb

@@ -25,7 +25,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    ClientPages.config do |c|
+    ClientPages.configure do |c|
       c.remote = false
       c.caching = false
       c.content_path = 'spec/fixtures/content'

data/spec/unit/template_spec.rb

@@ -1,16 +1,29 @@
 require 'spec_helper'
 
 module ClientPages
-  describe 'Template' do
-    let(:templates) { {} }
+  describe Template do
+    subject { described_class }
 
-    before do
-      expect(ClientPages).to receive(:template) { templates }
-      Template.new.set(:foo) { |args| 'foobar' + args }
+    describe '#template' do
+      before do
+        subject.template(:foo) { |args| 'foobar' + args }
+      end
+
+      it 'saves a referenceable block with arguments' do
+        expect(subject.templates[:foo].call('bam')).to eql('foobarbam')
+      end
     end
 
-    it 'saves a referenceable block with arguments' do
-      expect(templates[:foo].call('bam')).to eql('foobarbam')
+    context 'in a templating block' do
+      before do
+        subject.templating do
+          template(:bar) { '42' }
+          template(:baz) { 'yay' }
+        end
+      end
+
+      it { expect(subject[:bar].call).to eql('42') }
+      it { expect(subject[:baz].call).to eql('yay') }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_pages
 version: !ruby/object:Gem::Version
-  version: 0.0.3.beta
+  version: 0.0.5
 platform: ruby
 authors:
 - Marco Schaden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 1.17.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 1.17.4
 - !ruby/object:Gem::Dependency
   name: pry-plus
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - .rubocop.yml
 - Gemfile
 - LICENSE.txt
@@ -186,9 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11

data/.gitignore

@@ -1,20 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-.rspec
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.rvmrc
-*.notes