bpm 1.0.0.beta.8 → 1.0.0.beta.9

data/.gitignore

@@ -3,3 +3,4 @@ devbin
 .bundle
 Gemfile.lock
 *.gem
+*.swp

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+# 1.0.0.beta.9
+
+  * Fixed bug with init where it would generate broken apps at first.
+  * Fixed bug when exceptions are thrown in preview mode that would force you
+    to restart the server. Should recover more smoothly now.
+  * Other minor bug fixes.
+  
+# 1.0.0.beta.8
+
   * First cut at support for formats.
   * Also introduces new requirement for defining transport and format plugins 
     in the package.json.  Now you must use the "bpm:provides" keyword:

data/bpm.gemspec

@@ -21,13 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency "highline",     "~> 1.6.1"
   s.add_dependency "json_pure",    "~> 1.4.6"
   s.add_dependency "thor",         "~> 0.14.3"
-  s.add_dependency "therubyracer", "~> 0.9.2"
-
-  # Begin Sprockets Deps
-  s.add_dependency "hike", "~> 1.1"
-  s.add_dependency "rack", "~> 1.0"
-  s.add_dependency "tilt", ["~> 1.1", "!= 1.3.0"]
-  # End Sprockets Deps
+  s.add_dependency "therubyracer", "~> 0.9.3beta1"
+  s.add_dependency "sprockets",    "~> 2.0.0.beta.12"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rack", "~> 1.2.1"

data/lib/bpm/pipeline/generated_asset.rb

@@ -1,34 +1,34 @@
 require 'sprockets'
 
 module BPM
-  
+
   class GeneratedAsset < Sprockets::BundledAsset
 
     FORMAT_METHODS = {
       'text/css' => ['css', 'pipeline_css'],
       'application/javascript' => ['lib', 'pipeline_libs']
     }
-    
+
     def self.generating_asset
       @generating_asset && @generating_asset.last
     end
-    
+
     def self.push_generating_asset(asset)
       @generating_asset ||= []
       @generating_asset.push asset
     end
-    
+
     def self.pop_generating_asset
       @generating_asset && @generating_asset.pop
     end
 
     def build_settings
-      ret = environment.project.build_settings[asset_name] 
+      ret = environment.project.build_settings[asset_name]
       (ret && ret['bpm:settings']) || {}
     end
-    
+
     def minify_body(data)
-      
+
       project = environment.project
       minifier_name = project.minifier_name asset_name
       minifier_name = minifier_name.keys.first if minifier_name
@@ -46,7 +46,7 @@ module BPM
 
         plugin_ctx = environment.plugin_context_for minifier_plugin_name
 
-        # slice out the header at the top - we don't want the minifier to 
+        # slice out the header at the top - we don't want the minifier to
         # touch it.
         header   = data.match /^(\/\* ====.+====\*\/)$/m
         if header
@@ -54,11 +54,9 @@ module BPM
           data   = data[header.size..-1]
         end
 
-        V8::C::Locker() do
-          plugin_ctx["CTX"]  = BPM::PluginContext.new(pkg)
-          plugin_ctx["DATA"] = data
-          data = plugin_ctx.eval("BPM_PLUGIN.minify(DATA, CTX)")
-        end
+        plugin_ctx["CTX"]  = BPM::PluginContext.new(pkg)
+        plugin_ctx["DATA"] = data
+        data = plugin_ctx.eval("BPM_PLUGIN.minify(DATA, CTX)")
 
         data = header+data if header
       end
@@ -82,7 +80,7 @@ module BPM
 
     def minify(hash)
       return hash if environment.mode == :debug
