volt 0.8.21 → 0.8.22.beta1

data/spec/apps/kitchen_sink/Gemfile

@@ -10,6 +10,9 @@ 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'
+gem 'volt-user-templates', path: '/Users/ryanstout/Sites/volt/apps/volt-user-templates'
+
 # Server for MRI
 platform :mri do
   gem 'thin', '~> 1.6.0'

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

@@ -6,3 +6,9 @@ component 'bootstrap'
 
 # a default theme for the bootstrap framework
 component 'bootstrap-jumbotron-theme'
+
+# For testing user
+component 'fields'
+
+# For testing
+component 'user-templates'

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

@@ -6,7 +6,11 @@ get '/store', _action: 'store'
 get '/cookie_test', _action: 'cookie_test'
 get '/flash', _action: 'flash'
 get '/todos', _controller: 'todos'
-get '/users_test', _controller: 'users_test'
+
+# Signup/login routes
+get '/signup', _controller: 'user-templates', _action: 'signup'
+get '/login', _controller: 'user-templates', _action: 'login'
+
 
 # The main route, this should be last.  It will match any params not previously matched.
 get '/', {}

data/spec/apps/kitchen_sink/app/main/models/user.rb

@@ -0,0 +1,2 @@
+class User < Volt::User
+end

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

@@ -11,7 +11,7 @@
         <:nav href="/flash" text="Flash" />
         <:nav href="/cookie_test" text="Cookies" />
         <:nav href="/store" text="Store" />
-        <:nav href="/users_test" text="Users" />
+        <:user-templates:menu />
       </ul>
       <h3 class="text-muted">Project name</h3>
     </div>

data/spec/integration/bindings_spec.rb

@@ -1,7 +1,7 @@
 if ENV['BROWSER']
   require 'spec_helper'
 
-  describe 'bindings test', type: :feature do
+  describe 'bindings test', type: :feature, sauce: true do
     it 'should load the page' do
       visit '/'
 

data/spec/integration/cookies_spec.rb

@@ -1,7 +1,7 @@
 if ENV['BROWSER']
   require 'spec_helper'
 
-  describe 'cookies collection', type: :feature do
+  describe 'cookies collection', type: :feature, sauce: true do
     if ENV['BROWSER'] != 'phantom'
       # TODO: fails in phantom for some reason
       it 'should add' do

data/spec/integration/flash_spec.rb

@@ -1,7 +1,8 @@
-if ENV['BROWSER']
+# This spec fails on sauce randomly, disable for now
+if ENV['BROWSER'] && ENV['BROWSER'] != 'sauce'
   require 'spec_helper'
 
-  describe 'flash messages', type: :feature do
+  describe 'flash messages', type: :feature, :sauce => true do
     it 'should flash on sucesses, notices, warnings, and errors' do
       visit '/'
 

data/spec/integration/list_spec.rb

@@ -1,7 +1,7 @@
 if ENV['BROWSER'] == 'firefox'
   require 'spec_helper'
 
-  describe 'todo example spec', type: :feature do
+  describe 'todo example spec', type: :feature, :sauce => true do
     before do
       visit '/'
 

data/spec/integration/templates_spec.rb

@@ -1,7 +1,7 @@
 if ENV['BROWSER']
   require 'spec_helper'
 
-  describe 'bindings test', type: :feature do
+  describe 'bindings test', type: :feature, sauce: true do
     it 'should change the title when changing pages' do
       visit '/'
 

data/spec/integration/url_spec.rb

@@ -1,7 +1,7 @@
 if ENV['BROWSER'] && ENV['BROWSER'] != 'phantom'
   require 'spec_helper'
 
-  describe 'url features', type: :feature do
+  describe 'url features', type: :feature, sauce: true do
     it 'should update the page when using the back button' do
       visit '/'
       expect(current_url).to match(/\/$/)

data/spec/integration/user_spec.rb

