nesta 0.9.1 → 0.9.2

data/CHANGES

@@ -0,0 +1,35 @@
+= 0.9.2 / 10 January 2011
+
+ * Made the FileModel.metadata method public, to allow for custom
+   metadata at the top of each page. (Wynn Netherland)
+
+ * Relaxed the stringent dependency specifications, using pessimistic
+   version constraints (see http://docs.rubygems.org/read/chapter/16).
+
+ * Added templates required by `nesta theme:create`.
+
+= 0.9.1 / 31 December 2010
+
+ * Re-implemented the default theme, using semantic HTML5 and
+   Andy Clarke's Universal Internet Explorer 6 CSS. Named the previous
+   default theme "slate" and moved it into a separate GitHub project.
+   https://github.com/gma/nesta-theme-slate
+
+ * Added `--git` switch to `nesta new`, that will create a new git
+   repository and make an initial commit.
+
+ * Moved the navigation helpers into the Nesta::Navigation::Renderers
+   module.
+
+= 0.9.0 / 20 December 2010
+
+ * Packaged Nesta as a gem for the first time, instead of as a template
+   site that can be cloned, edited and deployed. Added the `nesta`
+   command for generating new sites and managing themes.
+
+= Previous versions / from 26 November 2008
+
+ * Prior to 0.9.0 Nesta was distributed as a git repository that could
+   be forked, edited and deployed. The only change log for these
+   versions is the Git commit history.
+   https://github.com/gma/nesta/commits/master

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.1)
-      RedCloth (= 4.2.2)
-      builder (= 2.1.2)
-      haml (= 3.0.12)
-      maruku (= 0.6.0)
+    nesta (0.9.2)
+      RedCloth (~> 4.2)
+      builder (~> 3.0)
+      haml (~> 3.0)
+      maruku (>= 0.6.0)
       shotgun (>= 0.8)
-      sinatra (= 1.1.0)
+      sinatra (= 1.1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.2)
-    builder (2.1.2)
-    haml (3.0.12)
+    RedCloth (4.2.3)
+    builder (3.0.0)
+    haml (3.0.25)
     hoe (2.6.2)
       rake (>= 0.8.7)
       rubyforge (>= 2.0.4)
-    hpricot (0.8.2)
+    hpricot (0.8.3)
     json_pure (1.4.6)
     maruku (0.6.0)
       syntax (>= 1.0.0)
     rack (1.2.1)
-    rack-test (0.5.3)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
     rspec (1.3.0)
@@ -32,27 +32,27 @@ GEM
       json_pure (>= 1.1.7)
     shotgun (0.8)
       rack (>= 1.0)
-    sinatra (1.1.0)
+    sinatra (1.1.2)
       rack (~> 1.1)
-      tilt (~> 1.1)
+      tilt (~> 1.2)
     syntax (1.0.0)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    tilt (1.1)
