volt 0.8.14 → 0.8.15

data/lib/volt.rb

@@ -8,47 +8,49 @@ else
   require 'volt/data_stores/data_store'
 end
 
-class Volt
-  if RUBY_PLATFORM == 'opal'
-    @@in_browser = `!!document && !window.OPAL_SPEC_PHANTOM`
-  else
-    @@in_browser = false
+module Volt
+  @in_browser = if RUBY_PLATFORM == 'opal'
+                  `!!document && !window.OPAL_SPEC_PHANTOM`
+                else
+                  false
+                end
+
+  class << self
+    include Volt::Config unless RUBY_PLATFORM == 'opal'
+    def root
+      @root ||= File.expand_path(Dir.pwd)
+    end
+
+    def root=(val)
+      @root = val
+    end
+
+    def server?
+      !!ENV['SERVER']
+    end
+
+    def client?
+      !ENV['SERVER']
+    end
+
+    def source_maps?
+      !!ENV['MAPS']
+    end
+
+    def env
+      @env ||= Volt::Environment.new
+    end
+
+    def logger
+      @logger ||= Logger.new
+    end
+
+    def logger=(val)
+      @logger = val
+    end
+
+    def in_browser?
+      @in_browser
+    end
   end
-
-  def self.root
-    @root ||= File.expand_path(Dir.pwd)
-  end
-
-  def self.root=(val)
-    @root = val
-  end
-
-  def self.server?
-    !!ENV['SERVER']
-  end
-
-  def self.client?
-    !ENV['SERVER']
-  end
-
-  def self.source_maps?
-    !!ENV['MAPS']
-  end
-
-  def self.env
-    @env ||= Volt::Environment.new
-  end
-
-  def self.logger
-    @logger ||= Logger.new
-  end
-
-  def self.logger=(val)
-    @logger = val
-  end
-
-  def self.in_browser?
-    @@in_browser
-  end
-
 end

data/spec/apps/kitchen_sink/app/main/assets/css/todos.css

@@ -0,0 +1,28 @@
+.todo-table {
+  width: auto;
+}
+
+.todo-table td {
+  padding: 5px;
+  border-top: 1px solid #EEEEEE;
+}
+
+.complete, tr.selected td.complete {
+  text-decoration: line-through;
+  color: #CCCCCC;
+}
+
+tr.selected td {
+  background-color: #428bca;
+  color: #FFFFFF;
+}
+
+
+textarea {
+  height: 140px;
+  width: 400px;
+}
+
+tr.selected td button {
+  color: #000000;
+}

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -3,6 +3,7 @@
 get "/bindings/{{_route_test}}", _action: 'bindings'
 get "/bindings", _action: 'bindings'
 get "/store", _action: 'store'
+get "/todos", _controller: 'todos'
 
 # The main route, this should be last.  It will match any params not previously matched.
 get '/', {}

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -1,4 +1,4 @@
-class MainController < ModelController
+class MainController < Volt::ModelController
   model :page
 
   private
@@ -8,4 +8,4 @@ class MainController < ModelController
     def main_path
       params._controller.or('main') + "/" + params._action.or('index')
     end
-end
+end

data/spec/apps/kitchen_sink/app/main/controllers/todos_controller.rb

@@ -0,0 +1,17 @@
+class TodosController < Volt::ModelController
+  model :page
+
+  def add_todo
+    self._todos << {name: self._new_todo}
+    self._new_todo = ''
+  end
+
+  def remove_todo(todo)
+    self._todos.delete(todo)
+  end
+
+  def completed
+    self._todos.count {|t| t._completed }
+  end
+
+end

data/spec/apps/kitchen_sink/app/main/views/main/main.html

@@ -7,6 +7,7 @@
       <ul class="nav nav-pills pull-right">
         <:nav href="/" text="Home" />
         <:nav href="/bindings" text="Bindings" />
+        <:nav href="/todos" text="Todos" />
         <:nav href="/store" text="Store" />
       </ul>
       <h3 class="text-muted">Project name</h3>

data/spec/apps/kitchen_sink/app/main/views/todos/index.html

