volt 0.9.5.pre4 → 0.9.5.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 237e158164bd2f394e80998fa3314f52024fbebc
-  data.tar.gz: abd1d018ffd679afba929518326f0139cce4deb0
+  metadata.gz: 848470b46efd1f1d8835f8501af6fc39d052cd4c
+  data.tar.gz: 6ff661da03f4f1e572c566b95d2b91868748148e
 SHA512:
-  metadata.gz: 48b5fa1a075beab16bbe901532b11e46e6ee4aa065d21db169bc425efc9def807d2d286f5ea4a2f6b569458b05fcb7052721ceb3df26aa7d585990a1d4fe6ffb
-  data.tar.gz: d18c325ef1f789d19a6ceaf2327452fd5b06dcefda74d0eeeca8e66b070599544ebf5176779d465a67bf641987f9af40de34a3eb7bbcffcd4b8d469910b17aea
+  metadata.gz: 11b26392d7fab2365755625fafd4708cc8398eecf3aad5c83757a3fbdb6f52baa1c9f38f483d23a52ca61ae98e5e42955028e382e87abf524495851d72684644
+  data.tar.gz: fe2f9c21b79e7da0b478b84aaffaa86da7cf63bf73b2f0b793723c73351de40971027c17044907822b43adbc88d3028ed525a0a7a5aca54fa8718068e998b915

data/CHANGELOG.md

@@ -7,6 +7,15 @@
 - Page load performance was improved, and more of sprockets was used for component loading.
 - You can now return promises in permissions blocks.  Also, can_read?, can_create?, and .can_delete?
 - Anything in /public is now served via Rack::Static in the default middleware stack.  (So you can put user uploaded images in there)
