nesta 0.9.9 → 0.9.10

data/.gitignore

@@ -12,3 +12,4 @@ db/*.db
 pkg/*
 plugins
 public/cache
+spec/tmp

data/CHANGES

@@ -1,3 +1,21 @@
+= 0.9.10 / (9 September 2011)
+
+ * Load Nesta plugins from gems. Any gem whose name begins with
+   nesta-plugin- can be used in a project by adding it to the project's
+   Gemfile beneath the `gem "nesta"` line. New plugins can be created
+   with the `nesta plugin:create` command.
+
+ * Mark pages as draft by setting a flag. Draft pages won't be shown in
+   production, but will be visible on your local copy of your site (as
+   it's running in production).
+
+ * Upgraded Sinatra to version 1.2.6. Upgraded other dependencies to
+   latest compatible versions.
+
+ * Bug fix: The `stylesheet` helper method assumes that you're using
+   the Sass rendering engine by default, which allows it to find .sass
+   files within the gem if no matching files are found locally.
+
 = 0.9.9 / (24 August 2011)
 
  * Bug fix: What a debacle this is turning into. The new Nesta::Env

data/Gemfile.lock

@@ -1,52 +1,48 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.9)
+    nesta (0.9.10)
       RedCloth (~> 4.2)
       haml (~> 3.1)
       maruku (>= 0.6.0)
       sass (~> 3.1)
       shotgun (>= 0.8)
-      sinatra (= 1.1.2)
+      sinatra (= 1.2.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.8)
     haml (3.1.2)
-    hoe (2.6.2)
-      rake (>= 0.8.7)
-      rubyforge (>= 2.0.4)
-    hpricot (0.8.3)
-    json_pure (1.4.6)
+    hoe (2.12.2)
+      rake (~> 0.8)
+    hpricot (0.8.4)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    rack (1.2.1)
-    rack-test (0.5.7)
+    rack (1.3.2)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.8.7)
+    rake (0.9.2)
     rspec (1.3.0)
     rspec_hpricot_matchers (1.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     sass (3.1.7)
     shotgun (0.9)
       rack (>= 1.0)
-    sinatra (1.1.2)
+    sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (~> 1.2)
+      tilt (< 2.0, >= 1.2.2)
     syntax (1.0.0)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    tilt (1.3.2)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  hpricot (= 0.8.3)
+  hpricot (= 0.8.4)
   nesta!
-  rack-test (= 0.5.7)
+  rack-test (= 0.6.1)
   rspec (= 1.3.0)
   rspec_hpricot_matchers (= 1.0)
   test-unit (= 1.2.3)

data/bin/nesta

@@ -6,7 +6,7 @@ require File.expand_path('../lib/nesta/commands', File.dirname(__FILE__))
 
 module Nesta
   class Cli
-    def self.usage
+    def self.usage(exitcode=1)
       puts <<EOF
 USAGE: #{File.basename($0)} [GLOBAL OPTIONS] <command> [COMMAND OPTIONS]
 
@@ -17,6 +17,7 @@ GLOBAL OPTIONS
 COMMANDS
     new <path>            Create a new Nesta project.
     demo:content          Install example pages in ./content-demo.
+    plugin:create <name>  Create a gem called nesta-plugin-name.
     theme:install <url>   Install a theme from a git repository.
     theme:enable <name>   Make the theme active, updating config.yml.
     theme:create <name>   Makes a template for a new theme in ./themes.
@@ -26,7 +27,7 @@ OPTIONS FOR new
     --vlad                Include config/deploy.rb.
 
 EOF
-exit 0
+      exit exitcode
     end
 
     def self.version
@@ -45,7 +46,7 @@ exit 0
       opts.each do |opt, arg|
         case opt 
         when '--help'
-          usage
+          usage(exitcode=0)
         when '--version'
           version
         else
@@ -53,6 +54,9 @@ exit 0
         end
       end
       options
+    rescue GetoptLong::InvalidOption => e
+      $stderr.puts
+      usage
     end
 
     def self.main(options)
@@ -63,12 +67,17 @@ exit 0
           Nesta::Commands::New.new(ARGV[0], options).execute
         when 'demo:content'
           Nesta::Commands::Demo::Content.new.execute
+        when 'plugin:create'
+          Nesta::Commands::Plugin::Create.new(ARGV[0]).execute
         when /^theme:(create|enable|install)$/
           command_cls = Nesta::Commands::Theme.const_get($1.capitalize.to_sym)
           command_cls.new(ARGV[0], options).execute
         else
-          usage
+          usage(exitcode=0)
       end
+    rescue RuntimeError => e
+      $stderr.puts "ERROR: #{e}"
+      exit 1
     rescue Nesta::Commands::UsageError => e
       $stderr.puts "ERROR: #{e}"
       usage

data/lib/nesta/app.rb

@@ -10,12 +10,10 @@ require File.expand_path('models', File.dirname(__FILE__))
 require File.expand_path('navigation', File.dirname(__FILE__))
 require File.expand_path('overrides', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
-require File.expand_path('plugins', File.dirname(__FILE__))
+require File.expand_path('plugin', File.dirname(__FILE__))
 
 Encoding.default_external = 'utf-8' if RUBY_VERSION =~ /^1.9/
 
-Nesta::Plugins.load_local_plugins
-
 module Nesta
   class App < Sinatra::Base
     register Sinatra::Cache
@@ -112,7 +110,7 @@ module Nesta
     error do
       set_common_variables
       haml(:error)
-    end unless Nesta::App.environment == :development
+    end unless Nesta::App.development?
 
     Overrides.load_local_app
     Overrides.load_theme_app
@@ -163,3 +161,6 @@ module Nesta
     end
   end
 end
+
+Nesta::Plugin.load_local_plugins
+Nesta::Plugin.initialize_plugins

data/lib/nesta/commands.rb

@@ -55,7 +55,9 @@ module Nesta
 
       def initialize(path, options = {})
         path.nil? && (raise UsageError.new('path not specified'))
-        fail("#{path} already exists") if File.exist?(path)
+        if File.exist?(path)
+          raise RuntimeError.new("#{path} already exists") 
+        end
         @path = path
         @options = options
       end
@@ -131,6 +133,75 @@ module Nesta
       end
     end
 
+    module Plugin
+      class Create
+        def initialize(name)
+          name.nil? && (raise UsageError.new('name not specified'))
+          @name = name
+          @gem_name = "nesta-plugin-#{name}"
+          if File.exist?(@gem_name)
+            raise RuntimeError.new("#{@gem_name} already exists")
+          end
+        end
+
+        def lib_path(*parts)
+          File.join(@gem_name, 'lib', *parts)
+        end
+
+        def modify_required_file
+          File.open(lib_path("#{@gem_name}.rb"), 'w') do |file|
+            file.write <<-EOF
+require "#{@gem_name}/version"
+
+Nesta::Plugin.register(__FILE__)
+            EOF
+          end
+        end
+
+        def modify_init_file
+          module_name = @name.split('-').map { |name| name.capitalize }.join('::')
+          File.open(lib_path(@gem_name, 'init.rb'), 'w') do |file|
+            file.puts <<-EOF
+module Nesta
+  module Plugin
+    module #{module_name}
+      module Helpers
+        helpers do
+          # If your plugin needs any helper methods, add them here...
+        end 
+      end
+    end
+  end
+
+  class App
+    helpers Nesta::Plugin::#{module_name}::Helpers
+  end
+end
+            EOF
+          end
+        end
+
+        def specify_gem_dependency
+          File.open(File.join(@gem_name, "#{@gem_name}.gemspec"), 'r+') do |file|
+            file.each_line do |line|
+              if line =~ /specify any dependencies here/
+                file.puts('  s.add_dependency("nesta", ">= 0.9.10")')
+                file.puts('  s.add_development_dependency("rake")')
+              end
+            end
+          end
+        end
+
+        def execute
+          system('bundle', 'gem', @gem_name)
+          modify_required_file
+          modify_init_file
+          specify_gem_dependency
+          Dir.chdir(@gem_name) { system('git', 'add', '.') }
+        end
+      end
+    end
+
     module Theme
       class Create
         include Command

data/lib/nesta/models.rb

@@ -110,6 +110,11 @@ module Nesta
       @metadata[key]
     end
 
+    def flagged_as?(flag)
+      flags = metadata("flags")
+      flags && flags.split(",").map { |name| name.strip }.include?(flag)
+    end
+
     private
       def markup
         @markup
@@ -154,7 +159,12 @@ module Nesta
     end
 
     def self.find_by_path(path)
-      load(path)
+      page = load(path)
+      page && page.hidden? ? nil : page
+    end
+
+    def self.find_all
+      super.select { |p| ! p.hidden? }
     end
 
     def self.find_articles
@@ -167,6 +177,14 @@ module Nesta
       other.respond_to?(:path) && (self.path == other.path)
     end
 
+    def draft?
+      flagged_as?('draft')
+    end
+
+    def hidden?
+      draft? && Nesta::App.production?
+    end
+
     def heading
       regex = case @format
         when :mdown
@@ -203,11 +221,11 @@ module Nesta
     end
 
     def atom_id
-      metadata("atom id")
+      metadata('atom id')
     end
 
     def read_more
-      metadata("read more") || "Continue reading"
+      metadata('read more') || 'Continue reading'
     end
 
     def summary

data/lib/nesta/overrides.rb

@@ -48,7 +48,7 @@ module Nesta
             end
           end
         end
-        [{}, nil]
+        [{}, :sass]
       end
 
       def self.local_view_path

data/lib/nesta/plugin.rb

@@ -0,0 +1,33 @@
+module Nesta
+  module Plugin
+    class << self
+      attr_accessor :loaded
+    end
+    self.loaded ||= []
+
+    def self.register(path)
+      name = File.basename(path, '.rb')
+      prefix = 'nesta-plugin-'
+      name.start_with?(prefix) || raise("Plugin names must match '#{prefix}*'")
+      self.loaded << name
+    end
+
+    def self.initialize_plugins
+      self.loaded.each { |name| require "#{name}/init" }
+    end
+
+    def self.load_local_plugins
+      plugins = Dir.glob(File.expand_path('../plugins/*', File.dirname(__FILE__)))
+      plugins.each { |path| require_local_plugin(path) }
+    end
+
+    private
+      def self.require_local_plugin(path)
+        Nesta.deprecated(
+            'loading plugins from ./plugins', "convert #{path} to a gem")
+        require File.join(path, 'lib', File.basename(path))
+      rescue LoadError => e
+        $stderr.write("Couldn't load plugins/#{File.basename(path)}: #{e}\n")
+      end
+  end
+end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end

data/nesta.gemspec

@@ -35,14 +35,14 @@ EOF
   s.add_dependency('sass', '~> 3.1')
   s.add_dependency('maruku', '>= 0.6.0')
   s.add_dependency('RedCloth', '~> 4.2')
-  s.add_dependency('sinatra', '1.1.2')
+  s.add_dependency('sinatra', '1.2.6')
   
   # Useful in development
   s.add_dependency('shotgun', '>= 0.8')
 
   # Test libraries
-  s.add_development_dependency('hpricot', '0.8.3')
-  s.add_development_dependency('rack-test', '0.5.7')
+  s.add_development_dependency('hpricot', '0.8.4')
+  s.add_development_dependency('rack-test', '0.6.1')
   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')

data/spec/atom_spec.rb

@@ -2,7 +2,6 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 require File.expand_path('model_factory', File.dirname(__FILE__))
 
 describe "atom feed" do
-  include ConfigSpecHelper
   include ModelFactory
   include RequestSpecHelper
   
@@ -17,7 +16,7 @@ describe "atom feed" do
   end
   
   after(:each) do
-    remove_fixtures
+    remove_temp_directory
   end
   
   it "should render successfully" do

data/spec/commands_spec.rb

@@ -2,15 +2,13 @@ require File.expand_path("spec_helper", File.dirname(__FILE__))
 require File.expand_path("../lib/nesta/commands", File.dirname(__FILE__))
 
 describe "nesta" do
-  include FixtureHelper
-
   before(:each) do
-    create_fixtures_directory
-    @project_path = File.join(FixtureHelper::FIXTURE_DIR, 'mysite.com')
+    create_temp_directory
+    @project_path = temp_path('mysite.com')
   end
   
   after(:each) do
-    remove_fixtures
+    remove_temp_directory
   end
   
   def project_path(path)
@@ -169,6 +167,80 @@ describe "nesta" do
     end
   end
 
+  describe "plugin:create" do
+    before(:each) do
+      @name = 'my-feature'
+      @gem_name = "nesta-plugin-#{@name}"
+      @plugins_path = temp_path('plugins')
+      @working_dir = Dir.pwd
+      Dir.mkdir(@plugins_path)
+      Dir.chdir(@plugins_path)
+      @command = Nesta::Commands::Plugin::Create.new(@name)
+      @command.stub!(:system)
+    end
+
+    after(:each) do
+      Dir.chdir(@working_dir)
+      FileUtils.rm_r(@plugins_path)
+    end
+
+    it "should create a new gem prefixed with nesta-plugin" do
+      @command.should_receive(:system).with('bundle', 'gem', @gem_name)
+      begin
+        @command.execute
+      rescue Errno::ENOENT
+        # This test is only concerned with running bundle gem; ENOENT
+        # errors are raised because we didn't create a real gem.
+      end
+    end
+
+    describe "after gem created" do
+      def create_gem_file(*components)
+        path = File.join(@plugins_path, @gem_name, *components)
+        FileUtils.makedirs(File.dirname(path))
+        File.open(path, 'w') { |f| yield f if block_given? }
+        path
+      end
+
+      before(:each) do
+        @required_file = create_gem_file('lib', "#{@gem_name}.rb")
+        @init_file = create_gem_file('lib', @gem_name, 'init.rb')
+        @gem_spec = create_gem_file("#{@gem_name}.gemspec") do |file|
+          file.puts "  # specify any dependencies here; for example:"
+        end
+      end
+
+      after(:each) do
+        FileUtils.rm(@required_file)
+        FileUtils.rm(@init_file)
+      end
+
+      it "should create the ruby file loaded on require" do
+        @command.execute
+        File.read(@required_file).should include('Plugin.register(__FILE__)')
+      end
+
+      it "should create a default init.rb file" do
+        @command.execute
+        init = File.read(@init_file)
+        boilerplate = <<-EOF
+    module My::Feature
+      module Helpers
+        helpers do
+        EOF
+        init.should include(boilerplate)
+        init.should include('helpers Nesta::Plugin::My::Feature::Helpers')
+      end
+
+      it "should specify plugin gem's dependencies" do
+        @command.execute
+        text = File.read(@gem_spec)
+        text.should include('s.add_dependency("nesta", ">= 0.9.10")')
+        text.should include('s.add_development_dependency("rake")')
+      end
+    end
+  end
+
   describe "theme:install" do
     before(:each) do
       @repo_url = 'git://github.com/gma/nesta-theme-mine.git'
@@ -221,7 +293,7 @@ describe "nesta" do
 
   describe "theme:enable" do
     before(:each) do
-      config = File.join(FixtureHelper::FIXTURE_DIR, 'config.yml')
+      config = temp_path('config.yml')
       Nesta::Config.stub!(:yaml_path).and_return(config)
       @name = 'mytheme'
       @command = Nesta::Commands::Theme::Enable.new(@name)
@@ -265,7 +337,7 @@ describe "nesta" do
     end
 
     before(:each) do
-      Nesta::App.stub!(:root).and_return(FixtureHelper::FIXTURE_DIR)
+      Nesta::App.stub!(:root).and_return(TempFileHelper::TEMP_DIR)
       @name = 'my-new-theme'
       Nesta::Commands::Theme::Create.new(@name).execute
     end