volt 0.8.21 → 0.8.22.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a638546992d567cf43d90ee011ecf7f30fa5880f
-  data.tar.gz: c9d05f29f59cd52ff900ae25e0176536fc4842b6
+  metadata.gz: 710bbd40c4e0f2a2ee402f97df5d82d1a6a57704
+  data.tar.gz: d21e4a67eb50b440710ab0abbd20f5c4b90da1ca
 SHA512:
-  metadata.gz: 4bb40aeba3bb1ffb8d680dc636ab2f4f0c2dfd64ee408994aa502f018a04729a8cd357b55c526c60ad7855b9c91f4635c75510abd445776d67a4e429e6217f37
-  data.tar.gz: 72c91c7a5390e3c7bda4e02861dc108504b56422f36a1d787ec47abcc22ed754ccfb323ccab08282a9d2b8fa2fbcaac9f670a88116edee581bcde044598c9a0a
+  metadata.gz: 1b544c000e50d4760a799bb63ae4a90a772b2dddff295063c93316dc09335c6c7664b97cc05d77d361dfb587298b90800ad62608a567e224179b9e10e5bb3034
+  data.tar.gz: 63cca01208dd44244a9aeae62319c1187e8bd393846e1f904277a7f0ee021eecfe8d6573bfce15c85b66c36179eced0396e19e09a3eaeba89fd821174a6f6aef

data/.travis.yml

@@ -1,16 +1,21 @@
 language: ruby
 rvm:
-  - "2.1.0"
-  - "2.1.1"
-  - "2.1.2"
-  - "2.1.3"
-  # - jruby-19mode # JRuby in 1.9 mode
-  # - rbx
+- 2.1.0
+- 2.1.1
+- 2.1.2
+- 2.1.3
+env:
+  global:
+  - secure: W03bt+hqLkAenymipqADIuRGZMiqu/sKx+9PXJJzCy0qAgmKs/PhPpHRpGpSmaYvVQQuiWX/rsw7xWXc2CHDJSp5aInd693xhJuSKXmnUp00r14/io+VWI9LE0lWjx4qdb6YQhdBTaxJB0+1sHDwU088yWBNnri/KwU4UlUgO5M=
+  - secure: X95q9DUVJRLIoxd116xEbi/3xL85XiGbWdz0p5z/UawShQalMHxLfPNdU9u5gyw99LrgxTdPsJOTps8hB3vhzp8qIegrM8i2AICcicXC1QDOWi7McXSH9SBmE1AjhlyE/PLLHwLDeqfvwNMPAOrDH1GOisQp505D7SSXUZ9m0GI=
+  matrix:
+  - NO_BROWSER=true
+  - BROWSER=sauce OS="Windows 8" USE_BROWSER="Firefox" VERSION="33"
 script: bundle exec rake
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/046f551739ef8cf19b8c
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+    - https://webhooks.gitter.im/e/046f551739ef8cf19b8c
+    on_success: change
+    on_failure: always
+    on_start: false

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.8.22 - 2014-...
+### Added
+- Volt.config is now accessable from the client.
+
+## 0.8.21 - 2014-11-05
+### Changed
+- fix merge conflict
+
 ## 0.8.20 - 2014-11-05
 ### Changed
 - fix secure random bug from 0.8.19 :-)

data/Gemfile

@@ -2,35 +2,6 @@ source 'http://rubygems.org'
 
 gemspec
 
-# gem 'rspec', '3.0.0.beta1'
-# gem 'opal', git: 'https://github.com/opal/opal.git'
-# gem 'opal-jquery', :git => 'https://github.com/opal/opal-jquery.git'
-
-#---------------------
-# Needed at the moment
-gem 'volt-sockjs', require: false, platforms: :mri
-
-# gem 'thor'
-
-# gem 'rack'
-# gem 'sprockets'
-# gem 'sprockets-sass'
-# gem 'sass'
-
-# gem 'mongo', require: false
-# gem 'pry', require: false
-# gem 'thin', require: false, platforms: :mri
-
-# Json parsing with multi_json, et al
-# gem 'multi_json'
-# gem 'oj', :platforms => :mri, :require => false
-# gem 'jrjackson', :platforms => :jruby, :require => false
-
-# gem 'rake', '10.0.4'
-
-# # Needed to get opal to work on rbx
-# gem 'racc', platforms: :rbx
-
 group :development do
   # For testing the kitchen sink app
   # Twitter bootstrap
@@ -39,11 +10,14 @@ group :development do
   # Simple theme for bootstrap, remove to theme yourself.
   gem 'volt-bootstrap-jumbotron-theme'
 
+  # For testing
+  gem 'volt-fields'
+
+  # For testing
+  gem 'volt-user-templates'
+
+  # For running rubocop
   gem 'rubocop', require: false
-  # gem 'guard', '2.0.1' # bug in current guard
-  # gem 'guard-rspec'
-  # gem 'opal-rspec', '0.3.0.beta2'#, git: 'https://github.com/adambeynon/opal-rspec.git'
-  # gem 'yard', require: false
 end
 
 group :development, :test do

data/Readme.md

@@ -35,3 +35,5 @@ 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)
+
+

data/VERSION

@@ -1 +1 @@
-0.8.21
+0.8.22.beta1

data/app/volt/assets/js/{setImmediate.js → volt_js_polyfills.js}

@@ -1,3 +1,17 @@
+// For phantomjs
+
+// Bind
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (scope) {
+      var fn = this;
+      return function () {
+          return fn.apply(scope);
+      };
+  };
+}
+
+
+// setImmediate
 (function (global, undefined) {
     "use strict";
 

data/app/volt/models/user.rb

@@ -2,37 +2,32 @@ 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)
-    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
+module Volt
+  class User < Model
+    # returns true if the user configured using the username
+    def self.login_field
+      if Volt.config.public.try(:auth).try(:use_username)
+        :username
+      else
+        :email
+      end
     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}"
