volt 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643b4bf773281e2714b4002a68362b71e886b84b
-  data.tar.gz: c229e47bfe005bbb3e4b5b0cfd54bef225b3eb87
+  metadata.gz: 7d48b14a1bdcbb5bd981ddba1c5eb3605a9ab64c
+  data.tar.gz: 7c74bc1525175653a03f9dc2053eab4cbecc5c29
 SHA512:
-  metadata.gz: e794f7cce33a794913abb6c06d516e50d9fb4fe55c099d63c2a478cb2d1339b75c96d46943e0960f6a42c16be8efc9d3526e77613362cc927ac9941955d844e8
-  data.tar.gz: 6e6b49d6d6504f25911bbf766d99453a25c34a9dee63f27b73f73dcfc5dd31f811ef29492a0189ff1ecbbdaa528d4ea5d87677cfef697f044cb3cae433512906
+  metadata.gz: 3a234d3f5b18ad192ffb575e7cbfbbf39586048a6e6b6ac835ccc06c2c13b1aaab720a0e5fbd3b8e84326b2553e153ba9fa9df42b7098ef210bd775f8b41198c
+  data.tar.gz: 6f70ce074f81d8c2d3da698090c9cfdd2b871b43ee9483198aaf2e61df477589002f82a8d469f1b8380803ccd7c5d8833f7286a3f375fda537d09cca7fba60d9

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.8.19 - 2014-11-05
+### Breaking Changes
+- the default index page is now moved from ```public/index.html``` to ```config/base/index.html```  Please update your app's accordingly.  Since the public page is essentially static at the moment, public will only be used for asset pre-compilation (and index.html will be rendered in place)
+- validations do not use underscore for the field name
+
+### Added
+- you can precompile an app with ```bundle exec volt precompile``` - still a work in process
+- update flash to handle successes, notices, warnings, errors.
+- Add .keys to models (you can use .keys.each do |key| until we get .each_pair binding support)
+- added ```cookies``` collection.  See docs for more info
+- ```validate :field_name, unique: true``` now supported (scope coming soon)
+- added custom validations by passing a block to ```validate``` and returning a hash of errors like ```{field_name => ['...', '...']}```
+
 ## 0.8.18 - 2014-10-26
 ### Added
 - Added a default app.css.scss file
@@ -7,6 +20,7 @@
 ### Changed
 - back button fixed
 - improve security on task dispatcher
+- lots of minor bug fixes
 
 ## 0.8.17 - 2014-10-20
 ### Added

data/Readme.md

