RubyGems - ichiban - Versions diffs - 1.0.13 → 1.1.0 - Mend

ichiban 1.0.13 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

checksums.yaml +4 -4
data/bin/ichiban +14 -2
data/empty_project/Gemfile +3 -0
data/empty_project/config.rb +33 -2
data/empty_project/layouts/default.html +1 -1
data/lib/ichiban/asset_compiler.rb +2 -2
data/lib/ichiban/command.rb +7 -3
data/lib/ichiban/config.rb +20 -2
data/lib/ichiban/dependencies.rb +46 -42
data/lib/ichiban/helpers.rb +6 -4
data/lib/ichiban/html_compiler.rb +0 -1
data/lib/ichiban/js_compiler.rb +89 -0
data/lib/ichiban/loader.rb +3 -1
data/lib/ichiban/logger.rb +4 -5
data/lib/ichiban/nav_helper.rb +1 -1
data/lib/ichiban/{file.rb → project_file.rb} +25 -44
data/lib/ichiban/scripts.rb +2 -44
data/lib/ichiban/watcher.rb +46 -30
data/lib/ichiban.rb +8 -9
metadata +192 -22

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed8e1c7721e2dde1e29fe7ee6e749ef444c4da6
-  data.tar.gz: cc2e0054c59fe95cb59637c42427656fa95568eb
+  metadata.gz: df9160a6af9ff5f9c21a2e6a5ca27f7488de6055
+  data.tar.gz: 9091f8368c5e34f12471910c537ab2e45ea1317d
 SHA512:
-  metadata.gz: e2db860d451e68cc3f83c1d4e77e8a64bddaa266a9daad0fc2d252299e5bb812566d8d7041692ad2c8886ab4bdd86dec46e28f7439b1f15f0b5dee399fba8a10
-  data.tar.gz: 0549dde9e9d8db5c32edff2c1ef16f83fac511e07fab45c5157a101467581d48dad913e3e86efa74a08f6ab61d5deb21c503335929914d33d995951d4991004e
+  metadata.gz: 2faa7ec8f821e61c0d39dad65ee70354ddcee0bf5c338a355c6ef901c0ffe5784717b99a0501e97eaca4e3c8bef096dd1d5e97609e5f14d957ce781f140c5b81
+  data.tar.gz: de957b1070e3f0f85f03065135c10660bf3e049749bcbadc3db593e6c26ce8fbfdeef7e21483d7822f21d7e694c2ed29b791d5f7cb148970bbc3263569b867e2

data/bin/ichiban CHANGED Viewed

@@ -1,9 +1,21 @@
 #!/usr/bin/env ruby
-# for dev purposes:
-#$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+# When developing Ichiban, run this script like so:
+#   DEV=1 ~/gems/ichiban/bin/ichiban watch
+# This will prevent your project's Gemfile from being used! There's really no way to avoid
+# that, because using the Gemfile would cause the installed version of Ichiban to be used.
 require 'rubygems'
+if ENV['DEV'] == '1'
+  puts "\n"
+  puts '====================================================='
+  puts 'Ichiban running in dev mode. Gemfile will be ignored.'
+  puts '====================================================='
+  puts "\n"
+  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+else
+  require 'bundler/setup'
+end
 require 'ichiban'
 Ichiban::Command.new(ARGV).run

data/empty_project/Gemfile ADDED Viewed

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'ichiban'

data/empty_project/config.rb CHANGED Viewed