+    tilt (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (= 4.2.2)
-  builder (= 2.1.2)
-  haml (= 3.0.12)
-  hpricot (= 0.8.2)
-  maruku (= 0.6.0)
+  RedCloth (~> 4.2)
+  builder (~> 3.0)
+  haml (~> 3.0)
+  hpricot (= 0.8.3)
+  maruku (>= 0.6.0)
   nesta!
-  rack-test (= 0.5.3)
+  rack-test (= 0.5.7)
   rspec (= 1.3.0)
   rspec_hpricot_matchers (= 1.0)
   shotgun (>= 0.8)
-  sinatra (= 1.1.0)
+  sinatra (= 1.1.2)
   test-unit (= 1.2.3)

data/lib/nesta/models.rb

@@ -97,16 +97,16 @@ module Nesta
     def keywords
       metadata("keywords")
     end
+    
+    def metadata(key)
+      @metadata[key]
+    end
 
     private
     def markup
       @markup
     end
 
-    def metadata(key)
-      @metadata[key]
-    end
-
     def paragraph_is_metadata(text)
       text.split("\n").first =~ /^[\w ]+:/
     end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/nesta.gemspec

@@ -31,19 +31,19 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("builder", "2.1.2")
-  s.add_dependency("haml", "3.0.12")
-  s.add_dependency("maruku", "0.6.0")
-  s.add_dependency("RedCloth", "4.2.2")
-  s.add_dependency("sinatra", "1.1.0")
+  s.add_dependency('builder', '~> 3.0')
+  s.add_dependency('haml', '~> 3.0')
+  s.add_dependency('maruku', '>= 0.6.0')
+  s.add_dependency('RedCloth', '~> 4.2')
+  s.add_dependency('sinatra', '1.1.2')
   
   # Useful in development
-  s.add_dependency("shotgun", ">= 0.8")
+  s.add_dependency('shotgun', '>= 0.8')
 
   # Test libraries
-  s.add_development_dependency("hpricot", "0.8.2")
-  s.add_development_dependency("rack-test", "0.5.3")
-  s.add_development_dependency("rspec", "1.3.0")
-  s.add_development_dependency("rspec_hpricot_matchers", "1.0")
-  s.add_development_dependency("test-unit", "1.2.3")
+  s.add_development_dependency('hpricot', '0.8.3')
+  s.add_development_dependency('rack-test', '0.5.7')
+  s.add_development_dependency('rspec', '1.3.0')
+  s.add_development_dependency('rspec_hpricot_matchers', '1.0')
+  s.add_development_dependency('test-unit', '1.2.3')
 end

data/spec/commands_spec.rb

@@ -76,8 +76,8 @@ describe "nesta" do
 
       it "should commit the blank project" do
         @command.should_receive(:system).with('git', 'add', '.')
-        @command.should_receive(:system)
-            .with('git', 'commit', '-m', 'Initial commit')
+        @command.should_receive(:system).with(
+            'git', 'commit', '-m', 'Initial commit')
         @command.execute
       end
     end
@@ -135,8 +135,8 @@ describe "nesta" do
     end
 
     it "should clone the repository" do
-      @command.should_receive(:system)
-          .with('git', 'clone', @repo_url, @demo_path)
+      @command.should_receive(:system).with(
+          'git', 'clone', @repo_url, @demo_path)
       @command.execute
     end
 

data/spec/models_spec.rb

@@ -222,6 +222,7 @@ describe "Page", :shared => true do
       @description = "Page about stuff"
       @summary = 'Multiline\n\nsummary'
       @read_more = "Continue at your leisure"
+      @skillz = "ruby, guitar, bowstaff"
       @article = create_article(:metadata => {
         "layout" => @layout,
         "template" => @template,
@@ -229,7 +230,8 @@ describe "Page", :shared => true do
         "description" => @description,
         "keywords" => @keywords,
         "summary" => @summary,
-        "read more" => @read_more
+        "read more" => @read_more,
+        "skillz" => @skillz
       })
     end
 
@@ -288,6 +290,10 @@ describe "Page", :shared => true do
     it "should treat double newline chars as paragraph break in summary" do
       @article.summary.should match(/#{@summary.split('\n\n').last}/)
     end
+    
+    it "should allow arbitrary access to metadata" do
+      @article.metadata('skillz').should == @skillz
+    end
   end
   
   describe "when checking last modification time" do

data/spec/overrides_spec.rb

@@ -18,6 +18,7 @@ describe "Rendering" do
   end
 
   def create_template(type, name, content)
+    create_fixture(type, File.join('views', 'layout.haml'), '= yield')
     create_fixture(type, File.join('views', name), content)
   end
   

data/templates/themes/README.md

@@ -0,0 +1,7 @@
+<%= @name.capitalize.gsub(/[_-]/, ' ') %> Nesta theme
+<%= '=' * @name.length %>============
+
+<%= @name %> is a theme for Nesta, a [Ruby CMS](nesta), designed by
+<insert your name here>.
+
+[nesta]: http://effectif.com/nesta

data/templates/themes/app.rb

@@ -0,0 +1,19 @@
+# Use the app.rb file to load Ruby code, modify or extend the models, or
+# do whatever else you fancy when the theme is loaded.
+
+module Nesta
+  class App
+    # Uncomment the Rack::Static line below if your theme has assets
+    # (i.e images or JavaScript).
+    #
+    # Put your assets in themes/<%= @name %>/public/<%= @name %>.
+    #
+    # use Rack::Static, :urls => ["/<%= @name %>"], :root => "themes/<%= @name %>/public"
+
+    helpers do
+      # Add new helpers here.
+    end
+
+    # Add new routes here.
+  end
+end

data/views/master.sass

@@ -110,7 +110,7 @@ div#container
   div#sidebar
     width: 12em
     margin-left: 40em
-    padding: 1px 1em
+    padding: 0 1em
   
   footer.branding
     clear: both

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Graham Ashton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 +00:00
+date: 2011-01-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +22,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -37,13 +36,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
-        - 12
-        version: 3.0.12
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -52,7 +50,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -67,13 +65,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 4
         - 2
-        - 2
-        version: 4.2.2
+        version: "4.2"
   type: :runtime
   prerelease: false
   version_requirements: *id004
@@ -87,8 +84,8 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 2
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -116,8 +113,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 2
-        version: 0.8.2
+        - 3
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -131,8 +128,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 7
+        version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: *id008
@@ -203,6 +200,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGES
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -241,6 +239,8 @@ files:
 - templates/config.ru
 - templates/config/config.yml
 - templates/config/deploy.rb
+- templates/themes/README.md
+- templates/themes/app.rb
 - views/analytics.haml
 - views/atom.builder
 - views/categories.haml
@@ -273,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3521966817245856409
+      hash: -3009128770582666243
       segments: 
       - 0
       version: "0"
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3521966817245856409
+      hash: -3009128770582666243
       segments: 
       - 0
       version: "0"