ruhoh 1.1 → 2.1

data/lib/ruhoh/views/rmustache.rb

@@ -0,0 +1,24 @@
+module Ruhoh::Views  
+  class RMustache < Mustache
+    class RContext < Context
+
+      # Overload find method to catch helper expressions
+      def find(obj, key, default = nil)
+        return super unless key.to_s.index('?')
+        keys = key.to_s.split('?')
+        context = keys[0]
+        helpers = keys[1..-1]
+        context = context.empty? ? obj : super(obj, context)
+        
+        helpers.each do |helper|
+          context = self.mustache_in_stack.__send__ helper, context
+        end
+        context
+      end
+    end
+  
+    def context
+      @context ||= RContext.new(self)
+    end
+  end
+end

data/ruhoh.gemspec

@@ -16,88 +16,12 @@ Gem::Specification.new do |s|
   # dependencies defined in Gemfile
   s.add_dependency 'rack', "~> 1.4"
   s.add_dependency 'mustache', "~> 0.99"
-  s.add_dependency 'directory_watcher', "~> 1.4"
+  s.add_dependency 'directory_watcher', "~> 1.4.0"
   s.add_dependency 'redcarpet', "~> 2.1"
   s.add_dependency 'nokogiri', "~> 1.5"
-  
-  # = MANIFEST =
-  s.files = %w[
-    Gemfile
-    README.md
-    Rakefile
-    bin/ruhoh
-    history.json
-    lib/ruhoh.rb
-    lib/ruhoh/client/client.rb
-    lib/ruhoh/client/console_methods.rb
-    lib/ruhoh/client/help.yml
-    lib/ruhoh/compiler.rb
-    lib/ruhoh/compilers/rss.rb
-    lib/ruhoh/compilers/theme.rb
-    lib/ruhoh/config.rb
-    lib/ruhoh/converters/converter.rb
-    lib/ruhoh/converters/markdown.rb
-    lib/ruhoh/db.rb
-    lib/ruhoh/deployers/s3.rb
-    lib/ruhoh/friend.rb
-    lib/ruhoh/logger.rb
-    lib/ruhoh/page.rb
-    lib/ruhoh/parsers/javascripts.rb
-    lib/ruhoh/parsers/layouts.rb
-    lib/ruhoh/parsers/pages.rb
-    lib/ruhoh/parsers/partials.rb
-    lib/ruhoh/parsers/payload.rb
-    lib/ruhoh/parsers/posts.rb
-    lib/ruhoh/parsers/routes.rb
-    lib/ruhoh/parsers/scaffolds.rb
-    lib/ruhoh/parsers/site.rb
-    lib/ruhoh/parsers/stylesheets.rb
-    lib/ruhoh/parsers/theme_config.rb
-    lib/ruhoh/parsers/widgets.rb
-    lib/ruhoh/paths.rb
-    lib/ruhoh/previewer.rb
-    lib/ruhoh/program.rb
-    lib/ruhoh/templaters/asset_helpers.rb
-    lib/ruhoh/templaters/base_helpers.rb
-    lib/ruhoh/templaters/helpers.rb
-    lib/ruhoh/templaters/rmustache.rb
-    lib/ruhoh/urls.rb
-    lib/ruhoh/utils.rb
-    lib/ruhoh/version.rb
-    lib/ruhoh/watch.rb
-    ruhoh.gemspec
-    spec/config_spec.rb
-    spec/db_spec.rb
-    spec/page_spec.rb
-    spec/parsers/layouts_spec.rb
-    spec/parsers/pages_spec.rb
-    spec/parsers/posts_spec.rb
-    spec/parsers/routes_spec.rb
-    spec/parsers/site_spec.rb
-    spec/setup_spec.rb
-    spec/spec_helper.rb
-    spec/support/shared_contexts.rb
-    system/dash.html
-    system/partials/categories_list.html
-    system/partials/pages_list.html
-    system/partials/posts_collate.html
-    system/partials/posts_list.html
-    system/partials/posts_summary.html
-    system/partials/tags_list.html
-    system/scaffolds/draft.html
-    system/scaffolds/layout.html
-    system/scaffolds/page.html
-    system/scaffolds/post.html
-    system/widgets/analytics/config.yml
-    system/widgets/analytics/layouts/getclicky.html
-    system/widgets/analytics/layouts/google.html
-    system/widgets/comments/config.yml
-    system/widgets/comments/layouts/disqus.html
-    system/widgets/comments/layouts/facebook.html
-    system/widgets/comments/layouts/intensedebate.html
-    system/widgets/comments/layouts/livefyre.html
-    system/widgets/google_prettify/config.yml
-    system/widgets/google_prettify/layouts/google_prettify.html
-  ]
-  # = MANIFEST =
+
+  s.files = `git ls-files`.
+              split("\n").
+              sort.
+              reject { |file| file =~ /^(\.|rdoc|pkg|coverage)/ }
 end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ RSpec.configure do |config|
   }
   config.after(:each) do 
     # Reset all configuration variables after each test.