@@ -0,0 +1,60 @@
+if ENV['BROWSER']
+  require 'spec_helper'
+
+  describe "user accounts", type: :feature, sauce: true do
+    before(:each) do
+      # Clear out db
+      DataStore.new.drop_database
+      # Volt::Persistors::ArrayStore.query_pool.clear
+    end
+
+    after(:each) do
+      # Clear out db
+      DataStore.new.drop_database
+      # Volt::Persistors::ArrayStore.query_pool.clear
+    end
+
+    it 'should create an account' do
+      visit '/'
+
+      # sleep 300
+
+      click_link 'Login'
+
+      click_link 'Signup here'
+
+      fields = all(:css, 'form .form-control')
+
+      fields[0].set('test@test.com')
+      fields[1].set('awes0mesEcRet')
+      fields[2].set('Test Account 9550')
+
+      click_button 'Signup'
+
+      expect(page).to have_content('Test Account 9550')
+    end
+
+    it 'should login and logout' do
+      visit '/'
+
+      # Add the user
+      $page.store._users << {email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550'}
+
+      click_link 'Login'
+
+      fields = all(:css, 'form .form-control')
+      fields[0].set('test@test.com')
+      fields[1].set('awes0mesEcRet')
+      click_button 'Login'
+
+      expect(page).to have_content('Test Account 9550')
+
+      # Click the logout link
+      click_link 'Test Account 9550'
+      click_link 'Logout'
+
+      expect(page).to_not have_content('Test Account 9550')
+    end
+  end
+
+end

data/spec/models/model_spec.rb

@@ -412,7 +412,6 @@ describe Volt::Model do
   if RUBY_PLATFORM != 'opal'
     describe 'class loading' do
       it 'should load classes for models' do
-        $page = Volt::Page.new
         $page.add_model('Item')
 
         @model = Volt::Model.new

data/spec/page/bindings/template_binding_spec.rb

@@ -22,10 +22,6 @@ describe Volt::TemplateBinding do
     @page.instance_variable_set('@templates', templates)
   end
 
-  after do
-    $page = nil
-  end
-
   it 'should lookup nested controller action' do
     @templates = {
       'main/main/blog/nav' => '',

data/spec/server/rack/asset_files_spec.rb

@@ -20,7 +20,7 @@ if RUBY_PLATFORM != 'opal'
     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/setImmediate.js', '/assets/js/sockjs-0.3.4.min.js', '/assets/js/bootstrap.js', '/assets/js/test2.js', '/assets/js/test3.js', '/assets/js/test1.js', '/assets/volt/page/page.js', '/components/main.js'])
+      expect(main.javascript_files(nil)).to eq(["/assets/js/jquery-2.0.3.js", "/assets/js/sockjs-0.3.4.min.js", "/assets/js/volt_js_polyfills.js", "/assets/js/bootstrap.js", "/assets/js/test2.js", "/assets/js/test3.js", "/assets/js/test1.js", "/assets/volt/page/page.js", "/components/main.js"])
     end
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,10 @@ end
 if RUBY_PLATFORM != 'opal'
 
   RSpec.configure do |config|
+    # config.before(:each) do
+    #   DataStore.new.drop_database
+    # end
+
     config.run_all_when_everything_filtered = true
     config.filter_run :focus
 
@@ -18,5 +22,6 @@ if RUBY_PLATFORM != 'opal'
     # the seed, which is printed after each run.
     #     --seed 1234
     config.order = 'random'
+    # config.seed = '2234'
   end
 end

data/templates/project/Gemfile.tt

@@ -11,19 +11,8 @@ gem 'volt-bootstrap'
 # Simple theme for bootstrap, remove to theme yourself.
 gem 'volt-bootstrap-jumbotron-theme'
 
-
 # Server for MRI
 platform :mri do
   gem 'thin', '~> 1.6.0'
   gem 'bson_ext', '~> 1.9.0'
 end
-
-# Server for jruby
-platform :jruby do
-  gem 'jubilee'
-end
-
-
-#---------------------
-# Needed at the moment
-gem 'volt-sockjs', require: false, platforms: :mri

data/templates/project/app/main/config/routes.rb

@@ -2,5 +2,10 @@
 
 get '/about', _action: 'about'
 
+# Routes for login and signup, provided by user-templates component gem
+get '/signup', _controller: 'user-templates', _action: 'signup'
+get '/login', _controller: 'user-templates', _action: 'login'
+
+
 # The main route, this should be last.  It will match any params not previously matched.
 get '/', {}

data/templates/project/app/main/views/main/main.html.tt

@@ -7,6 +7,7 @@
       <ul class="nav nav-pills pull-right">
         <:nav href="/" text="Home" />
         <:nav href="/about" text="About" />
+        <:user-templates:menu />
       </ul>
       <h3 class="text-muted"><%= config[:name] %></h3>
     </div>

data/templates/project/config/app.rb.tt

@@ -6,9 +6,6 @@ Volt.configure do |config|
   # without the need to customize.  Make sure this value doesn't leave your server.
   config.app_secret = '<%= SecureRandom.urlsafe_base64(50) %>'
 
-  # The app name defaults to the folder it is run in.
-  # config.app_name = '<%= config[:name] %>'
-
   # Database config all start with db_ and can be set either in the config
   # file or with an environment variable (DB_NAME for example).
 
@@ -22,4 +19,12 @@ Volt.configure do |config|
   # If you are not running behind something like nginx in production, you can
   # have rack deflate all files.
   # config.deflate = true
+
+  # Public configurations
+  # Anything under config.public will be sent to the client as well as the server,
+  # so be sure no private data ends up under public
+
+  # Use username instead of email as the login
+  # config.public.auth.use_username = true
+
 end

data/volt.gemspec

@@ -25,8 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets-sass', '~> 1.0.0'
   spec.add_dependency 'sass', '~> 3.2.5'
   spec.add_dependency 'mongo', '~> 1.9.0'
-  # spec.add_dependency "bson_ext", "~> 1.9.0"
-  # spec.add_dependency "thin", "~> 1.6.0"
   spec.add_dependency 'rake', '~> 10.0.4'
   spec.add_dependency 'listen', '~> 2.7.0'
   spec.add_dependency 'uglifier', '~> 2.4.0'
@@ -42,16 +40,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'poltergeist', '~> 1.5.0'
   spec.add_dependency 'opal-rspec', '0.3.0.beta3'
   spec.add_dependency 'bundler', '>= 1.5'
+  spec.add_dependency 'volt-sockjs', '~> 0.3.4.4'
 
   # For user passwords
   spec.add_dependency 'bcrypt', '~> 3.1.9'
 
-  # spec.add_dependency "promise.rb", "~> 0.6.1"
-
-  # spec.add_dependency "rack-colorized_logger", "~> 1.0.4"
-
   spec.add_development_dependency 'guard', '2.6.0' # bug in current guard
   spec.add_development_dependency 'guard-rspec', '~> 4.3.0'
   spec.add_development_dependency 'yard', '~> 0.8.7.0'
+  spec.add_development_dependency 'sauce', '~> 3.5.3'
+  spec.add_development_dependency 'sauce-connect', '~> 3.5.0'
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.8.21
+  version: 0.8.22.beta1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -304,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: volt-sockjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4.4
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +374,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.0
+- !ruby/object:Gem::Dependency
+  name: sauce
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.3
+- !ruby/object:Gem::Dependency
+  name: sauce-connect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 description: 
 email:
 - ryan@agileproductions.com
@@ -382,8 +424,8 @@ files:
 - VERSION
 - app/volt/assets/css/notices.css.scss
 - app/volt/assets/js/jquery-2.0.3.js
-- app/volt/assets/js/setImmediate.js
 - app/volt/assets/js/sockjs-0.3.4.min.js
+- app/volt/assets/js/volt_js_polyfills.js
 - app/volt/config/dependencies.rb
 - app/volt/controllers/notices_controller.rb
 - app/volt/models/user.rb
@@ -510,6 +552,7 @@ files:
 - lib/volt/server/rack/component_paths.rb
 - lib/volt/server/rack/index_files.rb
 - lib/volt/server/rack/opal_files.rb
+- lib/volt/server/rack/quiet_common_logger.rb
 - lib/volt/server/rack/source_map_server.rb
 - lib/volt/server/socket_connection_handler.rb
 - lib/volt/server/socket_connection_handler_stub.rb
@@ -522,6 +565,7 @@ files:
 - lib/volt/utils/generic_pool.rb
 - lib/volt/utils/local_storage.rb
 - lib/volt/volt/environment.rb
+- lib/volt/volt/users.rb
 - spec/apps/file_loading/app/bootstrap/assets/js/bootstrap.js
 - spec/apps/file_loading/app/main/assets/js/test1.js
 - spec/apps/file_loading/app/main/config/dependencies.rb
@@ -535,7 +579,7 @@ files:
 - spec/apps/kitchen_sink/app/main/config/routes.rb
 - spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
 - spec/apps/kitchen_sink/app/main/controllers/todos_controller.rb
-- spec/apps/kitchen_sink/app/main/controllers/users_test_controller.rb
+- spec/apps/kitchen_sink/app/main/models/user.rb
 - spec/apps/kitchen_sink/app/main/views/main/bindings.html
 - spec/apps/kitchen_sink/app/main/views/main/cookie_test.html
 - spec/apps/kitchen_sink/app/main/views/main/flash.html
@@ -543,10 +587,9 @@ files:
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/app/main/views/main/store.html
 - spec/apps/kitchen_sink/app/main/views/todos/index.html
-- spec/apps/kitchen_sink/app/main/views/users_test/index.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/config/app.rb
-- spec/apps/kitchen_sink/public/index.html
+- spec/apps/kitchen_sink/config/base/index.html
 - spec/controllers/reactive_accessors_spec.rb
 - spec/extra_core/array_spec.rb
 - spec/extra_core/inflector_spec.rb
@@ -560,6 +603,7 @@ files:
 - spec/integration/list_spec.rb
 - spec/integration/templates_spec.rb
 - spec/integration/url_spec.rb
+- spec/integration/user_spec.rb
 - spec/models/model_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
@@ -594,6 +638,7 @@ files:
 - templates/component/config/routes.rb
 - templates/component/controllers/main_controller.rb
 - templates/component/models/.empty_directory
+- templates/component/tasks/.empty_directory
 - templates/component/views/index/index.html.tt
 - templates/model/model.rb.tt
 - templates/newgem/Gemfile.tt
@@ -606,7 +651,7 @@ files:
 - templates/newgem/app/newgem/config/dependencies.rb
 - templates/newgem/app/newgem/config/routes.rb
 - templates/newgem/app/newgem/controllers/main_controller.rb.tt
-- templates/newgem/app/newgem/views/main/main.html
+- templates/newgem/app/newgem/views/main/index.html
 - templates/newgem/bin/newgem.tt
 - templates/newgem/gitignore.tt
 - templates/newgem/lib/newgem.rb.tt
@@ -628,6 +673,7 @@ files:
 - templates/project/app/main/config/routes.rb
 - templates/project/app/main/controllers/main_controller.rb
 - templates/project/app/main/models/.empty_directory
+- templates/project/app/main/tasks/.empty_directory
 - templates/project/app/main/views/main/about.html
 - templates/project/app/main/views/main/index.html
 - templates/project/app/main/views/main/main.html.tt
@@ -653,9 +699,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -677,7 +723,7 @@ test_files:
 - spec/apps/kitchen_sink/app/main/config/routes.rb
 - spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
 - spec/apps/kitchen_sink/app/main/controllers/todos_controller.rb
-- spec/apps/kitchen_sink/app/main/controllers/users_test_controller.rb
+- spec/apps/kitchen_sink/app/main/models/user.rb
 - spec/apps/kitchen_sink/app/main/views/main/bindings.html
 - spec/apps/kitchen_sink/app/main/views/main/cookie_test.html
 - spec/apps/kitchen_sink/app/main/views/main/flash.html
@@ -685,10 +731,9 @@ test_files:
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/app/main/views/main/store.html
 - spec/apps/kitchen_sink/app/main/views/todos/index.html
-- spec/apps/kitchen_sink/app/main/views/users_test/index.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/config/app.rb
-- spec/apps/kitchen_sink/public/index.html
+- spec/apps/kitchen_sink/config/base/index.html
 - spec/controllers/reactive_accessors_spec.rb
 - spec/extra_core/array_spec.rb
 - spec/extra_core/inflector_spec.rb
@@ -702,6 +747,7 @@ test_files:
 - spec/integration/list_spec.rb
 - spec/integration/templates_spec.rb
 - spec/integration/url_spec.rb
+- spec/integration/user_spec.rb
 - spec/models/model_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb