volt 0.9.3.pre3 → 0.9.3.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f07b58ba0668779997cda13fafd289b7c91451b6
-  data.tar.gz: b5b4d4a31d7b2ea898c6c1ce57ad6fa39373b03a
+  metadata.gz: 3a512670034e9289a6697c10ad2c3cc15c25c53e
+  data.tar.gz: 1bb81b98a09cc8d568803e76ecddd95cfcdfa3b6
 SHA512:
-  metadata.gz: f8a220c588390c7c6a1f37199b8be4a56129339e8d6450ab18fd142bb9ff7b892465290e6efdd79524c538af793e3f5ef80226fbd1e009704fe656585c8722bf
-  data.tar.gz: 5e89589d70e40122664207102c1e4abafb33fe58fcb6aa26827c2ef706a302ce83a1bca8d75f4e8989208d67a0690f2a2f3a4eac6d45cb73afbe1763e88e6a0f
+  metadata.gz: 0db33427235876fcd9d5f3f1c16ad38f3f0e30806febe59bce5da8d5516dbe7ee6c97163121b0f84de1c8e9fd8971d6cedd5bb1dbf27074b030c14fac90e5ab3
+  data.tar.gz: 5084fb2c133abb9a083964ef84cb63d3e338c2d1008a8b3636aedfac3f7a03fc3efffc91f4543574efa4b83779db8c3ebff364dd05a2c9a2418e622a0aaa710b

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 0.9.3.pre2
+## 0.9.3.pre4
 ### Added
 - Added validations block for conditional validation runs
 - you can now set the NO_FORKING=true ENV to prevent using the forking server in development.
@@ -10,12 +10,14 @@
 - You can now nest models on store.  Previously store was limited to only storing either values or ArrayModels (associations).  You can now store directly, in mongo this will be stored as a nested value.
 - Promises got more awesome.  Promises in volt can now proxy methods to their future resolved value.  Something like: ```promise.then {|v| v.name }``` can now be written simply as: ```promise.name```  It will still return a promise, but to make life easier:
 - All bindings now support promises directly.
-- You can now set/get properties directly on ```store``` and they will be saved to a ```root_stores_models``` table.
 - All code in config/initializers is now run on app startup.
 - All code in any components config/initializers (app/main/config/initializers/*.rb) is now run on the server during app startup.  On the client, only the included components initializers will be run.
 - all initializers folders now support a ```client``` and ```server``` folder.
 - has_one is now supported.
 - You can now use .create to make a new item on a collection.
+- .inspect for models is now cleaner
+- Volt.current_user now works in HttpController's
+- You can now add your own middleware to the middleware stack.  (see docs)
 
 ### Changed
 - All methods on ArrayModel's under the store collection now return a Promise.
@@ -30,6 +32,8 @@
 - You can now use .each in attribute bindings.
 - We moved to csso as the css compressor because it does not require libv8, only an execjs runtime.
 - Each bindings now support promises.
+- Volt.fetch_current_user has been deprecated and Volt.current_user now returns a promise.
+- Volt.current_user? now returns a promise that yields a boolean
 
 ## 0.9.2
 ### Changed

data/app/volt/models/user.rb

@@ -2,6 +2,11 @@ require 'bcrypt' unless RUBY_PLATFORM == 'opal'
 
 module Volt
   class User < Model
+    field :username
+    field :email
+    field :name
+    field :password
+
     # returns login field name depending on config settings
     def self.login_field
       if Volt.config.try(:public).try(:auth).try(:use_username)

data/app/volt/tasks/store_tasks.rb

@@ -13,7 +13,7 @@ class StoreTasks < Volt::Task
     collection = store.send(:"_#{path[-2]}")
 
     # See if the model has already been made
-    collection.where(id: data[:id]).fetch_first do |model|
+    collection.where(id: data[:id]).first.then do |model|
       # Otherwise assign to the collection
       model ||= collection
 
@@ -68,7 +68,7 @@ class StoreTasks < Volt::Task
       query = store.get(collection).where(id: id)
     end
 
-    query.fetch_first do |model|
+    query.first.then do |model|
       if model
         if model.can_delete?
           db.delete(collection, 'id' => id)

data/app/volt/tasks/user_tasks.rb

@@ -11,7 +11,7 @@ class UserTasks < Volt::Task
 
     # During login we need access to the user's info even though we aren't the user
     Volt.skip_permissions do
-      store._users.where(query).fetch_first do |user|
+      store._users.where(query).first.then do |user|
         fail VoltUserError, 'User could not be found' unless user
 
         match_pass = BCrypt::Password.new(user._hashed_password)

data/lib/volt/cli/asset_compile.rb

@@ -26,8 +26,6 @@ module Volt
 
       require 'volt/server/rack/component_paths'
       require 'volt/server/rack/component_code'
-      require 'volt/server/rack/opal_files'
-      require 'volt/server/rack/index_files'
       require 'volt/server/component_handler'
 
       @app_path = File.expand_path(File.join(@root_path, 'app'))

data/lib/volt/cli/generate.rb

@@ -33,7 +33,12 @@ class Generate < Thor
   def gem(name)
     require 'volt/cli/new_gem'
 
+    # remove prefixed volt-
+    name = name.gsub(/^volt[-]/, '')
+
     if name =~ /[-]/
+      require 'volt'
+      require 'volt/extra_core/logger'
       Volt.logger.error('Gem names should use underscores for their names.  Currently volt only supports a single namespace for a component.')
       return
     end
@@ -62,12 +67,12 @@ class Generate < Thor
   method_option :name, type: :string, banner: 'The name of the model controller.'
   method_option :component, type: :string, default: 'main', banner: 'The component the controller should be created in.', required: false
   def controller(name, component = 'main')
-    controller_name = name.underscore.pluralize + '_controller' unless name =~ /_controller$/
+    controller_name = name.underscore + '_controller' unless name =~ /_controller$/
     output_file = Dir.pwd + "/app/#{component.underscore}/controllers/#{controller_name}.rb"
-    spec_file = Dir.pwd + "/spec/app/#{component.underscore}/integration/#{name.underscore.pluralize}_spec.rb"
+    spec_file = Dir.pwd + "/spec/app/#{component.underscore}/integration/#{name.underscore}_spec.rb"
 
     template('controller/model_controller.rb.tt', output_file, component_module: component.camelize, model_controller_name: controller_name.camelize)
-    template('controller/model_controller_spec.rb.tt', spec_file, describe: name.underscore.pluralize)
+    template('controller/model_controller_spec.rb.tt', spec_file, describe: name.underscore)
   end
 
   desc 'task NAME COMPONENT', 'Creates a task named NAME in the app folder of the component named COMPONENT.'

data/lib/volt/cli.rb

@@ -87,21 +87,15 @@ module Volt
 
     def drop_collection(collection)
       ENV['SERVER'] = 'true'
-      require 'mongo'
       require 'volt/boot'
 
       Volt.boot(Dir.pwd)
 
-      host = Volt.config.db_host || 'localhost'
-      port = Volt.config.db_port || Mongo::MongoClient::DEFAULT_PORT
-      name = Volt.config.db_name
-
-      say("Connecting to #{host}:#{port}", :yellow)
-      db = Mongo::MongoClient.new(host, port).db(name)
+      db = Volt::DataStore.fetch
       drop = db.drop_collection(collection)
 
-      say("Collection #{collection} on #{name} couldn't be dropped", :red) if drop == false
-      say("Collection #{collection} on #{name} dropped", :green) if drop == true
+      say("Collection #{collection} could not be dropped", :red) if drop == false
+      say("Collection #{collection} dropped", :green) if drop == true
     end
 
     def self.source_root

data/lib/volt/controllers/actions.rb

@@ -62,7 +62,12 @@ module Volt
 
       begin
         filtered_callbacks.each do |callback|
-          instance_eval(&callback)
+          case callback
+          when Symbol
+            send(callback)
+          when Proc
+            instance_eval(&callback)
+          end
         end
 
         return false

data/lib/volt/controllers/http_controller.rb

@@ -1,11 +1,17 @@
 require 'volt/server/rack/http_response_header'
 require 'volt/server/rack/http_response_renderer'
+require 'volt/controllers/actions'
 
 module Volt
   # Allow you to create controllers that act as http endpoints
   class HttpController
-    attr_accessor :response_body
-    attr_reader :params, :response_headers, :request
+    include Actions
+
+    #TODO params is only public for testing
+    attr_accessor :params
+
+    # Setup before_action and after_action
+    setup_action_helpers_in_class(:before, :after)
 
     # Initialzed with the params parsed from the route and the HttpRequest
     def initialize(volt_app, params, request)
@@ -13,18 +19,21 @@ module Volt
       @response_headers = HttpResponseHeader.new
       @response_body = []
       @request = request
-      @params = Volt::Model.new(params.symbolize_keys.merge(request.params), persistor: Volt::Persistors::Params)
+      @params = Volt::Model.new(request.params.symbolize_keys.merge(params), persistor: Volt::Persistors::Params)
     end
 
     def perform(action)
-      # TODO: before actions
-      send(action.to_sym)
-      # TODO: after actions / around actions
+      filtered = run_actions(:before, action)
+      send(action.to_sym) unless filtered
+      run_actions(:after, action) unless filtered
       respond
     end
 
     private
 
+    attr_accessor :response_body
+    attr_reader :response_headers, :request
+
     def store
       @volt_app.page.store
     end
@@ -49,7 +58,7 @@ module Volt
       Rack::Response.new(response_body, response_status, response_headers)
     end
 
-    # Get the http status code as integer
+    # Returns the http status code as integer
     def response_status
       if @response_status.is_a?(Symbol)
         Rack::Utils::SYMBOL_TO_STATUS_CODE[@response_status]

data/lib/volt/controllers/model_controller.rb

@@ -34,6 +34,27 @@ module Volt
       section.range
     end
 
+    # Walks the dom_nodes range until it finds an element.  Typically this will
+    # be the container element without the whitespace text nodes.
+    def first_element
+      range = dom_nodes
+      nodes = `range.startContainer.childNodes`
+
+      start_index = `range.startOffset`
+      end_index = `range.endOffset`
+
+      start_index.upto(end_index) do |index|
+        node = `nodes[index]`
+
+        # Return if an element
+        if `node.nodeType === 1`
+          return node
+        end
+      end
+
+      return nil
+    end
+
     # yield_html renders the content passed into a tag as a string.  You can ```.watch!```
     # ```yield_html``` and it will be run again when anything in the template changes.
     def yield_html

data/lib/volt/models/array_model.rb

@@ -154,7 +154,11 @@ module Volt
     end
 
     def first
-      self[0]
+      if persistor.is_a?(Persistors::ArrayStore)
+        limit(1)[0]
+      else
+        self[0]
+      end
     end
 
     # Return the first item in the collection, or create one if one does not
@@ -174,7 +178,21 @@ module Volt
     end
 
     def reverse
-      super
+      @size_dep.depend
+      @array.reverse
+    end
+
+    # Array#select, with reactive notification
+    def select
+      new_array = []
+      @array.size.times do |index|
+        value = @array[index]
+        if yield(value)
+          new_array << value
+        end
+      end
+
+      new_array
     end
 
     # Return the model, on store, .all is proxied to wait for load and return
@@ -237,6 +255,11 @@ module Volt
       array
     end
 
+    def to_json
+      to_a.to_json
+    end
+
+
     def inspect
       Computation.run_without_tracking do
         # Track on size
@@ -262,7 +285,7 @@ module Volt
     end
 
     # We need to setup the proxy methods below where they are defined.
-    proxy_with_load :first, :[], :size, :last, :reverse, :all, :to_a
+    proxy_with_load :[], :size, :last, :reverse, :all, :to_a
 
   end
 end

data/lib/volt/models/model.rb

@@ -72,7 +72,7 @@ module Volt
       # model.  That information is relayed to the ArrayModel so it knows when it can
       # stop subscribing.
       # @root_dep    = Dependency.new(@listener_event_counter.method(:add), @listener_event_counter.method(:remove))
-      @root_dep    = Dependency.new(-> { add_list }, -> { remove_list })
+      @root_dep    = Dependency.new(-> { retain }, -> { release })
 
       @deps        = HashDependency.new
       @size_dep    = Dependency.new
@@ -94,11 +94,11 @@ module Volt
       trigger!(:new, :new)
     end
 
-    def add_list
+    def retain
       @listener_event_counter.add
     end
 
-    def remove_list
+    def release
       @listener_event_counter.remove
     end
 
@@ -308,28 +308,23 @@ module Volt
 
     def inspect
       Computation.run_without_tracking do
-        str = "<#{self.class}"
+        str = "#<#{self.class}"
+        # str += ":#{object_id}"
 
-        # Get path, loaded_state, and persistor, but cache in local var
-        # path = self.path
-        # str += " path:#{path}" if path
-
-        # loaded_state = self.loaded_state
-        # str += " state:#{loaded_state}" if loaded_state
-
-        # persistor = self.persistor
-        # str += " persistor:#{persistor.inspect}" if persistor
+        # First, select all of the non-ArrayModel values
+        attrs = attributes.reject {|key, val| val.is_a?(ArrayModel) }.to_h
 
         # Show the :id first, then sort the rest of the attributes
-        attrs = attributes.dup
-
         id = attrs.delete(:id)
+        id = id[0..3] + '..' + id[-4..-1] if id
 
         attrs = attrs.sort
-        attrs.insert(0, [:id, id])
-
-        str += " #{attrs.to_h.inspect}>"
+        attrs.insert(0, [:id, id]) if id
 
+        str += attrs.map do |key, value|
+          " #{key}: #{value.inspect}"
+        end.join(',')
+        str += '>'
         str
       end
     end
@@ -352,6 +347,10 @@ module Volt
       end
     end
 
+    def to_json
+      to_h.to_json
+    end
+
     private
     def run_initial_setup(initial_setup)
       # Save the changes
@@ -405,7 +404,7 @@ module Volt
 
       # Make an id if there isn't one yet
       if @attributes[:id].nil? && persistor.try(:auto_generate_id)
-        self.id = generate_id
+        @attributes[:id] = generate_id
       end
     end
 

data/lib/volt/models/persistors/array_store.rb

@@ -79,7 +79,7 @@ module Volt
       # sync with the database.  The data is kept in memory and the model's
       # loaded_state is marked as "dirty" meaning it may not be in sync.
       def stop_listening
-        Timers.next_tick do
+        Timers.client_set_timeout(5000) do
           Computation.run_without_tracking do
             if @listener_event_counter.count == 0
               if @added_to_query
@@ -210,6 +210,7 @@ module Volt
       # Returns a promise that is resolved/rejected when the query is complete.  Any
       # passed block will be passed to the promises then.  Then will be passed the model.
       def fetch(&block)
+        Volt.logger.warn('Deprication warning: in 0.9.3.pre4, all query methods on store now return Promises, so you can juse use .all or .first instead of .first')
         promise = Promise.new
 
         # Run the block after resolve if a block is passed in
@@ -230,15 +231,6 @@ module Volt
         promise
       end
 
-      # A combination of .fetch and .each.  Returns the fetch promise
-      def fetch_each
-        fetch do |items|
-          items.each do |item|
-            yield(item)
-          end
-        end
-      end
-
       # Alias then for now
       # TODO: Deprecate
       alias_method :then, :fetch

data/lib/volt/models/root_models/store_root.rb

@@ -9,28 +9,41 @@ require 'volt/models/root_models/root_models'
 module Volt
   module StoreRootHelpers
     def model_for_root
-      root = get(:root_store_models).first_or_create
+      root = nil
+      Volt::Computation.run_without_tracking do
+        root = get(:root_store_models).first_or_create
+      end
 
       root
     end
 
 
     def get(attr_name, expand = false)
-      if attr_name.singular? && attr_name.to_sym != :id
+      res = if attr_name.singular? && attr_name.to_sym != :id
+        puts "GET: #{attr_name}"
         model_for_root.get(attr_name, expand)
       else
         super
       end
+
+      # puts "GOT: #{res.inspect}"
+      res
     end
 
     def set(attr_name, value, &block)
       if attr_name.singular? && attr_name.to_sym != :id
-        model_for_root.set(attr_name, value, &block)
+        puts "SET ATTR NAME: #{attr_name.inspect}: #{value.inspect}"
+        Volt::Computation.run_without_tracking do
+          model_for_root.then do |model|
+            model.set(attr_name, value, &block)
+          end
+        end
       else
         super
       end
+      # puts "SET---"
     end
   end
 end
 
-StoreRoot.send(:include, Volt::StoreRootHelpers)
+# StoreRoot.send(:include, Volt::StoreRootHelpers)

data/lib/volt/models/validations/validations.rb

@@ -217,7 +217,7 @@ module Volt
     def validation_class(validation, args)
       Volt.const_get(:"#{validation.camelize}Validator")
     rescue NameError => e
-      puts "Unable to find #{validation} validator"
+      Volt.logger.error "Unable to find #{validation} validator"
     end
   end
 end

data/lib/volt/models/validators/unique_validator.rb

@@ -12,7 +12,7 @@ module Volt
 
           # Check if the value is taken
           # TODO: need a way to handle scope for unique
-          return $page.store.get(model.path[-2]).where(query).first do |item|
+          return $page.store.get(model.path[-2]).where(query).first.then do |item|
             if item
               message = (args.is_a?(Hash) && args[:message]) || 'is already taken'
 

data/lib/volt/models.rb

@@ -10,7 +10,7 @@ require 'volt/models/persistors/cookies' if RUBY_PLATFORM == 'opal'
 require 'volt/models/persistors/flash'
 require 'volt/models/persistors/local_store'
 require 'volt/models/root_models/root_models'
-require 'volt/models/root_models/store_root'
+# require 'volt/models/root_models/store_root'
 
 # Fow now, we're keeping a volt copy of the promise library from opal 0.8,
 # since opal 0.7.x's version has some bugs.

data/lib/volt/page/bindings/attribute_binding.rb

@@ -19,12 +19,13 @@ module Volt
         begin
           @context.instance_eval(&@getter)
         rescue => e
-          Volt.logger.error("AttributeBinding Error: #{e.inspect}")
+          getter_fail(e)
           ''
         end
-      end.watch_and_resolve! do |result|
-        update(result)
-      end
+      end.watch_and_resolve!(
+        method(:update),
+        method(:getter_fail)
+      )
 
       @is_select = `#{element}.is('select')`
       @is_hidden = `#{element}.is('[type=hidden]')`

data/lib/volt/page/bindings/base_binding.rb

@@ -41,5 +41,22 @@ module Volt
     def remove_anchors
       @dom_section.remove_anchors if @dom_section
     end
+
+    # log out a message about a failed computation or Promise.
+    def getter_fail(error)
+      message = "#{self.class.to_s} Error: #{error.inspect}"
+
+      if RUBY_PLATFORM == 'opal'
+        if `#{@getter}`
+          message += "\n" + `#{@getter}.toString()`
+        end
+      else
+        if error.respond_to?(:backtrace)
+          message += "\n" + error.backtrace.join("\n")
+        end
+      end
+
+      Volt.logger.error(message)
+    end
   end
 end

data/lib/volt/page/bindings/content_binding.rb

@@ -8,18 +8,20 @@ module Volt
 
     def initialize(volt_app, target, context, binding_name, getter)
       super(volt_app, target, context, binding_name)
+      @getter = getter
 
       # Listen for changes
       @computation = lambda do
         begin
-          res = @context.instance_eval(&getter)
+          @context.instance_eval(&getter)
         rescue => e
-          Volt.logger.error("ContentBinding Error: #{e.inspect}")
+          getter_fail(e)
           ''
         end
-      end.watch_and_resolve! do |result|
-        update(result)
-      end
+      end.watch_and_resolve!(
+        method(:update),
+        method(:getter_fail)
+      )
     end
 
     def update(value)