roger 1.3.5 → 1.4.0

data/test/unit/release/scm/git_test.rb

@@ -0,0 +1,58 @@
+require "test_helper"
+require "mocha/test_unit"
+require "test_construct"
+
+module Roger
+  # Test for Roger Zip finalizer
+  class GitScmTest < ::Test::Unit::TestCase
+    include TestConstruct::Helpers
+
+    def setup
+      @construct = setup_construct
+
+      @scm = Roger::Release::Scm::Git.new(path: @construct)
+
+      @construct.file "test.html"
+
+      # Setup git
+      `git init`
+      `git add *`
+      `git commit -m "Commit 1"`
+      `git tag v0.1.0`
+
+      @construct.file "test2.html"
+
+      `git add *`
+      `git commit -m "Commit 2"`
+      `git tag v1.0.0`
+    end
+
+    def teardown
+      teardown_construct(@construct)
+    end
+
+    def test_implements_scm_interfase
+      assert @scm.respond_to?(:version)
+      assert @scm.respond_to?(:date)
+      assert @scm.respond_to?(:previous)
+    end
+
+    def test_version
+      assert_equal "1.0.0", @scm.version
+    end
+
+    def test_previous
+      assert_equal "0.1.0", @scm.previous.version
+    end
+
+    def test_date
+      now = Time.now
+      date = @scm.date
+      assert_equal now.day, date.day
+      assert_equal now.month, date.month
+      assert_equal now.year, date.year
+      assert_equal now.hour, date.hour
+      assert_equal now.min, date.min
+    end
+  end
+end

data/test/unit/release_test.rb

@@ -1,20 +1,20 @@
 # Generators register themself on the CLI module
 require "test_helper"
-require "./lib/roger/release.rb"
+require "roger/testing/mock_project"
 
 module Roger
   # Test Roger Release
   class ReleaseTest < ::Test::Unit::TestCase
     def setup
-      @project = Project.new(File.dirname(__FILE__) + "/../project", mockupfile_path: false)
-      @mockupfile = Roger::Mockupfile.new(@project)
+      @project = Testing::MockProject.new
+      @rogerfile = Roger::Rogerfile.new(@project)
     end
 
     def test_run_should_set_project_mode
       assert_equal @project.mode, nil
 
       # Running a blank release
-      @mockupfile.release(blank: true) do |r|
+      @rogerfile.release(blank: true) do |r|
         r.use proc{|release|
           assert_equal release.project.mode, :release
         }
@@ -25,13 +25,103 @@ module Roger
     end
 
     def test_blank_release_should_have_no_processors_and_finalizers
-      @mockupfile.release(blank: true)
+      @rogerfile.release(blank: true)
       @project.release.run!
 
       assert @project.release.stack.empty?
       assert @project.release.finalizers.empty?
     end
 
+    def test_release_should_add_mockup_processor_as_first_by_default
+      release = @rogerfile.release
+      release.run!
+
+      assert release.stack.length > 0
+      assert_equal Roger::Release::Processors::Mockup, release.stack.first.first.class
+    end
+
+    def test_release_should_add_url_relativizer_by_default
+      release = @rogerfile.release
+      release.run!
+
+      assert release.stack.length > 0
+      assert_equal Roger::Release::Processors::UrlRelativizer, release.stack.last.first.class
+    end
+
+    def test_default_banner
+      release = @rogerfile.release(scm: :fixed)
+
+      # Set fixed version
+      date = Time.now
+      release.scm.version = "1.0.0"
+      release.scm.date = date
+
+      lines = release.banner.split("\n")
+
+      assert_equal "/* ====================== */", lines[0]
+      assert_equal "/* = Version : 1.0.0    = */", lines[1]
+      assert_equal "/* = Date  : #{date.strftime('%Y-%m-%d')} = */", lines[2]
+      assert_equal "/* ====================== */", lines[3]
+    end
+
+    def test_banner
+      release = @rogerfile.release(scm: :fixed)
+
+      banner = release.banner do
+        "BANNER"
+      end
+
+      assert_equal "/* BANNER */", banner
+    end
+
+    def test_comment_per_line
+      release = @rogerfile.release
+
+      options = {
+        style: :css,
+        per_line: true
+      }
+
+      assert_equal "/* a */", release.comment("a", options)
+      assert_equal "/* a */\n/* b */", release.comment("a\nb", options)
+    end
+
+    def test_comment_html
+      release = @rogerfile.release
+
+      options = {
+        style: :html,
+        per_line: false
+      }
+
+      assert_equal "<!-- a -->", release.comment("a", options)
+      assert_equal "<!-- a\nb -->", release.comment("a\nb", options)
+    end
+
+    def test_comment_css
+      release = @rogerfile.release
+
+      options = {
+        style: :css,
+        per_line: false
+      }
+
+      assert_equal "/* a */", release.comment("a", options)
+      assert_equal "/* a\nb */", release.comment("a\nb", options)
+    end
+
+    def test_comment_js
+      release = @rogerfile.release
+
+      options = {
+        style: :js,
+        per_line: false
+      }
+
+      assert_equal "/* a */", release.comment("a", options)
+      assert_equal "/* a\nb */", release.comment("a\nb", options)
+    end
+
     def test_get_callable
       p = -> {}
       assert_equal Release.get_callable(p, {}), p

