volt 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc433aea390d72ea67bc96a667a68184162990c
-  data.tar.gz: d75d3644a9633f81c9ccb20da751586f67463c73
+  metadata.gz: 7e05bc81468f67f439f7f8a045a68a0f9881ba28
+  data.tar.gz: db637839b429dee614b69e7acb573a56c47e39fc
 SHA512:
-  metadata.gz: 6a9a01e11d069071794c7d279a49bbbafb54b16a9a9f7a4f4d1210291914390c26383908884428d79ff5fa139608d1df270d8e83a742d15ec10e5e0de3db4487
-  data.tar.gz: a72b58ada2bda7c71d5be6ba48328b8c7390052f6a4ba479c948f1c1923d07bf7f7cea60736f97b7e4964652108187b19de9fd065b3db6fe96149ecdbf85b0dd
+  metadata.gz: e5419069da6a0ca76db6ae50d11f905f2b87638d341800a2922014fbdedc75de47faced77e92c8594c2d941c46ce4432c3676703074cc383db9a58b7be7a63aa
+  data.tar.gz: 1bcf04fe2b4c70e8e36a73286fda0fb8810ccb302d1f221f7459f23a66b4ab90307ff0a2f222dc6dfbb4528418d081e2891860701dde4a1afc1ebc3c42e941dd

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 # gem 'rspec', '3.0.0.beta1'
 gem 'opal', git: 'https://github.com/opal/opal.git'
 gem 'opal-jquery', :git => 'https://github.com/opal/opal-jquery.git'
-gem 'sockjs', git: 'https://github.com/kacperk/sockjs-ruby.git', require: false, platforms: :mri
+gem 'sockjs', git: 'https://github.com/voltrb/sockjs-ruby.git', require: false, platforms: :mri
 
 # gem 'thor'
 

data/Readme.md

@@ -658,13 +658,13 @@ or
 To find the control's views and optional controller, Volt will search the following (in order):
 
 
-| Component   | View Folder    | View File    | Section   |
-|-------------|----------------|--------------|-----------|
-|             |                |              | :{name}   |
-|             |                | {name}.html  | :body     |
-|             | {name}         | index.html   | :body     |
-| {name}      | index          | index.html   | :body     |
-| gems/{name} | index          | index.html   | :body     |
+| Section   | View File    | View Folder    | Component   |
+|-----------|--------------|----------------|-------------|
+| :{name}   |              |                |             |
+| :body     | {name}.html  |                |             |
+| :body     | index.html   | {name}         |             |
+| :body     | index.html   | index          | {name}      |
+| :body     | index.html   | index          | gems/{name} |
 
 **Note that anything with a view folder will also load a controller if the name/folder matches.**
 
@@ -694,12 +694,12 @@ When you create a control, you can also specify multiple parts of the search pat
 
 The above would search the following:
 
-| Component   | View Folder    | View File    | Section   |
-|-------------|----------------|--------------|-----------|
-|             |                | blog.html    | :comments |
-|             | blog           | comments.html| :body     |
-| blog        | comments       | index.html   | :body     |
-| gems/blog   | comments       | index.html   | :body     |
+| Section   | View File    | View Folder    | Component   |
+|-----------|--------------|----------------|-------------|
+| :comments | blog.html    |                |             |
+| :body     | comments.html| blog           |             |
+| :body     | index.html   | comments       | blog        |
+| :body     | index.html   | comments       | gems/blog   |
 
 Once the view file for the control or template is found, it will look for a matching controller.  If the control is specified as a local template, an empty ModelController will be used.  If a controller is found and loaded, a corrosponding "action" method will be called on it if its exists.  Action methods default to "index" unless the component or template path has two parts, in which case the last part is the action.
 
@@ -799,4 +799,4 @@ store._things
 
 # Contributing
 
