volt 0.7.1 → 0.7.2

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

@@ -8,7 +8,8 @@ class ComponentPaths
   def app_folders
     # Find all app folders
     @app_folders ||= begin
-      app_folders = ["#{@root}/app", "#{@root}/vendor/app"].map {|f| File.expand_path(f) }
+      volt_app = File.expand_path(File.join(File.dirname(__FILE__), "../../../../app"))
+      app_folders = [volt_app, "#{@root}/app", "#{@root}/vendor/app"].map {|f| File.expand_path(f) }
 
       # Gem folders with volt in them
       # TODO: we should probably qualify this a bit more
@@ -49,15 +50,17 @@ class ComponentPaths
 
   # Makes each components classes available on the load path, require classes.
   def require_in_components
-    # app_folders do |app_folder|
-    #   $LOAD_PATH.unshift(app_folder)
-    #
-    #   Dir["#{app_folder}/*/{controllers,model}/*.rb"].each do |ruby_file|
-    #     path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
-    #     puts "Path: #{path}"
-    #     # require(path)
-    #   end
-    # end
+    if RUBY_PLATFORM == 'opal'
+    else
+      app_folders do |app_folder|
+        $LOAD_PATH.unshift(app_folder)
+
+        Dir["#{app_folder}/*/{controllers,models}/*.rb"].each do |ruby_file|
+          path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
+          require(path)
+        end
+      end
+    end
 
     # add each tasks folder directly
     components.each do |name,component_folders|

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

@@ -17,16 +17,16 @@ class IndexFiles
   end
 
   def route_match?(path)
-    @@router.path_matchers.each do |path_matcher|
-      return true if path =~ path_matcher
-    end
+    params = @@router.url_to_params(path)
+
+    return params if params
 
     return false
   end
 
   def call(env)
     if route_match?(env['PATH_INFO'])
-      [200, { 'Content-Type' => 'text/html' }, [html]]
+      [200, { 'Content-Type' => 'text/html; charset=utf-8' }, [html]]
     else
       @app.call env
     end

data/lib/volt/server/socket_connection_handler.rb

@@ -43,7 +43,11 @@ class SocketConnectionHandler < SockJS::Session
   def send_message(*args)
     str = JSON.dump([*args])
 
-    send(str)
+    begin
+      send(str)
+    rescue MetaState::WrongStateError => e
+      puts "Tried to send to closed connection: #{e.inspect}"
+    end
   end
 
   def closed

data/lib/volt/server.rb

@@ -1,7 +1,12 @@
 ENV['SERVER'] = 'true'
 
 require 'opal'
-require 'thin'
+if RUBY_PLATFORM == 'java'
+  require 'jubilee'
+else
+  require 'thin'
+end
+
 require "rack"
 if RUBY_PLATFORM != 'java'
   require "rack/sockjs"
@@ -20,6 +25,7 @@ require 'volt/server/rack/component_paths'
 require 'volt/server/rack/index_files'
 require 'volt/server/rack/opal_files'
 require 'volt/tasks/dispatcher'
+require 'volt/page/page'
 
 module Rack
   # TODO: For some reason in Rack (or maybe thin), 304 headers close
@@ -96,9 +102,10 @@ class Server
     # which JS/CSS files to serve.
     @app.use IndexFiles, @component_paths, opal_files
 
+    component_paths.require_in_components
+
     # Handle socks js connection
     if RUBY_PLATFORM != 'java'
-      component_paths.require_in_components
       SocketConnectionHandler.dispatcher = Dispatcher.new
 
       @app.map "/channel" do
@@ -114,7 +121,7 @@ class Server
         [:all, {'Cache-Control' => 'public, max-age=86400'}]
       ]
 
-    @app.run lambda{ |env| [ 404, { 'Content-Type'  => 'text/html' }, ['404 - page not found'] ] }
+    @app.run lambda{ |env| [ 404, { 'Content-Type'  => 'text/html; charset=utf-8' }, ['404 - page not found'] ] }
 
     return @app
   end

data/spec/apps/kitchen_sink/.gitignore

@@ -0,0 +1,8 @@
+.bundle
+.config
+.yardoc
+tmp
+.idea
+.yardoc
+.sass-cache
+.DS_Store

data/spec/apps/kitchen_sink/Gemfile

@@ -0,0 +1,32 @@
+source 'https://rubygems.org'
+
+gem 'volt', path: '/Users/ryanstout/Sites/volt/volt'
+
+
+# The following gem's are optional for themeing
+
+# Twitter bootstrap
+gem 'volt-bootstrap'
+
+# Simple theme for bootstrap, remove to theme yourself.
+gem 'volt-bootstrap-jumbotron-theme'
+
+
+gem 'volt-fields', path: '/Users/ryanstout/Sites/volt/apps/volt-fields'
+
+# Server for MRI
+platform :mri do
+  gem 'thin', '~> 1.6.0'
+  gem 'bson_ext'
+end
+
+# Server for jruby
+platform :jruby do
+  gem 'jubilee'
+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