data/test/unit/server_test.rb

@@ -5,7 +5,7 @@ module Roger
   # Test Roger Server test
   class ServerTest < ::Test::Unit::TestCase
     def setup
-      @project = Project.new(File.dirname(__FILE__) + "/../../project", mockupfile_path: false)
+      @project = Project.new(File.dirname(__FILE__) + "/../../project", rogerfile_path: false)
       @server = Server.new(@project)
     end
 

data/test/unit/template_test.rb

@@ -4,6 +4,17 @@ require "test_helper"
 require "./lib/roger/template.rb"
 
 module Roger
+  # A simple template helper to use for testing
+  module TemplateHelper
+    def a
+      "a"
+    end
+
+    def from_env(key)
+      env[key]
+    end
+  end
+
   # Roger template tests
   class TemplateTest < ::Test::Unit::TestCase
     def setup
@@ -171,5 +182,27 @@ module Roger
       template = Template.new("<%= env[:test] %>", @config)
       assert_equal template.render(test: "test"), "test"
     end
+
+    # Helpers
+
+    def test_register_helper
+      Roger::Template.helper TemplateHelper
+
+      assert Roger::Template.helpers.include?(TemplateHelper)
+    end
+
+    def test_helper_works
+      Roger::Template.helper TemplateHelper
+
+      template = Roger::Template.new("<%= a %>", @config)
+      assert_equal template.render, "a"
+    end
+
+    def test_helper_has_access_to_env
+      Roger::Template.helper TemplateHelper
+
+      template = Roger::Template.new("<%= from_env(:test) %>", @config)
+      assert_equal template.render(test: "test"), "test"
+    end
   end
 end

data/test/unit/test_test.rb

@@ -16,7 +16,7 @@ module Roger
         @project.construct.file file
       end
 
-      @mockupfile = Roger::Mockupfile.new(@project)
+      @rogerfile = Roger::Rogerfile.new(@project)
     end
 
     def teardown
@@ -26,7 +26,7 @@ module Roger
     def test_test_run_should_set_project_mode
       assert_equal @project.mode, nil
 
