gakubuchi 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de0621a2c4aefec2689206b915624fdd2125bcbe
-  data.tar.gz: a475393b99e9491be9e527f97becebc1b77f26b9
+  metadata.gz: 7c899d677ecc5feddbca366ee1b59e5ecc22e307
+  data.tar.gz: 2db0642f6fc120915d464ff07f01392d81d2aa12
 SHA512:
-  metadata.gz: 2536c299852e56ccd4a6598b5753f2c08e4a61297a8cbe50545c80ba5eb0a15f305e31179f2e26199aa9e4df41faa2b68e8d0998679d5f587ee40b78012d22e1
-  data.tar.gz: 51a8b358d5d9f26886189378e591eb0557a1eeb14af5c3993d4af950a6f1da144ccdea6ce562563f55dafb7c15577e3fffab7f64efccd70ff7d49cf142cd1a17
+  metadata.gz: cc51f9de01fa55a1c0db624963e46271f8787de54cf23e9bb03d0a7a286c44fef7fce0461584325ed749ec75b35b1d04fb5465966d332f8a584b456cf8433a6a
+  data.tar.gz: 90c16f8304742a31e13a9291261bf9f6fe313aafdc6ae46fc85559b459261fb4327ab9dab3d0c31942e9a16a148b06cef7669f78561a46f0a7d03856c92c12cb

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 yasaichi
+Copyright 2015 Yuichi Goto
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/gakubuchi/engine_registrar.rb

@@ -0,0 +1,27 @@
+module Gakubuchi
+  class EngineRegistrar
+    def initialize(env)
+      @env = env
+    end
+
+    def register(target, engine)
+      klass = constantize(engine)
+      return false if !klass.instance_of?(::Class) || registered?(target)
+
+      @env.register_engine(target, klass)
+      true
+    end
+
+    def registered?(target)
+      @env.engines.key?(::Sprockets::Utils.normalize_extension(target))
+    end
+
+    private
+
+    def constantize(klass)
+      klass.to_s.constantize
+    rescue ::NameError
+      nil
+    end
+  end
+end

data/lib/gakubuchi/error.rb

@@ -0,0 +1,5 @@
+module Gakubuchi
+  class Error < StandardError
+    InvalidTemplate = Class.new(self)
+  end
+end

data/lib/gakubuchi/railtie.rb

@@ -1,8 +1,10 @@
 module Gakubuchi
   class Railtie < ::Rails::Railtie
-    initializer 'gakubuchi.assets.precompile' do
-      TemplateEngine.new('Slim::Template').register!('.slim')
-      TemplateEngine.new('Tilt::HamlTemplate').register!('.haml')
+    config.assets.configure do |env|
+      engine_registrar = EngineRegistrar.new(env)
+
+      engine_registrar.register(:haml, '::Tilt::HamlTemplate')
+      engine_registrar.register(:slim, '::Slim::Template')
     end
 
     rake_tasks do

data/lib/gakubuchi/task.rb

@@ -8,10 +8,10 @@ module Gakubuchi
 
     def execute!
       templates.each do |template|
-        src = template.precompiled_pathname
+        src = template.digest_path
         next if src.nil?
 
-        dest = template.destination_pathname
+        dest = template.destination_path
         FileUtils.copy_p(src, dest)
 
         FileUtils.remove(src) unless leave_digest_named_templates?

data/lib/gakubuchi/template.rb

@@ -2,54 +2,63 @@ module Gakubuchi
   class Template
     extend ::Forwardable
 
-    attr_reader :pathname
-    def_delegator :@pathname, :hash
+    attr_reader :source_path, :extname
+    def_delegators :source_path, :basename, :hash
 
     %w(== === eql?).each do |method_name|
       define_method(method_name) do |other|
-        self.class == other.class && @pathname.__send__(method_name, other.pathname)
+        self.class == other.class && source_path.public_send(method_name, other.source_path)
       end
     end
 
     def self.all
-      ::Dir.glob(root.join('**/*.html*')).map { |path| new(path) }
+      ::Dir.glob(root.join('**/*.html*')).map { |source_path| new(source_path) }
     end
 
     def self.root
       ::Rails.root.join('app/assets', ::Gakubuchi.configuration.template_directory)
     end
 