data/spec/apps/kitchen_sink/app/home/views/index/index.html

@@ -1,7 +1,5 @@
-<:title>
-Home
-</:title>
+<:Title>
+  Home
 
-<:body>
+<:Body>
   <h1>Home</h1>
-</:body>

data/spec/apps/kitchen_sink/config.ru

@@ -0,0 +1,4 @@
+# Run via rack server
+require 'bundler/setup'
+require 'volt/server'
+run Server.new.app

data/spec/apps/kitchen_sink/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/spec/extra_core/inflector_spec.rb

@@ -0,0 +1,8 @@
+require 'volt/extra_core/inflector'
+
+describe Inflector do
+  it "should pluralize correctly" do
+    expect('car'.pluralize).to eq('cars')
+    # expect('database'.pluralize).to eq('database')
+  end
+end

data/spec/models/event_chain_spec.rb

@@ -128,4 +128,22 @@ describe EventChain do
       expect(count).to eq(3)
     end
   end
+
+  it "should free events when events are unbound" do
+    a = ReactiveValue.new('cool')
+    b = a + 'dude'
+
+    expect(a.reactive_manager.event_chain.instance_variable_get('@event_counts')).to eq({})
+
+    listener1 = b.on('changed') { }
+    expect(a.reactive_manager.event_chain.instance_variable_get('@event_counts')).to_not eq({})
+
+    listener2 = b.on('changed') { }
+    listener1.remove
+
+    expect(a.reactive_manager.event_chain.instance_variable_get('@event_counts')).to_not eq({})
+    listener2.remove
+
+    expect(a.reactive_manager.event_chain.instance_variable_get('@event_counts')).to eq({})
+  end
 end

data/spec/models/model_buffers_spec.rb

@@ -0,0 +1,9 @@
+require 'volt/models'
+
+describe Model do
+  it "should create a buffer from an ArrayModel" do
+    page = ReactiveValue.new(Model.new)
+
+    page._items = []
+  end
+end

data/spec/models/model_spec.rb

@@ -80,15 +80,20 @@ describe Model do
   it "should not call changed on other attributes" do
     a = ReactiveValue.new(Model.new)
 
-    count = 0
-    a._blue.on('changed') { count += 1 }
-    expect(count).to eq(0)
+    blue_count = 0
+    green_count = 0
+    a._blue.on('changed') { blue_count += 1 }
+    a._green.on('changed') { green_count += 1}
+    expect(blue_count).to eq(0)
+    expect(green_count).to eq(0)
 
     a._green = 'one'
-    expect(count).to eq(0)
+    expect(blue_count).to eq(0)
+    expect(green_count).to eq(1)
 
     a._blue = 'two'
-    expect(count).to eq(1)
+    expect(blue_count).to eq(1)
+    expect(green_count).to eq(1)
 
   end
 
@@ -110,6 +115,12 @@ describe Model do
   end
 
   it "should store reactive values in arrays and trigger updates when those values change" do
+    a = ReactiveValue.new(Model.new)
+    b = ReactiveValue.new('blue')
+    a._items <<  b
+    b.cur = 'two'
+
+
     a = ReactiveValue.new(Model.new)
     b = ReactiveValue.new('blue')
     a._one = 1
@@ -241,10 +252,12 @@ describe Model do
     expect(count).to eq(0)
 
     a._blue._green = 5
-    expect(count).to eq(1)
 
-    a._blue = 22
+    # TODO: Should actually just equal one
     expect(count).to eq(2)
+
+    a._blue = 22
+    expect(count).to eq(3)
   end
 
   it "should trigger changed when a value is deleted" do
@@ -407,11 +420,11 @@ describe Model do
     c.on('changed') { count2 += 1 }
     expect(count1).to eq(0)
 
-    b._complete = true
+    a._complete = true
     expect(count1).to eq(1)
     expect(count2).to eq(1)
 
-    b._complete = false
+    a._complete = false
     expect(count1).to eq(2)
     expect(count2).to eq(2)
 

data/spec/models/reactive_array_spec.rb

@@ -252,7 +252,6 @@ describe ReactiveArray do
       model._current.on('changed') { count += 1 }
       expect(count).to eq(0)
 
-      ObjectTracker.process_queue
       model._items.delete_at(0)
 
       expect(count).to eq(1)
@@ -301,5 +300,31 @@ describe ReactiveArray do
 
 
     end
+
+    it "should trigger changed with a negative index assignment" do
+      a = ReactiveValue.new(ReactiveArray.new([1,2,3]))
+
+      count_0 = 0
+      count_1 = 0
+
+      a[0].on('changed') { count_0 += 1 }
+      a[1].on('changed') { count_1 += 1 }
+
+      a[-2] = 50
+
+      expect(count_0).to eq(0)
+      expect(count_1).to eq(1)
+    end
+
+    it "should not trigger on other indicies" do
+      a = ReactiveValue.new(ReactiveArray.new([1,2,3]))
+
+      count = 0
+      a[0].on('changed') { count += 1 }
+      expect(count).to eq(0)
+
+      a[1] = 5
+      expect(count).to eq(0)
+    end
   end
 end