-You want to contribute?  Great!  Thanks for being awesome!  At the moment, we have a big internal todo list, hop on #voltrb on freenode (irc) so we don't duplicate work.  Pull requests are always welcome, but asking about helping on IRC should save some duplication.
+You want to contribute?  Great!  Thanks for being awesome!  At the moment, we have a big internal todo list, hop on #voltrb on freenode (irc) so we don't duplicate work.  Pull requests are always welcome, but asking about helping on IRC should save some duplication.

data/VERSION

@@ -1 +1 @@
-0.7.14
+0.7.15

data/lib/volt/cli/asset_compile.rb

@@ -2,49 +2,114 @@ class CLI
 
   desc "precompile", "precompile all application assets"
   def precompile
-    require 'fileutils'
-    require 'opal'
-    require 'volt'
-    require 'volt/server/rack/component_paths'
-    require 'volt/server/rack/component_code'
-    require 'volt/server/rack/opal_files'
+    compile
+  end
+
+  desc "watch", "compiles the project to /compiled when a file changes"
+  def watch
+    require 'listen'
+
+    listener = Listen.to('app') do |modified, added, removed|
+      compile
+    end
+
+    listener.start # non-blocking
+
+    Signal.trap("SIGINT") do
+      listener.stop
+    end
 
+    compile
 
-    write_component_js
-    write_sprockets
+    begin
+      sleep
+    rescue ThreadError => e
+      # ignore, breaks out on sigint
+    end
   end
 
   private
-    def write_sprockets
-      root_path ||= Dir.pwd
-      Volt.root = root_path
+    def compile
+      print "compiling project..."
+      require 'fileutils'
+      require 'opal'
+      require 'volt'
+      require 'volt/server/rack/component_paths'
+      require 'volt/server/rack/component_code'
+      require 'volt/server/rack/opal_files'
+      require 'volt/server/rack/index_files'
+      require 'volt/server/component_handler'
 
-      @app_path = File.expand_path(File.join(root_path, "app"))
+      @root_path ||= Dir.pwd
+      Volt.root = @root_path
 
-      @component_paths = ComponentPaths.new(root_path)
+      @app_path = File.expand_path(File.join(@root_path, "app"))
+
+      @component_paths = ComponentPaths.new(@root_path)
       @app = Rack::Builder.new
+      @opal_files = OpalFiles.new(@app, @app_path, @component_paths)
+      @index_files = IndexFiles.new(@app, @component_paths, @opal_files)
+      @component_handler = ComponentHandler.new(@component_paths)
+
+      write_component_js
+      write_sprockets
+      write_js_and_css
+      write_index
 
+      puts "\rcompiled                             "
+    end
+
+    def write_sprockets
       # Serve the opal files
-      opal_files = OpalFiles.new(@app, @app_path, @component_paths)
-      opal_files.environment.each_file do |file_path|
-        unless file_path.to_s[/[.]rb$/]
-          puts "FILE: #{file_path}"
+      @opal_files.environment.each_logical_path do |logical_path|
+        logical_path = logical_path.to_s
+        # Only include files that aren't compiled elsewhere, like fonts
+        if !logical_path[/[.](y|css|js|html|erb)$/]
+          write_file(logical_path)
         end
       end
     end
 
