nesta 0.10.0 → 0.11.0

data/spec/commands/theme/enable_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe "nesta:theme:enable" do
+  include_context "temporary working directory"
+
+  before(:each) do
+    config = temp_path('config.yml')
+    Nesta::Config.stub(:yaml_path).and_return(config)
+    @name = 'mytheme'
+    @command = Nesta::Commands::Theme::Enable.new(@name)
+  end
+
+  shared_examples_for "command that configures the theme" do
+    it "should enable the theme" do
+      @command.execute
+      File.read(Nesta::Config.yaml_path).should match(/^theme: #{@name}/)
+    end
+  end
+
+  describe "when theme config is commented out" do
+    before(:each) do
+      create_config_yaml('  # theme: blah')
+    end
+
+    it_should_behave_like "command that configures the theme"
+  end
+
+  describe "when another theme is configured" do
+    before(:each) do
+      create_config_yaml('theme: another')
+    end
+
+    it_should_behave_like "command that configures the theme"
+  end
+
+  describe "when no theme config exists" do
+    before(:each) do
+      create_config_yaml('# I have no theme config')
+    end
+
+    it_should_behave_like "command that configures the theme"
+  end
+end

data/spec/commands/theme/install_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe "nesta:theme:install" do
+  include_context "temporary working directory"
+
+  before(:each) do
+    @repo_url = 'git://github.com/gma/nesta-theme-mine.git'
+    @theme_dir = 'themes/mine'
+    FileUtils.mkdir_p(File.join(@theme_dir, '.git'))
+    @command = Nesta::Commands::Theme::Install.new(@repo_url)
+    @command.stub(:enable)
+    @command.stub(:run_process)
+  end
+
+  after(:each) do
+    FileUtils.rm_r(@theme_dir)
+  end
+
+  it "should clone the repository" do
+    @command.should_receive(:run_process).with(
+      'git', 'clone', @repo_url, @theme_dir)
+    @command.execute
+  end
+
+  it "should remove the theme's .git directory" do
+    @command.execute
+    File.exist?(@theme_dir).should be_true
+    File.exist?(File.join(@theme_dir, '.git')).should be_false
+  end
+
+  it "should enable the freshly installed theme" do
+    @command.should_receive(:enable)
+    @command.execute
+  end
+
+  describe "when theme URL doesn't match recommended pattern" do
+    before(:each) do
+      @repo_url = 'git://foobar.com/path/to/mytheme.git'
+      @other_theme_dir = 'themes/mytheme'
+      FileUtils.mkdir_p(File.join(@other_theme_dir, '.git'))
+      @command = Nesta::Commands::Theme::Install.new(@repo_url)
+      @command.stub(:enable)
+    end
+
+    after(:each) do
+      FileUtils.rm_r(@other_theme_dir)
+    end
+
+    it "should use the basename as theme dir" do
+      @command.should_receive(:run_process).with(
+        'git', 'clone', @repo_url, @other_theme_dir)
+      @command.execute
+    end
+  end
+end

data/spec/config_spec.rb

@@ -18,10 +18,10 @@ describe "Config" do
       @title = "Title from ENV"
       ENV["NESTA_TITLE"] = @title
     end
-    
-    it "should never try and access config.yml" do
+
+    it "should fallback to config.yml" do
       stub_config_key("subtitle", "Subtitle in YAML file")
-      Nesta::Config.subtitle.should be_nil
+      Nesta::Config.subtitle.should == "Subtitle in YAML file"
     end
 
     it "should override config.yml" do

data/spec/models_spec.rb

@@ -317,15 +317,6 @@ shared_examples_for "Page" do
       @article.should_not be_in_category("orange")
     end
 
-    it "should sort categories by link text" do
-      create_category(heading: "Orange",
-                      metadata: { "link text" => "A citrus fruit" },
-                      path: "orange")
-      article = create_article(metadata: { "categories" => "apple, orange" })
-      @article.categories.first.link_text.should == "Apple"
-      article.categories.first.link_text.should == "A citrus fruit"
-    end
-
     it "should not be assigned to non-existant category" do
       delete_page(:category, "banana", @extension)
       @article.should_not be_in_category("banana")
@@ -540,25 +531,50 @@ end
 describe "Markdown page" do
   include ModelFactory
 
-  before(:each) do
-    @extension = :mdown
-  end
+  context "mdown extension" do
+    before(:each) do
+      @extension = :mdown
+    end
 
-  include_context "Page testing"
-  it_should_behave_like "Page"
+    include_context "Page testing"
+    it_should_behave_like "Page"
 
-  it "should set heading from first h1 tag" do
-    page = create_page(
-      path: "a-page",
-      heading: "First heading",
-      content: "# Second heading"
-    )
-    page.heading.should == "First heading"
+    it "should set heading from first h1 tag" do
+      page = create_page(
+        path: "a-page",
+        heading: "First heading",
+        content: "# Second heading"
+      )
+      page.heading.should == "First heading"
+    end
+
+    it "should ignore trailing # characters in headings" do
+      article = create_article(heading: 'With trailing #')
+      article.heading.should == 'With trailing'
+    end
   end
 
-  it "should ignore trailing # characters in headings" do
-    article = create_article(heading: 'With trailing #')
-    article.heading.should == 'With trailing'
+  context "md extension" do
+    before(:each) do
+      @extension = :md
+    end
+
+    include_context "Page testing"
+    it_should_behave_like "Page"
+
+    it "should set heading from first h1 tag" do
+      page = create_page(
+        path: "a-page",
+        heading: "First heading",
+        content: "# Second heading"
+      )
+      page.heading.should == "First heading"
+    end
+
+    it "should ignore trailing # characters in headings" do
+      article = create_article(heading: 'With trailing #')
+      article.heading.should == 'With trailing'
+    end
   end
 end
 
@@ -635,7 +651,7 @@ describe "Menu" do
   end
 
   it "should find top level menu items" do
-    text = [@page.path, "no-such-page"].join("\n")
+    text = ["no-such-page", @page.path].join("\n")
     create_menu(text)
     Nesta::Menu.top_level.should == [@page]
   end
@@ -656,6 +672,8 @@ describe "Menu" do
   #{@page2.path}
     #{@page3.path}
     #{@page4.path}
+    "no-such-page"
+"another-missing-page"
 #{@page5.path}
   #{@page6.path}
       EOF

data/spec/page_spec.rb

@@ -110,14 +110,14 @@ describe "The layout" do
   it "should not include GA JavaScript by default" do
     stub_configuration
     get "/"
-    assert_not_selector "script", content: "'_setAccount', 'UA-1234'"
+    assert_not_selector "script", content: "ga('create', 'UA-1234'"
   end
 
   it "should include GA JavaScript if configured" do
     stub_config_key('google_analytics_code', 'UA-1234', rack_env: true)
     stub_configuration
     get "/"
-    assert_selector 'script', content: "'_setAccount', 'UA-1234'"
+    assert_selector 'script', content: "ga('create', 'UA-1234'"
   end
 end
 
@@ -450,6 +450,22 @@ describe "A page" do
       end
     end
   end
+
+  describe "with associated categories" do
+    it "should link to the first assigned category in breadcrumb" do
+      category1 = create_category(path: 'category1', heading: 'Category 1')
+      create_category(path: 'category2', heading: 'Category 2')
+      @category = create_page(
+        path: "a-page",
+        heading: "A Page",
+        metadata: { 'categories' => 'category1, category2' }
+      )
+      do_get
+      href = category1.abspath
+      link_text = category1.link_text
+      assert_selector "nav.breadcrumb a[href='#{href}']", content: link_text
+    end
+  end
 end
 
 describe "A Haml page" do

data/spec/spec_helper.rb

@@ -89,3 +89,26 @@ module RequestSpecHelper
     body.should_not have_selector(*args)
   end
 end
+
+shared_context "temporary working directory" do
+  before(:each) do
+    create_temp_directory
+    @project_path = temp_path('mysite.com')
+  end
+  
+  after(:each) do
+    remove_temp_directory
+  end
+  
+  def project_path(path)
+    File.join(@project_path, path)
+  end
+
+  def should_exist(file)
+    File.exist?(project_path(file)).should be_true
+  end
+
+  def create_config_yaml(text)
+    File.open(Nesta::Config.yaml_path, 'w') { |f| f.puts(text) }
+  end
+end

data/templates/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'nesta', '<%= Nesta::VERSION %>'
+gem 'nesta'
 <% if @options['vlad'] %>gem 'vlad', '2.1.0'
 gem 'vlad-git', '2.2.0'<% end %>
 

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/views/analytics.haml

@@ -1,12 +1,11 @@
 - if @google_analytics_code
   :plain
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', '#{@google_analytics_code}']);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
-    </script>
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', '#{@google_analytics_code}', 'auto');
+      ga('send', 'pageview');
+    </script>