bpm 0.1.4 → 1.0.0.beta.4

data/lib/bpm/pipeline/plugin_asset.rb

@@ -9,6 +9,12 @@ module BPM
 
     def initialize(environment, module_name)
       pathname = Pathname.new(File.join(environment.project.root_path, '.bpm', 'plugins', module_name+'.js'))
+      
+      unless File.exists? pathname
+        FileUtils.mkdir_p File.dirname(pathname)
+        FileUtils.touch pathname
+      end
+      
       super(environment, module_name, pathname, {})
     end
     
@@ -41,7 +47,7 @@ module BPM
       deps << pkg # always load pkg too
 
       # Prime digest cache with data, since we happen to have it
-      environment.file_digest(pathname, body)
+      environment.file_digest(pathname, body.join("\n"))
 
       # add requires for each depedency to context
       context = blank_context
@@ -61,7 +67,7 @@ module BPM
 
       # require asset itself - this should be included directly in the body
       # we don't want to use any processors
-      module_path = context.resolve project.path_from_module(logical_path)
+      module_path = context.resolve logical_path
       context.depend_on module_path
       body << "(function(exports) {"
       body << File.read(module_path)

data/lib/bpm/pipeline/source_url_processor.rb

@@ -0,0 +1,16 @@
+require 'sprockets'
+
+module BPM
+  
+  class SourceURLProcessor < Sprockets::Processor
+    
+    def evaluate(context, locals)
+      return data if context.environment.mode != :debug
+      
+      root_path = file.to_s[context.environment.project.root_path.size+1..-1]
+      return %(eval(#{data.to_json[0..-2]}\\n//@sourceURL=#{file}");\n)
+    end
+    
+  end
+
+end

data/lib/bpm/pipeline/transport_processor.rb

@@ -8,7 +8,9 @@ module BPM
       environment = context.environment
       project = environment.project
       pkg, module_id = project.package_and_module_from_path file
-      transport_plugins = pkg.transport_plugins(project)
+      transport_plugins = Array(pkg.bpm_use_transport || pkg.find_transport_plugins(project))
+      
+      transport_plugins = [] if transport_plugins.first == 'none'
 
       # No transport, just return the existing data
       return data if transport_plugins.size == 0
@@ -16,7 +18,7 @@ module BPM
       if transport_plugins.size > 1
         # TODO: Maybe make custom error for this
         raise "#{pkg.name} depends on #{transport_plugins.size} packages that define transport plugins. " \
-                "Select a plugin by adding a `plugin:transport` property to the package.json"
+                "Select a plugin by adding a `bpm:use:transport` property to the package.json"
       end
       
       plugin_ctx = environment.plugin_context_for transport_plugins.first
@@ -24,7 +26,7 @@ module BPM
       out = ''
 
       V8::C::Locker() do
-        plugin_ctx["PACKAGE_INFO"] = pkg.attributes
+        plugin_ctx["PACKAGE_INFO"] = pkg.as_json
         plugin_ctx["DATA"]         = data
         out = plugin_ctx.eval("BPM_PLUGIN.compileTransport(DATA, PACKAGE_INFO, '#{module_id}', '#{filepath}');")
       end

data/lib/bpm/pipeline.rb

@@ -16,10 +16,12 @@ module BPM
   class Pipeline < Sprockets::Environment
     
     attr_reader :project
-    
+    attr_reader :mode
+
     # Pass in the project you want the pipeline to manage.
-    def initialize(project)
+    def initialize(project, mode = :debug, include_preview = false)
       @project = project
+      @mode    = mode
       @plugin_contexts = {}
       
       project_path = project.root_path
@@ -33,6 +35,7 @@ module BPM
       end
 
       register_postprocessor 'application/javascript', BPM::TransportProcessor
+      #register_postprocessor 'application/javascript', BPM::SourceURLProcessor
 
       # This gunks things up. I'm not a fan - PDW
       unregister_postprocessor 'application/javascript', Sprockets::SafetyColons
@@ -40,7 +43,8 @@ module BPM
       # configure search paths
       append_path File.join project_path, '.bpm', 'packages'
       append_path File.dirname project_path
-      append_path File.join project_path, 'assets'
+      append_path project.assets_root
+      append_path project.preview_root if include_preview
     end    
       
     def plugin_context_for(module_id)
@@ -53,17 +57,27 @@ module BPM
       
       # make sure the logical_path can be used to simply build into the 
       # assets directory when we are done
-      ret = ['bpm_packages.js', 'bpm_styles.css', "#{project.name}/app_package.js", "#{project.name}/app_styles.css"]
+      ret = project.buildable_asset_filenames mode
       
-      project.local_deps.each do |pkg|
-        pkg.load_json
-        pkg.pipeline_assets.each do |dir|
-          dir_name = pkg.directories[dir] || dir
-          dir_name.sub! /^\.?\//, ''
-          pkg_root = File.join(pkg.root_path, dir_name)
-          Dir[File.join(pkg_root, '**', '*')].each do |fn|
-            fn.sub! /^#{Regexp.escape pkg_root}\//, ''
-            ret << File.join(pkg.name, dir_name, fn)
+      # Add in the static assets that we just need to copy
+      project.build_settings(mode).each do |target_name, opts|
+        next unless opts.is_a? Array
+        opts.each do |dir_name| 
+          
+          dep = project.local_deps.find { |dep| dep.name == target_name }
+          dep = project if project.name == target_name
+          
+          dir_paths = File.join(dep.root_path, dir_name)
+          if File.directory? dir_paths
+            dir_paths = Dir[File.join(dir_paths, '**', '*')]
+          else
+            dir_paths = [dir_paths]
+          end
+
+          dir_paths.each do |dir_path|
+            if File.exist?(dir_path) && !File.directory?(dir_path)
+              ret << File.join(target_name, dir_path[dep.root_path.size+1..-1])
+            end
           end
         end
       end
@@ -74,19 +88,15 @@ module BPM
     # Detect whenever we are asked to build some of the magic files and swap
     # in a custom asset type that can generate the contents.
     def build_asset(logical_path, pathname, options)
-      magic_paths = %w(bpm_packages.js bpm_styles.css).map do |filename|
-        File.join project.root_path, 'assets', filename
+      magic_paths = project.buildable_asset_filenames(mode).map do |filename|
+        project.assets_root filename
       end
 
-      magic_paths += %w(app_package.js app_styles.css).map do |filename|
-        File.join project.root_path, 'assets', project.name, filename
+      magic_paths += project.buildable_asset_filenames(mode).map do |filename|
+        project.preview_root filename
       end
-      
-      plugin_path = File.join project.root_path, '.bpm', 'plugins'
-      
-      if pathname.to_s =~ /^#{Regexp.escape plugin_path}/
-         BPM::PluginAsset.new(self, "spade/~transports/spade", pathname, options)     
-      elsif magic_paths.include? pathname.to_s
+
+      if magic_paths.include? pathname.to_s
         BPM::GeneratedAsset.new(self, logical_path, pathname, options)
       else
         super logical_path, pathname, options