volt 0.9.4 → 0.9.5.pre1

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

@@ -10,7 +10,7 @@ ENV['EXECJS_RUNTIME'] = 'Node'
 # Sets up the maps for the opal assets, and source maps if enabled.
 module Volt
   class OpalFiles
-    attr_reader :environment
+    attr_reader :environment, :server
 
     def initialize(builder, app_path, component_paths)
       Opal::Processor.source_map_enabled = Volt.source_maps?
@@ -34,11 +34,12 @@ module Volt
       # Opal::Processor.arity_check_enabled = !Volt.env.production?
       # Opal::Processor.dynamic_require_severity = :raise
 
-      server = Opal::Server.new(prefix: '/')
+      @server = Opal::Server.new(prefix: '/assets', debug: Volt.source_maps?)
+      @server.use_index = false
 
       @component_paths                   = component_paths
       # @environment                       = Opal::Environment.new
-      @environment                       = server.sprockets
+      @environment                       = @server.sprockets
 
       # Since the scope changes in builder blocks, we need to capture
       # environment in closure
@@ -59,17 +60,38 @@ module Volt
         Csso.install(environment)
       end
 
-      server.append_path(app_path)
+      @server.append_path(app_path)
 
       volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '../../..'))
-      server.append_path(volt_gem_lib_path)
+      @server.append_path(volt_gem_lib_path)
 
-      add_asset_folders(server)
+      add_asset_folders(@server)
 
+      env = @enviroment
       builder.map '/assets' do
-        run server
+        run environment
       end
 
+      @environment.logger.level ||= Logger::DEBUG
+      source_map_enabled = Volt.source_maps?
+      if source_map_enabled
+        maps_prefix = Opal::Server::SOURCE_MAPS_PREFIX_PATH
+        maps_app = Opal::SourceMapServer.new(@environment, maps_prefix)
+        ::Opal::Sprockets::SourceMapHeaderPatch.inject!(maps_prefix)
+      end
+
+      if source_map_enabled
+          builder.map(maps_prefix) do
+            require 'rack/conditionalget'
+            require 'rack/etag'
+            use Rack::ConditionalGet
+            use Rack::ETag
+            run maps_app
+          end
+        end
+
+
+
       # map server.source_maps.prefix do
       #   run server.source_maps
       # end

data/lib/volt/server/template_handlers/sprockets_component_handler.rb