data/spec/models/reactive_call_times_spec.rb

@@ -0,0 +1,28 @@
+# require 'volt/models'
+#
+# class Test1 < Model
+#   def test
+#     puts "YEP"
+#
+#     {:yes => true}
+#   end
+# end
+#
+# describe ReactiveValue do
+#   it "should not trigger a model method multiple times" do
+#     a = ReactiveValue.new(Test1.new)
+#
+#     test = a.test
+#
+#     test.on('changed') { puts "CH" }
+#     a._name.on('changed') { puts "NAME CH" }
+#
+#     puts "--------"
+#     a._name = 'ok'
+#
+#
+#
+#
+#     # a.test
+#   end
+# end

data/spec/models/reactive_value_spec.rb

@@ -350,4 +350,23 @@ describe ReactiveValue do
 
     expect(a.deep_cur).to eq({_names: ['bob', 'jim']})
   end
+
+  it "should remove any event bindings bound through a reactive value when the value changes" do
+    a = ReactiveValue.new(Model.new)
+
+    a._info = {_name: 'Test'}
+    info = a._info.cur
+
+    expect(info.listeners.size).to eq(0)
+
+    listener = a._info.on('changed') { }
+
+    expect(info.listeners.size).to eq(1)
+
+    # Listener should be moved to the new object
+    a._info = {}
+
+    expect(info.listeners.size).to eq(0)
+  end
+
 end

data/spec/models/validations_spec.rb

@@ -0,0 +1,39 @@
+require 'volt/models'
+
+class TestModel < Model
+  validate :_name, length: 4
+end
+
+describe Model do
+  it "should validate the name" do
+    expect(TestModel.new.errors).to eq({:_name => ["must be at least 4 chars"]})
+  end
+
+  it "should show marked validations once they are marked" do
+    model = TestModel.new
+
+    expect(model.marked_errors).to eq({})
+
+    model.mark_field!(:_name)
+
+    expect(model.marked_errors).to eq(
+      {
+        :_name => ["must be at least 4 chars"]
+      }
+    )
+  end
+
+  it "should show all fields in marked errors once saved" do
+    model = TestModel.new
+
+    expect(model.marked_errors).to eq({})
+
+    model.save!
+
+    expect(model.marked_errors).to eq(
+      {
+        :_name => ["must be at least 4 chars"]
+      }
+    )
+  end
+end

data/spec/page/bindings/content_binding_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'volt/page/bindings/content_binding'
 require 'volt/page/targets/attribute_target'
+require 'volt/page/targets/dom_section'
 require 'volt/page/template_renderer'
 
 

data/spec/{templates → page/bindings}/template_binding_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'volt/page/bindings/template_binding'
 
 # Setup page stub
@@ -26,6 +27,59 @@ describe TemplateBinding do
     $page = nil
   end
 
+  it "should lookup nested controller action" do
+    @templates = {
+      'home/index/blog/nav' => '',
+      'home/comments/new/body' => '',
+    }
+
+    result = @template_binding.path_for_template('comments/new').last
+    expect(result).to eq(['home', 'comments_controller', 'new'])
+  end
+
+  it "it should not look in the local component/controller for a specified controller/action" do
+    @templates = {
+      'home/comments/new/body' => ''
+    }
+
+    path, result = @template_binding.path_for_template('comments/new')
+    expect(path).to eq('home/comments/new/body')
+    expect(result).to eq(['home', 'comments_controller', 'new'])
+  end
+
+
+  it "should handle a tripple lookup" do
+    @templates = {
+      'home/comments/new/errors' => '',
+      'comments/new/errors/body' => ''
+    }
+
+    path, result = @template_binding.path_for_template('comments/new/errors')
+    expect(path).to eq('home/comments/new/errors')
+    expect(result).to eq(nil)
+  end
+
+  it "should handle a tripple lookup to controllers" do
+    @templates = {
+      'comments/new/errors/body' => ''
+    }
+
+    path, result = @template_binding.path_for_template('comments/new/errors')
+    expect(path).to eq('comments/new/errors/body')
+    expect(result).to eq(['comments', 'new_controller', 'errors'])
+  end
+
+
+  it "should find a matching component" do
+    @templates = {
+      'comments/new/index/body' => ''
+    }
+
+    path, result = @template_binding.path_for_template('comments/new')
+    expect(path).to eq('comments/new/index/body')
+    expect(result).to eq(['comments', 'new_controller', 'index'])
+  end
+
   it "should lookup sub-templates within its own file" do
     @templates = {
       'home/index/blog/nav' => '',