middleman-jammit 0.2.0 → 0.3.0

data/README.rdoc

@@ -9,6 +9,10 @@ Use Jammit in Middleman - merge multiple javascripts/stylesheets into one
     gem install middleman-jammit -v 0.0.2 # for middleman 1.2.7
     gem install middleman-jammit -v 0.2.0 # for middleman 2.x
 
+   For middleman 3.x you can add it to your Gemfile:
+
+    gem 'middleman-jammit'
+
 2. Create your project
 
     middleman init your-middleman-project

data/bin/mm-jammit-install

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require "middleman"
+require "middleman-core"
 require "thor"
 require "thor/group"
 
@@ -9,9 +9,9 @@ module Middleman::Jammit
 
     class_option :package_path, :default => "assets", :desc => 'The path to the asset files'
 
-    class_option :build_dir, :default => Middleman.server.build_dir, :desc => 'Your build dir'
-    class_option :css_dir, :default => Middleman.server.css_dir, :desc => 'The path to the css files'
-    class_option :js_dir, :default => Middleman.server.js_dir, :desc => 'The path to the javascript files'
+    class_option :build_dir, :default => Middleman::Application.server.inst.build_dir, :desc => 'Your build dir'
+    class_option :css_dir, :default => Middleman::Application.server.inst.css_dir, :desc => 'The path to the css files'
+    class_option :js_dir, :default => Middleman::Application.server.inst.js_dir, :desc => 'The path to the javascript files'
 
 
     def self.source_root
@@ -19,11 +19,11 @@ module Middleman::Jammit
     end
 
     def create_jammit_config
-      config_dir = File.join(Middleman.server.root, "config")
+      config_dir = File.join(Middleman::Application.server.inst.root, "config")
       empty_directory config_dir
       template "assets.yml.tt", File.join(config_dir, "assets.yml")
-      prepend_file File.join(Middleman.server.root, "config.rb") do
-        ['require "middleman-jammit"', 'activate :jammit', "", ""].join("\n")
+      prepend_file File.join(Middleman::Application.server.inst.root, "config.rb") do
+        ['activate :jammit', "", ""].join("\n")
       end
     end
 

data/lib/middleman-jammit.rb

@@ -1,18 +1,21 @@
 require "jammit"
-require "middleman/builder"
+require "middleman-core"
 
 module Middleman
-  module Features
-    module Jammit
+  module Jammit
 
-      class << self
-        def registered(app)
-          full_build_dir = File.join(Middleman.server.root, Middleman.server.build_dir)
+    class << self
+      include Thor::Actions
+      def registered(app)
+        app.send :include, InstanceMethods
 
-          FileUtils.mkdir_p File.join(full_build_dir, Middleman.server.js_dir)
-          FileUtils.mkdir_p File.join(full_build_dir, Middleman.server.css_dir)
+        app.after_configuration do
+          full_build_dir = File.join(root, build_dir)
 
-          jammit_config_file = File.join(Middleman.server.root, 'config', 'assets.yml')
+          FileUtils.mkdir_p File.join(full_build_dir, js_dir)
+          FileUtils.mkdir_p File.join(full_build_dir, css_dir)
+
+          jammit_config_file = File.join(root, 'config', 'assets.yml')
           raise ConfigurationNotFound, "could not find \"#{jammit_config_file}\" " unless File.exists?(jammit_config_file)
           jammit_conf = YAML.load(ERB.new(File.read(jammit_config_file)).result)
 
@@ -20,71 +23,73 @@ module Middleman
           touch_asset_files jammit_conf['stylesheets']
 
           ::Jammit.load_configuration(jammit_config_file)
+        end
 
-          Middleman::Builder.after_run "jammit" do
-            full_package_path = File.join(full_build_dir, ::Jammit.package_path)
-            ::Jammit.packager.precache_all(full_package_path, Middleman.server.root)
-            say_status "Jammit", "build/assets"
-          end
+        app.after_build "jammit" do |build|
+          full_package_path = File.join(File.join(root, build_dir), ::Jammit.package_path)
+          ::Jammit.packager.precache_all(full_package_path, root)
+          build.say_status "Jammit", "build/assets"
+        end
 
-          app.helpers Jammit::Helpers
+        app.helpers Helpers
 
-        end
-        alias :included :registered
-
-        protected
-          def touch_asset_files(asset_files)
-            if asset_files.present?
-              asset_files.each do |name, files|
-                files.each do |f|
-                  next if f["*"].present?
-                  FileUtils.touch File.join(Middleman.server.root, f)
-                end
-              end
+      end
+      alias :included :registered
+
+    end
+
+    module InstanceMethods
+      def touch_asset_files(asset_files)
+        if asset_files.present?
+          asset_files.each do |name, files|
+            files.each do |f|
+              next if f["*"].present?
+              FileUtils.touch File.join(root, f)
             end
           end
-
+        end
       end
+    end
 
-      module Helpers
+    module Helpers
 
-        def include_javascripts(*packages)
-          generate_asset_tags(packages, :js)
-        end
+      def include_javascripts(*packages)
+        generate_asset_tags(packages, :js)
+      end
 
-        def include_stylesheets(*packages)
-          generate_asset_tags(packages, :css)
-        end
+      def include_stylesheets(*packages)
+        generate_asset_tags(packages, :css)
+      end
 
-        protected
-          def generate_asset_tags(packages, type)
-            packages.map do |pack|
-              if ENV['MM_ENV'] == "build"
-                url = asset_url(::Jammit.asset_url(pack, type.to_sym))
+      protected
+        def generate_asset_tags(packages, type)
+          packages.map do |pack|
+            if ENV['MM_ENV'] == "build"
+              url = asset_url(::Jammit.asset_url(pack, type.to_sym))
+              generate_tag(type, url)
+            else
+              ::Jammit.packager.individual_urls(pack.to_sym, type.to_sym).map do |file|
+                url = file.gsub(%r(^.*build/), '/')
                 generate_tag(type, url)
-              else
-                ::Jammit.packager.individual_urls(pack.to_sym, type.to_sym).map do |file|
-                  url = file.gsub(%r(^.*build/), '/')
-                  generate_tag(type, url)
-                end
               end
-            end.join("\n")
-          end
-
-          def generate_tag(type, url)
-            self.method("#{type.to_s}_tag").call(url)
-          end
+            end
+          end.join("\n")
+        end
 
-          def js_tag(url)
-            javascript_include_tag url
-          end
+        def generate_tag(type, url)
+          self.method("#{type.to_s}_tag").call(url)
+        end
 
-          def css_tag(url)
-            stylesheet_link_tag url
-          end
+        def js_tag(url)
+          javascript_include_tag url
+        end
 
-      end
+        def css_tag(url)
+          stylesheet_link_tag url
+        end
 
     end
+
   end
 end
+::Middleman::Extensions.register(:jammit, Middleman::Jammit)

data/lib/middleman-jammit/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Jammit
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/middleman-jammit.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "middleman-jammit"
 
   s.add_dependency "jammit", "~> 0.6"
-  s.add_dependency "middleman", "> 1.2.7"
+  s.add_dependency "middleman", ">= 3.0.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-jammit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000Z
+date: 2012-07-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jammit
-  requirement: &70238914407440 !ruby/object:Gem::Requirement
+  requirement: &70140587370860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,18 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70238914407440
+  version_requirements: *70140587370860
 - !ruby/object:Gem::Dependency
   name: middleman
-  requirement: &70238914406940 !ruby/object:Gem::Requirement
+  requirement: &70140587370360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70238914406940
+  version_requirements: *70140587370360
 description: Use Jammit in Middleman - merge multiple javascripts/stylesheets into
   one
 email: