gumdrop 0.8.0 → 1.0.0

metadata

@@ -3,10 +3,10 @@ name: gumdrop
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 8
   - 0
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Matt McCray
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-30 00:00:00 -05:00
+date: 2012-07-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: listen
+  name: onfire
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +70,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: sinatra
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -83,7 +83,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: listen
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -96,7 +96,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundle
+  name: i18n
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -108,7 +108,85 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
-description: The sweet 'n simple cms/prototyping tool for creating static html websites and webapps.
+- !ruby/object:Gem::Dependency 
+  name: bundle
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: sprockets
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: stitch
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: jsmin
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
+description: The sweet 'n simple cms and prototyping tool for creating static html websites and webapps.
 email: matt@elucidata.net
 executables: 
 - gumdrop
@@ -127,81 +205,152 @@ files:
 - bin/gumdrop
 - gumdrop.gemspec
 - lib/gumdrop.rb
+- lib/gumdrop/builder.rb
+- lib/gumdrop/cli.rb
 - lib/gumdrop/cli/external.rb
 - lib/gumdrop/cli/internal.rb
 - lib/gumdrop/content.rb
-- lib/gumdrop/context.rb
-- lib/gumdrop/data_manager.rb
+- lib/gumdrop/data.rb
+- lib/gumdrop/data_providers/csv.rb
+- lib/gumdrop/data_providers/pstore.rb
+- lib/gumdrop/data_providers/sqlite.rb
+- lib/gumdrop/data_providers/xml.rb
+- lib/gumdrop/data_providers/yaml_and_json.rb
+- lib/gumdrop/data_providers/yamldb.rb
+- lib/gumdrop/data_providers/yamldoc.rb
 - lib/gumdrop/generator.rb
+- lib/gumdrop/renderer.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/site.rb
-- lib/gumdrop/support/base_packager.rb
-- lib/gumdrop/support/callbacks.rb
-- lib/gumdrop/support/hash_object.rb
-- lib/gumdrop/support/proxy_handler.rb
+- lib/gumdrop/support/compressor.rb
 - lib/gumdrop/support/sprockets.rb
 - lib/gumdrop/support/stitch.rb
+- lib/gumdrop/support/yaml_doc_template.rb
+- lib/gumdrop/util/configurable.rb
+- lib/gumdrop/util/core_ex.rb
+- lib/gumdrop/util/eventable.rb
+- lib/gumdrop/util/hash_object.rb
+- lib/gumdrop/util/loggable.rb
+- lib/gumdrop/util/pager.rb
+- lib/gumdrop/util/proxy_handler.rb
+- lib/gumdrop/util/scanner.rb
+- lib/gumdrop/util/site_access.rb
+- lib/gumdrop/util/view_helpers.rb
+- lib/gumdrop/util/yaml_doc.rb
 - lib/gumdrop/version.rb
-- lib/gumdrop/view_helpers.rb
-- notes.md
 - specs/content_spec.rb
