ruhoh 1.1 → 2.1

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

@@ -1,9 +1,16 @@
+---
+appid : 123
+num_posts: 5
+width: 580
+colorscheme: light
+---
+
 <div id="fb-root"></div>
 <script>(function(d, s, id) {
   var js, fjs = d.getElementsByTagName(s)[0];
   if (d.getElementById(id)) return;
   js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId={{ site.config.facebook.appid }}";
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId={{ this_config.appid }}";
   fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));</script>
-<div class="fb-comments" data-href="{{ site.production_url }}" data-num-posts="{{ config.facebook.num_posts }}" data-width="{{ config.facebook.width }}" data-colorscheme="{{ config.facebook.colorscheme }}"></div>
+<div class="fb-comments" data-href="{{ urls.production_url }}" data-num-posts="{{ this_config.num_posts }}" data-width="{{ this_config.width }}" data-colorscheme="{{ this_config.colorscheme }}"></div>

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

@@ -1,5 +1,9 @@
+---
+account : 123abc
+---
+
 <script>
-var idcomments_acct = '{{ config.intensedebate.account }}';
+var idcomments_acct = '{{ this_config.account }}';
 var idcomments_post_id;
 var idcomments_post_url;
 </script>

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

@@ -1,6 +1,10 @@
+---
+site_id : 123
+---
+
 <script type='text/javascript' src='http://zor.livefyre.com/wjs/v1.0/javascripts/livefyre_init.js'></script>
 <script type='text/javascript'>
     var fyre = LF({
-        site_id: {{ config.livefyre.site_id }}
+        site_id: {{ this_config.site_id }}
     });
 </script>

data/system/widgets/google_prettify/{layouts/google_prettify.html → default.html}

@@ -1,10 +1,14 @@
+---
+linenums : true
+---
+
 <!-- Google Prettify -->
 <script src="http://cdnjs.cloudflare.com/ajax/libs/prettify/188.0.0/prettify.js"></script>
 <script>
   var pres = document.getElementsByTagName("pre");
   for (var i=0; i < pres.length; ++i) {
-    pres[i].className = "prettyprint {{# config.linenums }}linenums{{/config.linenums}}";
+    pres[i].className = "prettyprint {{# this_config.linenums }}linenums{{/this_config.linenums}}";
   }
   prettyPrint();
 </script>
-<!-- end Google Prettify -->
+<!-- end Google Prettify -->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '2.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -104,76 +104,84 @@ files:
 - 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/base/collection.rb
+- lib/ruhoh/base/compiler.rb
+- lib/ruhoh/base/model.rb
+- lib/ruhoh/base/model_view.rb
+- lib/ruhoh/base/watcher.rb
+- lib/ruhoh/cache.rb
+- lib/ruhoh/client.rb
+- lib/ruhoh/collections.rb
+- lib/ruhoh/console_methods.rb
+- lib/ruhoh/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/programs/compile.rb
+- lib/ruhoh/programs/preview.rb
+- lib/ruhoh/programs/watch.rb
+- lib/ruhoh/resources/dash/collection.rb
+- lib/ruhoh/resources/dash/model.rb
+- lib/ruhoh/resources/dash/model_view.rb
+- lib/ruhoh/resources/dash/previewer.rb
+- lib/ruhoh/resources/data/collection.rb
+- lib/ruhoh/resources/data/collection_view.rb
+- lib/ruhoh/resources/javascripts/collection.rb
+- lib/ruhoh/resources/javascripts/collection_view.rb
+- lib/ruhoh/resources/javascripts/compiler.rb
+- lib/ruhoh/resources/layouts/client.rb
+- lib/ruhoh/resources/layouts/model.rb
+- lib/ruhoh/resources/media/collection.rb
+- lib/ruhoh/resources/media/compiler.rb
+- lib/ruhoh/resources/pages/client.rb
+- lib/ruhoh/resources/pages/collection.rb
+- lib/ruhoh/resources/pages/collection_view.rb
+- lib/ruhoh/resources/pages/compiler.rb
+- lib/ruhoh/resources/pages/model.rb
+- lib/ruhoh/resources/pages/model_view.rb
+- lib/ruhoh/resources/pages/previewer.rb
+- lib/ruhoh/resources/partials/model.rb
+- lib/ruhoh/resources/stylesheets/collection.rb
+- lib/ruhoh/resources/stylesheets/collection_view.rb
+- lib/ruhoh/resources/stylesheets/compiler.rb
+- lib/ruhoh/resources/theme/collection.rb
+- lib/ruhoh/resources/theme/compiler.rb
+- lib/ruhoh/resources/widgets/collection.rb
+- lib/ruhoh/resources/widgets/collection_view.rb
+- lib/ruhoh/resources/widgets/compiler.rb
+- lib/ruhoh/resources/widgets/model.rb
+- lib/ruhoh/routes.rb
 - lib/ruhoh/utils.rb
 - lib/ruhoh/version.rb