@@ -1,3 +1,34 @@
-Ichiban.config do |config|
-  config.relative_url_root = '/'
+Ichiban.config do |cfg|
+  # If your site lives under a sub-path specify that here. For example, if your site lives
+  # under http://example.com/my-site, then the relative_url_root should be '/my-site'.
+  cfg.relative_url_root = '/'
+  # Specifies what must be recompiled when files change. For example, the following rule:
+  #
+  #   'layouts/default.html' => ['html/**/*', 'scripts/**/*']
+  #
+  # means that when layouts/default.html changes, everything in the html and scripts
+  # folders must be recompiled.
+  cfg.dependencies = {
+    'layouts/default.html' => ['html/**/*', 'scripts/**/*']
+  }
+  # Configures JavaScript compilation. Each hash key is the name of a concatenated,
+  # minified JS file. Each hash value is an array of source files in the assets/js
+  # folder. For example, the following rule:
+  #
+  #   'site.js' => ['home.js', 'popups.js']
+  #
+  # would generate compiled/js/site.js and compiled/js/site.js.map, using the source files
+  # assets/js/home.js and assets/js/popups.js.
+  cfg.js_manifests = {
+    'site.js' => ['site.js']
+  }
+  # Identify the SCSS files in assets/css that should be compiled into final CSS files.
+  # Often, many of your SCSS files are simply imported into other SCSS files--in
+  # other words, they don't map to their own, distinct CSS files. Make sure that
+  # cfg.dependencies covers any SCSS imports. Otherwise, saving the imported file won't
+  # update the root file.
+  cfg.scss_root_files = ['screen.scss']
 end

data/empty_project/layouts/default.html CHANGED Viewed

@@ -3,7 +3,7 @@
   <head>
     <title><%= @page_title %> - Site Name Here</title>
     <%= stylesheet_link_tag 'screen.css' %>
-    <%= javascript_include_tag 'interaction.js' %>
+    <%= javascript_include_tag 'site.js' %>
   </head>
   <body>

data/lib/ichiban/asset_compiler.rb CHANGED Viewed

@@ -11,8 +11,8 @@ module Ichiban
       end
       case @file
       when Ichiban::SCSSFile
-        Sass.compile_file @file.abs, @file.dest
-      else
+        Sass.compile_file @file.abs, @file.dest, load_paths: [File.join(Ichiban.project_root, 'assets/css')]
+      else
         FileUtils.cp @file.abs, @file.dest
       end
       Ichiban.logger.compilation(@file.abs, @file.dest)

data/lib/ichiban/command.rb CHANGED Viewed

@@ -7,10 +7,12 @@ module Ichiban
     def print_usage
       puts(
-        "Usage: ichiban [command]\n" +
+        "\nUsage: ichiban [command]\n" +
         "Available commands: \n" +
         "  watch\n" +
-        "  new [path]"
+        "  new [path]\n" +
+        "  help\n\n" +
+        "https://github.com/jarrett/ichiban\n\n"
       )
     end
@@ -24,7 +26,9 @@ module Ichiban
         Ichiban::ProjectGenerator.new(
           File.expand_path(@args[0])
         ).generate
-        puts "Initialized Ichiban project in #{@args[0]}"
+        Ichiban.logger.out "Initialized Ichiban project in #{@args[0]}"
+      when 'version', '-v', '--version'
+        puts "Ichiban version #{::Ichiban::VERSION}"
       else
         print_usage
       end

data/lib/ichiban/config.rb CHANGED Viewed

@@ -6,16 +6,34 @@ module Ichiban
   end
   class Config
-    attr_writer :relative_url_root
     def self.load_file
       config_file = File.join(Ichiban.project_root, 'config.rb')
       raise "#{config_file} must exist" unless File.exists?(config_file)
       load config_file
     end
+    attr_writer :dependencies
+    def dependencies
+      @dependencies || raise("Ichiban.config.dependencies not set. Set inside block in config.rb like this: cfg.dependencies = {...}")
+    end
+    attr_writer :js_manifests
+    def js_manifests
+      @js_manifests || raise("Ichiban.config.js_manifests not set. Set inside block in config.rb like this: cfg.js_manifests = {...}")
+    end
+    attr_writer :relative_url_root
     def relative_url_root
       @relative_url_root || raise("Ichiban.config.relative_url_root not set. Set inside block in config.rb like this: cfg.relative_url_root = '/'")
     end