-      @mockupfile.test do |t|
+      @rogerfile.test do |t|
         t.use proc{|test|
           assert_equal test.project.mode, :test
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -206,12 +206,12 @@ files:
 - doc/images/logo_plain-square.png
 - doc/images/logo_plain.png
 - doc/images/logo_plain.svg
-- doc/mockupfile.md
+- doc/rogerfile.md
 - doc/templating.md
 - examples/default_template/.gitignore
 - examples/default_template/CHANGELOG
 - examples/default_template/Gemfile
-- examples/default_template/Mockupfile
+- examples/default_template/Rogerfile
 - examples/default_template/html/.empty_directory
 - examples/default_template/partials/.empty_directory
 - lib/roger/cli.rb
@@ -220,7 +220,6 @@ files:
 - lib/roger/cli/release.rb
 - lib/roger/cli/serve.rb
 - lib/roger/cli/test.rb
-- lib/roger/extractor.rb
 - lib/roger/generators.rb
 - lib/roger/generators/generator.rb
 - lib/roger/generators/new.rb
@@ -228,7 +227,6 @@ files:
 - lib/roger/helpers/get_callable.rb
 - lib/roger/helpers/get_files.rb
 - lib/roger/helpers/logging.rb
-- lib/roger/mockupfile.rb
 - lib/roger/project.rb
 - lib/roger/rack/roger.rb
 - lib/roger/rack/sleep.rb
@@ -247,8 +245,12 @@ files:
 - lib/roger/release/scm/fixed.rb
 - lib/roger/release/scm/git.rb
 - lib/roger/resolver.rb
+- lib/roger/rogerfile.rb
 - lib/roger/server.rb
 - lib/roger/template.rb
+- lib/roger/template/helpers/capture.rb
+- lib/roger/template/helpers/partial.rb
+- lib/roger/template/template_context.rb
 - lib/roger/test.rb
 - lib/roger/testing/mock_project.rb
 - lib/roger/testing/mock_release.rb
@@ -258,7 +260,7 @@ files:
 - test/project/.rvmrc
 - test/project/Gemfile
 - test/project/Gemfile.lock
-- test/project/Mockupfile
+- test/project/Rogerfile
 - test/project/html/formats/csv.rcsv
 - test/project/html/formats/erb.html.erb
 - test/project/html/formats/index.html
@@ -298,15 +300,20 @@ files:
 - test/unit/generators_test.rb
 - test/unit/helpers/get_files_test.rb
 - test/unit/helpers/logging_test.rb
+- test/unit/mockupfile_test.rb
 - test/unit/rack/roger_test.rb
 - test/unit/release/cleaner_test.rb
+- test/unit/release/finalizers/dir_test.rb
 - test/unit/release/finalizers/git_branch_test.rb
 - test/unit/release/finalizers/rsync_test.rb
 - test/unit/release/finalizers/zip_test.rb
+- test/unit/release/injector_test.rb
 - test/unit/release/processors/mockup_test.rb
 - test/unit/release/processors/url_relativizer_test.rb
 - test/unit/release/processors_test.rb
+- test/unit/release/scm/base_test.rb
 - test/unit/release/scm/fixed_test.rb
+- test/unit/release/scm/git_test.rb
 - test/unit/release_test.rb
 - test/unit/resolver_test.rb
 - test/unit/server_test.rb
@@ -343,7 +350,7 @@ test_files:
 - test/project/.rvmrc
 - test/project/Gemfile
 - test/project/Gemfile.lock
-- test/project/Mockupfile
+- test/project/Rogerfile
 - test/project/html/formats/csv.rcsv
 - test/project/html/formats/erb.html.erb
 - test/project/html/formats/index.html
@@ -383,15 +390,20 @@ test_files:
 - test/unit/generators_test.rb
 - test/unit/helpers/get_files_test.rb
 - test/unit/helpers/logging_test.rb
+- test/unit/mockupfile_test.rb
 - test/unit/rack/roger_test.rb
 - test/unit/release/cleaner_test.rb
+- test/unit/release/finalizers/dir_test.rb
 - test/unit/release/finalizers/git_branch_test.rb
 - test/unit/release/finalizers/rsync_test.rb
 - test/unit/release/finalizers/zip_test.rb
+- test/unit/release/injector_test.rb
 - test/unit/release/processors/mockup_test.rb
 - test/unit/release/processors/url_relativizer_test.rb
 - test/unit/release/processors_test.rb
+- test/unit/release/scm/base_test.rb
 - test/unit/release/scm/fixed_test.rb
+- test/unit/release/scm/git_test.rb
 - test/unit/release_test.rb
 - test/unit/resolver_test.rb
 - test/unit/server_test.rb

data/lib/roger/extractor.rb

@@ -1,94 +0,0 @@
-require "hpricot"
-require File.dirname(__FILE__) + "/resolver"
-
-module Roger
-  # @deprecated Don't use the extractor anymore, use release.use(:mockup, options) processor and
-  # release.use(:url_relativizer, options) processor
-  class Extractor
-    attr_reader :project, :target_path
-
-    # @param [Project] project Project object
-    # @param [String,Pathname] target_path Path to extract to
-    # @param [Hash] options Options hash
-
-    # @option options [Array] :url_attributes The element attributes to parse and relativize
-    # @option options [Array] :url_relativize Wether or not we should relativize
-    # @option options [Array] :env ENV variable to pass to template renderer.
-    def initialize(project, target_path, options = {})
-      @project = project
-      @target_path = Pathname.new(target_path)
-      @resolver = Resolver.new(self.target_path)
-
-      @options = {
-        url_attributes: %w(src href action),
-        url_relativize: true,
-        env: {}
-      }
-
-      @options.update(options) if options
-
-      @options[:env].update("MOCKUP_PROJECT" => project)
-    end
-
-    def run!
-      target_path = self.target_path
-      source_path = project.html_path
-
-      filter = "**/*.html"
-      fail(
-        ArgumentError,
-        "Target #{target_path} already exists, please choose a new directory to extract into"
-      ) if target_path.exist?
-
-      mkdir_p(target_path)
-      target_path = target_path.realpath
-
-      # Copy source to target first, we'll overwrite the templates later on.
-      cp_r(source_path.children, target_path)
-
-      Dir.chdir(source_path) do
-        Dir.glob(filter).each do |file_path|
-          self.run_on_file!(file_path, @options[:env])
-        end
-      end
-    end
-
-    def run_on_file!(file_path, env = {})
-      source = extract_source_from_file(file_path, env)
-      File.open(target_path + file_path, "w") { |f| f.write(source) }
-    end
-
-    # Runs the extractor on a single file and return processed source.
-    def extract_source_from_file(file_path, env = {})
-      source = Roger::Template.open(
-        file_path,
-        partials_path: project.partial_path,
-        layouts_path: project.layouts_path
-      ).render(env.dup)
-
-      source = relativize_urls(source, file_path) if @options[:url_relativize]
-
-      source
-    end
-
-    protected
-
-    def relativize_urls(source, file_path)
-      doc = Hpricot(source)
-      @options[:url_attributes].each do |attribute|
-        (doc / "*[@#{attribute}]").each do |tag|
-          converted_url = @resolver.url_to_relative_url(tag[attribute], file_path)
-
-          case converted_url
-          when String
-            tag[attribute] = converted_url
-          when nil
-            puts "Could not resolve link #{tag[attribute]} in #{file_path}"
-          end
-        end
-      end
-
-      doc.to_original_html
-    end
-  end
-end