-      
+
       hash = environment.cache_hash("#{pathname}:minify", id) do
         data = minify_body hash['source']
         { 'length' => Rack::Utils.bytesize(data),
@@ -98,7 +96,7 @@ module BPM
 
       hash
     end
-    
+
     def asset_name
       project = environment.project
       if pathname.to_s.include?(project.assets_root)
@@ -107,23 +105,23 @@ module BPM
         pathname.relative_path_from(Pathname.new(project.preview_root)).to_s
       end
     end
-    
+
     def build_dependency_context_and_body
 
       project       = environment.project
       settings = project.build_settings(environment.mode)[asset_name]
-      pkgs     = settings.keys.map do |pkg_name| 
+      pkgs     = settings.keys.map do |pkg_name|
         next if pkg_name == 'bpm:minifier'
         if pkg_name == project.name
           project
         else
-          project.local_deps.find { |dep| dep.name == pkg_name } 
+          project.local_deps.find { |dep| dep.name == pkg_name }
         end
       end.compact
 
       if pkgs.size > 0
-        manifest = pkgs.sort { |a,b| a.name <=> b.name } 
-        manifest = manifest.map do |x| 
+        manifest = pkgs.sort { |a,b| a.name <=> b.name }
+        manifest = manifest.map do |x|
           "#{x.name} (#{x.version})"
         end.join " "
       else
@@ -135,7 +133,7 @@ module BPM
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: #{manifest}
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/
 
 EOF

data/lib/bpm/pipeline/plugin_context.rb

@@ -1,16 +1,16 @@
 module BPM
-  
-  class PluginContext 
-    
+
+  class PluginContext
+
     attr_reader :moduleId
     attr_reader :package
-    
+
     def initialize(pkg, module_id=nil)
       @generating_asset = BPM::GeneratedAsset.generating_asset
       @package = pkg.as_json
       @moduleId = module_id
     end
-    
+
     def minify(body)
       @generating_asset ? @generating_asset.minify_body(body) : body
     end
@@ -18,7 +18,7 @@ module BPM
     def settings
       @generating_asset ? @generating_asset.build_settings : {}
     end
-    
+
   end
-  
+
 end

data/lib/bpm/pipeline/plugin_processor.rb

@@ -2,11 +2,11 @@ require 'sprockets'
 
 module BPM
 
-  # A processor that will invoke a JavaScript-based plugin provided by a 
-  # package in the system.  The passed method name will be invoked on the 
+  # A processor that will invoke a JavaScript-based plugin provided by a
+  # package in the system.  The passed method name will be invoked on the
   # plugin.
   class PluginProcessor < Tilt::Template
-    
+
     def self.with_plugin(plugin_opts, method_name)
       ret = Class.new(self)
       ret.instance_eval do
@@ -19,34 +19,25 @@ module BPM
     def self.method_name
       @method_name
     end
-    
+
     def self.plugin_name
       @plugin_opts["main"]
     end
-  
+
     def prepare
     end
-    
+
     def evaluate(context, locals, &block)
       ctx = context.environment.plugin_context_for self.class.plugin_name
       project = context.environment.project
       pkg, module_id = project.package_and_module_from_path file
-      
-      filepath   = file.to_s
-      out = ''
 
-      V8::C::Locker() do
-        ctx["DATA"]  = data
-        ctx["CTX"]   = BPM::PluginContext.new(pkg, module_id)
-        out = ctx.eval("BPM_PLUGIN.#{self.class.method_name}(DATA, CTX, '#{filepath}');")
-      end
+      filepath   = file.to_s
 
-      out
+      ctx["DATA"]  = data
+      ctx["CTX"]   = BPM::PluginContext.new(pkg, module_id)
+      ctx.eval("BPM_PLUGIN.#{self.class.method_name}(DATA, CTX, '#{filepath}');")
     end
-    
+
   end
 end
-
-      
-    
-    

data/lib/bpm/pipeline/transport_processor.rb

@@ -1,15 +1,15 @@
 require 'sprockets'
 
 module BPM
-  
+
   class TransportProcessor < Sprockets::Processor
-    
+
     def evaluate(context, locals)
       environment = context.environment
       project = environment.project
       pkg, module_id = project.package_and_module_from_path file
       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
@@ -20,20 +20,15 @@ module BPM
         raise "#{pkg.name} depends on #{transport_plugins.size} packages that define transport plugins. " \
                 "Select a plugin by adding a `bpm:use:transport` property to the package.json"
       end
-      
+
       plugin_ctx = environment.plugin_context_for transport_plugins.first
       filepath   = file.to_s
-      out = ''
 
-      V8::C::Locker() do
-        plugin_ctx["DATA"]  = data
-        plugin_ctx["CTX"]   = BPM::PluginContext.new(pkg, module_id)
-        out = plugin_ctx.eval("BPM_PLUGIN.compileTransport(DATA, CTX, '#{filepath}');")
-      end
-
-      out + "\n\n"
+      plugin_ctx["DATA"]  = data
+      plugin_ctx["CTX"]   = BPM::PluginContext.new(pkg, module_id)
+      plugin_ctx.eval("BPM_PLUGIN.compileTransport(DATA, CTX, '#{filepath}');") + "\n\n"
     end
-    
+
   end
 
 end

data/lib/bpm/pipeline.rb

@@ -7,28 +7,28 @@ module BPM
     def log(str)
       shell.say str
     end
-    
+
     private
-    
+
     def shell
       @shell ||= Thor::Base.shell.new
     end
-    
+
   end
-  
+
   # A BPM package-aware asset pipeline.  Asset lookup respects package.json
   # directory configurations as well as loading preprocessors, formats, and
   # postprocessors from the package config.
   #
   class Pipeline < Sprockets::Environment
-    
+
     attr_reader :project
     attr_reader :mode
     attr_reader :package_pipelines
 
     # Pass in the project you want the pipeline to manage.
     def initialize(project, mode = :debug, include_preview = false)
-      
+
       @project = project
       @mode    = mode
       @plugin_contexts = {}
@@ -38,12 +38,12 @@ module BPM
         BPM::PackagePipeline.new self, pkg
       end
       @package_pipelines << BPM::PackagePipeline.new(self, project)
-      
+
       project_path = project.root_path
 
       super project_path
 
-      # Unregister built-in processors.  We want most things served by the 
+      # Unregister built-in processors.  We want most things served by the
       # pipeline directly to just pass through.  (package pipelines do the
       # processing)
       %w(text/css application/javascript).each do |kind|
@@ -54,19 +54,19 @@ module BPM
       # configure search paths
       append_path project.assets_root
       append_path project.preview_root if include_preview
-    end    
-    
-    # determines the proper pipeline for the path  
+    end
+
+    # determines the proper pipeline for the path
     def pipeline_for(path)
       return nil if magic_paths.include?(path)
       package_pipelines.find do |cur_pipeline|
         path.to_s[cur_pipeline.package.root_path.to_s]
       end
     end
-    
+
     def attributes_for(path)
       if path.to_s[File.join(project.root_path, '.bpm')] ||  !Pathname.new(path).absolute?
-        return super(path) 
+        return super(path)
       end
 
       pipeline = pipeline_for path
@@ -74,23 +74,23 @@ module BPM
     end
 
     def resolve(logical_path, options={}, &block)
-      
+
       magic_path = magic_paths.find do |path|
         path =~ /#{Regexp.escape logical_path.to_s}(\..+)?$/
       end
-      
+
       package_name = logical_path.to_s.sub(/#{Regexp.escape File::SEPARATOR}.+/,'')
-      pipeline = package_pipelines.find do |cur_pipeline| 
+      pipeline = package_pipelines.find do |cur_pipeline|
         cur_pipeline.package_name == package_name
       end
-      
+
       if pipeline && magic_path.nil?
         logical_path = logical_path.to_s[package_name.size+1..-1]
         pipeline.resolve Pathname.new(logical_path), options, &block
       else
         super logical_path, options, &block
       end
-      
+
     end
 
     # Detect whenever we are asked to build some of the magic files and swap
@@ -113,16 +113,16 @@ module BPM
     # Returns an array of all the buildable assets in the current directory.
     # These are the assets that will be built when you compile the project.
     def buildable_assets
-      
-      # make sure the logical_path can be used to simply build into the 
+
+      # make sure the logical_path can be used to simply build into the
       # assets directory when we are done
       ret = project.buildable_asset_filenames mode
-      
+
       # 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| 
-          
+        opts.each do |dir_name|
+
           dep = project.local_deps.find { |dep| dep.name == target_name }
           dep = project if project.name == target_name
 
@@ -147,46 +147,51 @@ module BPM
     def plugin_context_for(logical_path)
       @plugin_contexts[logical_path] ||= build_plugin_context(logical_path)
     end
-    
+
   protected
 
     def build_magic_paths
       magic_paths = project.buildable_asset_filenames(mode).map do |filename|
         project.assets_root filename
       end
-      
+
       magic_paths += project.buildable_asset_filenames(mode).map do |filename|
         project.preview_root filename
       end
     end
-      
+
     # Pass along to package pipelines
     def expire_index!
       super
       @magic_paths = nil
       package_pipelines.each { |pipeline| pipeline.expire_index! }
     end
-      
+
   private
-  
+
+    def javascript_exception_response(exception)
+      expire_index!
+      super exception
+    end
+    
+    def css_exception_response(exception)
+      expire_index!
+      super exception
+    end
+    
     def build_plugin_context(logical_path)
       asset = BPM::PluginAsset.new(self, logical_path)
       plugin_text = asset.to_s
-      
-      ctx = nil
-      V8::C::Locker() do
-        ctx = V8::Context.new do |ctx|
-          ctx['window'] = ctx # make browser-like environment
-          ctx['console'] = BPM::Console.new
-          
-          ctx['BPM_PLUGIN'] = {}
-          ctx.eval plugin_text
-        end
+
+      V8::Context.new do |ctx|
+        ctx['window'] = ctx # make browser-like environment
+        ctx['console'] = BPM::Console.new
+
+        ctx['BPM_PLUGIN'] = {}
+        ctx.eval plugin_text
       end
-      
-      ctx
     end
-        
+
   end
-  
+
 end

data/lib/bpm/project_generator.rb

@@ -7,7 +7,7 @@ module BPM
       return false if directory_exists?
 
       empty_directory '.', :verbose => false
-      empty_directory 'app'
+      empty_directory 'lib'
 
       create_files
 
@@ -25,7 +25,7 @@ module BPM
         template "README.md"
         template "index.html"
         
-        inside 'app' do
+        inside 'lib' do
           template 'main.js'
         end
         

data/lib/bpm/version.rb

@@ -1,4 +1,4 @@
 module BPM
-  VERSION = "1.0.0.beta.8"
+  VERSION = "1.0.0.beta.9"
   COMPAT_VERSION = '1.0.0'
 end

data/lib/bpm.rb

@@ -1,6 +1,3 @@
-# Included vendored sprockets
-$:.unshift File.expand_path('../../vendor/sprockets/lib', __FILE__)
-
 module BPM
   BPM_DIR = ".bpm"
   TEMPLATES_DIR = File.expand_path("../../templates", __FILE__)