nesta 0.9.7 → 0.9.8

data/.gitignore

@@ -3,6 +3,7 @@
 .*.swp
 .bundle
 .DS_Store
+.rbenv-version
 .rvmrc
 .sass-cache
 config/config.yml

data/CHANGES

@@ -1,3 +1,14 @@
+= 0.9.8 / (22 August 2011)
+
+ * Bug fix: The Sinatra app's root directory wasn't set which meant
+   that Nesta couldn't always find the ./public directory (such as when
+   running on Heroku).
+   
+   The modifications made in 0.9.6 to make Nesta easier to mount inside
+   another Rack application moved Nesta::App.root to the (new)
+   Nesta::Env class. In 0.9.6 I forgot to actually set Nesta::App.root
+   as well, which was a big mistake. Whoops.
+
 = 0.9.7 / (19 August 2011)
 
  * No code changes from 0.9.6; version number increased to allow new gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.7)
+    nesta (0.9.8)
       RedCloth (~> 4.2)
       haml (~> 3.1)
       maruku (>= 0.6.0)

data/lib/nesta/app.rb

@@ -19,6 +19,7 @@ module Nesta
   class App < Sinatra::Base
     register Sinatra::Cache
 
+    set :root, Nesta::Env.root
     set :views, File.expand_path('../../views', File.dirname(__FILE__))
     set :cache_enabled, Config.cache
     set :haml, { :format => :html5 }
@@ -83,11 +84,11 @@ module Nesta
   
       def local_stylesheet?
         Nesta.deprecated('local_stylesheet?', 'use local_stylesheet_link_tag')
-        File.exist?(File.expand_path('views/local.sass', Nesta::Env.root))
+        File.exist?(File.expand_path('views/local.sass', Nesta::App.root))
       end
 
       def local_stylesheet_link_tag(name)
-        pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::Env.root)
+        pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::App.root)
         if Dir.glob(pattern).size > 0
           haml_tag :link, :href => "/css/#{name}.css", :rel => "stylesheet"
         end

data/lib/nesta/config.rb

@@ -46,7 +46,7 @@ module Nesta
     end
     
     def self.yaml_path
-      File.expand_path('config/config.yml', Nesta::Env.root)
+      File.expand_path('config/config.yml', Nesta::App.root)
     end
     
     def self.from_environment(setting)

data/lib/nesta/path.rb

@@ -1,11 +1,11 @@
 module Nesta
   class Path
     def self.local(*args)
-      File.expand_path(File.join(args), Nesta::Env.root)
+      File.expand_path(File.join(args), Nesta::App.root)
     end
 
     def self.themes(*args)
-      File.expand_path(File.join('themes', *args), Nesta::Env.root)
+      File.expand_path(File.join('themes', *args), Nesta::App.root)
     end
   end
 end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

data/spec/commands_spec.rb

@@ -115,7 +115,7 @@ describe "nesta" do
       FileUtils.mkdir_p(File.dirname(@config_path))
       Nesta::Config.stub!(:yaml_path).and_return(@config_path)
       create_config_yaml('content: path/to/content')
-      Nesta::Env.stub!(:root).and_return(@project_path)
+      Nesta::App.stub!(:root).and_return(@project_path)
       @repo_url = 'git://github.com/gma/nesta-demo-content.git'
       @demo_path = project_path('content-demo')
       @command = Nesta::Commands::Demo::Content.new
@@ -265,7 +265,7 @@ describe "nesta" do
     end
 
     before(:each) do
-      Nesta::Env.stub!(:root).and_return(FixtureHelper::FIXTURE_DIR)
+      Nesta::App.stub!(:root).and_return(FixtureHelper::FIXTURE_DIR)
       @name = 'my-new-theme'
       Nesta::Commands::Theme::Create.new(@name).execute
     end

data/spec/overrides_spec.rb

@@ -27,8 +27,8 @@ describe "Rendering" do
   end
 
   before(:each) do
-    @app_root = Nesta::Env.root
-    Nesta::Env.root = File.expand_path('fixtures/tmp', File.dirname(__FILE__))
+    @app_root = Nesta::App.root
+    Nesta::App.root = File.expand_path('fixtures/tmp', File.dirname(__FILE__))
     @theme = 'my-theme'
     @fixtures = []
     stub_configuration
@@ -36,7 +36,7 @@ describe "Rendering" do
   
   after(:each) do
     @fixtures.each { |path| FileUtils.rm(path) if File.exist?(path) }
-    Nesta::Env.root = @app_root
+    Nesta::App.root = @app_root
   end
     
   describe "when rendering stylesheets" do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nesta
 version: !ruby/object:Gem::Version 
+  hash: 43
   prerelease: 
-  version: 0.9.7
+  segments: 
+  - 0
+  - 9
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Graham Ashton
@@ -10,130 +15,180 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 +01:00
+date: 2011-08-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: haml
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
         version: "3.1"
-  type: :runtime
-  prerelease: false
   version_requirements: *id001
+  name: haml
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: sass
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
         version: "3.1"
-  type: :runtime
-  prerelease: false
   version_requirements: *id002
+  name: sass
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: maruku
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :runtime
-  prerelease: false
   version_requirements: *id003
+  name: maruku
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 4
+        - 2
         version: "4.2"
-  type: :runtime
-  prerelease: false
   version_requirements: *id004
+  name: RedCloth
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-  type: :runtime
-  prerelease: false
   version_requirements: *id005
+  name: sinatra
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: shotgun
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
-  type: :runtime
-  prerelease: false
   version_requirements: *id006
+  name: shotgun
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: hpricot
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-  type: :development
-  prerelease: false
   version_requirements: *id007
+  name: hpricot
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rack-test
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 5
+        - 7
         version: 0.5.7
-  type: :development
-  prerelease: false
   version_requirements: *id008
+  name: rack-test
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rspec
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-  type: :development
-  prerelease: false
   version_requirements: *id009
+  name: rspec
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rspec_hpricot_matchers
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-  type: :development
-  prerelease: false
   version_requirements: *id010
+  name: rspec_hpricot_matchers
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: test-unit
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
-  type: :development
-  prerelease: false
   version_requirements: *id011
+  name: test-unit
+  prerelease: false
+  type: :development
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
@@ -231,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3003652627560154656
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -240,14 +295,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3003652627560154656
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nesta
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby CMS, written in Sinatra