@@ -0,0 +1,163 @@
+# This file Monkeypatches sprockets to provide custom file loading (from volt
+# instead disk) for component root files.  These files then require in all parts
+# or include generated ruby for templates, routes, and tasks.
+module Volt
+  class StatStub
+    def directory?
+      false
+    end
+
+    def file?
+      false
+    end
+
+    def stub?
+      true
+    end
+
+    def digest
+      "stub-digest-#{mtime}"
+    end
+
+    def mtime
+      # return a random mtime so it always reloads
+      rand(2_000_000_000)
+    end
+  end
+end
+
+module Sprockets
+  # Internal: The first processor in the pipeline that reads the file into
+  # memory and passes it along as `input[:data]`.
+  class FileReader
+    def self.call(input)
+      env = input[:environment]
+      path = input[:filename]
+
+      # Handle a /components path match.  /components will load up a component.
+      if path =~ /\/components\/[^.]+[.]rb$/
+        component_name = path.match(/\/components\/([^.]+)[.]rb$/)[1]
+
+        cached = env.cached
+
+        stats = cached.instance_variable_get('@stats')
+
+        stats[path] = Volt::StatStub.new
+
+        # Working with a component path
+        data = Volt::ComponentCode.new(component_name, $volt_app.component_paths, true).code
+      else
+        data = env.read_file(input[:filename], input[:content_type])
+      end
+
+      dependencies = Set.new(input[:metadata][:dependencies])
+      dependencies += [env.build_file_digest_uri(input[:filename])]
+
+      { data: data, dependencies: dependencies }
+    end
+  end
+end
+
+module Sprockets
+  # Internal: File and path related utilities. Mixed into Environment.
+  #
+  # Probably would be called FileUtils, but that causes namespace annoyances
+  # when code actually wants to reference ::FileUtils.
+  module PathUtils
+    extend self
+
+    # Public: Like `File.file?`.
+    #
+    # path - String file path.
+    #
+    # Returns true path exists and is a file.
+    def file?(path)
+      # if path =~  /\/components\/[^.]+[.]rb$/
+      #   return true
+      # end
+
+      if stat = self.stat(path)
+        stat.file?
+      elsif path =~ /^#{Volt.root}\/app\/components\/[^\/]+[.]rb$/
+        # Matches a component
+        return true
+      else
+        false
+      end
+    end
+
+    # Public: Like `File.directory?`.
+    #
+    # path - String file path.
+    #
+    # Returns true path exists and is a directory.
+    def directory?(path)
+      # if path == '/Users/ryanstout/Sites/volt/volt/app/components/main'
+      #   return true
+      # end
+
+      if stat = self.stat(path)
+        stat.directory?
+      # else
+      elsif path =~ /^#{Volt.root}\/app\/components\/[^\/]+$/
+        # Matches a component
+        return true
+      else
+        false
+      end
+    end
+  end
+end
+
+module Sprockets
+  module PathDigestUtils
+    def stat_digest(path, stat)
+      if stat.directory?
+        # If its a directive, digest the list of filenames
+        digest_class.digest(self.entries(path).join(','))
+      elsif stat.file?
+        # If its a file, digest the contents
+        digest_class.file(path.to_s).digest
+      elsif stat.stub?
+        # Component lookup, custom digest that always invalidates
+        return stat.digest
+      else
+        raise TypeError, "stat was not a directory or file: #{stat.ftype}"
+      end
+    end
+  end
+end
+
+module Sprockets
+  module Resolve
+    def path_matches(load_path, logical_name, logical_basename)
+
+      dirname    = File.dirname(File.join(load_path, logical_name))
+      candidates = dirname_matches(dirname, logical_basename)
+      deps       = file_digest_dependency_set(dirname)
+
+      if load_path == "#{Volt.root}/app"
+        match = logical_name.match(/^components\/([^\/]+)$/)
+        if match && (component_name = match[1])
+          return [["#{Volt.root}/app/components/#{component_name}.rb", "application/javascript"]], deps
+        end
+      end
+
+      result = resolve_alternates(load_path, logical_name)
+      result[0].each do |fn|
+        candidates << [fn, parse_path_extnames(fn)[1]]
+      end
+      deps.merge(result[1])
+
+      dirname = File.join(load_path, logical_name)
+      if directory? dirname
+        result = dirname_matches(dirname, "index")
+        candidates.concat(result)
+      end
+
+      deps.merge(file_digest_dependency_set(dirname))
+
+      return candidates.select { |fn, _| file?(fn) }, deps
+    end
+  end
+end

data/lib/volt/server.rb

@@ -5,13 +5,12 @@ require 'opal'
 require 'rack'
 require 'sass'
 require 'volt/utils/tilt_patch'
-require 'sprockets-sass'
 
 require 'volt'
 require 'volt/tasks/dispatcher'
 require 'volt/tasks/task'
-require 'volt/server/component_handler'
-require 'volt/server/rack/component_paths'
+require 'volt/server/rack/component_code'
+require 'volt/server/template_handlers/sprockets_component_handler'
 
 require 'volt/server/websocket/websocket_handler'
 require 'volt/utils/read_write_lock'

data/lib/volt/utils/generic_pool.rb

@@ -112,7 +112,7 @@ module Volt
     end
 
     def inspect
-      "<#{self.class} #{@pool.inspect}>"
+      "<#{self.class}:#{object_id} #{@pool.inspect}>"
     end
 
     def print

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.4'
+    STRING = '0.9.5.pre1'
   end
 end

