volt 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb91ea42e6c276676ed2e332f3fa6852a1934c14
-  data.tar.gz: f9cdcfc29256f2b153546f6036639391d8bb3a81
+  metadata.gz: 7be61678b8ab551460135dfeeaaab5060ed02f47
+  data.tar.gz: cc56d76316db3a18138fcce5f9bae3b7e4d301d7
 SHA512:
-  metadata.gz: 3aa3f0d5362a4dd8877d82434de5c9ef40b0bdae7ab2cea519ee706f1955e6bb4403bb8421744b5f609240f7075a7319c17b4d93c80f5e103a9800f4f463772f
-  data.tar.gz: 46a84efeaf3d6c254a9753d4e1b5fb97595276b6fa674a965f8809e89ef0872243ff20e66ad6c55555e4802a97d5a0b9209484339b58eef24075ab706192d0da
+  metadata.gz: 2cbbe9373a883d689ac88dfbc2d710a8c8e621de33e9baf90b1513b62c85021c7eda0ea21a8ed037d1d85a58149a64c71e742c681cd4ee5b5f591479ecf6df67
+  data.tar.gz: 9052a27af07b504f5f765d5c9ad2c833efea2acecb60e820518cf9a5532198435be84b3c84cfdf64a750e35077f1ba4b1e026801d51108c58f2937fa70582bbd

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.9

data/lib/volt.rb

@@ -10,4 +10,8 @@ class Volt
   def self.client?
     !!ENV['CLIENT']
   end
+  
+  def self.source_maps?
+    !!ENV['MAPS']
+  end
 end

data/lib/volt/server/rack/component_files.rb

@@ -1,15 +1,20 @@
 require 'volt/server/rack/component_paths'
-
-SOURCE_MAPS = !!ENV['MAPS'] unless defined?(SOURCE_MAPS)
+require 'volt'
 
 # Takes in the path to a component and gets all other components
 # required from this one
 class ComponentFiles
-  def initialize(component_name, component_paths)
+  def initialize(component_name, component_paths, main_component=false)
     @component_name = component_name
     @component_paths = component_paths
     @asset_folders = []
     @components = [component_name]
+    @main_component = main_component
+    
+    if @main_component
+      # Add in volt's JS files first
+      component('volt')
+    end
     
     load_child_components
     add_asset_folder(component_name)
@@ -57,7 +62,6 @@ class ComponentFiles
     if File.exists?(dependencies_file)
       # Run the dependencies file in this ComponentFiles context
       code = File.read(dependencies_file)
-      puts "CODE: #{code.inspect}"
       instance_eval(code)
     end
   end
@@ -75,16 +79,19 @@ class ComponentFiles
   
   
   def javascript_files
-    if SOURCE_MAPS
-      javascript_files = environment['volt/templates/page'].to_a.map {|v| '/assets/' + v.logical_path + '?body=1' }
-    else
-      javascript_files = ['/assets/volt/templates/page.js']
+    javascript_files = asset_folders do |asset_folder|
+      Dir["#{asset_folder}/**/*.js"].map {|path| '/assets' + path[asset_folder.size..-1] }
     end
     
-    javascript_files << '/components/home.js'
-    javascript_files += asset_folders do |asset_folder|
-      Dir["#{asset_folder}/**/*.js"].map {|path| '/assets' + path[asset_folder.size..-1] }
+    opal_js_files = []
+    if Volt.source_maps?
+      opal_js_files << environment['volt/templates/page'].to_a.map {|v| '/assets/' + v.logical_path + '?body=1' }
+    else
+      opal_js_files << '/assets/volt/templates/page.js'
     end
+    opal_js_files << '/components/home.js'
+
+    javascript_files.insert(2, *opal_js_files)
     
     return javascript_files
   end

data/lib/volt/server/rack/component_paths.rb

@@ -12,7 +12,7 @@ class ComponentPaths
       # Gem folders with volt in them
       # TODO: we should probably qualify this a bit more
       app_folders += Gem.loaded_specs.values.map { |g| g.full_gem_path }.reject {|g| g !~ /volt/ }.map {|f| f + '/app' }
-      
+
       app_folders
     end
     

data/lib/volt/server/rack/index_files.rb

@@ -23,8 +23,8 @@ class IndexFiles
   end
   
   def javascript_files
-    # TODO: OPTimize
-    ComponentFiles.new('home', @component_paths).javascript_files
+    # TODO: Cache somehow, this is being loaded every time
+    ComponentFiles.new('home', @component_paths, true).javascript_files
   end
   
   def css_files

data/lib/volt/server/rack/opal_files.rb

