nesta 0.9.11 → 0.12.0

data/lib/nesta/navigation.rb

@@ -2,10 +2,10 @@ module Nesta
   module Navigation
     module Renderers
       def display_menu(menu, options = {})
-        defaults = { :class => nil, :levels => 2 }
+        defaults = { class: nil, levels: 2 }
         options = defaults.merge(options)
         if options[:levels] > 0
-          haml_tag :ul, :class => options[:class] do
+          haml_tag :ul, class: options[:class] do
             menu.each do |item|
               display_menu_item(item, options)
             end
@@ -17,14 +17,14 @@ module Nesta
         if item.respond_to?(:each)
           if (options[:levels] - 1) > 0
             haml_tag :li do
-              display_menu(item, :levels => (options[:levels] - 1))
+              display_menu(item, levels: (options[:levels] - 1))
             end
           end
         else
-          html_class = (request.path == item.abspath) ? "current" : nil
-          haml_tag :li, :class => html_class do
-            haml_tag :a, :<, :href => item.abspath do
-              haml_concat item.heading
+          html_class = current_item?(item) ? current_menu_item_class : nil
+          haml_tag :li, class: html_class do
+            haml_tag :a, :<, href: path_to(item.abspath) do
+              haml_concat link_text(item)
             end
           end
         end
@@ -41,20 +41,44 @@ module Nesta
       end
 
       def display_breadcrumbs(options = {})
-        haml_tag :ul, :class => options[:class] do
+        haml_tag :ul, class: options[:class] do
           breadcrumb_ancestors[0...-1].each do |page|
             haml_tag :li do
-              haml_tag :a, :<, :href => page.abspath do
-                haml_concat breadcrumb_label(page)
+              haml_tag :a, :<, href: path_to(page.abspath), itemprop: 'url' do
+                haml_tag :span, :<, itemprop: 'title' do
+                  haml_concat link_text(page)
+                end
               end
             end
           end
-          haml_tag(:li) { haml_concat breadcrumb_label(@page) }
+          haml_tag(:li, class: current_breadcrumb_class) do
+            haml_concat link_text(@page)
+          end
         end
       end
 
+      def link_text(page)
+        page.link_text
+      rescue LinkTextNotSet
+        return 'Home' if page.abspath == '/'
+        raise
+      end
+
       def breadcrumb_label(page)
-        (page.abspath == '/') ? 'Home' : page.heading
+        Nesta.deprecated('breadcrumb_label', 'use link_text')
+        link_text(page)
+      end
+
+      def current_item?(item)
+        request.path_info == item.abspath
+      end
+
+      def current_menu_item_class
+        'current'
+      end
+
+      def current_breadcrumb_class
+        nil
       end
     end
   end

data/lib/nesta/overrides.rb

@@ -6,6 +6,11 @@ module Nesta
         super(template, defaults.merge(options), locals)
       end
 
+      def erb(template, options = {}, locals = {})
+        defaults, engine = Overrides.render_options(template, :erb)
+        super(template, defaults.merge(options), locals)
+      end
+
       def scss(template, options = {}, locals = {})
         defaults, engine = Overrides.render_options(template, :scss)
         super(template, defaults.merge(options), locals)
@@ -24,15 +29,15 @@ module Nesta
     end
 
     def self.load_local_app
-      require Nesta::Path.local("app")
-    rescue LoadError
+      app_file = Nesta::Path.local('app.rb')
+      require app_file if File.exist?(app_file)
     end
     
     def self.load_theme_app
       if Nesta::Config.theme
-        require Nesta::Path.themes(Nesta::Config.theme, "app")
+        app_file = Nesta::Path.themes(Nesta::Config.theme, 'app.rb')
+        require app_file if File.exist?(app_file)
       end
-    rescue LoadError
     end
 
     private
@@ -44,7 +49,7 @@ module Nesta
         [local_view_path, theme_view_path].each do |path|
           engines.each do |engine|
             if template_exists?(engine, path, template)
-              return { :views => path }, engine
+              return { views: path }, engine
             end
           end
         end

data/lib/nesta/plugin.rb

@@ -17,17 +17,19 @@ module Nesta
     end
 
     def self.load_local_plugins
+      # This approach is deprecated; plugins should now be distributed
+      # as gems. See http://nestacms.com/docs/plugins/writing-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
+    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
+    private_class_method :require_local_plugin
   end
 end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.11'
+  VERSION = '0.12.0'
 end

data/nesta.gemspec

@@ -24,26 +24,27 @@ Implementing your site's design is easy, but Nesta also has a small
 selection of themes to choose from.
 EOF
 