data/lib/volt/volt/app.rb

@@ -44,7 +44,7 @@ module Volt
     attr_reader :component_paths, :router, :live_query_pool,
                 :channel_live_queries, :app_path, :database, :message_bus,
                 :middleware, :browser
-    attr_accessor :sprockets
+    attr_accessor :sprockets, :opal_files
 
     def initialize(app_path=nil)
       if Volt.server? && !app_path

data/lib/volt.rb

@@ -40,7 +40,12 @@ module Volt
     end
 
     def source_maps?
-      !!ENV['MAPS']
+      if !ENV['MAPS']
+        # If no MAPS is specified, enable it in dev
+        Volt.env.development?
+      else
+        ENV['MAPS'] != 'false'
+      end
     end
 
     def env

data/spec/apps/kitchen_sink/config/base/index.html

@@ -2,14 +2,10 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-	    <% javascript_files.each do |javascript_file| %>
-	      <script src="<%= javascript_file %>"></script>
-	    <% end %>
+	    <%= javascript_tags %>
+
+	    <%= css_tags %>
 
-	    <% css_files.each do |css_file| %>
-	      <link href="<%= css_file %>" media="all" rel="stylesheet" type="text/css" />
-	    <% end %>
-    
 	</head>
 	<body>
 

data/spec/integration/bindings_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe 'bindings test', type: :feature, sauce: true do
   it 'should load the page' do
     visit '/'
+    sleep 10
 
     expect(page).to have_content('Kitchen Sink')
   end

data/spec/models/associations_spec.rb

@@ -9,6 +9,10 @@ class ::Address < Volt::Model
   has_one :zip_info
 end
 
+class ::AddressBelongToOption < Volt::Model
+  belongs_to :someone, collection: :person, foreign_key: :id, local_key: :some_weird_id
+end
+
 class ::ZipInfo < Volt::Model
   belongs_to :address
 end
@@ -29,6 +33,20 @@ describe Volt::Associations do
         expect(address.person.sync.id).to eq(@person.id)
       end
 
+      it 'should support collection and foreign_key on belongs_to' do
+        @person = Person.new(name: 'Jimmy')
+        store.people << @person
+        @location = AddressBelongToOption.new(someone: @person)
+
+        store.address_belong_to_options << @location
+
+        @location.someone.then do |someone|
+          expect(someone.id).to eq(@person.id)
+        end
+      end
+
+      it 'should raise an exception if you try to use an association on a model that isn\'t associated with a repository'
+
       it 'should associate via has_many' do
         store._people!.first do |person|
 

data/spec/models/buffer_spec.rb

@@ -26,6 +26,18 @@ describe Volt::Buffer do
     expect(result.class).to eq(Promise)
   end
 
+  it 'should clear the buffer\'s changed attributes after a save' do
+    buffer = the_page._items.buffer
+
+    buffer._name = 'Jimithy'
+
+    expect(buffer.changed_attributes).to eq({name: [nil]})
+
+    buffer.save!
+
+    expect(buffer.changed_attributes).to eq({})
+  end
+
   if RUBY_PLATFORM != 'opal'
     it 'should copy attributes back from the save_to model incase it changes them during save' do
       buffer = the_page._test_changed_attributes.buffer

data/spec/server/rack/asset_files_spec.rb

@@ -1,6 +1,8 @@
 if RUBY_PLATFORM != 'opal'
   require 'spec_helper'
   require 'volt/server/rack/asset_files'
+  require 'volt/server/template_handlers/sprockets_component_handler'
+
    describe Volt::AssetFiles do
     before do
       spec_app_root = File.join(File.dirname(__FILE__), '../../apps/file_loading')
@@ -19,30 +21,30 @@ if RUBY_PLATFORM != 'opal'
       context "when the component's dependencies.rb does not contain .disable_auto_import" do
         it 'should list all JS files' do
           main = Volt::AssetFiles.new('main', @component_paths)