+    attr_writer :scss_root_files
+    def scss_root_files
+      @scss_root_files || raise("Ichiban.config.scss_root_files not set. Set inside block in config.rb like this: cfg.scss_root_files = ['screen.scss']")
+    end
   end
 end

data/lib/ichiban/dependencies.rb CHANGED Viewed

@@ -1,54 +1,58 @@
 module Ichiban
-  module Dependencies
-    @graphs = {}
-    # Does not delete the files. Just clears the graphs from memory. This gets called whenever
-    # Ichiban.project_root is changed.
-    def self.clear_graphs
-      @graphs = {}
-    end
-    def self.delete_dep(graph_file_path, dep)
-      ensure_graph_initialized(graph_file_path)
-      graph = @graphs[graph_file_path]
-      graph.each do |ind, deps|
-        deps.delete dep
-      end
-      save_graph_file(graph_file_path, graph)
-    end
-    # graph_file_path is a relative path
-    def self.graph(graph_file_path)
-      ensure_graph_initialized(graph_file_path)
-      @graphs[graph_file_path]
-    end
-    # graph_file_path is a relative path
-    def self.ensure_graph_initialized(graph_file_path)
-      unless @graphs[graph_file_path]
-        abs = File.join(Ichiban.project_root, graph_file_path)
-        if File.exists?(abs)
-          @graphs[graph_file_path] = JSON.parse(File.read(abs))
+  module Dependencies
+    def self.files_depending_on(abs_path)
+      rel = abs_path.slice((Ichiban.project_root.length + 1)..-1)
+      if deps = Ichiban.config.dependencies[rel]
+        case deps
+        when String
+          paths = Dir.glob(File.join(Ichiban.project_root, deps))
+        when Array
+          paths = deps.map do |dep|
+            case dep
+            when String
+              Dir.glob(File.join(Ichiban.project_root, dep))
+            when Proc
+              files_from_proc(dep)
+            else
+              raise(TypeError, "Expected String or Proc, but was: #{files.inspect}")
+            end
+          end.flatten
+        when Proc
+          paths = [files_from_proc(deps)].flatten
         else
-          @graphs[graph_file_path] = {}
+          raise(TypeError, "Expected String, Array, or Proc, but was: #{files.inspect}")
         end
+        paths.map do |path|
+          project_file = Ichiban::ProjectFile.from_abs(path)
+        end.compact
+      else
+        []
       end
     end
-    def self.save_graph_file(graph_file_path, graph)
-      File.open(File.join(Ichiban.project_root, graph_file_path), 'w') do |f|
-        f << JSON.generate(graph)
+    def self.files_from_proc(proc)
+      files = proc.call
+      # Validate return value is String or Array.
+      if !files.is_a?(String) and !files.is_a?(Array)
+        raise(TypeError, "Expected Proc to return String or Array, but was: #{files.inspect}")
+      end
+      # If return value is Array, validate all members are Strings.
+      if files.is_a?(Array) and !files.all? { |f| f.is_a?(String) }
+        raise(TypeError, "Proc returned Array, but not all elements were Strings: #{files.inspect}")
+      end
+      # If return value is String, wrap it in an Array.
+      if files.is_a?(String)
+        files = [files]
+      end
+      files.map do |file|
+        File.join(Ichiban.project_root,file)
       end
     end
-    # Loads the graph from disk if it's not already in memory. Updates the graph. Writes the new
-    # graph to disk. graph_file_path is a relative path.
-    def self.update(graph_file_path, ind, dep)
-      ensure_graph_initialized(graph_file_path)
-      graph = @graphs[graph_file_path]
-      graph[ind] ||= []
-      graph[ind] << dep unless graph[ind].include?(dep)
-      save_graph_file(graph_file_path, graph)
+    def self.propagate(path)
+      files_depending_on(path).each do |project_file|
+        project_file.update
+      end
     end
   end
 end

data/lib/ichiban/helpers.rb CHANGED Viewed

@@ -26,6 +26,8 @@ module Ichiban
       @_current_path
     end