-  s.rubyforge_project = "nesta"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('haml', '~> 3.1')
-  s.add_dependency('sass', '~> 3.1')
-  s.add_dependency('rdiscount', '~> 1.6')
+  s.add_dependency('haml', '>= 3.1')
+  s.add_dependency('haml-contrib', '>= 1.0')
+  s.add_dependency('rack', '~> 2.0')
+  s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')
-  s.add_dependency('sinatra', '1.2.6')
-  
+  s.add_dependency('sassc', '>= 2.2')
+  s.add_dependency('sinatra', '~> 2.0')
+  s.add_dependency('tilt', '~> 2.0')
+
   # Useful in development
-  s.add_dependency('shotgun', '>= 0.8')
+  s.add_development_dependency('mr-sparkle')
 
   # Test libraries
-  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')
+  s.add_development_dependency('byebug')
+  s.add_development_dependency('capybara', '~> 2.0')
+  s.add_development_dependency('minitest', '~> 5.0')
+  s.add_development_dependency('minitest-reporters')
+  s.add_development_dependency('rake')
 end

data/templates/Gemfile

@@ -1,8 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'nesta', '<%= Nesta::VERSION %>'
-<% if @options['heroku'] %>gem 'heroku'<% end %>
+gem 'nesta'
 <% if @options['vlad'] %>gem 'vlad', '2.1.0'
 gem 'vlad-git', '2.2.0'<% end %>
 
-# gem (RUBY_VERSION =~ /^1.9/) ? 'ruby-debug19': 'ruby-debug'
+group :development do
+  gem 'mr-sparkle'
+end
+
+# gem 'debugger'

data/templates/config.ru

@@ -3,6 +3,9 @@ require 'bundler/setup'
 
 Bundler.require(:default)
 
+use Rack::ConditionalGet
+use Rack::ETag
+
 require 'nesta/env'
 Nesta::Env.root = ::File.expand_path('.', ::File.dirname(__FILE__))
 

data/templates/config/config.yml

@@ -8,7 +8,7 @@ subtitle: "(change this text in config/config.yml)"
 # Atom feed. Specify at least one of name, uri or email, and Nesta will
 # include it in your feed. See the Atom spec for more info:
 #
-# http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.feed
+# https://tools.ietf.org/html/rfc4287#section-4.1.1
 #
 # author:
 #   name: Your Name
@@ -28,14 +28,6 @@ subtitle: "(change this text in config/config.yml)"
 #
 # disqus_short_name: mysite
 
-# cache
-#     Set it to true if you'd like Nesta to cache your pages in ./public.
-#     Useful if you're deploying Nesta with a proxy server such as Nginx,
-#     but not in the least bit helpful if your pages are dynamic, or you're
-#     deploying Nesta to Heroku.
-#
-cache: false
-
 # content
 #     The root directory where nesta will look for your article files.
 #     Should contain "pages" and "attachments" subdirectories that contain
@@ -54,14 +46,22 @@ content: content
 #
 # google_analytics_code: "UA-???????-?"
 
-# Overriding "cache" and "content" in production is recommended if you're
-# deploying Nesta to your own server (but see the deployment documentation
-# on the Nesta site). Setting google_analytics_code in production is
-# recommended regardless of how you're deploying (if you have a GA account!).
+# read_more
+#     When the summary of an article is displayed on the home page, or
+#     on a category page, there is a link underneath the summary that
+#     points to the rest of the post. Use this value to customize the
+#     default link text. You can still override this value on a per-page
+#     basis with the 'Read more' metadata key.
+#
+# read_more: "Continue reading"
+
+# Overriding "content" in production is recommended if you're deploying
+# Nesta to your own server (but see the deployment documentation on the
+# Nesta site). Setting google_analytics_code in production is recommended
+# regardless of how you're deploying (if you have a GA # account!).
 #
 # Don't forget to uncomment the "production:" line too...
 
 # production:
-#   cache: true    
 #   content: /var/apps/nesta/shared/content
 #   google_analytics_code: "UA-???????-?"

data/templates/config/deploy.rb

@@ -38,10 +38,10 @@ namespace :vlad do
   # using a different app server in the call to Vlad.load in Rakefile.
   #
   desc "Deploy the code and restart the server"
-  task :deploy => [:update, :start_app]
+  task deploy: [:update, :start_app]
 
   # If you use bundler to manage the installation of gems on your server
   # you can use this definition of the deploy task instead:
   #
-  # task :deploy => [:update, :bundle, :start_app]
+  # task deploy: [:update, :bundle, :start_app]
 end

data/templates/index.haml

@@ -1 +1,3 @@
+Link text: Home
+
 %section.articles= article_summaries(latest_articles)

data/templates/plugins/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in <%= @gem_name %>.gemspec
+gemspec

data/templates/plugins/README.md

@@ -0,0 +1,13 @@
+README
+======
+
+TODO: Explain what your plugin is for
+
+Installation
+------------
+
+To use this plugin just add it to your Nesta project's `Gemfile` and
+then install it with Bundler:
+
+    $ echo 'gem "<%= @gem_name %>"' >> Gemfile
+    $ bundle