-- specs/deferred_loader_spec.rb
-- specs/fixtures/expected/posts/post1.html
-- specs/fixtures/expected/posts/post1.js
-- specs/fixtures/expected/posts/post2.html
-- specs/fixtures/expected/sub/sub/sub/test.html
-- specs/fixtures/expected/sub/sub/sub/test2.html
-- specs/fixtures/expected/test.js
+- specs/fixtures/expected/data-access/from-csv.html
+- specs/fixtures/expected/data-access/from-json.html
+- specs/fixtures/expected/data-access/from-sqlite.html
+- specs/fixtures/expected/data-access/from-xml.html
+- specs/fixtures/expected/data-access/from-yaml.html
+- specs/fixtures/expected/data-access/from-yamldb.html
+- specs/fixtures/expected/data-access/from-yamldoc.html
+- specs/fixtures/expected/gen-with-block/as-file.html
+- specs/fixtures/expected/gen-with-block/as-plain.html
+- specs/fixtures/expected/gen-with-block/layout-nested.html
+- specs/fixtures/expected/gen-with-block/layout-nil.html
+- specs/fixtures/expected/gen-with-block/layout-wrap.html
+- specs/fixtures/expected/gen-with-inline-render/0-as-file.html
+- specs/fixtures/expected/gen-with-inline-render/0-as-plain.html
+- specs/fixtures/expected/gen-with-inline-render/0-layout-nil.html
+- specs/fixtures/expected/gen-with-inline-render/0-layout-sub.html
+- specs/fixtures/expected/gen-with-inline-render/0-layout-wrap.html
+- specs/fixtures/expected/gen-with-inline-render/1-as-file.html
+- specs/fixtures/expected/gen-with-inline-render/1-as-plain.html
+- specs/fixtures/expected/gen-with-inline-render/1-layout-nil.html
+- specs/fixtures/expected/gen-with-inline-render/1-layout-sub.html
+- specs/fixtures/expected/gen-with-inline-render/1-layout-wrap.html
+- specs/fixtures/expected/goodbye.html
+- specs/fixtures/expected/hello.html
+- specs/fixtures/expected/image.png
+- specs/fixtures/expected/index.html
+- specs/fixtures/expected/js/sprockets-app.js
+- specs/fixtures/expected/js/stitch-app.js
+- specs/fixtures/expected/js/stitch-app.min.js
+- specs/fixtures/expected/js/stitch-app.min.src.js
+- specs/fixtures/expected/js/straight.js
+- specs/fixtures/expected/js/test-coffee.js
+- specs/fixtures/expected/pages/docs/force-abs.html
+- specs/fixtures/expected/pages/docs/index.html
+- specs/fixtures/expected/partials/hoisted-data.html
+- specs/fixtures/expected/partials/nested.html
+- specs/fixtures/expected/partials/params.html
+- specs/fixtures/expected/partials/with-layouts.html
+- specs/fixtures/expected/robots.txt
+- specs/fixtures/expected/test-multi-procs.html
+- specs/fixtures/expected/test-nested-layout.html
+- specs/fixtures/expected/test-no-layout.html
+- specs/fixtures/expected/test-yamldoc.html
+- specs/fixtures/expected/test.html
+- specs/fixtures/source/Gemfile
+- specs/fixtures/source/Gemfile.lock
 - specs/fixtures/source/Gumdrop
-- specs/fixtures/source/posts/post1.html.slim
-- specs/fixtures/source/posts/post1.js.coffee
-- specs/fixtures/source/posts/post2.html.erb
-- specs/fixtures/source/sub/sub/sub/test.html
-- specs/fixtures/source/sub/sub/sub/test2.html.erb
-- specs/fixtures/source/test.js.coffee
-- specs/fixtures/source/test.js.erb.coffee
+- specs/fixtures/source/data-access/from-csv.html.erb
+- specs/fixtures/source/data-access/from-json.html.erb
+- specs/fixtures/source/data-access/from-sqlite.html.erb
+- specs/fixtures/source/data-access/from-xml.html.erb
+- specs/fixtures/source/data-access/from-yaml.html.erb
+- specs/fixtures/source/data-access/from-yamldb.html.erb
+- specs/fixtures/source/data-access/from-yamldoc.html.erb
+- specs/fixtures/source/data/csv_data.csv
+- specs/fixtures/source/data/json_data.json
+- specs/fixtures/source/data/sql_data.sqlite
+- specs/fixtures/source/data/xml_data.xml
+- specs/fixtures/source/data/yaml_db.yamldb
+- specs/fixtures/source/data/yaml_items.yaml
+- specs/fixtures/source/data/yamldoc.yamldoc
+- specs/fixtures/source/gen-with-inline-render.generator
+- specs/fixtures/source/goodbye.html.erb
+- specs/fixtures/source/hello.html
+- specs/fixtures/source/image.png
+- specs/fixtures/source/index.html.erb
+- specs/fixtures/source/js/sprockets/app.js
+- specs/fixtures/source/js/sprockets/view.js.coffee
+- specs/fixtures/source/js/stitch/app.js
+- specs/fixtures/source/js/stitch/view.js.coffee
+- specs/fixtures/source/js/straight.js
+- specs/fixtures/source/js/test-coffee.js.coffee
+- specs/fixtures/source/layouts/site.layout.erb
+- specs/fixtures/source/layouts/sub.layout.erb
+- specs/fixtures/source/layouts/wrap.layout.erb
+- specs/fixtures/source/pages/_users-nested.html.erb
+- specs/fixtures/source/pages/docs/force-abs.html.erb
+- specs/fixtures/source/pages/docs/index.html.erb
+- specs/fixtures/source/partials/_post_entry.html.erb
+- specs/fixtures/source/partials/_provides_name.html.erb
+- specs/fixtures/source/partials/_user-params.html.erb
+- specs/fixtures/source/partials/_user.html.erb
+- specs/fixtures/source/partials/_user_sets_layout.html.erb
+- specs/fixtures/source/partials/hoisted-data.html.erb
+- specs/fixtures/source/partials/nested.html.erb
+- specs/fixtures/source/partials/params.html.erb
+- specs/fixtures/source/partials/with-layouts.html.erb
+- specs/fixtures/source/test-multi-procs.html.markdown.erb
+- specs/fixtures/source/test-nested-layout.html.erb
+- specs/fixtures/source/test-no-layout.html.erb
+- specs/fixtures/source/test-yamldoc.html.erb.yamldoc
+- specs/fixtures/source/test.html.erb
 - specs/hash_object_spec.rb