+    # h is provided by ERB::Util.
     def javascript_include_tag(js_file)
       js_file = js_file + '.js' unless js_file.end_with?('.js')
       path = normalize_path(File.join('/js', js_file))
@@ -79,14 +81,14 @@ module Ichiban
       path
     end
-    def partial(path)
+    def partial(path, options = {})
+      options = {ivars: {}}.merge(options)
       file = Ichiban::PartialHTMLFile.new(
         File.join('html', path)
       )
-      # Record the dependency like this: 'folder/partial-name' => 'folder/included-file.html'
-      Ichiban::Dependencies.update('.partial_dependencies.json', file.partial_name, @_template_path)
       compiler = Ichiban::HTMLCompiler.new(file)
-      compiler.ivars = to_hash # to_hash is inherited from Erubis::Context. It's a hash of the instance variables.
+      # to_hash is inherited from Erubis::Context. It's a hash of the instance variables.
+      compiler.ivars = to_hash.merge(options[:ivars])
       compiler.compile_to_str
     end

data/lib/ichiban/html_compiler.rb CHANGED Viewed

@@ -60,7 +60,6 @@ module Ichiban
           :filename => layout_path
         )
         html = eruby.evaluate(ctx) { html }
-        Ichiban::Dependencies.update('.layout_dependencies.json', layout_name, @html_file.rel)
         html
       end
     end

data/lib/ichiban/js_compiler.rb ADDED Viewed

@@ -0,0 +1,89 @@
+module Ichiban
+  # This class uses source_map and uglifier to concatenate, minify, and source-map JS files.
+  class JSCompiler
+    def compile
+      rel = @file.rel_to 'assets/js'
+      Ichiban.config.js_manifests.each do |dest, sources|
+        if sources.include? rel
+          # Make the source paths absolute.
+          sources = sources.map do |source|
+            abs = File.join Ichiban.project_root, 'assets/js', source
+            unless File.exists? abs
+              raise "Something's wrong with Ichiban.config.js_manifests. JS source file does not exist: #{abs.inspect}"
+            end
+            abs
+          end
+          # Make two code strings. The first contains the minified JS. The second
+          # contains the source map.
+          js, map = compile_paths(
+            sources,
+            File.join(Ichiban.config.relative_url_root, 'js'),
+            dest,
+            dest + '.map'
+          )
+          # Make sure the JS folder exists.
+          FileUtils.mkdir_p File.join(Ichiban.project_root, 'compiled/js')
+          # Write the minified JS.
+          compiled_js_path = File.join(Ichiban.project_root, 'compiled/js', dest)
+          File.open(compiled_js_path, 'w') do |f|
+            f << js
+          end
+          # Write the source map.
+          File.open(File.join(Ichiban.project_root, 'compiled/js', dest + '.map'), 'w') do |f|
+            f << map
+          end
+          # Log the compilation of the JS file, but don't log the compilation of the map.
+          Ichiban.logger.compilation(@file.abs, compiled_js_path)
+        end
+      end
+    end
+    def initialize(file)
+      @file = file
+    end
+    private
+    # Pass in absolute source_paths.
+    def compile_paths(source_paths, source_root, js_filename, map_filename)
+      js, map = concat(
+        source_paths.map { |p| [File.read(p), File.basename(p)] },
+        source_root
+      )
+      js, map = uglify js, map, js_filename
+      map_url = File.join Ichiban.config.relative_url_root, 'js', map_filename
+      js << "\n//# sourceMappingURL=#{map_url}"
+      [js, map]
+    end
+    # Sources should be an array of form: [['alert("foo");', 'alert.js']] Returns a tuple. The
+    # first element is the concatenated JS. The second element is the map string.
+    def concat(sources, source_root)
+      js = StringIO.new
+      map = SourceMap.new(
+        generated_output: js,
+        source_root: source_root
+      )
+      sources.each do |source_js, source_filename|
+        map.add_generated source_js, source: source_filename
+      end
+      js.rewind
+      [js.read, map.to_s]
+    end
+    def uglify(js, map, js_filename)
+      Uglifier.new(
+        input_source_map: map,
+        output_filename: js_filename
+      ).compile_with_map(js)
+    end
+  end
+end