@@ -3,6 +3,7 @@
 [![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg)](https://travis-ci.org/voltrb/volt)
 [![Inline docs](http://inch-ci.org/github/voltrb/volt.svg?branch=master)](http://inch-ci.org/github/voltrb/volt)
 [![Volt Chat](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/voltrb/volt)
+[![Stories in Ready](https://badge.waffle.io/voltrb/volt.png?label=ready&title=Ready)](https://waffle.io/voltrb/volt)
 
 ** For the current status of volt, read: http://voltframework.com/blog
 
@@ -33,4 +34,4 @@ Read the [full docs on Volt here](http://voltframework.com/docs)
 
 You want to contribute?  Great!  Thanks for being awesome!  At the moment, we have a big internal todo list, hop on https://gitter.im/voltrb/volt so we don't duplicate work.  Pull requests are always welcome, but asking about helping on gitter should save some duplication.
 
-[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
+[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)

data/VERSION

@@ -1 +1 @@
-0.8.18
+0.8.19

data/app/volt/controllers/notices_controller.rb

@@ -6,8 +6,18 @@ module Volt
       'yep'
     end
 
-    def page
-      $page.page
+    def map_key_class(key)
+      case key
+      when 'errors'
+        'danger'
+      when 'warnings'
+        'warning'
+      when 'successes'
+        'success'
+      else
+        # notices
+        'info'
+      end
     end
   end
 end

data/app/volt/models/user.rb

@@ -1,5 +1,38 @@
+if RUBY_PLATFORM != 'opal'
+  require 'bcrypt'
+end
+
 class User < Volt::Model
+  validate :username, unique: true, length: 8
+  if RUBY_PLATFORM == 'opal'
+    # Don't validate on the server
+    validate :password, length: 8
+  end
+
   def password=(val)
-    self._password = '--encoded: ' + val
+    if Volt.server?
+      # on the server, we bcrypt the password and store the result
+      self._hashed_password = BCrypt::Password.create(val)
+    else
+      self._password = val
+    end
+  end
+
+  # Login the user, return a promise for success
+  def self.login(username, password)
+    puts "Login now"
+    UserTasks.login(username, password).then do |result|
+      puts "Got: #{result.inspect}"
+
+      # Assign the user_id cookie for the user
+      $page.cookies._user_id = result
+
+      # Pass nil back
+      nil
+    end
+  end
+
+  def self.logout
+    $page.cookies.delete(:user_id)
   end
 end

data/app/volt/tasks/store_tasks.rb

@@ -12,6 +12,7 @@ class StoreTasks < Volt::TaskHandler
   end
 
   def load_model(collection, path, data)
+    puts "Load Model: #{path.inspect}"
     model_name = collection.singularize.camelize
 
     # TODO: Security check to make sure we have a valid model
@@ -22,37 +23,39 @@ class StoreTasks < Volt::TaskHandler
       model_class = Volt::Model
     end
 
-    if model_class
-      # Load the model, use the Store persistor and set the path
-      model = model_class.new(data, persistor: Volt::Persistors::StoreFactory.new(nil), path: path)
-      return model
-    end
+    # Load the model, use the Store persistor and set the path
+    model = model_class.new({}, persistor: Volt::Persistors::StoreFactory.new(nil), path: path)
+    model.persistor.change_state_to(:loaded)
+
+    # Create a buffer
+    buffer = model.buffer
 
-    return nil
+    # Assign the data
+    buffer.attributes = data
+
+    return buffer
   end
 
   def save(collection, path, data)
     data = data.symbolize_keys
-    model = load_model(collection, path, data)
-
-    errors = model.errors
+    model = nil
+    Volt::Model.nosave do
+      model = load_model(collection, path, data)
+    end
 
-    if model.errors.size == 0
+    # On the backend, the promise is resolved before its returned, so we can
+    # return from within it.
+    #
+    # Pass the channel as a thread-local so that we don't update the client
+    # who sent the update.
+    Thread.current['in_channel'] = @channel
+    promise = model.save!.then do |result|
+      return nil
+    end
 
-      # On the backend, the promise is resolved before its returned, so we can
-      # return from within it.
-      #
-      # Pass the channel as a thread-local so that we don't update the client
-      # who sent the update.
-      Thread.current['in_channel'] = @channel
-      model.persistor.changed do |errors|
-        Thread.current['in_channel'] = nil
+    Thread.current['in_channel'] = nil
 
-        return errors
-      end
-    else
-      return errors
-    end
+    return promise
   end
 
   def delete(collection, id)

data/app/volt/tasks/user_tasks.rb

@@ -1,6 +1,30 @@
 class UserTasks < Volt::TaskHandler
   # Login a user, takes a username and password
-  def create_user(username, password)
-    $page.store._users << { email: username, password: password }
+
+  def login(username, password)
+    puts "META: " + Thread.current['meta'].inspect
+
+    if Volt.user
+      puts "USER: " + Volt.user._name
+    end
+
+    return store._users.find(username: username).then do |users|
+      user = users.first
+
+      match_pass = BCrypt::Password.new(user._hashed_password)
+      if match_pass == password
+        raise "app_secret is not configured" unless Volt.config.app_secret
+
+        # TODO: returning here should be possible, but causes some issues
+
+        # Salt the user id with the app_secret so the end user can't tamper with the cookie
+        signature = BCrypt::Password.create("#{Volt.config.app_secret}::#{user._id}")
+
+        # Return user_id:hash on user id
+        next "#{user._id}:#{signature}"
+      else
+        raise "Password did not match"
+      end
+    end
   end
 end

data/app/volt/views/notices/index.html

@@ -11,10 +11,12 @@
   {{ if page._reconnected }}
     <div class="notices alert alert-success">Reconnected!</div>
   {{ end }}
-  {{ if !flash.empty? }}
-    <div class="notices alert alert-info" e-click="flash.clear">
-      {{ flash._notices.each do |notice| }}
-        <p>{{ notice }}</p>
-      {{ end }}
-    </div>
+  {{ flash.keys.each do |key| }}
+    {{ if flash.send(:"_#{key}").present? }}
+      <div class="notices alert alert-{{ map_key_class(key) }}" e-click="flash.clear">
+        {{ flash.send(:"_#{key}").each do |notice| }}
+          <p>{{ notice }}</p>
+        {{ end }}
+      </div>
+    {{ end }}
   {{ end }}

data/lib/volt.rb

@@ -16,7 +16,6 @@ module Volt
                 end
 
   class << self
-    include Volt::Config unless RUBY_PLATFORM == 'opal'
     def root
       @root ||= File.expand_path(Dir.pwd)
     end
@@ -48,5 +47,52 @@ module Volt
     def in_browser?
       @in_browser
     end
+
+    # Get the user_id from the cookie
+    def user_id
+      if Volt.client?
+        user_id_signature = $page.cookies._user_id
+      else
+        # Check meta for the user id and validate it
+        meta_data = Thread.current['meta']
+        if meta_data
+          user_id_signature = meta_data['user_id']
+        else
+          user_id_signature = nil
+        end
+      end
+
+      if user_id_signature.nil?
+        return nil
+      else
+        index = user_id_signature.index(':')
+        user_id = user_id_signature[0...index]
+
+        if RUBY_PLATFORM != 'opal'
+          hash = user_id_signature[(index+1)..-1]
+
+          # Make sure the user hash matches
+          if BCrypt::Password.new(hash) != "#{Volt.config.app_secret}::#{user._id}"
+            # user id has been tampered with, reject
+            raise "user id or hash has been tampered with"
+          end
+
+        end
+
+        return user_id
+      end
+    end
+
+    # Return the current user.
+    def user
+      user_id = self.user_id
+      if user_id
+        return $page.store._users.find_one(_id: user_id)
+      else
+        return nil
+      end
+    end
+
   end
 end
+

data/lib/volt/cli/asset_compile.rb

@@ -6,37 +6,19 @@ module Volt
       compile
     end
 
-    desc 'watch', 'compiles the project to /compiled when a file changes'
-
-    def watch
-      require 'listen'
-
-      listener = Listen.to('app') do |modified, added, removed|
-        compile
-      end
-
-      listener.start # non-blocking
-
-      Signal.trap('SIGINT') do
-        listener.stop
-      end
-
-      compile
-
-      begin
-        sleep
-      rescue ThreadError => e
-        # ignore, breaks out on sigint
-      end
-    end
-
     private
 
     def compile
       print 'compiling project...'
       require 'fileutils'
+      ENV['SERVER'] = 'true'
+
       require 'opal'
       require 'volt'
+      require 'volt/boot'
+
+      Volt.boot(Dir.pwd)
+
       require 'volt/server/rack/component_paths'
       require 'volt/server/rack/component_code'
       require 'volt/server/rack/opal_files'
@@ -68,28 +50,26 @@ module Volt
         logical_path = logical_path.to_s
         # Only include files that aren't compiled elsewhere, like fonts
         unless logical_path[/[.](y|css|js|html|erb)$/]
-          write_file(logical_path)
+          write_sprocket_file(logical_path)
         end
       end
     end
 
     def write_js_and_css
       (@index_files.javascript_files + @index_files.css_files).each do |logical_path|
-        logical_path = logical_path.gsub(/^\/assets\//, '')
-        write_file(logical_path)
+        if logical_path =~ /^\/assets\//
+          logical_path = logical_path.gsub(/^\/assets\//, '')
+          write_sprocket_file(logical_path)
+        end
       end
     end
 
-    def write_file(logical_path)
-      path = "#{@root_path}/compiled/assets/#{logical_path}"
-
-      FileUtils.mkdir_p(File.dirname(path))
+    def write_sprocket_file(logical_path)
+      path = "#{@root_path}/public/assets/#{logical_path}"
 
       begin
         content = @opal_files.environment[logical_path].to_s
-        File.open(path, 'wb') do |file|
-          file.write(content)
-        end
+        write_file(path, content)
       rescue Sprockets::FileNotFound, SyntaxError => e
         # ignore
       end
@@ -98,19 +78,21 @@ module Volt
     def write_component_js
       javascript_code = @component_handler.compile_for_component('main')
 
-      components_folder = File.join(Volt.root, '/compiled/components')
-      FileUtils.mkdir_p(components_folder)
-      File.open(File.join(components_folder, '/main.js'), 'w') do |file|
-        file.write(javascript_code)
-      end
+      path = File.join(Volt.root, '/public/components/main.js')
+      write_file(path, javascript_code)
     end
 
     def write_index
-      path = "#{@root_path}/compiled/index.html"
+      path = "#{@root_path}/public/index.html"
+
+      write_file(path, @index_files.html)
+    end
+
+    def write_file(path, data)
       FileUtils.mkdir_p(File.dirname(path))
 
-      File.open(path, 'w') do |file|
-        file.write(@index_files.html)
+      File.open(path, 'wb') do |file|
+        file.write(data)
       end
     end
   end

data/lib/volt/config.rb

@@ -1,25 +1,25 @@
 # Config lets a user set global config options for Volt.
+require 'configurations'
 module Volt
-  module Config
-    def setup
-      yield config
-    end
-
-    def config
-      @config || self.reset_config!
-    end
+  include Configurations
 
-    # Resets the configuration to the default (empty hash)
-    def reset_config!
+  class << self
+    def defaults
       app_name = File.basename(Dir.pwd)
-
-      @config = OpenStruct.new(
+      {
           app_name:  app_name,
           db_name:   ENV['DB_NAME'] || (app_name + '_' + Volt.env.to_s),
           db_host:   ENV['DB_HOST'] || 'localhost',
           db_port:   (ENV['DB_PORT'] || 27_017).to_i,
-          db_driver: ENV['DB_DRIVER'] || 'mongo'
-      )
+          db_driver: ENV['DB_DRIVER'] || 'mongo',
+        }
+    end
+
+    # Resets the configuration to the default (empty hash)
+    def reset_config!
+      self.configure do |c|
+        c.from_h(defaults)
+      end
     end
 
     # Load in all .rb files in the config folder
@@ -28,5 +28,15 @@ module Volt
         require(config_file)
       end
     end
+
+    alias_method :setup,  :configure
+    alias_method :config, :configuration
+  end
+
+  configuration_defaults do |c|
+    c.from_h(Volt.defaults)
   end
+
+
+
 end