+- You can now use _ or - in volt tag names and attributes.  (We're moving to using dash ( - ) as the standard in html)
+- You can now trigger events on controllers rendered as tags.  The events will bubble up through the DOM and can be caught by any e- bindings.  See the docs for more information.
+- Rewrote the precompile pipeline.
+    - Added image compression by default. (using image_optim)
+- All volt CLI tasks now can run from inside of any directory in the volt app (or the root)
+
+### Changed
+- fix issue with ```raw``` and promises (#275)
+- fix issue with .length on store (#269)
 
 ## 0.9.4
 ### Lingo Change
@@ -34,6 +43,7 @@ the base collections will now be called "Repositories" or "Repo's" for short.  T
 - fixed issue with local_store not persisting in some cases
 - runners now block until messages have propigated to the message bus and updates have been pushed.
 - upgraded some dependency gems to fix a conflict
+- fixed bug with .last on ReactiveArray (#259)
 
 ## 0.9.3
 [0.9.3 Update Blog Post](http://blog.voltframework.com/post/121128931859/0-9-3-stuff-you-asked-for)

data/README.md

@@ -35,11 +35,19 @@ There is also a [work in progress tutorial](https://github.com/rhgraysonii/volt_
 
 # More Videos
 
-Rick Carlino has been putting together some great volt tutorial videos also.
-
-- [Volt Tasks](http://datamelon.io/blog/2015/creating-volt-task-objects.html)
-- [Build a Realtime Chat App with Volt](http://datamelon.io/blog/2015/building-a-chat-app-in-volt.html)
-- [Understanding Volt Views](http://datamelon.io/blog/2015/understanding-views-in-volt-with-a-card-game.html)
+Rick Carlino has been putting together some [great volt tutorial videos](http://datamelon.io/blog) also.
+
+ - [Volt URL Routing](http://datamelon.io/blog/2015/routes-and-multi-view-apps.html)
+ - [Volt Tasks](http://datamelon.io/blog/2015/creating-volt-task-objects.html)
+ - [Volt Views](http://datamelon.io/blog/2015/understanding-views-in-volt-with-a-card-game.html)
+ - [Volt Permissions](http://datamelon.io/blog/2015/twitter-clone-demonstrates-volt-permissions.html)
+ - [Volt Runners](http://datamelon.io/blog/2015/automation-of-everything-with-volt-runners.html)
+ - [Volt Components](http://datamelon.io/blog/2015/staying-productive-with-the-volt-component-ecosystem.html)
+ - [REST APIs in Volt](http://datamelon.io/blog/2015/building-rest-apis-with-volt.html)
+ - [Javascript Library Interop](http://datamelon.io/blog/2015/using-js-libraries-with-opal.html)
+ - [Credit Card Payments with Volt](http://datamelon.io/blog/2015/payment-form-using-volt-and-stripe.html)
+ - [Build a Realtime Chat App](http://datamelon.io/blog/2015/building-a-chat-app-in-volt.html)
+ - [6 Key Concepts for New Volt Learners](http://datamelon.io/blog/2015/6-concepts-for-volt-beginners.html)
 
 @ahnbizcad maintains a [playlist of Volt related videos](https://www.youtube.com/watch?v=McxtO8ybxy8&list=PLmQFeDKFCPXatHb-zEXwfeMH01DPiZjP7).
 

data/app/volt/models/active_volt_instance.rb

@@ -2,5 +2,5 @@ class ActiveVoltInstance < Volt::Model
   field :server_id, String
   field :ips, String
   field :port, Fixnum
-  field :time, Time
+  field :time#, Time
 end

data/app/volt/tasks/live_query/live_query.rb

@@ -30,11 +30,14 @@ class LiveQuery
   end
 
   def notify_added(index, data, skip_channel)
-    # puts "Added: #{index} - #{data.inspect}"
     # Make model for testing permissions against
-    model = model_for_filter(data)
+    model = nil
 
     notify! do |channel|
+      # Only load the model for filtering if we are sending to a channel
+      # (skip if we are the only one listening)
+      model ||= model_for_filter(data)
+
       filtered_data = nil
       Volt.as_user(channel.user_id) do
         filtered_data = model.filtered_attributes.sync
@@ -52,9 +55,14 @@ class LiveQuery
   end
 
   def notify_changed(id, data, skip_channel)
-    model = model_for_filter(data)
+    # puts "NOTIFY CHANGED"
+    model = nil
 
     notify!(skip_channel) do |channel|
+      # Only load the model for filtering if we are sending to a channel
+      # (skip if we are the only one listening)
+      model ||= model_for_filter(data)
+
       filtered_data = nil
       Volt.as_user(channel.user_id) do
         filtered_data = model.filtered_attributes.sync

data/app/volt/tasks/store_tasks.rb

@@ -9,31 +9,21 @@ class StoreTasks < Volt::Task
     model_name = collection.singularize.camelize
 
     # Fetch the model
-    collection = store.send(:"_#{path[-2]}")
+    collection = store.get(path[-2])
 
     # See if the model has already been made
-    collection.where(id: data[:id]).first.then do |model|
-      # Otherwise assign to the collection
-      model ||= collection
+    model_promise = collection.where(id: data[:id]).first
 
-      # Create a buffer
-      buffer = model.buffer
-
-      # Assign the changed data to the buffer
-      buffer.assign_attributes(data, false, true)
-
-      buffer
-    end
+    return collection, model_promise
   end
 
   def save(collection, path, data)
     data = data.symbolize_keys
-    promise = nil
+    model_promise = nil
 
-    # Don't check the permissions when we load the model, since we want all fields
     Volt.skip_permissions do
       Volt::Model.no_validate do
-        promise = load_model(collection, path, data)
+        collection, model_promise = load_model(collection, path, data)
       end
     end
 
@@ -44,9 +34,16 @@ class StoreTasks < Volt::Task
     # who sent the update.
     #
     # return another promise
-    promise.then do |model|
+    model_promise.then do |model|
       Thread.current['in_channel'] = @channel
-      save_promise = model.save!.then do |result|
+
+      result = if model
+        model.update(data)
+      else
+        collection.create(data)
+      end
+
+      save_promise = result.then do |result|
         next nil
       end.fail do |err|
         # An error object, convert to hash

data/lib/volt/cli.rb

@@ -131,5 +131,27 @@ end
 # Add in more features
 require 'volt/cli/asset_compile'
 
+unless Gem.win_platform?
+  # Change CWD to the root of the volt project
+  pwd = Dir.pwd
+  changed = false
+  loop do
+    if File.exists?(pwd + '/Gemfile')
+      Dir.chdir(pwd) if changed
+      break
+    else
+      changed = true
+
+      # Move up a directory and try again
+      pwd = pwd.gsub(/\/[^\/]+$/, '')
+
+      if pwd == ''
+        puts "You are not currently in a volt project directory"
+        exit 1
+      end
+    end
+  end
+end
+
 puts "Volt #{Volt::Version::STRING}"
 Volt::CLI.start(ARGV)

data/lib/volt/cli/asset_compile.rb

@@ -9,9 +9,11 @@ module Volt
     private
 
     def compile
-      puts 'compiling project...'
+      say "Starting Precompile...", :red
       require 'fileutils'
       ENV['SERVER'] = 'true'
+      ENV['MAPS'] = 'false'
+      ENV['NO_FORKING'] = 'true'
 
       require 'opal'
       require 'rack'
@@ -19,90 +21,88 @@ module Volt
       require 'volt/volt/core'
       require 'volt/boot'
       require 'volt/server'
+      require 'volt/server/rack/component_paths'
+      require 'volt/server/rack/component_code'
 
       @root_path ||= Dir.pwd
       Volt.root  = @root_path
 
-      volt_app = Volt.boot(@root_path)
-
-      require 'volt/server/rack/component_paths'
-      require 'volt/server/rack/component_code'
+      @volt_app = Volt.boot(@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, volt_app, @component_paths, @opal_files)
-
-      puts 'Compile Opal for components'
-      write_component_js
-      puts 'Copy assets'
-      write_sprockets
-      puts 'Compile JS/CSS'
-      write_js_and_css
-      puts 'Write index files'
+      say 'Compiling RB, JS, CSS, and Images...', :red
+      write_files_and_manifest
+      compile_manifests
+      say 'Write index files...', :red
       write_index
-
-      puts "compiled"
-    end
-
-    def logical_paths_and_full_paths
-      env = @opal_files.environment
-      env.each_file do |full_path|
-        # logical_path = env[full_path].logical_path
-        # logical_path = @opal_files.environment.send(:logical_path_for_filename, full_path, []).to_s
-        # puts "FULL PATH: #{full_path.inspect} -- #{logical_path}"
-
-        # yield(logical_path, full_path.to_s)
-      end
-
+      say "Done", :green
     end
 
-    def write_sprockets
-      # Serve the opal files
-      logical_paths_and_full_paths do |logical_path, full_path|
-        # Only include files that aren't compiled elsewhere, like fonts
-        if !logical_path[/[.](y|css|js|html|erb)$/] &&
-          File.extname(logical_path) != '' &&
-          # opal includes some node modules in the standard lib that we don't need to compile in
-          (full_path !~ /\/opal/ && full_path !~ /\/stdlib\// && logical_path !~ /^node_js\//)
-          write_sprocket_file(logical_path)
+    def write_files_and_manifest
+      asset_files = AssetFiles.from_cache('main', @volt_app.component_paths)
+      # Write a temp css file
+      js = asset_files.javascript(@volt_app)
+      css = asset_files.css
+      @tmp_files = []
+
+      File.open(Volt.root + '/app/main/app.js', 'wb') do |file|
+        js.each do |type, src_or_body|
+          if type == :src
+            src = src_or_body
+            url = src.gsub(/^\/assets\//, '')
+            file.write("//= require '#{url}'\n")
+          else
+            body = src_or_body
+
+            # Write to a tempfile, since sprockets can't mix requires and
+            # code.
+
+            require 'securerandom'
+            hex = SecureRandom.hex
+            tmp_path = Volt.root + "/app/main/__#{hex}.js"
+            url = "main/__#{hex}"
+            file.write("//= require '#{url}'\n")
+
+            @tmp_files << tmp_path
+            File.open(tmp_path, 'wb') {|f| f.write("#{body}\n") }
+          end
         end
       end
-    end
 
-    def write_js_and_css
-      (@index_files.javascript_files + @index_files.css_files).each do |logical_path|
-        if logical_path =~ /^\/assets\//
-          logical_path = logical_path.gsub(/^\/assets\//, '')
-          write_sprocket_file(logical_path)
+      File.open(Volt.root + '/app/main/app.scss', 'wb') do |file|
+        css.each do |link|
+          url = link.gsub(/^\/assets\//, '')
+          file.write("//= require '#{url}'\n")
         end
       end
     end
 
-    def write_sprocket_file(logical_path)
-      path = "#{@root_path}/public/assets/#{logical_path}"
-
-      begin
-        # Only write out the assets
-        # if logical_path =~ /\/assets\//
-          content = @opal_files.environment[logical_path].to_s
-          write_file(path, content)
-        # end
-      rescue Sprockets::FileNotFound, SyntaxError => e
-        # ignore
-      end
-    end
+    def compile_manifests
+      manifest = Sprockets::Manifest.new(@volt_app.sprockets, './public/assets/manifest.json')
 
-    def write_component_js
-      write_sprocket_file('components/main.js')
+      # Compile the files (and linked assets)
+      manifest.compile('main/app.js')
+      manifest.compile('main/app.css')
+
+      # Clear temp files
+      @tmp_files.each {|path| FileUtils.rm(path) }
+
+      # Remove the temp files
+      FileUtils.rm(Volt.root + '/app/main/app.js')
+      FileUtils.rm(Volt.root + '/app/main/app.scss')
     end
 
     def write_index
-      path = "#{@root_path}/public/index.html"
+      require 'volt/cli/base_index_renderer'
+
+      output_path = "#{@root_path}/public/index.html"
+      require 'json'
+
+      @manifest = JSON.parse(File.read(@root_path + '/public/assets/manifest.json'))
+      output_html = BaseIndexRenderer.new(@manifest).html
 
-      write_file(path, @index_files.html)
+      write_file(output_path, output_html)
     end
 
     def write_file(path, data)

data/lib/volt/cli/base_index_renderer.rb

@@ -0,0 +1,26 @@
+# Render the config/base/index.html when precompiling.  Here we only render
+# one js and one css file.
+
+module Volt
+  class BaseIndexRenderer
+    def initialize(manifest)
+      @manifest = manifest
+    end
+
+    def html
+      index_path = File.expand_path(File.join(Volt.root, 'config/base/index.html'))
+      html       = File.read(index_path)
+
+      ERB.new(html, nil, '-').result(binding)
+    end
+
+    # When writing the index, we render the
+    def javascript_tags
+      "<script src=\"/assets/#{@manifest['assets']['main/app.js']}\"></script>"
+    end
+
+    def css_tags
+      "<link href=\"/assets/#{@manifest['assets']['main/app.css']}\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />"
+    end
+  end
+end

data/lib/volt/cli/generate.rb

@@ -81,7 +81,7 @@ class Generate < Thor
   method_option :name, type: :string, banner: 'The name of the task.'
   method_option :component, type: :string, default: 'main', banner: 'The component the task should be created in.', required: false
   def task(name, component = 'main')
-    name = name.underscore.gsub(/_tasks$/, '').singularize + '_task'
+    name = name.underscore.gsub(/_tasks$/, '').singularize.gsub('_task', '') + '_task'
     output_file = Dir.pwd + "/app/#{component}/tasks/#{name}.rb"
     spec_file = Dir.pwd + "/spec/app/#{component}/tasks/#{name}_spec.rb"
     template('task/task.rb.tt', output_file, task_name: name.camelize.singularize)

data/lib/volt/config.rb

@@ -60,6 +60,7 @@ else
 
           compress_javascript: Volt.env.production?,
           compress_css:        Volt.env.production?,
+          compress_images:     Volt.env.production?,
           abort_on_exception:  true,
 
           min_worker_threads: 1,

data/lib/volt/controllers/model_controller.rb

@@ -27,16 +27,19 @@ module Volt
 
     # Container returns the node that is parent to all nodes in the section.
     def container
+      check_section!('container')
       section.container_node
     end
 
     def dom_nodes
+      check_section!('dom_nodes')
       section.range
     end
 
     # Walks the dom_nodes range until it finds an element.  Typically this will
     # be the container element without the whitespace text nodes.
     def first_element
+      check_section!('first_element')
       range = dom_nodes
       nodes = `range.startContainer.childNodes`
 
@@ -76,6 +79,24 @@ module Volt
       end
     end
 
+    def trigger(event, *args)
+      # Trigger on the current controller if an e- was setup on the component.
+      component_event = attrs.send(:"e_#{event}")
+
+      if component_event
+        # Add a nil arg for the event, trim to arity
+        args2 = (args + [nil])[0...component_event.arity]
+        component_event.call(*args2)
+      end
+
+      args.unshift(self)
+      # Trigger via jquery, so it bubbles up through the DOM
+      `$(#{first_element}).trigger(#{event}, #{args});`
+
+      # return nil, so we return a ruby object
+      nil
+    end
+
     def self.model(val)
       self.default_model = val
     end
@@ -208,7 +229,14 @@ module Volt
     # Raw marks a string as html safe, so bindings can be rendered as html.
     # With great power comes great responsibility.
     def raw(str)
-      str = str.to_s unless str.is_a?(String)
+      # Promises need to have .to_s called using .then, since .to_s is a promise
+      # method, so it won't be passed down to the value.
+      if str.is_a?(Promise)
+        str = str.then(&:to_s)
+      else
+        str = str.to_s unless str.is_a?(String)
+      end
+
       str.html_safe
     end
 
@@ -230,5 +258,13 @@ module Volt
         super
       end
     end
+
+    private
+    def check_section!(method_name)
+      unless section
+        raise "##{method_name} can't be called before the {action}_ready method is called"
+      end
+    end
+
   end
 end