data/lib/ichiban/loader.rb CHANGED Viewed

@@ -20,7 +20,9 @@ module Ichiban
     # Calls Object.remove_const on all tracked modules. Also clears the compiler's list of user-defined helpers.
     def delete_all
       @loaded_constants.each do |const_name|
-        Object.send(:remove_const, const_name)
+        if Object.const_defined?(const_name)
+          Object.send(:remove_const, const_name)
+        end
       end
       Ichiban::HTMLCompiler::Context.clear_user_defined_helpers
     end

data/lib/ichiban/logger.rb CHANGED Viewed

@@ -82,10 +82,9 @@ module Ichiban
       end
     end
-    def script_run(ind_path, dep_path)
-      ind_path = ind_path.slice(Ichiban.project_root.length + 1..-1)
-      dep_path = dep_path.slice(Ichiban.project_root.length + 1..-1)
-      msg = "#{dep_path} running due to change in #{ind_path}"
+    def script_run(path)
+      path = path.slice(Ichiban.project_root.length + 1..-1)
+      msg = "#{path} running"
       if ansi?
         msg = ANSI.color(msg, :magenta)
       end
@@ -103,7 +102,7 @@ module Ichiban
       require 'ansi'
       @ansi = true
     rescue LoadError
-      Ichiban.logger.out("Try `gem install ansi` for colorized output. If you're using a Gemfile, add it there too.")
+      Ichiban.logger.out("Add `gem ansi` to your Gemfile for colorized output.")
     end
   end
 end

data/lib/ichiban/nav_helper.rb CHANGED Viewed

@@ -122,7 +122,7 @@ module Ichiban
                 li_inner_html << @ctx.content_tag('span', text, 'class' => 'selected')
               else
                 if current_path_starts_with?(path)
-                  a_attrs = {'class' => 'ancestor_of_selected'}
+                  a_attrs = {'class' => 'above-selected'}
                 else
                   a_attrs = {}
                 end

data/lib/ichiban/{file.rb → project_file.rb} RENAMED Viewed

@@ -12,6 +12,7 @@ module Ichiban
     # Returns a new instance based on an absolute path. Will automatically pick the right subclass.
     # Return nil if the file is not recognized.
     def self.from_abs(abs)