-- templates/backbone/Gemfile
-- templates/backbone/Gumdrop
-- templates/backbone/Rakefile
-- templates/backbone/app/app.js.coffee
-- templates/backbone/app/init.js.coffee
-- templates/backbone/app/models/.gitkeep
-- templates/backbone/app/utils/index.js.coffee
-- templates/backbone/app/views/home.js.coffee
-- templates/backbone/app/views/styles/home.scss
-- templates/backbone/app/views/templates/home.mustache
-- templates/backbone/config.ru
-- templates/backbone/lib/all.js.coffee
-- templates/backbone/lib/backbone.js
-- templates/backbone/lib/hogan.js
-- templates/backbone/lib/jquery.js
-- templates/backbone/lib/underscore.js
-- templates/backbone/powrc
-- templates/backbone/source/default.htaccess.erb
-- templates/backbone/source/favicon.ico
-- templates/backbone/source/feed.xml.builder.txt
-- templates/backbone/source/index.html.erb
-- templates/backbone/source/theme/screen.css.sass
-- templates/backbone/source/theme/scripts/app.js.coffee
-- templates/backbone/source/theme/styles/_tools.scss
-- templates/backbone/source/theme/templates/app.template.slim
-- templates/backbone/source/theme/templates/site.template.slim
+- specs/render_spec.rb
+- specs/site_spec.rb
+- specs/spec_helper.rb
 - templates/blank/Gemfile
 - templates/blank/Gumdrop
 - templates/default/Gemfile
 - templates/default/Gumdrop
-- templates/default/Rakefile
+- templates/default/ReadMe.md
 - templates/default/config.ru
-- templates/default/powrc
-- templates/default/source/default.htaccess.erb
+- templates/default/data/news/20120703.yamldoc
+- templates/default/data/news/20120704.yamldoc
 - templates/default/source/favicon.ico
-- templates/default/source/feed.xml.builder.txt
+- templates/default/source/feed.xml.builder
 - templates/default/source/index.html.erb
+- templates/default/source/theme/layout/_sidebar.html
+- templates/default/source/theme/layout/site.layout.slim
 - templates/default/source/theme/screen.css.sass
 - templates/default/source/theme/scripts/app.js.coffee
 - templates/default/source/theme/styles/_tools.scss
-- templates/default/source/theme/templates/site.template.slim
 has_rdoc: true
 homepage: https://github.com/darthapo/gumdrop
 licenses: []
@@ -233,6 +382,6 @@ rubyforge_project: gumdrop
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: The sweet 'n simple cms/prototyping tool.
+summary: The sweet 'n simple cms and prototyping tool.
 test_files: []
 

data/lib/gumdrop/context.rb

@@ -1,135 +0,0 @@
-
-module Gumdrop
-  
-  class Context
-    include ::Gumdrop::ViewHelpers
-    
-    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
-        "#{ path_to_root }#{ path }"
-      end
-      if opts[:fresh] and @site.content_hash.has_key?(path)
-        uri_string += "?v=#{ @site.content_hash[path].mtime.to_i }"
-      end
-      uri_string = "/" if uri_string == ""
-      uri_string
-    end
-
-    def path_to_root
-      '../' * @state['current_depth']
-    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
-    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
-
-    def site
-      @site
-    end
-
-    # Access to settings as defined in the configure block
-    def config
-      @site.config
-    end
-  
-    def reset_data(preset={})
-      @state = preset
-    end
-
-    def method_missing(name, value=nil)
-      @state=  Hash.new {|h,k| h[k]= nil } if @state.nil? 
-      unless value.nil?
-        @state[name.to_s]= value
-      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= @site.content_hash[path]
-      page= @site.content_hash["#{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