data/templates/plugins/Rakefile

@@ -0,0 +1,58 @@
+def version
+  version_file = File.join(File.dirname(__FILE__), "lib", name, "version.rb")
+  contents = File.read(version_file)
+  contents.match(/VERSION = ['"]([0-9a-z.-]+)['"].*$/)
+  $1
+end
+
+def name
+  "<%= @gem_name %>"
+end
+
+def built_gem_path
+  gem_packages = File.join(File.dirname(__FILE__), "pkg", "#{name}-*.gem")
+  Dir[gem_packages].sort_by { |file| File.mtime(file) }.last
+end
+
+def already_tagged?
+  `git tag`.split(/\n/).include?("v#{version}")
+end
+
+desc "Build #{name}-#{version}.gem into the pkg directory."
+task 'build' do
+  `gem build -V #{File.join(File.dirname(__FILE__), "#{name}.gemspec")}`
+  FileUtils.mkdir_p(File.join(File.dirname(__FILE__), "pkg"))
+  gem = Dir[File.join(File.dirname(__FILE__), "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last
+  FileUtils.mv(gem, 'pkg')
+  puts "#{name} #{version} built to #{built_gem_path}."
+end
+
+desc "Build and install #{name}-#{version}.gem into system gems."
+task 'install' => 'build' do
+  `gem install '#{built_gem_path}' --local`
+end
+
+desc "Create tag v#{version} and build and push #{name}-#{version}.gem to Rubygems\n" \
+     "To prevent publishing in Rubygems use `gem_push=no rake release`"
+task 'release' => ['build', 'release:guard_clean',
+                   'release:source_control_push', 'release:rubygem_push'] do
+end
+
+task 'release:guard_clean' do
+  if !system("git diff --exit-code") || !system("git diff-index --quiet --cached HEAD")
+    puts "There are files that need to be committed first."
+    exit(1)
+  end
+end
+
+task 'release:source_control_push' do
+  unless already_tagged?
+    system "git tag -a -m 'Version #{version}' v#{version}"
+    system 'git push'
+    system 'git push --tags'
+  end
+end
+
+task 'release:rubygem_push' do
+  system "gem push #{built_gem_path}"
+end

data/templates/plugins/gitignore

@@ -0,0 +1,3 @@
+*.gem
+Gemfile.lock
+pkg/*

data/templates/plugins/lib/init.rb

@@ -0,0 +1,13 @@
+module Nesta
+  module Plugin
+    module <%= module_name %>
+      module Helpers
+        # If your plugin needs any helper methods, add them here...
+      end
+    end
+  end
+
+  class App
+    helpers Nesta::Plugin::<%= module_name %>::Helpers
+  end
+end

data/templates/plugins/lib/required.rb

@@ -0,0 +1,3 @@
+require "<%= @gem_name %>/version"
+
+Nesta::Plugin.register(__FILE__)

data/templates/plugins/lib/version.rb

@@ -0,0 +1,5 @@
+module Nesta
+  module Plugin
+<%= nested_module_definition_with_version -%>
+  end
+end

data/templates/plugins/plugin.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)                                       
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)  
+require "<%= @gem_name %>/version"
+
+Gem::Specification.new do |spec|
+  spec.name        = "<%= @gem_name %>"
+  spec.version     = Nesta::Plugin::<%= module_name %>::VERSION
+  spec.authors     = ["TODO: Your name"]
+  spec.email       = ["TODO: Your email address"]
+  spec.homepage    = ""
+  spec.summary     = %q{TODO: Write a gem summary}
+  spec.description = %q{TODO: Write a gem description}
+  spec.license     = "MIT"
+
+  spec.rubyforge_project = "<%= @gem_name %>"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }       
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/}) 
+  spec.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  # spec.add_development_dependency "rspec"
+  # spec.add_runtime_dependency "rest-client"
+  spec.add_dependency("nesta", ">= 0.9.11")
+  spec.add_development_dependency("rake")
+end

data/templates/themes/README.md

@@ -4,4 +4,4 @@
 <%= @name %> is a theme for Nesta, a [Ruby CMS](nesta), designed by
 <insert your name here>.
 
-[nesta]: http://effectif.com/nesta
+[nesta]: http://nestacms.com

data/templates/themes/app.rb

@@ -8,7 +8,7 @@ module Nesta
     #
     # Put your assets in themes/<%= @name %>/public/<%= @name %>.
     #
-    # use Rack::Static, :urls => ["/<%= @name %>"], :root => "themes/<%= @name %>/public"
+    # use Rack::Static, urls: ["/<%= @name %>"], root: "themes/<%= @name %>/public"
 
     helpers do
       # Add new helpers here.