gumdrop 0.5.2 → 0.6.0

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.6
+- Extracted Gumdrop::Build into Gumdrop::Site. Removed static Gumdrop#site.
+
 # v0.5.2
 - DeferredLoader changed to DataManager
 - Added YamlDoc support to data collections -- a data format (.yamldoc) that strips YAML front matter and puts the content under the key 'content', or it will use a custom key from the front matter if the value of the pair is '_YAMLDOC_'

data/License

@@ -1,4 +1,4 @@
-Copyright (C) 2011 by Matt McCray
+Copyright (C) 2011-12 by Matt McCray
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Notes.md

@@ -6,14 +6,22 @@
   - What would happen with conflicts, last one in wins?
 - Multiple data_dir too?
 - Refactor code to not use Gumdrop as a singleton (static really)
-- Add YamlDoc support for nodes?
+- Add YamlDoc support for nodes? (Tilt compiler? or in Content)
 
 
+- `Gumdrop.mode` :build, :serve (other?)
+- `Gumdrop.env` (specified via -e on cli, default: production)
+  - Easy access to ENV in RenderingContext (MODE as well)
+
+- configure block for each env/mode?
+
 # TODO:
 - New/Update Doc Site
 - API for retrieving pages and pages under a path (simple query)
 - Need test coverage.
 
+- Extract Build class into a Site class that can be instansiated (so multiple site can be loaded/run in memory)
+
 
 # Possible New Internals
 - Gumdrop (module)

data/gumdrop.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
 
    s.authors = ["Matt McCray"]
    s.email = %q{matt@elucidata.net}