+    validate login_field, unique: true, length: 8
 
-      # Assign the user_id cookie for the user
-      $page.cookies._user_id = result
+    if RUBY_PLATFORM == 'opal'
+      # Don't validate on the server
+      validate :password, length: 8
+    end
 
-      # Pass nil back
-      nil
+    def password=(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
-  end
 
-  def self.logout
-    $page.cookies.delete(:user_id)
   end
 end

data/app/volt/tasks/live_query/data_store.rb

@@ -18,4 +18,8 @@ class DataStore
 
     return cursor.to_a
   end
+
+  def drop_database
+    db.connection.drop_database(Volt.config.db_name)
+  end
 end

data/app/volt/tasks/store_tasks.rb

@@ -12,20 +12,17 @@ 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
-    # and don't load classes we shouldn't
-    begin
-      model_class = Object.send(:const_get, model_name)
-    rescue NameError => e
-      model_class = Volt::Model
-    end
+    # Fetch the model
+    collection = store.send(:"_#{path[-2]}")
+
+    # See if the model has already been made
+    model = collection.find_one({_id: data[:_id]})
+
+    # Otherwise assign to the collection
+    model ||= collection
 
-    # 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

data/app/volt/tasks/user_tasks.rb

@@ -1,29 +1,30 @@
 class UserTasks < Volt::TaskHandler
-  # Login a user, takes a username and password
 
-  def login(username, password)
-    puts "META: " + Thread.current['meta'].inspect
+  # Login a user, takes a login and password.  Login can be either a username or an e-mail
+  # based on Volt.config.public.auth.use_username
+  def login(login, password)
+    query = {User.login_field => login}
 
-    if Volt.user
-      puts "USER: " + Volt.user._name
-    end
-
-    return store._users.find(username: username).then do |users|
+    return store._users.find(query).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
+      if user
+        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
+          # 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}")
+          # 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}"
+          # Return user_id:hash on user id
+          next "#{user._id}:#{signature}"
+        else
+          raise "Password did not match"
+        end
       else
-        raise "Password did not match"
+        raise "User could not be found"
       end
     end
   end

data/lib/volt.rb

@@ -2,11 +2,12 @@ require 'volt/volt/environment'
 require 'volt/extra_core/extra_core'
 require 'volt/reactive/computation'
 require 'volt/reactive/dependency'
+require 'volt/config'
 if RUBY_PLATFORM == 'opal'
 else
-  require 'volt/config'
   require 'volt/data_stores/data_store'
 end
+require 'volt/volt/users'
 
 module Volt
   @in_browser = if RUBY_PLATFORM == 'opal'
@@ -83,6 +84,11 @@ module Volt
       end
     end
 
+    # True if the user is logged in and the user is loaded
+    def user?
+      !!user
+    end
+
     # Return the current user.
     def user
       user_id = self.user_id

data/lib/volt/cli.rb

@@ -1,4 +1,6 @@
+# Load in the gemfile
 require 'bundler/setup'
+
 require 'thor'
 require 'volt/extra_core/extra_core'
 require 'volt/cli/generate'

data/lib/volt/config.rb

@@ -1,42 +1,82 @@
 # Config lets a user set global config options for Volt.
-require 'configurations'
-module Volt
-  include Configurations
-
-  class << self
-    def defaults
-      app_name = File.basename(Dir.pwd)
-      {
-          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',
-        }
+# The hash is setup on the server, then passed to the client on initial page render.
+if RUBY_PLATFORM == 'opal'
+  require 'ostruct'
+
+  # TODO: Temporary fix for missing on OpenStruct in opal
+  class OpenStruct
+    def respond_to?(method_name)
+      @table.key?(method_name) || super
     end
+  end
 
-    # Resets the configuration to the default (empty hash)
-    def reset_config!
-      self.configure do |c|
-        c.from_h(defaults)
+  module Volt
+    class << self
+      # Returns the config
+      def config
+        @config
       end
-    end
 
-    # Load in all .rb files in the config folder
-    def run_files_in_config_folder
-      Dir[Dir.pwd + '/config/*.rb'].each do |config_file|
-        require(config_file)
+      # Called on page load to pass the backend config to the client
+      def setup_client_config(config_hash)
+        # Only Volt.config.public is passed from the server (for security reasons)
+        @config = wrap_config({public: config_hash})
       end
-    end
 
-    alias_method :setup,  :configure
-    alias_method :config, :configuration
-  end
+      # Wraps the config hash in an OpenStruct so it can be accessed in the same way
+      # as the server side config.
+      def wrap_config(hash)
+        new_hash = {}
+
+        hash.each_pair do |key, value|
+          if value.is_a?(Hash)
+            new_hash[key] = wrap_config(value)
+          else
+            new_hash[key] = value
+          end
+        end
 
-  configuration_defaults do |c|
-    c.from_h(Volt.defaults)
+        OpenStruct.new(new_hash)
+      end
+    end
   end
+else
+  require 'configurations'
+  module Volt
+    include Configurations
 
+    class << self
+      def defaults
+        app_name = File.basename(Dir.pwd)
+        {
+            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',
+          }
+      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
+      def run_files_in_config_folder
+        Dir[Volt.root + '/config/*.rb'].each do |config_file|
+          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
 end

data/lib/volt/extra_core/object.rb

@@ -32,4 +32,12 @@ class Object
   def deep_clone
     Marshal.load(Marshal.dump(self))
   end
+
+  def try(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      public_send(*a, &b) if respond_to?(a.first)
+    end
+  end
 end