-- lib/ruhoh/watch.rb
+- lib/ruhoh/views/helpers/categories.rb
+- lib/ruhoh/views/helpers/paginator.rb
+- lib/ruhoh/views/helpers/tags.rb
+- lib/ruhoh/views/master_view.rb
+- lib/ruhoh/views/rmustache.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/_scaffold.html
+- system/dash/index.html
+- system/layouts/_scaffold.html
+- system/layouts/paginator.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
+- system/plugins/sprockets/javascripts/compiler.rb
+- system/plugins/sprockets/javascripts/previewer.rb
+- system/plugins/sprockets/stylesheets/compiler.rb
+- system/plugins/sprockets/stylesheets/previewer.rb
+- system/widgets/analytics/getclicky.html
+- system/widgets/analytics/google.html
+- system/widgets/comments/disqus.html
+- system/widgets/comments/facebook.html
+- system/widgets/comments/intensedebate.html
+- system/widgets/comments/livefyre.html
+- system/widgets/google_prettify/default.html
 homepage: http://github.com/ruhoh/ruhoh.rb
 licenses:
 - http://www.opensource.org/licenses/MIT
@@ -187,18 +195,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2404318061189800228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2404318061189800228
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -206,3 +208,4 @@ signing_key:
 specification_version: 3
 summary: Ruby based library to process your Ruhoh static blog.
 test_files: []
+has_rdoc: 

data/lib/ruhoh/client/client.rb