-   s.summary = %q{A simple cms/prototyping tool.}
+   s.summary = %q{A sweet 'n simple cms/prototyping tool.}
    s.homepage = %q{https://github.com/darthapo/gumdrop}
-   s.description = %q{A simple cms/prototyping tool.}
+   s.description = %q{A sweet 'n simple cms/prototyping tool for creating static html websites and webapps.}
 
    s.files         = `git ls-files`.split("\n")
    s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
    s.add_dependency 'tilt'
    s.add_dependency 'active_support'
    s.add_dependency 'trollop'
-   s.add_dependency 'haml'
-   s.add_dependency 'sass'
+   # s.add_dependency 'haml'
+   # s.add_dependency 'sass'
    s.add_dependency 'i18n'
    s.add_dependency 'bundle'
 

data/lib/gumdrop/cli.rb

@@ -49,6 +49,7 @@ EOS
 
 end
 
+# NO COMMANDS GIVEN
 
 unless opts[:create_given] or opts[:build_given] or opts[:server_given] or opts[:new_given] or opts[:template_given] or opts[:list_given]
   puts banner_text
@@ -56,19 +57,22 @@ unless opts[:create_given] or opts[:build_given] or opts[:server_given] or opts[
 end
 
 
+# BUILD
 
 if opts[:build_given]
   puts banner_text unless opts[:quiet_given]
   Gumdrop.run(opts)
 
 
+# SERVER
+
 elsif opts[:server_given]
   puts banner_text unless opts[:quiet_given]
-  Gumdrop.config.auto_run= true
-  Gumdrop.config.force_reload= opts[:reload_given]
   Gumdrop::Server
 
 
+# LIST TEMPLATES
+
 elsif opts[:list_given]
   # List templates
   puts banner_text unless opts[:quiet_given]
@@ -85,11 +89,15 @@ elsif opts[:list_given]
   end
 
 
+# NEW DATA COLLECTION ITEM
+
 elsif opts[:new_given]
   puts banner_text unless opts[:quiet_given]
   puts "Not implemented yet..."
 
 
+# CREATE NEW SITE
+
 elsif opts[:create_given]
   puts banner_text unless opts[:quiet_given]
 
@@ -127,6 +135,8 @@ elsif opts[:create_given]
   end
 
 
+# SAVE CURRENT SITE AS TEMPLATE
+
 elsif opts[:template_given]
   # Save as template...
   puts banner_text unless opts[:quiet_given]
@@ -145,7 +155,7 @@ elsif opts[:template_given]
   end
   
 
-
+# UNKNOWN COMMAND
 
 else
   puts banner_text

data/lib/gumdrop/content.rb

@@ -3,13 +3,15 @@ module Gumdrop
   
   class Content
     
-    attr_accessor :path, :level, :filename, :source_filename, :type, :ext, :uri, :slug, :template, :params
+    attr_accessor :path, :level, :filename, :source_filename, :type, :ext, :uri, :slug, :template, :params, :site, :ignored
     
-    def initialize(path, params={})
+    def initialize(path, site, params={})
+      @site= site
       @params= HashObject.new params
       @path= path
       @level= (@path.split('/').length - 2)
       @source_filename= File.basename path
+      @ignored= false
 
       filename_parts= @source_filename.split('.')
       ext= filename_parts.pop
@@ -35,27 +37,27 @@ module Gumdrop
       end
     end
     
-    def render(ignore_layout=false, reset_context=true, locals={})
+    def render(context=nil, ignore_layout=false, reset_context=true, locals={})
+      context= @site.render_context if context.nil?
       if reset_context
-
         default_layout= (@ext == '.css' or @ext == '.js' or @ext == '.xml') ? nil : 'site'
-        Context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout, 'params'=>self.params
+        context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout, 'params'=>self.params
       end
-      Context.set_content self, locals
-      content= @template.render(Context) 
+      context.set_content self, locals
+      content= @template.render(context) 
       return content if ignore_layout
-      layout= Context.get_template()
+      layout= context.get_template()
       while !layout.nil?
-        content = layout.template.render(Context, content:content) { content }
-        layout= Context.get_template()
+        content = layout.template.render(context, content:content) { content }
+        layout= context.get_template()
       end
       content
     end
     
-    def renderTo(output_path, filters=[], opts={})
+    def renderTo(context, output_path, filters=[], opts={})
       return copyTo(output_path, opts) unless useLayout?
-      Gumdrop.report " Rendering: #{@uri}", :warning
-      output= render()
+      @site.report " Rendering: #{@uri}", :warning
+      output= render(context)
       filters.each {|f| output= f.call(output, self) }
       File.open output_path, 'w' do |f|
         f.write output
@@ -70,10 +72,10 @@ module Gumdrop
         true
       end
       if do_copy
-        Gumdrop.report "   Copying: #{@uri}", :warning
+        @site.report "   Copying: #{@uri}", :warning
         FileUtils.cp_r @path, output, opts
       else
-        Gumdrop.report "    (same): #{@uri}", :info
+        @site.report "    (same): #{@uri}", :info
       end
     end
     

data/lib/gumdrop/context.rb

@@ -1,130 +1,135 @@
 
 module Gumdrop
   
-  module Context
-    class << self
-      
-      include ::Gumdrop::ViewHelpers
-      
-      attr_accessor :state
-      #attr_reader :data
-      
-      def uri(path, opts={})
-        path= path[1..-1] if path.starts_with?('/') # and path != "/"
-        uri_string= if !Gumdrop.config.relative_paths or Context.force_absolute
-          "/#{path}"
-        else
-          "#{'../'*@state['current_depth']}#{path}"
-        end
-        if opts[:fresh] and Gumdrop.site.has_key?(path)
-          uri_string += "?v=#{ Gumdrop.site[path].mtime.to_i }"
-        end
-        uri_string = "/" if uri_string == ""
-        uri_string
-      end
-      
-      def url(path)
-        path= path[1..-1] if path.starts_with?('/')
-        "#{Gumdrop.config.site_url}/#{path}"
-      end
+  class Context
+    include ::Gumdrop::ViewHelpers
     
-      def slug
-        @state['current_slug']
-      end
-      
-      def get_template
-        layout= @state['layout']
-        @state['layout']= nil
-        unless layout.nil?
-          Gumdrop.layouts["#{layout}.template"]
-        else
-          nil
-        end
+    attr_accessor :state
+
+    def initialize(site)
+      @site= site
+      # puts "NEW CONTEXT!!!"
+    end
+    
+    def uri(path, opts={})
+      path= path[1..-1] if path.starts_with?('/') # and path != "/"
+      uri_string= if !@site.config.relative_paths or force_absolute
+        "/#{path}"
+      else
+        "#{'../'*@state['current_depth']}#{path}"
       end
-      
-      def use_template(name)
-        @state['layout']= name
+      if opts[:fresh] and @site.node_tree.has_key?(path)
+        uri_string += "?v=#{ @site.node_tree[path].mtime.to_i }"
       end
-      
-      def render(path, opts={})
-        page= get_page path
-        unless page.nil?
-          #TODO: nested state for an inline rendered page?
-          old_layout= @state['layout']
-          content= page.render(true, false, opts)
-          old_layout= @state['layout']
-          content
-        else
-          ""
-        end
+      uri_string = "/" if uri_string == ""
+      uri_string
+    end
+    
+    def url(path)
+      path= path[1..-1] if path.starts_with?('/')
+      "#{@site.config.site_url}/#{path}"
+    end
+  
+    def slug
+      @state['current_slug']
+    end
+    
+    def get_template
+      layout= @state['layout']
+      @state['layout']= nil
+      unless layout.nil?
+        @site.layouts["#{layout}.template"]
+      else
+        nil
       end
-      
-      def data
-        Gumdrop.data
+    end
+    
+    def use_template(name)
+      @state['layout']= name
+    end
+    alias_method :use_layout, :use_template
+    
+    def render(path, opts={})
+      page= get_page path
+      unless page.nil?
+        #TODO: nested state for an inline rendered page?
+        old_layout= @state['layout']
+        content= page.render(nil, true, false, opts)
+        old_layout= @state['layout']
+        content
+      else
+        ""
       end
+    end
+    
+    def data
+      @site.data
+    end
 
-      # Access to settings from configure block
-      def config
-        Gumdrop.config
+    def site
+      @site
+    end
+
+    # Access to settings from configure block
+    def config
+      @site.config
+    end
+  
+    def reset_data(preset={})
+      # TODO: Add a setting for reloading data on every request/page
+      #  was this for the server?
+      # @site.data.reset if !Gumdrop.config.cache_data
+      @state = preset
+    end
+
+    def method_missing(name, value=nil)
+      @state=  Hash.new {|h,k| h[k]= nil } if @state.nil? 
+      # puts "Looking for >> #{name} in #{@state.keys}"
+      unless value.nil?
+        @state[name.to_s]= value
+      else
+        @state[name.to_s]
       end
+    end
     
-      def reset_data(preset={})
-        # TODO: Add a setting for reloading data on every request/page
-        #  was this for the server?
-        Gumdrop.data.reset if !Gumdrop.config.cache_data
-        @state = preset
-      end
-
-      def method_missing(name, value=nil)
-        @state=  Hash.new {|h,k| h[k]= nil } if @state.nil? 
-        # puts "Looking for >> #{name} in #{@state.keys}"
-        unless value.nil?
-          @state[name.to_s]= value
+    def params
+      @content.params
+    end
+    
+    def set_content(content, locals)
+      @content= content
+      @state= @state.reverse_merge(content.params).merge(locals)
+    end
+    
+    def content_for(key, &block)
+      keyname= "_content_#{key}"
+      if block_given?
+        @state[keyname]= block
+        nil
+      else
+        if @state.has_key?(keyname)
+          @state[keyname].call
         else
-          @state[name.to_s]
-        end
-      end
-      
-      def params
-        @content.params
-      end
-      
-      def set_content(content, locals)
-        @content= content
-        @state= @state.reverse_merge(content.params).merge(locals)
-      end
-      
-      def content_for(key, &block)
-        keyname= "_content_#{key}"
-        if block_given?
-          @state[keyname]= block
           nil
-        else
-          if @state.has_key?(keyname)
-            @state[keyname].call
-          else
-            nil
-          end
         end
       end
-      
-      def content_for?(key)
-        keyname= "_content_#{key}"
-        @state.has_key?(keyname)
-      end
-      
-    protected
-      
-      def get_page(path)
-        page= Gumdrop.site[path]
-        page= Gumdrop.site["#{path}.html"] if page.nil? # Bit of a hack...
-        page= Gumdrop.partials[path] if page.nil?
-        page= Gumdrop.layouts[path] if page.nil? # ???
-        page
-      end
-      
     end
+    
+    def content_for?(key)
+      keyname= "_content_#{key}"
+      @state.has_key?(keyname)
+    end
+    
+  protected
+    
+    def get_page(path)
+      page= @site.node_tree[path]
+      page= @site.node_tree["#{path}.html"] if page.nil? # Bit of a hack...
+      page= @site.partials[path] if page.nil?
+      page= @site.layouts[path] if page.nil? # ???
+      page
+    end
+    
   end
   
-  
 end

data/lib/gumdrop/data_manager.rb

@@ -1,78 +1,42 @@
 require 'yaml'
 require 'ostruct'
 
-def hashes2ostruct(object)
-  return case object
-  when Hash
-    object = object.clone
-    object.each do |key, value|
-      object[key] = hashes2ostruct(value)
-    end
-    OpenStruct.new(object)
-  when Array
-    object = object.clone
-    object.map! { |i| hashes2ostruct(i) }
-  else
-    object
-  end
-end
-
 module Gumdrop
-  
+
+  # Supported Data File Types:
+  DATA_DOC_EXTS= %w(json yml yaml ymldb yamldb yamldoc ymldoc)
+
   class DataManager
     attr_reader :cache
   
-    def initialize(data_dir="data")
-      @dir= data_dir
+    def initialize(site, data_dir="./data")
+      @site= site
+      @dir= File.expand_path data_dir
       @cache= {}
-      @persisted= {}
     end
   
     def method_missing(key, value=nil)
-      cache_or_load_data(key)
+      cache_dataset(key)
       @cache[key]
     end
   
-    def set(key, value, opts={})
+    def set(key, value)
       @cache[key]= value
-      @persisted[key]= value #unless opts[:persist] == false
     end
   
-    def reset(hard=false)
-      if hard
-        @cache={}
-        @persisted={}
-      else
-        @cache= @persisted.clone #Hash.new(@persisted)  #{|h,k| h[k]= load_data(k) }
-      end
+    def reset
+      @cache={}
     end
 
-    # TODO: This is not a great place for this. MOVE IT!
-    # This'll go on the Site class for query support: .find()/.all()/.paths()/.nodes()
-    def site
-      site= Hash.new {|h,k| h[k]= nil }
-      Gumdrop.site.keys.sort.each do |path|
-        unless Gumdrop.greylist.any? {|pattern| path_match path, pattern }
-          site[path]= Gumdrop.site[path]    
-        end
-      end
-      site
-    end
-    # Oh dear god! This belongs elsewhere!
-    def path_match(path, pattern)
-      File.fnmatch pattern, path, File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_CASEFOLD
-    end
-
-
-    def site_all
-      Gumdrop.site
+    def site(pattern=nil, opts={})
+      @site.contents(pattern, opts)
     end
     
     def pager_for(key, opts={})
       base_path= opts.fetch(:base_path, 'page')
       page_size= opts.fetch(:page_size, 5)
       data= if key.is_a? Symbol
-        cache_or_load_data(key)
+        cache_dataset(key)
         @cache[key]
       else
         key
@@ -83,17 +47,14 @@ module Gumdrop
   
   private
   
-    def cache_or_load_data(key)
+    def cache_dataset(key)
       @cache[key]= load_data(key) unless @cache.has_key? key
-      @persisted[key]= @cache[key] # New persist data loaded from file?
     end
 
     def load_data(key)
-      path=get_filename(key)
+      path=get_filename key 
       return nil if path.nil?
-      if File.extname(path) == ".yamldb"
-        load_from_yamldb path
-      elsif File.extname(path) == ""
+      if File.directory? path
         load_from_directory path
       else
         load_from_file path
@@ -104,10 +65,14 @@ module Gumdrop
       ext=File.extname(filename)
       if ext == '.yamldoc' or ext == '.ymldoc'
         load_from_yamldoc filename
+      elsif ext == '.yamldb' or ext == '.ymldb'
+        load_from_yamldb filename
       elsif ext == '.yaml' or ext == '.yml' or ext == '.json'
         hashes2ostruct( YAML.load_file(filename)  )
       else
-        raise "Unknown data type (#{ext}) for #{filename}"
+        # raise "Unknown data type (#{ext}) for #{filename}"
+        Gumdrop.report "Unknown data type (#{ext}) for #{filename}", :warning
+        nil
       end
     end
 
@@ -148,7 +113,7 @@ module Gumdrop
 
     def load_from_directory( filepath )
       all=[]
-      Dir[ File.join( "#{filepath}", "{*.yaml,*.json,*.yml,*.yamldoc,*.ymldoc}" ) ].each do |filename|
+      Dir[ File.join "#{filepath}", "{*.#{ DATA_DOC_EXTS.join ',*.'}}" ].each do |filename|
         # Gumdrop.report ">> Loading data file: #{filename}"
         id= File.basename filename
         obj_hash= load_from_file filename
@@ -159,19 +124,14 @@ module Gumdrop
     end
 
     def get_filename(path)
-      if File.exists? local_path_to("#{path}.json")
-        local_path_to "#{path}.json"
-      elsif File.exists? local_path_to("#{path}.yml")
-        local_path_to "#{path}.yml"
-      elsif File.exists? local_path_to("#{path}.yaml")
-        local_path_to  "#{path}.yaml"
-      elsif File.exists? local_path_to("#{path}.yamldb")
-        local_path_to "#{path}.yamldb"
-      elsif File.directory? local_path_to(path)
-        local_path_to(path)
+      lpath= local_path_to(path)
+      if File.directory? lpath
+        lpath
       else
-        #FIXME: Should it die if it can't find data?\
-        # raise "No data found for #{path}"
+        DATA_DOC_EXTS.each do |ext|
+          lpath= local_path_to("#{path}.#{ext}")
+          return lpath if File.exists? lpath
+        end
         Gumdrop.report "No data found for #{path}", :warning
         nil
       end
@@ -180,9 +140,71 @@ module Gumdrop
     def local_path_to(filename)
       File.join(@dir.to_s, filename.to_s)
     end
+
+    def hashes2ostruct(object)
+      return case object
+      when Hash
+        object = object.clone
+        object.each do |key, value|
+          object[key] = hashes2ostruct(value)
+        end
+        OpenStruct.new(object)
+      when Array
+        object = object.clone
+        object.map! { |i| hashes2ostruct(i) }
+      else
+        object
+      end
+    end
+
   end
 
-  class YamlDoc
+  class Pager
+    attr_reader :all, :pages, :base_url, :current_page, :page_sets
+
+    def initialize(articles, base_path="/page", page_size=5)
+      @all= articles
+      @page_size= page_size
+      @base_path= base_path
+      @page_sets= @all.in_groups_of(page_size, false)
+      @pages= []
+      @current_page=1
+      @page_sets.each do |art_ary|
+        @pages << HashObject.new({
+          items: art_ary,
+          page: @current_page,
+          uri: "#{base_path}/#{current_page}",
+          pager: self
+        })
+        @current_page += 1
+      end
+      @current_page= nil
+    end
+
+    def length
+      @pages.length
+    end
 
+    def first
+      @pages.first
+    end
+
+    def last
+      @pages.last
+    end
+
+    def each
+      @current_page=1
+      @pages.each do |page_set|
+        yield page_set
+        @current_page += 1
+      end
+      @current_page= nil
+    end
+
+    def [](key)
+      @pages[key]
+    end
   end
+
 end