+      return nil if File.directory?(abs)
       rel = abs.slice(Ichiban.project_root.length..-1) # Relative to project root
       rel.sub!(/^\//, '') # Remove leading slash
       handler = @types.detect do |_, proc|
@@ -45,6 +46,18 @@ module Ichiban
     attr_reader :rel
+    # Pass in a path relative to Ichiban.projet_root. Returns the path relative to the
+    # one you passed in. E.g. if the file is assets/js/example.js, then
+    # rel_to('assets/js') returns 'example.js'.
+    def rel_to(path)
+      path = path + '/' unless path.end_with?('/')
+      if rel.start_with?(path)
+        rel.sub(path, '')
+      else
+        raise "#{@abs} is not in #{path}"
+      end
+    end
     # Returns a new path where the old extension is replaced with new_ext
     def replace_ext(path, new_ext)
       path.sub(/\..+$/, '.' + new_ext)
@@ -85,24 +98,7 @@ module Ichiban
     end
     def update
-      # Normal HTML files that depend on this partial
-      if deps = Ichiban::Dependencies.graph('.partial_dependencies.json')[partial_name]
-        deps.each do |dep|
-          # dep will be a path relative to the html directory. It looks like this: 'folder/file.html'
-          Ichiban::HTMLFile.new(File.join('html', dep)).update
-        end
-      end
-      # Scripts that depend on this partial
-      dep_key = "html/#{partial_name}.html"
-      if deps = Ichiban::Dependencies.graph('.script_dependencies.json')[dep_key]
-        deps.each do |dep|
-          # dep will be a path relative to the html directory. It looks like this: 'folder/file.html'
-          script_path = File.join(Ichiban.project_root, dep)
-          Ichiban.logger.script_run(@abs, script_path)
-          script = Ichiban::Script.new(script_path).run
-        end
-      end
+      # no-op
     end
   end
@@ -112,30 +108,13 @@ module Ichiban
     end
     def update
-      Ichiban.logger.layout(@abs)
-      if deps = Ichiban::Dependencies.graph('.layout_dependencies.json')[layout_name]
-        deps.each do |dep|
-          # dep is a path relative to the project root
-          if File.exists?(File.join(Ichiban.project_root, dep))
-            # Ignore partial templates
-            unless File.basename(dep).start_with?('_')
-              Ichiban::HTMLFile.new(dep).update
-            end
-          else
-            Dependencies.delete_dep('.layout_dependencies.json', dep)
-          end
-        end
-      end
+      # no-op
     end
   end
-  class JSFile < ProjectFile
-    def dest_rel_to_compiled
-      File.join('js', @rel.slice('assets/js/'.length..-1))
-    end
+  class JSFile < ProjectFile
     def update
-      Ichiban::AssetCompiler.new(self).compile
+      Ichiban::JSCompiler.new(self).compile
     end
   end
@@ -168,7 +147,9 @@ module Ichiban
     end
     def update
-      Ichiban::AssetCompiler.new(self).compile
+      if Ichiban.config.scss_root_files.include?(rel_to('assets/css'))
+        Ichiban::AssetCompiler.new(self).compile
+      end
     end
   end
@@ -218,7 +199,7 @@ module Ichiban
   class DataFile < ProjectFile
     def update
-      Ichiban.script_runner.data_file_changed(@abs)
+      #no-op
     end
   end
@@ -241,16 +222,16 @@ module Ichiban
       !File.basename(rel).start_with?('_')
     end
     register_type(Ichiban::LayoutFile)    { |rel| rel.start_with?('layouts') and rel.end_with?('.html') }
-    register_type(Ichiban::JSFile)        { |rel| rel.start_with?('assets/js') }
+    register_type(Ichiban::JSFile)        { |rel| rel.start_with?('assets/js') and rel.end_with?('.js') }
     register_type(Ichiban::EJSFile)       { |rel| rel.start_with?('assets/ejs') and rel.end_with?('.ejs') }
     register_type(Ichiban::CSSFile)       { |rel| rel.start_with?('assets/css') and rel.end_with?('.css') }
     register_type(Ichiban::SCSSFile)      { |rel| rel.start_with?('assets/css') and rel.end_with?('.scss') }
     register_type(Ichiban::ImageFile)     { |rel| rel.start_with?('assets/img') }
     register_type(Ichiban::MiscAssetFile) { |rel| rel.start_with?('assets/misc') }
-    register_type(Ichiban::ModelFile)     { |rel| rel.start_with?('models') }
+    register_type(Ichiban::ModelFile)     { |rel| rel.start_with?('models') and rel.end_with?('.rb') }
     register_type(Ichiban::DataFile)      { |rel| rel.start_with?('data') }
-    register_type(Ichiban::ScriptFile)    { |rel| rel.start_with?('scripts') }
-    register_type(Ichiban::HelperFile)    { |rel| rel.start_with?('helpers') }
+    register_type(Ichiban::ScriptFile)    { |rel| rel.start_with?('scripts') and rel.end_with?('.rb') }
+    register_type(Ichiban::HelperFile)    { |rel| rel.start_with?('helpers') and rel.end_with?('.rb') }
     register_type(Ichiban::HtaccessFile)  { |rel| rel == 'webserver/htaccess.txt' }
   end
 end

data/lib/ichiban/scripts.rb CHANGED Viewed

@@ -3,57 +3,15 @@ module Ichiban
     @script_runner ||= Ichiban::ScriptRunner.new
   end
-  class ScriptRunner
-    # Takes an absolute path. Consults the dependencies graph.
-    def data_file_changed(path)
-      # Add one to the length to remove the leading slash
-      rel_to_root = path.slice(Ichiban.project_root.length + 1..-1)
-      dep_graph = Ichiban::Dependencies.graph(self.class.dep_graph_path)
-      if deps = dep_graph[rel_to_root]
-        deps.each do |dep|
-          Ichiban.logger.script_run(path, File.join(Ichiban.project_root, dep))
-          Ichiban::Script.new(
-            File.join(Ichiban.project_root, dep)
-          ).run
-        end
-      end
-    end
-    def self.dep_graph_path
-      '.script_dependencies.json'
-    end
+  class ScriptRunner
     # Takes an absolute path
     def script_file_changed(path)
-      Ichiban.logger.script_run(path, path)
+      Ichiban.logger.script_run(path)
       script = Ichiban::Script.new(path).run
     end
   end
   class Script
-    # Every file that the script depends on (e.g. a data file) should be declared with this method.
-    # This is how Ichiban knows to re-run the script when one of the files changes. Pass in a path
-    # relative to the project root.
-    #
-    # However, you don't need to declare dependencies for the files in the html directory that the
-    # script uses. Those will automatically be tracked.
-    def depends_on(ind_path)
-      if ind_path.start_with?('/')
-        raise(ArgumentError, 'depends_on must be passed a path relative to the project root, e.g. "data/employees.xml"')
-      end
-      # Format in dependency graph: 'data/employees.json' => 'scripts/generate_employees.rb'
-      Ichiban::Dependencies.update(
-        Ichiban::ScriptRunner.dep_graph_path,
-        # Path to independent file, relative to project root.
-        ind_path,
-        # Path to dependent file (i.e. this script), relative to project root.
-        # Add one to the length to remove the leading slash.
-        @path.slice(Ichiban.project_root.length + 1..-1)
-      )
-    end
     # Automatically appends .html to dest_path
     def generate(template_path, dest_path, ivars)
       dest_path += '.html'

data/lib/ichiban/watcher.rb CHANGED Viewed

@@ -1,46 +1,62 @@
 module Ichiban
-  class Watcher
+  class Watcher
     def initialize(options = {})
       @options = {
         :latency => 0.5
       }.merge(options)
+      @listen_event_log = []
+      @loader = Ichiban::Loader.new
     end
-    def start(blocking = true)
-      @loader = Ichiban::Loader.new
+    attr_reader :listener
+    attr_reader :listen_event_log
+    # The test suite calls this method directly
+    # to bypass the Listen gem for certain tests.
+    def on_change(modified, added, deleted)
+      # Modifications and additions are treated the same.
+      (modified + added).uniq.each do |path|
+        if file = Ichiban::ProjectFile.from_abs(path)
+          begin
+            @loader.change(file) # Tell the Loader that this file has changed
+            file.update
+          rescue Exception => exc
+            Ichiban.logger.exception(exc)
+          end
+        end
+      end
+      # Deletions are handled specially.
+      deleted.each do |path|
+        Ichiban::Deleter.new.delete_dest(path)
+      end
+      # Finally, propagate this change to any dependent files.
+      (modified + added + deleted).uniq.each do |path|
+        begin
+          Ichiban::Dependencies.propagate(path)
+        rescue => exc
+          Ichiban.logger.exception(exc)
+        end
+      end
+    end
+    def start
       Ichiban.logger.out 'Starting watcher'
       begin
         @listener = Listen.to(
-          File.join(Ichiban.project_root, 'html'),
-          File.join(Ichiban.project_root, 'layouts'),
-          File.join(Ichiban.project_root, 'assets'),
-          File.join(Ichiban.project_root, 'models'),
-          File.join(Ichiban.project_root, 'helpers'),
-          File.join(Ichiban.project_root, 'scripts'),
-          File.join(Ichiban.project_root, 'data'),
-          File.join(Ichiban.project_root, 'webserver')
-        )
-        .ignore(/.listen_test$/)
-        .latency(@options[:latency])
-        .change do |modified, added, deleted|
-          (modified + added).uniq.each do |path|
-            if file = Ichiban::ProjectFile.from_abs(path)
-              @loader.change(file) # Tell the Loader that this file has changed
-              begin
-                file.update
-              rescue => exc
-                Ichiban.logger.exception(exc)
-              end
-            end
-          end
-          deleted.each do |path|
-            Ichiban::Deleter.new.delete_dest(path)
-          end
+          Ichiban.project_root,
+          ignore: /.listen_test$/,
+          latency: @options[:latency]
+        ) do |modified, added, deleted|
+          @listen_event_log << [modified, added, deleted]
+          on_change modified, added, deleted
         end