@@ -1,306 +0,0 @@
-require 'ruhoh/compiler'
-require 'ruhoh/client/console_methods'
-require 'irb'
-
-class Ruhoh
-  
-  class Client
-    
-    Paths = Struct.new(:page_template, :draft_template, :post_template, :layout_template, :theme_template)
-    DefaultBlogScaffold = 'git://github.com/ruhoh/blog.git'
-    
-    def initialize(data)
-      @iterator = 0
-      self.setup_options(data)
-      
-      cmd = (data[:args][0] == 'new') ? 'blog' : (data[:args][0] || 'help')
-      Ruhoh::Friend.say { 
-        red "Command not found"
-        exit 
-      } unless self.respond_to?(cmd)
-
-      unless ['help','blog','compile'].include?(cmd)
-        Ruhoh.setup
-        Ruhoh.setup_paths
-        Ruhoh.setup_urls
-      end  
-
-      self.__send__(cmd)
-    end  
-    
-    # Thanks rails! https://github.com/rails/rails/blob/master/railties/lib/rails/commands/console.rb
-    def console
-      ARGV.clear # IRB throws an error otherwise.
-      require 'pp'
-      IRB::ExtendCommandBundle.send :include, Ruhoh::ConsoleMethods
-      IRB.start
-    end
-    
-    def setup_options(data)
-      @args = data[:args]
-      @options = data[:options]
-      @opt_parser = data[:opt_parser]
-      @options.ext = (@options.ext || 'md').gsub('.', '')
-    end
-    
-    # Internal: Show Client Utility help documentation.
-    def help
-      file = File.join(Ruhoh::Root, 'lib', 'ruhoh', 'client', 'help.yml')
-      content = Ruhoh::Utils.parse_yaml_file(file)
-      options = @opt_parser.help
-      Ruhoh::Friend.say { 
-        plain content['description']
-        plain ''
-        plain options
-        plain ''
-        plain 'Commands:'
-        plain ''
-        content['commands'].each do |a|
-          green("  " + a["command"])
-          plain("    "+ a["desc"])
-        end
-      }
-    end
-    
-    def draft
-      self.draft_or_post(:draft)
-    end
-
-    def post
-      self.draft_or_post(:post)
-    end
-    
-    def draft_or_post(type)
-      begin
-        name = @args[1] || "untitled-#{type}"
-        name = "#{name}-#{@iterator}" unless @iterator.zero?
-        name = Ruhoh::Urls.to_slug(name)
-        filename = File.join(Ruhoh.paths.posts, "#{name}.#{@options.ext}")
-        @iterator += 1
-      end while File.exist?(filename)
-      
-      Ruhoh::DB.update(:scaffolds)
-
-      FileUtils.mkdir_p File.dirname(filename)
-      output = Ruhoh::DB.scaffolds["#{type}.html"].to_s
-      output = output.gsub('{{DATE}}', Ruhoh::Parsers::Posts.formatted_date(Time.now))
-      File.open(filename, 'w:UTF-8') {|f| f.puts output }
-      
-      Ruhoh::Friend.say { 
-        green "New #{type}:" 
-        green Ruhoh::Utils.relative_path(filename)
-        green 'View drafts at the URL: /dash'
-      }
-    end
-    
-    # Public: Create a new page file.
-    def page
-      name = @args[1]
-      Ruhoh::Friend.say { 
-        red "Please specify a path"
-        plain "  ex: ruhoh page projects/hello-world"
-        exit
-      } if (name.nil? || name.gsub(/\s/, '').empty?)
-
-      filename = File.join(Ruhoh.paths.pages, name.gsub(/\s/, '-'))
-      filename = File.join(filename, "index.#{@options.ext}") if File.extname(filename) == ""
-      if File.exist?(filename)
-        abort("Create new page: aborted!") if ask("#{filename} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
-      end
-      
-      Ruhoh::DB.update(:scaffolds)
-      
-      FileUtils.mkdir_p File.dirname(filename)
-      File.open(filename, 'w:UTF-8') do |page|
-        page.puts Ruhoh::DB.scaffolds['page.html'].to_s
-      end
-      
-      Ruhoh::Friend.say { 
-        green "New page:"
-        plain Ruhoh::Utils.relative_path(filename)
-      }
-    end
-
-    # Public: Update draft filenames to their corresponding titles.
-    def titleize
-       Ruhoh::Parsers::Posts.files.each do |file|
-          next unless File.basename(file) =~ /^untitled/
-          parsed_page = Ruhoh::Utils.parse_page_file(file)
-          next unless parsed_page['data']['title']
-          new_name = Ruhoh::Urls.to_slug(parsed_page['data']['title'])
-          new_file = File.join(File.dirname(file), "#{new_name}#{File.extname(file)}")
-          FileUtils.mv(file, new_file)
-          Ruhoh::Friend.say { green "Renamed #{file} to: #{new_file}" }
-       end
-    end
-    
-    # Public: Compile to static website.
-    def compile
-      Ruhoh::Program.compile(@args[1])
-    end
-    
-    # Public: Create a new blog at the directory provided.
-    def blog
-      name = @args[1]
-      scaffold = @args.length > 2 ? @args[2] : DefaultBlogScaffold
-      useHg = @options.hg
-      Ruhoh::Friend.say { 
-        red "Please specify a directory path." 
-        plain "  ex: ruhoh new the-blogist"
-        exit
-      } if name.nil?
-
-      target_directory = File.join(Dir.pwd, name)
-
-      Ruhoh::Friend.say { 
-        red "#{target_directory} already exists."
-        plain "  Specify another directory or `rm -rf` this directory first."
-        exit
-      } if File.exist?(target_directory)
-      
-      Ruhoh::Friend.say { 
-        plain "Trying this command:"
-
-        if useHg
-          cyan "  hg clone #{scaffold} #{target_directory}"
-          success = system('hg', 'clone', scaffold, target_directory)
-        else
-          cyan "  git clone #{scaffold} #{target_directory}"
-          success = system('git', 'clone', scaffold, target_directory)
-        end
-
-        if success
-          green "Success! Now do..."
-          cyan "  cd #{target_directory}"
-          cyan "  rackup -p9292"
-          cyan "  http://localhost:9292"
-        else
-          red "Could not git clone blog scaffold. Please try it manually:"
-          cyan "  git clone git://github.com/ruhoh/blog.git #{target_directory}"
-        end
-      }
-    end
-    
-    # Public: Create a new layout file for the active theme.
-    def layout
-      name = @args[1]
-      Ruhoh::Friend.say { 
-        red "Please specify a layout name." 
-        cyan "ex: ruhoh new layout splash"
-        exit
-      } if name.nil?
-      
-      filename = File.join(Ruhoh.paths.theme_layouts, name.gsub(/\s/, '-').downcase) + ".html"
-      if File.exist?(filename)
-        abort("Create new layout: aborted!") if ask("#{filename} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
-      end
-      
-      Ruhoh::DB.update(:scaffolds)
-      
-      FileUtils.mkdir_p File.dirname(filename)
-      File.open(filename, 'w:UTF-8') do |page|
-        page.puts Ruhoh::DB.scaffolds['layout.html'].to_s
-      end
-      
-      Ruhoh::Friend.say {
-        green "New layout:"
-        plain Ruhoh::Utils.relative_path(filename)
-      }
-    end
-
-    # Public : List drafts
-    def drafts
-      self.list(:drafts)
-    end
-
-    # Public : List posts
-    def posts
-      self.list(:posts)
-    end
-
-    # Public : List pages
-    def pages
-      self.list(:pages)
-    end
- 
-    # Return the payload hash for inspection/study.
-    def payload
-      require 'pp'
-      Ruhoh::DB.update_all
-      Ruhoh::Friend.say {
-        plain Ruhoh::DB.payload.pretty_inspect
-      }
-    end
-    
-    # Internal: Outputs a list of the given data-type to the terminal.
-    def list(type)
-      data = case type
-      when :posts
-        Ruhoh::DB.update(:posts)
-        Ruhoh::DB.posts['dictionary']
-      when :drafts
-        Ruhoh::DB.update(:posts)
-        drafts = Ruhoh::DB.posts['drafts']
-        h = {}
-        drafts.each {|id| h[id] = Ruhoh::DB.posts['dictionary'][id]}
-        h
-      when :pages
-        Ruhoh::DB.update(:pages)
-        Ruhoh::DB.pages
-      end  
-
-      if @options.verbose
-        Ruhoh::Friend.say {
-          data.each_value do |p|
-            cyan("- #{p['id']}")
-            plain("  title: #{p['title']}") 
-            plain("  url: #{p['url']}")
-          end
-        }
-      else
-        Ruhoh::Friend.say {
-          data.each_value do |p|
-            cyan("- #{p['id']}")
-          end
-        }
-      end
-    end
-    
-    # Internal: Get the last active file based on data-type.
-    # Note File.ctime is the last time the file was changed as opposed to created.
-    # Returns: String file id, where id is the relative path to the file.
-    def last(type)
-      self.get_files(type).sort_by { |f| File.ctime(f) }.last || nil
-    end
-    
-    # Internal: Get an Array list of file ids based on the data-type.
-    # Returns: Array of file ids (ids are relative paths to the file.)
-    def get_files(type)
-      case type
-      when 'post'
-        Ruhoh::Parsers::Posts.files
-      when 'page'
-        Ruhoh::Parsers::Pages.files
-      else
-        Ruhoh::Friend.say { red  "Type: '#{type}' not supported." }
-        exit
-      end
-    end
-    
-    def ask(message, valid_options)
-      if valid_options
-        answer = get_stdin("#{message} #{valid_options.to_s.gsub(/"/, '').gsub(/, /,'/')} ") while !valid_options.include?(answer)
-      else
-        answer = get_stdin(message)
-      end
-      answer
-    end
-
-    def get_stdin(message)
-      print message
-      STDIN.gets.chomp
-    end
-    
-    
-  end #Client
-end #Ruhoh