-    def initialize(path)
-      @pathname = ::Pathname.new(path)
-    end
+    def initialize(source_path)
+      path = ::Pathname.new(source_path)
+      root = self.class.root
+
+      @extname = extract_extname(path)
+      @source_path = path.absolute? ? path : root.join(path)
 
-    def destination_pathname
-      dirname = relative_pathname.dirname
-      ::Rails.public_path.join(dirname, "#{relative_pathname.basename(extname)}.html")
+      case
+      when !@extname.include?('html')
+        fail Error::InvalidTemplate, 'source path must refer to a template file'
+      when !@source_path.fnmatch?(root.join('*').to_s)
+        fail Error::InvalidTemplate, "template must exist in #{root}"
+      end
     end
 
-    def extname
-      extnames = []
-      basename_without_ext = pathname.basename
+    def destination_path
+      ::Rails.public_path.join(logical_path)
+    end
 
-      loop do
-        extname = basename_without_ext.extname
-        break if extname.empty?
+    def digest_path
+      resolved_path = view_context.asset_digest_path(logical_path.to_s)
+      return if resolved_path.nil?
 
-        extnames.unshift(extname)
-        basename_without_ext = basename_without_ext.basename(extname)
-      end
+      ::Pathname.new(::File.join(::Rails.public_path, view_context.assets_prefix, resolved_path))
+    end
 
-      extnames.join
+    def logical_path
+      dirname = source_path.relative_path_from(self.class.root).dirname
+      ::Pathname.new(dirname).join("#{basename(extname)}.html")
     end
 
-    def precompiled_pathname
-      asset = ::Rails.application.assets.find_asset(relative_pathname)
-      ::Rails.public_path.join('assets', asset.digest_path) if asset
+    private
+
+    def extract_extname(path)
+      extname = path.extname
+      extname.empty? ? extname : "#{extract_extname(path.basename(extname))}#{extname}"
     end
 
-    def relative_pathname
-      pathname.relative_path_from(self.class.root)
+    def view_context
+      @view_context ||= ::ActionView::Base.new
     end
   end
 end

data/lib/gakubuchi/version.rb

@@ -1,3 +1,3 @@
 module Gakubuchi
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/gakubuchi.rb

@@ -4,14 +4,15 @@ require 'logger'
 require 'active_support/configurable'
 
 require 'gakubuchi/configuration'
+require 'gakubuchi/error'
 require 'gakubuchi/fileutils'
 require 'gakubuchi/task'
 require 'gakubuchi/version'
 
 if defined?(::Rails::Railtie) && defined?(::Sprockets::Railtie)
   require 'pathname'
+  require 'gakubuchi/engine_registrar'
   require 'gakubuchi/template'
-  require 'gakubuchi/template_engine'
   require 'gakubuchi/railtie'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gakubuchi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - yasaichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -28,16 +28,16 @@ dependencies:
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -190,11 +190,12 @@ files:
 - Rakefile
 - lib/gakubuchi.rb
 - lib/gakubuchi/configuration.rb
+- lib/gakubuchi/engine_registrar.rb
+- lib/gakubuchi/error.rb
 - lib/gakubuchi/fileutils.rb
 - lib/gakubuchi/railtie.rb
 - lib/gakubuchi/task.rb
 - lib/gakubuchi/template.rb
-- lib/gakubuchi/template_engine.rb
 - lib/gakubuchi/version.rb
 - lib/generators/gakubuchi/install/install_generator.rb
 - lib/generators/gakubuchi/install/templates/gakubuchi.rb.erb

data/lib/gakubuchi/template_engine.rb

@@ -1,29 +0,0 @@
-module Gakubuchi
-  class TemplateEngine
-    extend ::Forwardable
-
-    attr_reader :klass
-    alias_method :engine, :klass
-
-    def_delegator '::Rails.application', :assets
-    def_delegator '::Sprockets::Utils', :normalize_extension
-    private :assets, :normalize_extension
-
-    def initialize(engine)
-      @klass = engine.to_s.constantize rescue nil
-    end
-
-    def register!(extname)
-      if engine.instance_of?(::Class) && !registered?(extname)
-        !!assets.register_engine(extname, engine)
-      else
-        false
-      end
-    end
-
-    def registered?(extname)
-      ext = normalize_extension(extname)
-      assets.engines.key?(ext) && assets.engines[ext] == engine
-    end
-  end
-end