-    def write_component_js
-      component_paths = ComponentPaths.new(Volt.root)
+    def write_js_and_css
+      (@index_files.javascript_files + @index_files.css_files).each do |logical_path|
+        logical_path = logical_path.gsub(/^\/assets\//, '')
+        write_file(logical_path)
+      end
+
+    end
 
-      code = ComponentCode.new('main', component_paths).code
+    def write_file(logical_path)
+      path = "#{@root_path}/compiled/assets/#{logical_path}"
+
+      FileUtils.mkdir_p(File.dirname(path))
+
+      begin
+        content = @opal_files.environment[logical_path].to_s
+        File.open(path, "wb") do |file|
+          file.write(content)
+        end
+      rescue Sprockets::FileNotFound, SyntaxError => e
+        # ignore
+      end
+    end
 
-      javascript_code = Opal.compile(code)
+    def write_component_js
+      javascript_code = @component_handler.compile_for_component('main')
 
-      components_folder = File.join(Volt.root, '/public/components')
+      components_folder = File.join(Volt.root, '/compiled/components')
       FileUtils.mkdir_p(components_folder)
       File.open(File.join(components_folder, '/main.js'), 'w') do |file|
         file.write(javascript_code)
       end
     end
 
+
+    def write_index
+      path = "#{@root_path}/compiled/index.html"
+      FileUtils.mkdir_p(File.dirname(path))
+
+      File.open(path, 'w') do |file|
+        file.write(@index_files.html)
+      end
+    end
 end

data/lib/volt/extra_core/extra_core.rb

@@ -1,3 +1,4 @@
+require 'volt/extra_core/log'
 require 'volt/extra_core/array'
 require 'volt/extra_core/hash'
 require 'volt/extra_core/object'

data/lib/volt/extra_core/log.rb

@@ -0,0 +1,56 @@
+if RUBY_PLATFORM == 'opal'
+  require 'volt/extra_core/logger'
+else
+  require 'logger'
+end
+
+# Simple global access to the logger.
+# You can also include Log into a class to get the logger
+# inside of it.
+module Log
+  def self.logger
+    @logger = Logger.new(STDOUT)
+  end
+
+  # Module methods, Log.info...
+  def self.fatal(*args, &block)
+    logger.fatal(*args, &block)
+  end
+
+  def self.info(*args, &block)
+    logger.info(*args, &block)
+  end
+
+  def self.warn(*args, &block)
+    logger.warn(*args, &block)
+  end
+
+  def self.debug(*args, &block)
+    logger.debug(*args, &block)
+  end
+
+  def self.error(*args, &block)
+    logger.error(*args, &block)
+  end
+
+  # Included methods, info "something"
+  def fatal(*args, &block)
+    Log.fatal(*args, &block)
+  end
+
+  def info(*args, &block)
+    Log.info(*args, &block)
+  end
+
+  def warn(*args, &block)
+    Log.warn(*args, &block)
+  end
+
+  def debug(*args, &block)
+    Log.debug(*args, &block)
+  end
+
+  def error(*args, &block)
+    Log.error(*args, &block)
+  end
+end

data/lib/volt/extra_core/logger.rb

@@ -0,0 +1,12 @@
+class Logger
+  def initialize(log_to)
+  end
+
+  [:fatal, :info, :warn, :debug, :error].each do |method_name|
+    define_method(method_name) do |text, &block|
+      text = block.call if block
+
+      `console[method_name](text);`
+    end
+  end
+end

data/lib/volt/models/persistors/query/query_listener.rb

@@ -18,7 +18,9 @@ class QueryListener
     @tasks.call('QueryTasks', 'add_listener', @collection, @query) do |results, errors|
       # When the initial data comes back, add it into the stores.
       @stores.each do |store|
-        store.model.clear
+        # Clear if there are existing items
+        store.model.clear if store.model.size > 0
+
         results.each do |index, data|
           store.add(index, data)
         end

data/lib/volt/models/persistors/store_state.rb

@@ -11,11 +11,16 @@ module StoreState
   end
 
   # Called from the QueryListener when the data is loaded
-  def change_state_to(new_state)
+  def change_state_to(new_state, skip_trigger=false)
+    old_state = @state
     @state = new_state
 
     # Trigger changed on the 'state' method
-    @model.trigger_for_methods!('changed', :state, :loaded?)
+    unless skip_trigger
+      if old_state != @state
+        @model.trigger_for_methods!('changed', :state, :loaded?)
+      end
+    end
 
     if @state == :loaded && @fetch_promises
       # Trigger each waiting fetch

data/lib/volt/models/url.rb

@@ -23,19 +23,20 @@ class URL
       update!
     else
       host = `document.location.host`
+      protocol = `document.location.protocol`
 
-      if url[0..3] != 'http'
-        # Add the host for localized names
-        url = "http://#{host}" + url
+      if url !~ /[:]\/\//
+        # Add the host for local urls
+        url = protocol + "//#{host}" + url
       else
-        # Make sure its on the same host, otherwise its external.
-        if url !~ /https?[:]\/\/#{host}/
+        # Make sure its on the same protocol and host, otherwise its external.
+        if url !~ /#{protocol}\/\/#{host}/
           # Different host, don't process
           return false
         end
       end
 
-      matcher = url.match(/^(https?)[:]\/\/([^\/]+)(.*)$/)
+      matcher = url.match(/^(#{protocol[0..-2]})[:]\/\/([^\/]+)(.*)$/)
       @scheme = matcher[1]
       @host, @port = matcher[2].split(':')
       @port ||= 80
@@ -91,9 +92,13 @@ class URL
     if Volt.client?
       new_url = full_url()
 
-      if `(document.location.href != new_url)`
-        `history.pushState(null, null, new_url)`
-      end
+      # Push the new url if pushState is supported
+      # TODO: add fragment fallback
+      %x{
+        if (document.location.href != new_url && history && history.pushState) {
+          history.pushState(null, null, new_url);
+        }
+      }
     end
   end
 
@@ -106,7 +111,6 @@ class URL
           if (anchor.length == 0) {
             anchor = $('*[name="' + this.fragment + '"]:first');
           }
-          console.log('found anchor: ', anchor);
           if (anchor && anchor.length > 0) {
             console.log('scroll to: ', anchor.offset().top);
             $(document.body).scrollTop(anchor.offset().top);

data/lib/volt/page/bindings/each_binding.rb

@@ -88,7 +88,7 @@ class EachBinding < BaseBinding
     values = @value.cur
 
     return [] if values.is_a?(Model) || values.is_a?(Exception)
-    values = values.attributes
+    values = values.attributes unless values.is_a?(ReactiveArray)
 
     return values
   end

data/lib/volt/page/bindings/event_binding.rb

@@ -11,8 +11,11 @@ class JSEvent
     `this.js_event.keyCode`
   end
 
-  def stop
-    # `this.js_event.stopPropagation();`
+  def stop!
+    `this.js_event.stopPropagation();`
+  end
+
+  def prevent_default!
     `this.js_event.preventDefault();`
   end
 
@@ -30,7 +33,7 @@ class EventBinding < BaseBinding
 
     handler = Proc.new do |js_event|
       event = JSEvent.new(js_event)
-      event.stop if event_name == 'submit'
+      event.prevent_default! if event_name == 'submit'
 
       # Call the proc the user setup for the event in context,
       # pass in the wrapper for the JS event

data/lib/volt/reactive/reactive_array.rb

@@ -1,5 +1,5 @@
 require 'volt/reactive/object_tracking'
-require 'volt/reactive/reactive_count'
+require 'volt/reactive/reactive_block'
 
 class ReactiveArray# < Array
   include ReactiveTags
@@ -115,7 +115,6 @@ class ReactiveArray# < Array
 
     trigger_for_index!('changed', self.size-1)
     trigger_on_direct_listeners!('added', self.size-1)
-
     trigger_size_change!
 
     return result
@@ -231,6 +230,8 @@ class ReactiveArray# < Array
         true
       end
 
+      result = false if method_name == :reject
+
       result
     end
   end
@@ -242,9 +243,45 @@ class ReactiveArray# < Array
   # tag_method(:count) do
   #   destructive!
   # end
-  def count(&block)
+  def count(*args, &block)
+    # puts "GET COUNT"
     if block
-      return ReactiveCount.new(self, block)
+      run_block = Proc.new do |source|
+        count = 0
+        source.cur.size.times do |index|
+          val = source[index]
+          result = block.call(val).cur
+          if result == true
+            count += 1
+          end
+        end
+
+        count
+      end
+
+      return ReactiveBlock.new(self, block, run_block)
+    else
+      @array.count(*args)
+    end
+  end
+
+  def reject(*args, &block)
+    if block
+      run_block = Proc.new do |source|
+        puts "RUN REJECT"
+        new_array = []
+        source.cur.size.times do |index|
+          val = source[index]
+          result = block.call(val).cur
+          if result != true
+            new_array << val.cur
+          end
+        end
+
+        ReactiveArray.new(new_array)
+      end
+
+      return ReactiveBlock.new(self, block, run_block)
     else
       @array.count
     end

data/lib/volt/reactive/{reactive_count.rb → reactive_block.rb}

@@ -1,40 +1,20 @@
-class ReactiveCount
+class ReactiveBlock
   include ReactiveTags
 
   def reactive?
     true
   end
 
-  def initialize(source, block)
+  def initialize(source, check_block, run_block)
     @source = ReactiveValue.new(source)
-    @block = block
+    @check_block = check_block
+    @run_block = run_block
   end
 
   def cur
-    direct_count
-  end
-
-  # After events are bound, we keep a cache of each cell's count
-  # value, and base the results
-  def cached_count
-    @cached_results = []
-
-
-  end
-
-  # Before events are bound, when .cur is called, we simply
-  # run the count on the source object.
-  def direct_count
-    count = 0
-    @source.cur.size.times do |index|
-      val = @source[index]
-      result = @block.call(val).cur
-      if result == true
-        count += 1
-      end
-    end
+    val = @run_block.call(@source)
 
-    count
+    return val
   end
 
   def setup_listeners
@@ -57,7 +37,6 @@ class ReactiveCount
   # We need to make sure we're listening on the result from each cell,
   # that way we can trigger when the value changes.
   def change_cell_count(size)
-    # puts "CHANGE SIZE: #{size}"
     current_size = @cell_trackers.size
 
     if current_size < size
@@ -67,10 +46,10 @@ class ReactiveCount
         # Get the reactive value for the index
         val = @source[index]
 
-        result = @block.call(val)
+        result = @check_block.call(val)
 
         @cell_trackers << result.on('changed') do
-          # puts "RESULT CHANGED: #{index}"
+          puts "RESULT CHANGED: #{index} - #{self.object_id}"
           trigger!('changed')
         end
       end

data/lib/volt/router/routes.rb

@@ -96,7 +96,9 @@ class Routes
     # Next, split the url and walk the sections
     parts = url_parts(path)
 
-    return match_path(parts, parts, @indirect_routes)
+    result = match_path(parts, parts, @indirect_routes)
+
+    return result
   end
 
   private

data/lib/volt/server/component_handler.rb

@@ -13,11 +13,22 @@ class ComponentHandler
     # TODO: Sanatize template path
     component_name = req.path.strip.gsub(/^\/components\//, '').gsub(/[.]js$/, '')
 
+    javascript_code = compile_for_component(component_name)
+
+    return [200, {"Content-Type" => "text/html; charset=utf-8"}, StringIO.new(javascript_code)]
+  end
+
+  def compile_for_component(component_name)
     code = ComponentCode.new(component_name, @component_paths).code
 
+    # Add the lib directory to the load path
+    Opal.append_path(Volt.root + '/lib')
+
+    # Compile the code
     javascript_code = Opal.compile(code)
 
-    [200, {"Content-Type" => "text/html; charset=utf-8"}, StringIO.new(javascript_code)]
+    return javascript_code
+
   end
 
 

data/lib/volt/server/html_parser/sandlebars_parser.rb

@@ -13,7 +13,7 @@ class SandlebarsParser
   def self.truth_hash(array)
     hash = {}
     array.each {|v| hash[v] = true }
-    
+
     return hash
   end
 
@@ -23,28 +23,28 @@ class SandlebarsParser
   ATTRIBUTES = /([-\:A-Za-z0-9_]+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/
 
   # Types of elements
-  BLOCK = truth_hash(%w{address applet blockquote button center dd del dir div dl dt fieldset form frameset hr iframe ins isindex li map menu noframes noscript object ol p pre script table tbody td tfoot th thead tr ul})
+  BLOCK = truth_hash(%w{a address applet blockquote button center dd del dir div dl dt fieldset form frameset hr iframe ins isindex li map menu noframes noscript object ol p pre script table tbody td tfoot th thead tr ul})
   EMPTY = truth_hash(%w{area base basefont br col frame hr img input isindex link meta param embed})
-  INLINE = truth_hash(%w{a abbr acronym applet b basefont bdo big br button cite code del dfn em font i iframe img input ins kbd label map object q s samp script select small span strike strong sub sup textarea tt u var})
+  INLINE = truth_hash(%w{abbr acronym applet b basefont bdo big br button cite code del dfn em font i iframe img input ins kbd label map object q s samp script select small span strike strong sub sup textarea tt u var})
   CLOSE_SELF = truth_hash(%w{colgroup dd dt li options p td tfoot th thead tr})
   SPECIAL = truth_hash(%w{script style})
-  
+
   FILL_IN_ATTRIBUTES = truth_hash(%w{checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected})
-  
+
   def initialize(html, handler, file_path=nil)
     @html = StringScanner.new(html)
     @handler = handler
     @file_path = file_path
-    
+
     @stack = []
-    
+
     parse
   end
-  
+
   def last
     @stack.last
   end
-  
+
   def parse
     loop do
       if last && SPECIAL[last]
@@ -52,27 +52,27 @@ class SandlebarsParser
         close_tag = "</#{last}>"
         body = @html.scan_until(/#{close_tag}/)
         body = body[0..((-1 * close_tag.size)-1)]
-        
+
         body = body.gsub(/\<\!--(.*?)--\>/, "\\1").gsub(/\<\!\[CDATA\[(.*?)\]\]\>/, "\\1")
-        
+
         text(body)
-        
+
         end_tag(last, last)
       elsif @html.scan(/\<\!--/)
         # start comment
         comment = @html.scan_until(/--\>/)
         comment = comment[0..-4]
-        
+
         @handler.comment(comment) if @handler.respond_to?(:comment)
       elsif (tag = @html.scan(START_TAG))
         tag_name = @html[1]
         rest = @html[2]
         unary = @html[3]
-      
+
         start_tag(tag, tag_name, rest, unary)
       elsif @html.scan(END_TAG)
         tag_name = @html[1]
-        
+
         end_tag(tag_name, tag_name)
       elsif (escaped = @html.scan(/\{\{\{(.*?)\}\}\}([^\}]|$)/))
         # Anything between {{{ and }}} is escaped and not processed (treaded as text)
@@ -80,7 +80,7 @@ class SandlebarsParser
           # Move back if we matched a new non } for close, skip if we hit the end
           @html.pos = @html.pos - 1
         end
-        
+
         text(@html[1])
       elsif (binding = @html.scan(/\{/))
         # We are in text mode and matched the start of a binding
@@ -93,14 +93,14 @@ class SandlebarsParser
         break
       end
     end
-    
+
     end_tag(nil, nil)
   end
-  
+
   def text(text)
     @handler.text(text) if @handler.respond_to?(:text)
   end
-  
+
   # Findings the end of a binding
   def start_binding
     binding = ''
@@ -109,7 +109,7 @@ class SandlebarsParser
     # scan until we reach a { or }
     loop do
       binding << @html.scan_until(/([\{\}\n]|\Z)/)
-      
+
       match = @html[1]
       if match == '}'
         # close
@@ -126,23 +126,23 @@ class SandlebarsParser
         raise "should not reach here"
       end
     end
-    
+
     binding = binding[0..-2]
-    @handler.binding(binding) if @handler.respond_to?(:binding)    
+    @handler.binding(binding) if @handler.respond_to?(:binding)
   end
-  
+
   def raise_parse_error(error)
     line_number = @html.pre_match.count("\n") + 1
-    
+
     error_str = error + " on line: #{line_number}"
     error_str += " of #{@file_path}" if @file_path
 
     raise HTMLParseError, error_str
   end
-  
+
   def start_tag(tag, tag_name, rest, unary)
     section_tag = tag_name[0] == ':' && tag_name[1] =~ /[A-Z]/
-    
+
     tag_name = tag_name.downcase
 
     # handle doctype so we get it output exactly the same way
@@ -157,33 +157,33 @@ class SandlebarsParser
         end_tag(nil, last)
       end
     end
-    
+
     # Some tags close themselves when a new one of themselves is reached.
     # ex, a tr will close the previous tr
     if CLOSE_SELF[tag_name] && last == tag_name
       end_tag(nil, tag_name)
     end
-    
+
     unary = EMPTY[tag_name] || !unary.blank?
-    
+
     # Section tag's are also unary
     unless unary || section_tag
       @stack.push(tag_name)
     end
-    
+
     if @handler.respond_to?(:start_tag)
       attributes = {}
-      
+
       # Take the rest string and extract the attributes, filling in any
       # "fill in" attribute values if not provided.
       rest.scan(ATTRIBUTES).each do |match|
         name = match[0]
-        
+
         value = match[1] || match[2] || match[3] || FILL_IN_ATTRIBUTES[name] || ''
-        
+
         attributes[name] = value
       end
-      
+
       if section_tag
         @handler.start_section(tag_name, attributes, unary)
       else
@@ -191,11 +191,11 @@ class SandlebarsParser
       end
     end
   end
-  
+
   def end_tag(tag, tag_name)
     # If no tag name is provided, close all the way up
     new_size = 0
-    
+
     if tag
       # Find the closest tag that closes.
       (@stack.size-1).downto(0) do |index|
@@ -205,7 +205,7 @@ class SandlebarsParser
         end
       end
     end
-        
+
     if new_size >= 0
       if @handler.respond_to?(:end_tag)
         (@stack.size-1).downto(new_size) do |index|

data/lib/volt/volt/environment.rb

@@ -1,7 +1,18 @@
 class Volt
   class Environment
     def initialize
-      @env = ENV['VOLT_ENV'] || 'development'
+      @env = ENV['VOLT_ENV']
+
+      # If we're in opal, we can set the env from JS before opal loads
+      if RUBY_PLATFORM == 'opal'
+        unless @env
+          `if (window.start_env) {`
+            @env = `window.start_env`
+          `}`
+        end
+      end
+
+      @env ||= 'development'
     end
 
     def ==(val)

data/spec/models/reactive_array_spec.rb

@@ -327,4 +327,38 @@ describe ReactiveArray do
       expect(count).to eq(0)
     end
   end
+
+  # describe "concat, diff" do
+  #   it "should concat two arrays and trigger added/removed through" do
+  #     a = ReactiveValue.new(ReactiveArray.new([1,2,3]))
+  #     b = ReactiveValue.new(ReactiveArray.new([1,2,3]))
+  #
+  #     c = a + b
+  #
+  #     count = 0
+  #     # c.on('added') { count += 1 }
+  #     c.on('changed') { count += 1 }
+  #     expect(count).to eq(0)
+  #
+  #     b << 4
+  #
+  #     expect(count).to eq(1)
+  #   end
+  # end
+
+  describe "array methods" do
+    it "should handle compact with events" do
+      a = ReactiveValue.new(ReactiveArray.new([1,2,nil,3]))
+
+      count = 0
+      last_position = nil
+      compact = a.compact
+      compact.on('changed') { count += 1 }
+      expect(count).to eq(0)
+
+      a << 4
+
+      expect(count).to eq(1)
+    end
+  end
 end

data/spec/models/{reactive_count_spec.rb → reactive_block_spec.rb}

@@ -1,6 +1,6 @@
 require 'volt/models'
 
-describe ReactiveCount do
+describe ReactiveBlock do
   it "should call cur through the reactive count to the number" do
     model = ReactiveValue.new(Model.new)
 

data/templates/project/.gitignore

@@ -5,4 +5,5 @@ tmp
 .idea
 .yardoc
 .sass-cache
-.DS_Store
+.DS_Store
+compiled

data/templates/project/Gemfile.tt

@@ -28,4 +28,4 @@ end
 # Needed at the moment
 gem 'opal', git: 'https://github.com/opal/opal.git'
 gem 'opal-jquery', :git => 'https://github.com/opal/opal-jquery.git'
-gem 'sockjs', git: 'https://github.com/kacperk/sockjs-ruby.git', require: false, platforms: :mri
+gem 'sockjs', git: 'https://github.com/voltrb/sockjs-ruby.git', require: false, platforms: :mri

data/templates/project/public/index.html

@@ -9,9 +9,9 @@
     <% css_files.each do |css_file| %>
       <link href="<%= css_file %>" media="all" rel="stylesheet" type="text/css" />
     <% end %>
-    
+
 	</head>
 	<body>
-    
+
 	</body>
 </html>

data/volt.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "bson_ext", "~> 1.9.0"
   # spec.add_dependency "thin", "~> 1.6.0"
   spec.add_dependency "rake", "~> 10.0.4"
-  spec.add_dependency "listen", "~> 2.4.0"
+  spec.add_dependency "listen", "~> 2.7.0"
   spec.add_dependency "uglifier", "~> 2.4.0"
   spec.add_dependency "yui-compressor", "~> 0.12.0"
   # spec.add_dependency "promise.rb", "~> 0.6.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,8 @@ files:
 - lib/volt/extra_core/inflector.rb
 - lib/volt/extra_core/inflector/inflections.rb
 - lib/volt/extra_core/inflector/methods.rb
+- lib/volt/extra_core/log.rb
+- lib/volt/extra_core/logger.rb
 - lib/volt/extra_core/numeric.rb
 - lib/volt/extra_core/object.rb
 - lib/volt/extra_core/string.rb
@@ -439,7 +441,7 @@ files:
 - lib/volt/reactive/events.rb
 - lib/volt/reactive/object_tracking.rb
 - lib/volt/reactive/reactive_array.rb
-- lib/volt/reactive/reactive_count.rb
+- lib/volt/reactive/reactive_block.rb
 - lib/volt/reactive/reactive_generator.rb
 - lib/volt/reactive/reactive_tags.rb
 - lib/volt/reactive/reactive_value.rb
@@ -496,8 +498,8 @@ files:
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
 - spec/models/reactive_array_spec.rb
+- spec/models/reactive_block_spec.rb
 - spec/models/reactive_call_times_spec.rb
-- spec/models/reactive_count_spec.rb
 - spec/models/reactive_generator_spec.rb
 - spec/models/reactive_tags_spec.rb
 - spec/models/reactive_value_spec.rb
@@ -557,6 +559,7 @@ files:
 - templates/project/app/main/views/main/index.html
 - templates/project/app/main/views/main/main.html
 - templates/project/config.ru
+- templates/project/lib/.empty_directory
 - templates/project/public/index.html
 - templates/project/spec/spec_helper.rb
 - volt.gemspec
@@ -609,8 +612,8 @@ test_files:
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
 - spec/models/reactive_array_spec.rb
+- spec/models/reactive_block_spec.rb
 - spec/models/reactive_call_times_spec.rb
-- spec/models/reactive_count_spec.rb
 - spec/models/reactive_generator_spec.rb
 - spec/models/reactive_tags_spec.rb
 - spec/models/reactive_value_spec.rb