-        @listener.start(blocking)
+        @listener.start
+        sleep
       rescue Interrupt
-        Ichiban.logger.out "Stopping watcher"
+        stop
         exit 0
       end
     end

data/lib/ichiban.rb CHANGED Viewed

@@ -2,19 +2,20 @@
 require 'fileutils'
 require 'json'
 require 'erb' # Just for the helpers
+require 'stringio'
 # Gems
-#require 'active_support/core_ext/class/attribute'
-#require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/inflector'
 require 'sass'
 require 'erubis'
 require 'rake'
 require 'bundler'
-gem 'listen', '= 0.7.3'
 require 'listen'
 require 'ejs'
+require 'uglifier'
+require 'therubyracer'
+require 'source_map'
 # Ichiban files. Order matters!
 require 'ichiban/bundle'
@@ -26,23 +27,21 @@ require 'ichiban/dependencies'
 require 'ichiban/loader'
 require 'ichiban/watcher'
 require 'ichiban/deleter'
-require 'ichiban/file'
+require 'ichiban/project_file'
 require 'ichiban/helpers'
 require 'ichiban/nav_helper'
 require 'ichiban/html_compiler'
 require 'ichiban/asset_compiler'
+require 'ichiban/js_compiler'
 require 'ichiban/ejs_compiler'
 require 'ichiban/markdown'
 require 'ichiban/scripts'
 module Ichiban
+  VERSION = '1.1.0'
   # In addition to setting the variable, this loads the config file
   def self.project_root=(path)
-    unless @project_root == path
-      # If we're changing the project root, then we need to clear all dependency graphs from memory.
-      # This doesn't delete any files.
-      Ichiban::Dependencies.clear_graphs
-    end
     @project_root = path
     if path # It's valid to set project_root to nil, though this would likely only happen in tests
       Ichiban::Config.load_file

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ichiban
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ejs
@@ -16,75 +16,148 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.14
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.14
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.9
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.9
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.3
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.3
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -92,41 +165,113 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: source_map
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.4.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.4.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: lorax
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -134,9 +279,32 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Static website compiler with advanced feature, including watcher script.
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.7
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.7
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+description: Static website compiler with advanced features, including watcher script.
 email: jarrett@madebyhq.com
 executables:
 - ichiban
@@ -144,6 +312,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ichiban
+- empty_project/Gemfile
 - empty_project/assets/css/screen.scss
 - empty_project/assets/js/interaction.js
 - empty_project/assets/misc/readme.txt
@@ -168,13 +337,14 @@ files:
 - lib/ichiban/deleter.rb
 - lib/ichiban/dependencies.rb
 - lib/ichiban/ejs_compiler.rb
-- lib/ichiban/file.rb
 - lib/ichiban/helpers.rb
 - lib/ichiban/html_compiler.rb
+- lib/ichiban/js_compiler.rb
 - lib/ichiban/loader.rb
 - lib/ichiban/logger.rb
 - lib/ichiban/markdown.rb
 - lib/ichiban/nav_helper.rb
+- lib/ichiban/project_file.rb
 - lib/ichiban/project_generator.rb
 - lib/ichiban/scripts.rb
 - lib/ichiban/watcher.rb