-    Ruhoh.reset
+    #Ruhoh.reset
     FileUtils.remove_dir(SampleSitePath,1) if Dir.exists? SampleSitePath
   end
 end

data/spec/support/shared_contexts.rb

@@ -3,22 +3,23 @@ shared_context 'write_default_theme' do
     Dir.mkdir SampleSitePath
     theme = "twitter"
     # Create base config.yml + base theme
-    File.open(File.join(SampleSitePath, Ruhoh.names.config_data), "w+") { |file|
+    File.open(File.join(SampleSitePath, "config.yml"), "w+") { |file|
       file.puts <<-TEXT
 ---
 theme: '#{theme}'
 ---  
   TEXT
     }
-    theme_dir = File.join(SampleSitePath, Ruhoh.names.themes, theme)
+    theme_dir = File.join(SampleSitePath, theme)
     FileUtils.makedirs theme_dir
   end
 end
 
 shared_context 'default_setup' do
   before(:each) do
-    Ruhoh.setup(:source => SampleSitePath)
-    Ruhoh.setup_paths
-    Ruhoh.setup_urls
+    @ruhoh = Ruhoh.new
+    @ruhoh.setup(:source => SampleSitePath)
+    @ruhoh.setup_paths
+    @ruhoh.setup_urls
   end
 end

data/system/{scaffolds/post.html → _scaffold.html}

@@ -2,5 +2,5 @@
 title:
 date: '{{DATE}}'
 description:
-categories:
+tags: []
 ---

data/system/{dash.html → dash/index.html}

@@ -101,6 +101,9 @@
     ul.page-list li {
       margin-bottom:3px;
     }  
+    ul.page-list li.draft {
+      background-color:#EEE;
+    }
     ul.page-list li a{
       display:block;
       overflow:hidden;
@@ -127,62 +130,43 @@
   </style>
 </head>
 <body>
-<div id="wrapper">
-  
-  <div id="nav-wrapper">
-    <ul id="nav">
-      <li><a href="#drafts" class="active">Drafts</a></li>
-      <li><a href="#public">Posts</a></li>
-      <li><a href="#pages">Pages</a></li>
-    </ul>
-  </div>
+  <div id="wrapper">
 
-  <div id="drafts" class="page-pane">
-    <ul class="page-list">
-    {{# db.posts.drafts?to_posts }}
-      <li>
-        <a href="{{url}}">
-          <span class="title">{{title}}</span>
-          <span class="date">{{date}}</span>
-          <br><span class="id">{{id}}</span></small>
-        </a>
-      </li>
-    {{/ db.posts.drafts?to_posts }}
-    </ul>
-  </div>  
+    <div id="nav-wrapper">
+      <ul id="nav">
+      {{# page_collections }}
+        <li><a href="#{{ resource_name }}">{{ resource_name }}</a></li>
+      {{/ page_collections }}
+      </ul>
+    </div>
 
-  <div id="public" class="page-pane" style="display:none">
-    <ul class="page-list">
-  {{#posts}}
-    {{^ type }}
-      <li>
-        <a href="{{url}}">
-          <span class="title">{{title}}</span>
-          <span class="date">{{date}}</span>
-          <br><span class="id">{{id}}</span></small>
-        </a>
-      </li>
-    {{/ type }}
-  {{/posts}}
-    </ul>
-  </div>
+  {{# page_collections }}
+    <div id="{{ resource_name }}" class="page-pane">
+      <ul class="page-list">
+        {{# drafts }}
+          <li class="draft">
+            <a href="{{url}}">
+              <span class="title">{{title}}</span>
+              <span class="date">{{date}}</span>
+              <br><span class="id">{{id}}</span></small>
+            </a>
+          </li>
+        {{/ drafts }}
 
-  <div id="pages" class="page-pane" style="display:none">
-    <ul class="page-list">
-    {{#pages}}
-      <li>
-        <a href="{{url}}">
-          <span class="title">{{title}}</span>
-          <span class="date">{{date}}</span>
-          <br><span class="id">{{id}}</span></small>
-        </a>
-      </li>
-    {{/pages}}
-    </ul>
+        {{# all }}
+          <li>
+            <a href="{{url}}">
+              <span class="title">{{title}}</span>
+              <span class="date">{{date}}</span>
+              <br><span class="id">{{id}}</span></small>
+            </a>
+          </li>
+        {{/ all }}
+      </ul>
+    </div>
+  {{/ page_collections }}
   </div>
 
-</div>
-  
   <script>
     // Tabs is a small script for showing/hiding the different page lists.
     // This mostly likely only works in modern browsers but
@@ -208,6 +192,8 @@
           var id = e.target.href.split('#')[1];
           document.getElementById(id).style.display = 'block';
         }, false)
+
+        Tabs.nav.children[0].children[0].click();
       },
       
       clearActive : function(){

data/system/layouts/paginator.html

@@ -0,0 +1,28 @@
+<div class="row-fluid">
+  <div class="span12">
+    {{#collection.paginator}}
+      <div class="{{ collection.resource_name}}">
+        <h3 class="title"><a href="{{url}}">{{title}}</a> <span class="date">{{ date }}</span></h3>
+
+        {{{ summary }}}
+
+        <div class="more">
+          <a href="{{url}}" class="btn btn-small">read more..</a>
+        </div>
+      </div>
+    {{/collection.paginator}}
+    
+    <div class="pagination">
+      <ul>
+      {{#collection.paginator_navigation}}
+        {{#is_active_page}}
+          <li class="active"><a href="{{url}}">{{name}}</a></li>
+        {{/is_active_page}}
+        {{^is_active_page}}
+          <li><a href="{{url}}">{{name}}</a></li>
+        {{/is_active_page}}
+      {{/collection.paginator_navigation}}
+      </ul>
+    </div>
+  </div>
+</div>

data/system/plugins/sprockets/javascripts/compiler.rb

@@ -0,0 +1,25 @@
+require 'sprockets'
+module Ruhoh::Resources::Javascripts
+  class Compiler
+    include Ruhoh::Base::Compilable
+
+    def run
+      Ruhoh::Friend.say { cyan "Javascripts: (using sprockets)" }
+      env = Sprockets::Environment.new
+      env.logger = Logger.new(STDOUT)
+      @collection.paths.reverse.each do |h|
+        env.append_path(File.join(h["path"], @collection.resource_name))
+      end
+
+      compiled_path = Ruhoh::Utils.url_to_path(@collection.url_endpoint, @ruhoh.paths.compiled)
+      FileUtils.mkdir_p compiled_path
+
+      manifest = Sprockets::Manifest.new(env, compiled_path)
+      assets = @collection.files.values.map{ |p| p["id"] }
+      manifest.compile(assets)
+
+      # Update the stylesheet paths to the digest format:
+      @collection._cache.merge!(manifest.assets)
+    end
+  end
+end

data/system/plugins/sprockets/javascripts/previewer.rb

@@ -0,0 +1,17 @@
+require 'sprockets'
+module Ruhoh::Resources::Javascripts
+  class Previewer
+    extend Forwardable
+
+    def_instance_delegator :@environment, :call
+
+    def initialize(ruhoh)
+      environment = Sprockets::Environment.new
+      collection = ruhoh.collection('javascripts')
+      collection.paths.reverse.each do |path|
+        environment.append_path(path)
+      end
+      @environment = environment
+    end
+  end
+end

data/system/plugins/sprockets/stylesheets/compiler.rb

@@ -0,0 +1,26 @@
+require 'sprockets'
+module Ruhoh::Resources::Stylesheets
+  class Compiler
+    include Ruhoh::Base::Compilable
+
+    def run
+      Ruhoh::Friend.say { cyan "Stylesheets: (using sprockets)" }
+      env = Sprockets::Environment.new
+      env.logger = Logger.new(STDOUT)
+      @collection.paths.reverse.each do |h|
+        env.append_path(File.join(h["path"], @collection.resource_name))
+      end
+      
+      compiled_path = Ruhoh::Utils.url_to_path(@collection.url_endpoint, @ruhoh.paths.compiled)
+      FileUtils.mkdir_p compiled_path
+
+      manifest = Sprockets::Manifest.new(env, compiled_path)
+      assets = @collection.files.values.map{ |p| p["id"] }
+      puts assets.inspect
+      manifest.compile(assets)
+
+      # Update the stylesheet paths to the digest format:
+      @collection._cache.merge!(manifest.assets)
+    end
+  end
+end

data/system/plugins/sprockets/stylesheets/previewer.rb

@@ -0,0 +1,17 @@
+require 'sprockets'
+module Ruhoh::Resources::Stylesheets
+  class Previewer
+    extend Forwardable
+
+    def_instance_delegator :@environment, :call
+
+    def initialize(ruhoh)
+      environment = Sprockets::Environment.new
+      collection = ruhoh.collection('stylesheets')
+      collection.paths.reverse.each do |path|
+        environment.append_path(path)
+      end
+      @environment = environment
+    end
+  end
+end

data/system/widgets/analytics/{layouts/getclicky.html → getclicky.html}

@@ -1,6 +1,10 @@
+---
+site_id : 123
+---
+
 <script>
 var clicky_site_ids = clicky_site_ids || [];
-clicky_site_ids.push({{ config.getclicky.site_id }});
+clicky_site_ids.push({{ this_config.site_id }});
 (function() {
   var s = document.createElement('script');
   s.type = 'text/javascript';
@@ -9,4 +13,4 @@ clicky_site_ids.push({{ config.getclicky.site_id }});
   ( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
 })();
 </script>
-<noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/{{ config.getclicky.site_id }}ns.gif" /></p></noscript>
+<noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/{{ this_config.site_id }}ns.gif" /></p></noscript>

data/system/widgets/analytics/{layouts/google.html → google.html}

@@ -1,5 +1,9 @@
+---
+tracking_id : 'UA-123-12'
+---
+
 <script>
-  var _gaq=[['_setAccount','{{ config.google.tracking_id }}'],['_trackPageview']];
+  var _gaq=[['_setAccount','{{ this_config.tracking_id }}'],['_trackPageview']];
   (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));

data/system/widgets/comments/{layouts/disqus.html → disqus.html}

@@ -1,7 +1,11 @@
+---
+short_name : jekyllbootstrap # Change This!
+---
+
 <div id="disqus_thread"></div>
 <script>
-    {{^production }}var disqus_developer = 1;{{/production}}
-    var disqus_shortname = '{{ config.disqus.short_name }}'; // required: replace example with your forum shortname
+    {{^ env.production }}var disqus_developer = 1;{{/ env.production }}
+    var disqus_shortname = '{{ this_config.short_name }}'; // required: replace example with your forum shortname
     /* * * DON'T EDIT BELOW THIS LINE * * */
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;