ruhoh 2.5 → 2.6

data/lib/ruhoh/client.rb

@@ -40,8 +40,6 @@ class Ruhoh
       return server if %w(s serve server).include?(cmd)
 
       @ruhoh = Ruhoh.new
-      @ruhoh.setup
-      @ruhoh.setup_paths
       @ruhoh.setup_plugins
 
       return __send__(cmd) if respond_to?(cmd)
@@ -136,7 +134,7 @@ class Ruhoh
       end
 
       if Ruhoh::Publish.const_defined?(service.to_sym)
-        publish_config = Ruhoh::Parse.data_file(@ruhoh.base, "publish") || {}
+        publish_config = Ruhoh::Parse.data_file(@ruhoh.cascade.base, "publish") || {}
         Ruhoh::Publish.const_get(service.to_sym).new.run(@args, publish_config[service.downcase])
       else
         Ruhoh::Friend.say {

data/lib/ruhoh/collections.rb

@@ -1,3 +1,4 @@
+module Ruhoh::Base ; end
 module Ruhoh::Resources ; end
 # Require all the resources
 FileUtils.cd(File.join(File.dirname(__FILE__), 'base')) do
@@ -71,7 +72,7 @@ class Ruhoh
     def discover
       results = Set.new
 
-      @ruhoh.cascade.each do |h|
+      @ruhoh.cascade.paths.each do |h|
         FileUtils.cd(h["path"]) do
           results += Dir['*'].select { |x|
             File.directory?(x) && !["plugins", 'compiled'].include?(x)

data/lib/ruhoh/config.rb

@@ -0,0 +1,67 @@
+class Ruhoh
+  class Config < SimpleDelegator
+    include Observable
+
+    def initialize(ruhoh)
+      @ruhoh = ruhoh
+      @data = {}
+      super(@data)
+    end
+
+    # Regenerate the config data
+    def touch
+      data = @ruhoh.cascade.merge_data_file('config') || {}
+      data = Ruhoh::Utils.deep_merge(data, collections_config)
+      data = Ruhoh::Utils.deep_merge(data, find_theme_path)
+
+      @data.clear
+      @data.merge!(data)
+      
+      Time.default_format = @data['date_format']
+      @data["compiled_path"] = File.expand_path(@data["compiled_path"])
+
+      changed
+      notify_observers(@data)
+
+      self
+    end
+
+    def base_path
+      return '/' unless (@ruhoh.env == 'production')
+
+      @data['base_path'] += "/" unless @data['base_path'][-1] == '/'
+      string = @data['base_path'].chomp('/').reverse.chomp('/').reverse
+      return '/' if string.empty? || string == '/'
+      "/#{ string }/"
+    end
+
+    private
+
+    def find_theme_path
+      theme_name = @data.find { |resource, data| data.is_a?(Hash) && data['use'] == "theme" }
+      if theme_name
+        Ruhoh::Friend.say { plain "Using theme: \"#{theme_name[0]}\""}
+        { "_theme_collection" => theme_name[0] }
+      else 
+        { "_theme_collection" => nil }
+      end
+    end
+
+    # Quick and dirty way to scan for config files in collection folders.
+    # This is needed because we don't know which collection defines itself as a theme 
+    # so we'll scan for any configs and merge the data to find the theme folder.
+    def collections_config
+      data = {}
+      @ruhoh.cascade.paths.map{ |a| a['path'] }.each do |path|
+        FileUtils.cd(path) { 
+          Dir["*/config.*"].each { |id|
+            next unless File.exist?(id) && FileTest.file?(id)
+            data = Ruhoh::Utils.deep_merge(data, (Ruhoh::Parse.data_file(File.realpath(id)) || {}))
+          }
+        }
+      end
+
+      data
+    end
+  end
+end

data/lib/ruhoh/console_methods.rb

@@ -7,9 +7,7 @@ class Ruhoh
     def ruhoh
       return @ruhoh if @ruhoh
       @ruhoh = Ruhoh.new
-      @ruhoh.setup
       @ruhoh.env = ConsoleMethods.env || 'development'
-      @ruhoh.setup_paths
       @ruhoh
     end
 

data/lib/ruhoh/parse.rb

@@ -42,13 +42,15 @@ class Ruhoh
     end
 
     def self.data_file(*args)
-      base = File.__send__(:join, args)
+      filepath = File.__send__(:join, args)
+      if File.extname(filepath).to_s.empty?
+        path = nil
+        ["#{ filepath }.json", "#{ filepath }.yml", "#{ filepath }.yaml"].each do |result|
+          filepath = path = result and break if File.exist?(result)
+        end
 
-      filepath = nil
-      ["#{ base }.json", "#{ base }.yml", "#{ base }.yaml"].each do |result|
-        filepath = result and break if File.exist?(result)
+        return nil unless path
       end
-      return nil unless filepath
 
       file = File.open(filepath, 'r:UTF-8') { |f| f.read }
 

data/lib/ruhoh/plugins/initializer.rb

@@ -0,0 +1,24 @@
+module Ruhoh::Plugins
+  class Initializer
+    attr_reader :name
+
+    def initialize name, &block
+      raise ArgumentError, "block required for initializer '#{name}'" unless block_given?
+      @name, @block = name, block
+    end
+
+    def run *args
+      raise "Initializer '#{name}' need to be bound" unless context
+      context.instance_exec *args, &block
+    end
+
+    def bind ctx
+      @context = ctx
+      self
+    end
+
+    private
+
+    attr_reader :block, :context
+  end
+end

data/lib/ruhoh/plugins/local_plugins_plugin.rb

@@ -0,0 +1,10 @@
+module Ruhoh::Plugins
+  class LocalPluginsPlugin
+    include Plugin
+
+    initializer 'ruhoh.local_plugins' do
+      plugins = Dir[File.join(@base, "plugins", "**/*.rb")]
+      plugins.each { |f| require f }
+    end
+  end
+end

data/lib/ruhoh/plugins/plugin.rb

@@ -0,0 +1,27 @@
+require 'ruhoh/plugins/initializer'
+
+module Ruhoh::Plugins
+  module Plugin
+    def self.included base
+      base.send :extend, ClassMethods
+    end
+
+    def self.run_all(context, *args)
+      initializers.each do |i|
+        i.bind(context).run *args
+      end
+    end
+
+    protected
+
+    def self.initializers
+      @initializers ||= []
+    end
+
+    module ClassMethods
+      def initializer name, &block
+        Plugin.initializers << Initializer.new(name, &block)
+      end
+    end
+  end
+end

data/lib/ruhoh/programs/compile.rb

@@ -5,15 +5,11 @@ class Ruhoh
     # to properly omit drafts and other development-only settings.
     def self.compile(target=nil)
       ruhoh = Ruhoh.new
-      ruhoh.setup
       ruhoh.env = 'production'
-      ruhoh.setup_paths
       ruhoh.setup_plugins
-      
+
       if target
-        ruhoh.paths.compiled = File.expand_path(target)
-      elsif ruhoh.config["compiled"]
-        ruhoh.paths.compiled = ruhoh.config["compiled"]
+        ruhoh.config['compiled_path'] = File.expand_path(target)
       end
 
       ruhoh.compile

data/lib/ruhoh/programs/preview.rb

@@ -1,4 +1,5 @@
 require 'ruhoh/programs/watch'
+require 'ruhoh/ui/dashboard'
 class Ruhoh
   module Program
     # Public: A program for running ruhoh as a rack application
@@ -17,9 +18,7 @@ class Ruhoh
       opts[:env] ||= 'development'
       
       ruhoh = Ruhoh.new
-      ruhoh.setup
       ruhoh.env = opts[:env]
-      ruhoh.setup_paths
       ruhoh.setup_plugins unless opts[:enable_plugins] == false
 
       # initialize the routes dictionary for all page resources.
@@ -52,6 +51,10 @@ class Ruhoh
           end
         end
 
+        map '/dash' do
+          run Ruhoh::UI::Dashboard.new(ruhoh)
+        end
+
         # The generic Page::Previewer is used to render any/all page-like resources,
         # since they likely have arbitrary urls based on permalink settings.
         map '/' do

data/lib/ruhoh/programs/watch.rb

@@ -7,12 +7,10 @@ class Ruhoh
     # The observer triggers data regeneration as files change
     # in order to keep the data up to date in real time.
     def self.watch(ruhoh)
-      ruhoh.ensure_setup
-
       Ruhoh::Friend.say {
-        cyan "=> Start watching: #{ruhoh.paths.base}"
+        cyan "=> Start watching: #{ruhoh.cascade.base}"
       }
-      dw = DirectoryWatcher.new(ruhoh.paths.base, {
+      dw = DirectoryWatcher.new(ruhoh.cascade.base, {
         :glob => "**/*", 
         :pre_load => true
       })
@@ -21,14 +19,14 @@ class Ruhoh
         args.each do |event|
           ruhoh.cache.delete(event['path'])
 
-          path = event['path'].gsub(ruhoh.paths.base + '/', '')
+          path = event['path'].gsub(ruhoh.cascade.base + '/', '')
 
           Ruhoh::Friend.say {
             yellow "Watch [#{Time.now.strftime("%H:%M:%S")}] [Update #{path}] : #{args.size} files changed"
           }
 
           if %w{ config.json config.yml config.yaml }.include?(path)
-            ruhoh.config true
+            ruhoh.config.touch
           else
             separator = File::ALT_SEPARATOR ?
                         %r{#{ File::SEPARATOR }|#{ File::ALT_SEPARATOR }} :

data/lib/ruhoh/publish/rsync.rb

@@ -22,9 +22,9 @@ class Ruhoh
       if @config["command"]
         system(@config["command"])
       else
-        system('rsync', File.join(ruhoh.paths.compiled, '.'), '-avz', '--delete', '--exclude', '.git', remote)
+        system('rsync', File.join(ruhoh.config['compiled_path'], '.'), '-avz', '--delete', '--exclude', '.git', remote)
       end
-      FileUtils.rm_r(ruhoh.paths.compiled)
+      FileUtils.rm_r(ruhoh.config['compiled_path'])
     end
 
     private

data/lib/ruhoh/resources/_base/collection.rb

@@ -0,0 +1,6 @@
+# Generic base implementation of a Collection class.
+# All collections use this class by default
+# unless the Collection class is explicitly defined for the collection.
+class Ruhoh::Base::Collection
+  include Ruhoh::Base::Collectable
+end

data/lib/ruhoh/resources/_base/compiler.rb

@@ -0,0 +1,3 @@
+class Ruhoh::Base::Compiler
+  include Ruhoh::Base::Compilable
+end

data/lib/ruhoh/resources/_base/model.rb

@@ -0,0 +1,3 @@
+class Ruhoh::Base::Model
+  include Ruhoh::Base::Modelable
+end

data/lib/ruhoh/resources/_base/model_view.rb

@@ -0,0 +1,3 @@
+class Ruhoh::Base::ModelView < SimpleDelegator
+  include Ruhoh::Base::ModelViewable
+end

data/lib/ruhoh/resources/_base/watcher.rb

@@ -0,0 +1,4 @@
+# Base watcher class that loads if no custom Watcher class is defined.
+class Ruhoh::Base::Watcher
+  include Ruhoh::Base::Watchable
+end

data/lib/ruhoh/resources/data/collection.rb

@@ -2,24 +2,45 @@ module Ruhoh::Resources::Data
   class Collection
     include Ruhoh::Base::Collectable
 
+    def glob
+      "*"
+    end
+
+    def dictionary
+      resource_name == "data" ?
+        _support_legacy_api :
+        _support_new_data_api
+    end
+
+    private 
+
+    def _support_new_data_api
+      data = {}
+      files.values.each do |pointer|
+        name = File.basename(pointer["id"], File.extname(pointer["id"])) 
+        data[name] = Ruhoh::Parse.data_file(pointer["realpath"]) || {}
+      end
+
+      data
+    end
+
     # TODO: This is ugly but it works. 
     # Should handle data extensions in the cascade more elegantly
-    def dictionary
-      found_path_prefix = nil
+    def _support_legacy_api
+      found_paths = []
 
-      @ruhoh.cascade.reverse.map do |h|
+      @ruhoh.cascade.paths.each do |h|
         path_prefix = File.join(h["path"], resource_name)
 
         ["#{ path_prefix }.json", "#{ path_prefix }.yml", "#{ path_prefix }.yaml"].each do |file|
-          found_path_prefix = path_prefix and break if File.exist?(file)
+          found_paths << path_prefix and break if File.exist?(file)
         end
-
-        break if found_path_prefix
       end
 
-      return {} unless found_path_prefix
+      data = {}
+      found_paths.each { |path| data.merge!(Ruhoh::Parse.data_file(path) || {}) }
 
-      Ruhoh::Parse.data_file(found_path_prefix) || {}
+      data
     end
   end
-end
+end

data/lib/ruhoh/resources/javascripts/collection_view.rb

@@ -27,7 +27,11 @@ module Ruhoh::Resources::Javascripts
       }.join("\n")
     end
 
-    protected
+    def all()
+      files.values.map { |pointer|
+        load_model_view(pointer)
+      }
+    end
 
     def make_url(name)
       return name if name =~ /^(http:|https:)?\/\//i

data/lib/ruhoh/resources/javascripts/model_view.rb

@@ -0,0 +1,15 @@
+module Ruhoh::Resources::Javascripts
+  class ModelView < SimpleDelegator
+    def url()
+      	self.collection.make_url(self.pointer['id'])
+    end
+
+    def id()
+    	self.pointer['id']
+    end
+
+    def path()
+    	self.pointer['realpath']
+    end
+  end
+end

data/lib/ruhoh/resources/layouts/client.rb

@@ -24,7 +24,7 @@ module Ruhoh::Resources::Layouts
         exit
       } if name.nil?
 
-      filename = File.join((@ruhoh.paths.theme || @ruhoh.paths.base), "layouts", name.gsub(/\s/, '-').downcase) + ".html"
+      filename = File.join((@ruhoh.cascade.theme || @ruhoh.cascade.base), "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'

data/lib/ruhoh/resources/pages/client.rb

@@ -105,8 +105,8 @@ module Ruhoh::Resources::Pages
 
         name = "#{name}-#{@iterator}" unless @iterator.zero?
         filename = opts[:draft] ?
-          File.join(@ruhoh.paths.base, @collection.resource_name, "drafts", "#{name}#{ext}") :
-          File.join(@ruhoh.paths.base, @collection.resource_name, "#{name}#{ext}")
+          File.join(@ruhoh.cascade.base, @collection.resource_name, "drafts", "#{name}#{ext}") :
+          File.join(@ruhoh.cascade.base, @collection.resource_name, "#{name}#{ext}")
         @iterator += 1
       end while File.exist?(filename)
 

data/lib/ruhoh/resources/pages/collection.rb

@@ -1,27 +1,8 @@
+require 'ruhoh/base/routable'
 module Ruhoh::Resources::Pages
-  module Routable
-    def routes
-      return @routes if @routes
-      @routes = {}
-      dictionary
-      @routes
-    end
-
-    def routes_add(route, pointer)
-      @routes ||= {}
-      @routes[route] = pointer
-    end
-
-    def routes_delete(pointer)
-      return unless @routes
-      route = @routes.find{ |k, v| v == pointer }
-      @routes.delete(route[0]) if route
-    end
-  end
-
   class Collection
     include Ruhoh::Base::Collectable
-    include Routable
+    include Ruhoh::Base::Routable
 
     # model observer callback.
     def update(model_data)