@@ -1,14 +1,12 @@
 require 'volt/server/rack/source_map_server'
 
-SOURCE_MAPS = !!ENV['MAPS'] unless defined?(SOURCE_MAPS)
-
-Opal::Processor.source_map_enabled = SOURCE_MAPS
-# Opal::Processor.arity_check_enabled = true
-# Opal::Processor.dynamic_require_severity = :raise
-
 # Sets up the maps for the opal assets, and source maps if enabled.
 class OpalFiles
   def initialize(builder, app_path, component_paths)
+    Opal::Processor.source_map_enabled = Volt.source_maps?
+    # Opal::Processor.arity_check_enabled = true
+    # Opal::Processor.dynamic_require_severity = :raise
+
     @component_paths = component_paths
     environment = Opal::Environment.new
     environment.cache = Sprockets::Cache::FileStore.new("./tmp")
@@ -33,7 +31,7 @@ class OpalFiles
       run environment
     end
 
-    if SOURCE_MAPS
+    if Volt.source_maps?
       source_maps = SourceMapServer.new(environment)
 
       builder.map(source_maps.prefix) do

data/spec/app/main/config/dependencies.rb

@@ -1 +1,2 @@
 component 'shared'
+component 'slideshow'

data/spec/server/rack/component_files_spec.rb

@@ -12,12 +12,12 @@ describe ComponentFiles do
     main = ComponentFiles.new("main", @component_paths)
     
     components = main.components
-    expect(components).to eq(['main', 'shared', 'bootstrap'])
+    expect(components).to eq(['main', 'shared', 'bootstrap', "slideshow"])
   end
   
   it "should list all JS files" do
     main = ComponentFiles.new("main", @component_paths)
     
-    expect(main.javascript_files).to eq(["/assets/volt/templates/page.js", "/components/home.js", "/assets/js/test2.js", "/assets/js/test1.js"])
+    expect(main.javascript_files).to eq(["/assets/js/test2.js", "/assets/js/bootstrap.js", "/assets/volt/templates/page.js", "/components/home.js", "/assets/js/test3.js", "/assets/js/test1.js"])
   end
 end

data/templates/project/app/home/config/dependencies.rb

@@ -1,4 +1,5 @@
 # Specify which components you wish to include when 
 # the "home" component loads.
 
+# the bootstrap theme
 component 'bootstrap'

data/templates/project/public/index.html

@@ -2,8 +2,6 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-		<script src="/js/jquery-2.0.3.js"></script>
-		<script src="/js/sockjs-0.2.1.min.js"></script>
     <% javascript_files.each do |javascript_file| %>
       <script src="<%= javascript_file %>"></script>
     <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Ryan Stout
@@ -265,6 +265,8 @@ files:
 - Rakefile
 - Readme.md
 - VERSION
+- app/volt/assets/js/jquery-2.0.3.js
+- app/volt/assets/js/sockjs-0.2.1.min.js
 - bin/volt
 - docs/GETTING_STARTED.md
 - docs/GUIDE.md
@@ -336,10 +338,12 @@ files:
 - lib/volt/templates/targets/dom_target.rb
 - lib/volt/templates/template_binding.rb
 - lib/volt/templates/template_renderer.rb
+- spec/app/bootstrap/assets/js/bootstrap.js
 - spec/app/main/assets/js/test1.js
 - spec/app/main/config/dependencies.rb
 - spec/app/shared/assets/js/test2.js
 - spec/app/shared/config/dependencies.rb
+- spec/app/slideshow/assets/js/test3.js
 - spec/models/event_chain_spec.rb
 - spec/models/model_spec.rb
 - spec/models/old_model_spec.rb
@@ -385,8 +389,6 @@ files:
 - templates/project/app/home/views/index/index.html
 - templates/project/config.ru
 - templates/project/public/index.html
-- templates/project/public/js/jquery-2.0.3.js
-- templates/project/public/js/sockjs-0.2.1.min.js
 - templates/project/spec/spec_helper.rb
 - volt.gemspec
 homepage: http://voltframework.com
@@ -415,10 +417,12 @@ specification_version: 4
 summary: A ruby web framework where your ruby runs on both server and client (via
   Opal)
 test_files:
+- spec/app/bootstrap/assets/js/bootstrap.js
 - spec/app/main/assets/js/test1.js
 - spec/app/main/config/dependencies.rb
 - spec/app/shared/assets/js/test2.js
 - spec/app/shared/config/dependencies.rb
+- spec/app/slideshow/assets/js/test3.js
 - spec/models/event_chain_spec.rb
 - spec/models/model_spec.rb
 - spec/models/old_model_spec.rb