-          expect(main.javascript_files(nil)).to eq([
-            '/assets/js/jquery-2.0.3.js',
-            '/assets/js/volt_js_polyfills.js',
-            '/assets/js/volt_watch.js',
-            '/assets/js/bootstrap.js',
-            '/assets/js/test2.js',
-            '/assets/js/test3.js',
-            '/assets/js/test1.js',
-            '/assets/volt/volt/app.js',
-            '/components/main.js'
+          expect(main.javascript(volt_app)).to eq([
+            [:src, '/assets/js/jquery-2.0.3.js'],
+            [:src, '/assets/js/volt_js_polyfills.js'],
+            [:src, '/assets/js/volt_watch.js'],
+            [:src, '/assets/js/bootstrap.js'],
+            [:src, '/assets/js/test2.js'],
+            [:src, '/assets/js/test3.js'],
+            [:src, '/assets/js/test1.js'],
+            [:src, '/assets/volt/volt/app.js'],
+            [:src, '/assets/components/main.js']
           ])
         end
       end
-    
+
       context "when the component's dependencies.rb contains .disable_auto_import" do
         it 'should list only the files included via the css_file helpers' do
           disabled_auto = Volt::AssetFiles.new('disable_auto', @component_paths)
-          expect(disabled_auto.javascript_files(nil)).to eq([
-            '/assets/js/jquery-2.0.3.js',
-            '/assets/js/volt_js_polyfills.js',
-            '/assets/js/volt_watch.js',
-            '/assets/disable_auto/assets/js/test1.js',
-            '/assets/volt/volt/app.js',
-            '/components/main.js'
+          expect(disabled_auto.javascript(volt_app)).to eq([
+            [:src, '/assets/js/jquery-2.0.3.js'],
+            [:src, '/assets/js/volt_js_polyfills.js'],
+            [:src, '/assets/js/volt_watch.js'],
+            [:src, '/assets/disable_auto/assets/js/test1.js'],
+            [:src, '/assets/volt/volt/app.js'],
+            [:src, '/assets/components/main.js']
           ])
         end
       end
@@ -54,7 +56,7 @@ if RUBY_PLATFORM != 'opal'
         it 'should list all the asset files in that component' do
           main = Volt::AssetFiles.new('main', @component_paths)
 
-          expect(main.css_files).to eq([
+          expect(main.css).to eq([
             '/assets/css/notices.css',
             '/assets/css/01-bootstrap.css',
             '/assets/css/test3.css'
@@ -66,39 +68,39 @@ if RUBY_PLATFORM != 'opal'
         it 'should list only the files included via the css_file helpers' do
           disabled_auto = Volt::AssetFiles.new('disable_auto', @component_paths)
 
-          expect(disabled_auto.css_files).to eq([
+          expect(disabled_auto.css).to eq([
             '/assets/css/notices.css',
             '/assets/disable_auto/assets/css/test1.css'
           ])
         end
       end
     end
-    
+
     describe '.is_url?' do
       it 'should return true for URIs like //something.com/something.js' do
         main = Volt::AssetFiles.new('main', @component_paths)
         expect(main.url_or_path? '//something.com/a-folder/something.js').to eq(true)
       end
-      
+
       it 'should return true for HTTP and HTTPS urls' do
         main = Volt::AssetFiles.new('main', @component_paths)
         expect(main.url_or_path? 'http://something.com/a-folder/something.js').to eq(true)
         expect(main.url_or_path? 'https://something.com/a-folder/something.js').to eq(true)
       end
-      
+
       it 'should return true for paths' do
         main = Volt::AssetFiles.new('main', @component_paths)
         expect(main.url_or_path? 'something.js').to eq(false)
         expect(main.url_or_path? '/assets/something.js').to eq(true)
         expect(main.url_or_path? '/assets/something/something.js').to eq(true)
       end
-      
+
       it 'should return false for file names' do
         main = Volt::AssetFiles.new('main', @component_paths)
         expect(main.url_or_path? 'something.js').to eq(false)
         expect(main.url_or_path? 'assets/something/something.js').to eq(false)
       end
-      
+
     end
 
     it 'should raise an exception for a missing component gem' do
@@ -121,5 +123,13 @@ if RUBY_PLATFORM != 'opal'
         main.load_dependencies(path_to_missing_deps, 'component_name')
       end.to_not raise_error
     end
+
+    it 'should parse javascript src/body from the javascript tags' do
+      main = Volt::AssetFiles.new('main', @component_paths)
+
+      expect(main).to receive(:javascript_tags).and_return("<script src='/someurl.js'></script><script>var inlinejs = true;</script>")
+
+      expect(main.javascript(nil)).to eq([[:src, "/someurl.js"], [:body, "var inlinejs = true;"]])
+    end
   end
 end

data/templates/project/config/base/index.html

@@ -6,13 +6,8 @@
   <%# language difference. This file handles auto-loading all JS/Opal and CSS.  %>
   <head>
     <meta charset="UTF-8" />
-    <% javascript_files.each do |javascript_file| %>
-      <script src="<%= javascript_file %>"></script>
-    <% end %>
-
-    <% css_files.each do |css_file| %>
-      <link href="<%= css_file %>" media="all" rel="stylesheet" type="text/css" />
-    <% end %>
+    <%= javascript_tags %>
+    <%= css_tags %>
   </head>
   <body>
 

data/volt.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.19.0'
   spec.add_dependency 'pry', '~> 0.10.1'
   spec.add_dependency 'rack', '~> 1.5.0'
-  spec.add_dependency 'sprockets-sass', '~> 1.0.0'
-  spec.add_dependency 'sass', '~> 3.2.5'
+  # spec.add_dependency 'sprockets-sass', '~> 1.0.0'
+  spec.add_dependency 'sass', '~> 3.4.15'
   spec.add_dependency 'listen', '~> 3.0.1'
   spec.add_dependency 'configurations', '~> 2.0.0.pre'
-  spec.add_dependency 'opal', '~> 0.7.2'
+  spec.add_dependency 'opal', '~> 0.8.0'
   spec.add_dependency 'bundler', '>= 1.5'
-  spec.add_dependency 'faye-websocket', '~> 0.9.2'
+  spec.add_dependency 'faye-websocket', '~> 0.10.0'
 
   # Locking down concurrent-ruby because one currently used feature is going to
   # be deprecated (which we need to build a work around for)
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
 
   # For testing
   spec.add_development_dependency 'rspec', '~> 3.2.0'
-  spec.add_development_dependency 'opal-rspec', '~> 0.4.2'
+  spec.add_development_dependency 'opal-rspec', '~> 0.4.3'
   spec.add_development_dependency 'capybara', '~> 2.4.2'
 
   # There is a big performance issue with selenium-webdriver on v2.45.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5.pre1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,34 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.4.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.4.15
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -527,7 +513,6 @@ files:
 - lib/volt/router/routes.rb
 - lib/volt/server.rb
 - lib/volt/server/banner.txt
-- lib/volt/server/component_handler.rb
 - lib/volt/server/component_templates.rb
 - lib/volt/server/forking_server.rb
 - lib/volt/server/forking_server/boot_error.html.erb
@@ -564,7 +549,7 @@ files:
 - lib/volt/server/rack/source_map_server.rb
 - lib/volt/server/socket_connection_handler.rb
 - lib/volt/server/socket_connection_handler_stub.rb
-- lib/volt/server/template_handlers/handlers.rb
+- lib/volt/server/template_handlers/sprockets_component_handler.rb
 - lib/volt/server/websocket/rack_server_adaptor.rb
 - lib/volt/server/websocket/websocket_handler.rb
 - lib/volt/spec/capybara.rb
@@ -849,9 +834,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5