@@ -0,0 +1,24 @@
+<:Title>
+  Todos
+
+<:Body>
+  <h1>Todos Example</h1>
+
+  <div id="count">{{ completed }} of {{ _todos.size }}</div>
+
+  <table id="todos-table" class="table">
+    {{ _todos.each do |todo| }}
+      <tr>
+        <td><input type="checkbox" checked="{{ todo._completed }}"></td>
+        <td class="name {{ if todo._completed }}complete{{ end }}">{{todo._name}}</td>
+        <td><button e-click="remove_todo(todo)">X</button></td>
+      </tr>
+    {{ end }}
+  </table>
+
+  <form e-submit="add_todo" role="form">
+    <div class="form-group">
+       <label>Todo</label>
+       <input class="form-control" id="newtodo" type="text" value="{{ page._new_todo }}" />
+    </div>
+  </form>

data/spec/apps/kitchen_sink/config.ru

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

data/spec/controllers/reactive_accessors_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 require 'volt/reactive/reactive_accessors'
 
 class TestReactiveAccessors
-  include ReactiveAccessors
+  include Volt::ReactiveAccessors
 
   reactive_accessor :_name
 end
 
-describe ReactiveAccessors do
+describe Volt::ReactiveAccessors do
   it "should assign a reactive value" do
     inst = TestReactiveAccessors.new
 
@@ -30,11 +30,11 @@ describe ReactiveAccessors do
     expect(values).to eq([nil])
 
     inst._name = 'Ryan'
-    Computation.flush!
+    Volt::Computation.flush!
     expect(values).to eq([nil,'Ryan'])
 
     inst._name = 'Stout'
-    Computation.flush!
+    Volt::Computation.flush!
     expect(values).to eq([nil,'Ryan','Stout'])
   end
-end
+end

data/spec/extra_core/inflector_spec.rb

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

data/spec/integration/list_spec.rb

@@ -0,0 +1,68 @@
+if ENV['BROWSER'] == 'firefox'
+  require 'spec_helper'
+
+  describe "todo example spec", :type => :feature do
+    before do
+      visit '/'
+
+      click_link 'Todos'
+
+
+      fill_in('newtodo', :with => "Item 1\n")
+      fill_in('newtodo', :with => "Item 2\n")
+      fill_in('newtodo', :with => "Item 3\n")
+    end
+
+    it "should add items to the list" do
+      expect(find('#todos-table')).to have_content('Item 1')
+    end
+
+    it 'should strikethrough when the checkbox is checked' do
+      box = all(:css, "#todos-table input[type=checkbox]")[0]
+
+      expect(find('#todos-table')).to_not have_css('td.name.complete')
+
+      box.set(true)
+      expect(find('#todos-table')).to have_css('td.name.complete')
+
+      box.set(false)
+      expect(find('#todos-table')).to_not have_css('td.name.complete')
+    end
+
+    it 'should delete items' do
+      expect(find('#todos-table')).to have_content('Item 1')
+      expect(find('#todos-table')).to have_content('Item 2')
+      expect(find('#todos-table')).to have_content('Item 3')
+
+      # Click the middle one
+      all(:css, "#todos-table button")[1].click
+
+      expect(find('#todos-table')).to have_content('Item 1')
+      expect(find('#todos-table')).to_not have_content('Item 2')
+      expect(find('#todos-table')).to have_content('Item 3')
+    end
+
+    it 'should track the number of todos and the numbers that are complete' do
+      count = find('#count')
+
+      expect(count).to have_content('0 of 3')
+
+      box1 = all(:css, "#todos-table input[type=checkbox]")[0]
+      box1.set(true)
+
+      expect(count).to have_content('1 of 3')
+
+      all(:css, "#todos-table button")[0].click
+      expect(count).to have_content('0 of 2')
+
+      box1 = all(:css, "#todos-table input[type=checkbox]")[0]
+      box1.set(true)
+      expect(count).to have_content('1 of 2')
+
+      box2 = all(:css, "#todos-table input[type=checkbox]")[1]
+      box2.set(true)
+
+      expect(count).to have_content('2 of 2')
+    end
+  end
+end