volt 0.9.3.pre1 → 0.9.3.pre2

data/lib/volt/controllers/template_helpers.rb

@@ -0,0 +1,19 @@
+module Volt
+  module TemplateHelpders
+    module ClassMethods
+      def template(name, template, bindings)
+        @templates[name] = { 'html' => template, 'bindings' => bindings }
+      end
+    end
+
+    def self.included(base)
+      # Setup blank templates class variable
+      base.class_attribute :__templates
+      base.__templates = {}
+
+      base.send :extend, ClassMethods
+    end
+  end
+
+
+end

data/lib/volt/extra_core/array.rb

@@ -2,4 +2,10 @@ class Array
   def sum
     inject(0, :+)
   end
+
+  # For some reason .to_h doesn't show as defined in opal, but defined?(:to_h)
+  # returns true.
+  def to_h
+    Hash[self]
+  end
 end

data/lib/volt/extra_core/hash.rb

@@ -1,26 +1,8 @@
-# module Hash
-#   class Indifferent < Hash
-#     def []=(key, value)
-#       super(convert_key(key), value)
-#     end
-#
-#     def [](key)
-#       super(convert_key(key))
-#     end
-#
-#     def key?(key)
-#       super(convert_key(key))
-#     end
-#
-#     def fetch(key, *args)
-#       super(convert_key(key), *args)
-#     end
-#
-#     private
-#
-#     # Converts all keys to symbols for assignments
-#     def convert_key(key)
-#       key.is_a?(String) ? key : key.to_sym
-#     end
-#   end
-# end
+class Hash
+  # Returns a hash excluding the keys passed in.
+  def without(*keys)
+    reject do |key, value|
+      keys.include?(key)
+    end
+  end
+end

data/lib/volt/extra_core/string.rb

@@ -7,7 +7,7 @@ class String
   # Turns a string into the camel case version.  If it is already camel case, it should
   # return the same string.
   def camelize(first_letter = :upper)
-    new_str = gsub(/_[a-z]/) { |a| a[1].upcase }
+    new_str = gsub(/[_\-][a-z]/) { |a| a[1].upcase }
     new_str = new_str[0].capitalize + new_str[1..-1] if first_letter == :upper
 
     new_str

data/lib/volt/models/array_model.rb

@@ -67,7 +67,7 @@ module Volt
     # Make sure it gets wrapped
     def <<(model)
       if model.is_a?(Model)
-        # Set the new path
+        # Set the new path and the persistor.
         model.options = @options.merge(path: @options[:path] + [:[]])
       else
         model = wrap_values([model]).first
@@ -77,12 +77,17 @@ module Volt
         fail "permissions did not allow create for #{model.inspect}"
       end
 
+      # Add it to the array and trigger any watches or on events.
       super(model)
 
       if @persistor
         promise = @persistor.added(model, @array.size - 1)
         if promise && promise.is_a?(Promise)
           return promise.then do
+
+            # Mark the model as not new
+            model.instance_variable_set('@new', false)
+
             # Mark the model as loaded
             model.change_state_to(:loaded_state, :loaded)
 
@@ -191,8 +196,9 @@ module Volt
       Computation.run_without_tracking do
         # Track on size
         @size_dep.depend
-        str = "#<#{self.class}:#{object_id} #{loaded_state}"
-        str += " path:#{path.join('.')}" if path
+        str = "#<#{self.class}"
+        # str += " state:#{loaded_state}"
+        # str += " path:#{path.join('.')}" if path
         # str += " persistor:#{persistor.inspect}" if persistor
         str += " #{@array.inspect}>"
 
@@ -214,7 +220,9 @@ module Volt
 
     # Takes the persistor if there is one and
     def setup_persistor(persistor)
-      @persistor = persistor.new(self) if persistor
+      # Use page as the default persistor
+      persistor ||= Persistors::Page
+      @persistor = persistor.new(self)
     end
   end
 end

data/lib/volt/models/associations.rb

@@ -2,28 +2,25 @@ module Volt
   module Associations
     module ClassMethods
       def belongs_to(method_name, key_name = nil)
+        key_name ||= "#{method_name}_id"
+        # Add a field for the association_id
+        field(key_name)
+
         # getter
         define_method(method_name) do
           association_with_root_model('belongs_to') do |root|
             # Lookup the associated model id
-            lookup_key = send(:"_#{key_name || method_name}_id")
+            lookup_key = get(key_name)
 
             # Return a promise for the belongs_to
-            root.send(:"_#{method_name.pluralize}").where(_id: lookup_key).fetch_first
+            root.get(method_name.pluralize).where(id: lookup_key).fetch_first
           end
         end
       end
 
       def has_many(method_name, remote_key_name = nil)
         define_method(method_name) do
-          association_with_root_model('has_many') do |root|
-            id = _id
-
-            # The key will be "{this class name}_id"
-            remote_key_name ||= :"#{path[-2].singularize}_id"
-
-            root.send(:"_#{method_name.pluralize}!").where(remote_key_name => id)
-          end
+          get(method_name.pluralize, true)
         end
       end
     end
@@ -37,10 +34,11 @@ module Volt
     # Currently the has_many and belongs_to associations only work on the store collection,
     # this method checks to make sure we are on store and returns the root reference to it.
     def association_with_root_model(method_name)
-      persistor = self.persistor || (respond_to?(:save_to) && save_to.persistor)
+      persistor = self.persistor || (respond_to?(:save_to) && save_to && save_to.persistor)
 
       # Check if we are on the store collection
-      if persistor.is_a?(Volt::Persistors::ModelStore)
+      if persistor.is_a?(Volt::Persistors::ModelStore) ||
+         persistor.is_a?(Volt::Persistors::Page)
         # Get the root node
         root = persistor.try(:root_model)
 
@@ -48,7 +46,7 @@ module Volt
         yield(root)
       else
         # raise an error about the method not being supported on this collection
-        fail "#{method_name} currently only works on the store collection (support for other collections coming soon)"
+        fail "#{method_name} currently only works on the store and page collection (support for other collections coming soon)"
       end
     end
   end

data/lib/volt/models/buffer.rb

@@ -33,7 +33,7 @@ module Volt
                 new_model.change_state_to(:loaded_state, :loaded)
 
                 # Set the buffer's id to track the main model's id
-                attributes[:_id] = new_model._id
+                attributes[:id] = new_model.id
                 options[:save_to]     = new_model
               end
 

data/lib/volt/models/model.rb

@@ -104,13 +104,16 @@ module Volt
       super
     end
 
-    # the id is stored in a field named _id, so we setup _id to proxy to this
-    def _id
-      __id
+    def id
+      get(:id)
+    end
+
+    def id=(val)
+      set(:id, val)
     end
 
-    def _id=(val)
-      self.__id = val
+    def _id
+      raise "Accessing  _id has been deprecated in favor of id"
     end
 
     # Return true if the model hasn't been saved yet
@@ -302,14 +305,14 @@ module Volt
 
     def inspect
       Computation.run_without_tracking do
-        str = "<#{self.class}:#{object_id}"
+        str = "<#{self.class}"
 
         # Get path, loaded_state, and persistor, but cache in local var
-        path = self.path
-        str += " path:#{path}" if path
+        # path = self.path
+        # str += " path:#{path}" if path
 
-        loaded_state = self.loaded_state
-        str += " state:#{loaded_state}" if loaded_state
+        # loaded_state = self.loaded_state
+        # str += " state:#{loaded_state}" if loaded_state
 
         persistor = self.persistor
         # str += " persistor:#{persistor.inspect}" if persistor
@@ -339,7 +342,6 @@ module Volt
 
     private
     def run_initial_setup(initial_setup)
-
       # Save the changes
       if initial_setup
         # Run initial validation
@@ -372,7 +374,9 @@ module Volt
 
     # Takes the persistor if there is one and
     def setup_persistor(persistor)
-      @persistor = persistor.new(self) if persistor
+      # Use page as the default persistor
+      persistor ||= Persistors::Page
+      @persistor = persistor.new(self)
     end
 
     # Used internally from other methods that assign all attributes
@@ -390,9 +394,14 @@ module Volt
           send(:"#{key}=", value)
         else
           # Otherwise, use the _ version
-          send(:"_#{key}=", value)
+          set(key, value)
         end
       end
+
+      # Make an id if there isn't one yet
+      if @attributes[:id].nil? && persistor.try(:auto_generate_id)
+        self.id = generate_id
+      end
     end
   end
 end

data/lib/volt/models/model_helpers/model_change_helpers.rb

@@ -46,7 +46,6 @@ module Volt
       nil
     end
 
-
     # Should only be called from run_changed.  Saves the changes back to the persistor
     # and clears the tracked changes.
     def persist_changes(attribute_name)

data/lib/volt/models/model_helpers/model_helpers.rb

@@ -21,6 +21,17 @@ module Volt
       @persistor.event_removed(event, last, last_for_event) if @persistor
     end
 
+    ID_CHARS = [('a'..'f'), ('0'..'9')].map(&:to_a).flatten
+
+    # Create a random unique id that can be used as the mongo id as well
+    def generate_id
+      id = []
+      24.times { id << ID_CHARS.sample }
+
+      id.join
+    end
+
+
     module ClassMethods
       # Gets the class for a model at the specified path.
       def class_at_path(path)

data/lib/volt/models/permissions.rb

@@ -9,7 +9,13 @@ module Volt
         #
         # @param key [Symbol] the name of the attribute to store
         def own_by_user(key = :user_id)
-          # When the model is created, assign it the user_id (if the user is logged in)
+          relation, pattern = key.to_s, /_id$/
+          if relation.match(pattern)
+            belongs_to key.to_s.gsub(pattern, '')
+          else
+            raise "You tried to auto associate a model using #{key}, but #{key} "\
+                  "does not end in `_id`"
+          end          # When the model is created, assign it the user_id (if the user is logged in)
           on(:new) do
             # Only assign the user_id if there isn't already one and the user is logged in.
             if _user_id.nil? && !(user_id = Volt.current_user_id).nil?
@@ -33,15 +39,6 @@ module Volt
           end
         end
 
-        # TODO: Change to
-        # permissions(:create, :read, :update) do |action|
-        #   if owner?
-        #     allow
-        #   else
-        #     deny :user_id
-        #   end
-        # end
-
         # permissions takes a block and yields
         def permissions(*actions, &block)
           # Store the permissions block so we can run it in validations
@@ -156,14 +153,14 @@ module Volt
 
         if allow && allow != true && allow.size > 0
           # always keep id
-          allow << :_id
+          allow << :id
 
           # Only keep fields in the allow list
           return @attributes.select { |key| allow.include?(key) }
         elsif deny == true
           # Only keep id
           # TODO: Should this be a full reject?
-          return @attributes.reject { |key| key != :_id }
+          return @attributes.reject { |key| key != :id }
         elsif deny && deny.size > 0
           # Reject any in the deny list
           return @attributes.reject { |key| deny.include?(key) }

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

@@ -134,10 +134,10 @@ module Volt
 
           parent.persistor.ensure_setup if parent.persistor
 
-          if parent && (attrs = parent.attributes) && attrs[:_id]
+          if parent && (attrs = parent.attributes) && attrs[:id]
             query = query.dup
 
-            query << [:find, { :"#{@model.path[-3].singularize}_id" => attrs[:_id] }]
+            query << [:find, { :"#{@model.path[-3].singularize}_id" => attrs[:id] }]
           end
         end
 
@@ -208,7 +208,7 @@ module Volt
         $loading_models = true
 
         Model.no_validate do
-          data_id = data['_id'] || data[:_id]
+          data_id = data['id'] || data[:id]
 
           # Don't add if the model is already in the ArrayModel (from the client already)
           unless @ids[data_id]
@@ -232,7 +232,7 @@ module Volt
         ids.each do |id|
           # TODO: optimize this delete so we don't need to loop
           @model.each_with_index do |model, index|
-            if model._id == id
+            if model.id == id
               @ids.delete(id)
               del = @model.delete_at(index)
               break
@@ -259,7 +259,7 @@ module Volt
           promise = model.persistor.add_to_collection
 
           # Track the the model got added
-          @ids[model._id] = true
+          @ids[model.id] = true
 
           promise
         end
@@ -271,13 +271,13 @@ module Volt
           # Tell the persistor it was removed
           model.persistor.remove_from_collection
 
-          @ids.delete(model._id)
+          @ids.delete(model.id)
         end
 
         if defined?($loading_models) && $loading_models
           return
         else
-          StoreTasks.delete(channel_name, model.attributes[:_id])
+          StoreTasks.delete(channel_name, model.attributes[:id])
         end
       end
     end

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

@@ -2,6 +2,10 @@ module Volt
   module Persistors
     # Implements the base persistor functionality.
     class Base
+      def initialize(model)
+        @model = model
+      end
+
       def loaded(initial_state = nil)
         @model.change_state_to(:loaded_state, initial_state || :loaded)
       end
@@ -27,6 +31,11 @@ module Volt
       def event_removed(event, last, last_for_event)
       end
 
+      # Specify if this collection should auto-generate id's
+      def auto_generate_id
+        false
+      end
+
       # Find the root for this model
       def root_model
         node = @model

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

@@ -45,10 +45,6 @@ module Volt
         `document.cookie = cookie_val`
       end
 
-      def initialize(model)
-        @model = model
-      end
-
       # Called when a model is added to the collection
       def added(model, index)
         # Save an added cookie

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

@@ -3,10 +3,6 @@ require 'volt/models/persistors/base'
 module Volt
   module Persistors
     class Flash < Base
-      def initialize(model)
-        @model = model
-      end
-
       def added(model, index)
         if Volt.client?
           # Setup a new timer for clearing the flash.

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

@@ -6,10 +6,6 @@ module Volt
   module Persistors
     # Backs a collection in the local store
     class LocalStore < Base
-      def initialize(model)
-        @model = model
-      end
-
       # Called when a model is added to the collection
       def added(model, index)
         root_model.persistor.save_all

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

@@ -11,8 +11,6 @@ module Volt
     class ModelStore < Store
       include StoreState
 
-      ID_CHARS = [('a'..'f'), ('0'..'9')].map(&:to_a).flatten
-
       attr_reader :model
       attr_accessor :in_identity_map
 
@@ -40,32 +38,23 @@ module Volt
         @in_collection = false
       end
 
+      def auto_generate_id
+        true
+      end
+
       # Called the first time a value is assigned into this model
       def ensure_setup
-        if (attrs = @model.attributes)
-          # Do a nil check incase there is a nil model there
-          @model.__id = generate_id if attrs[:_id].nil?
-
-          add_to_identity_map
-        end
+        add_to_identity_map
       end
 
       def add_to_identity_map
         unless @in_identity_map
-          @@identity_map.add(@model._id, @model)
+          @@identity_map.add(@model.id, @model)
 
           @in_identity_map = true
         end
       end
 
-      # Create a random unique id that can be used as the mongo id as well
-      def generate_id
-        id = []
-        24.times { id << ID_CHARS.sample }
-
-        id.join
-      end
-
       def save_changes?
         if RUBY_PLATFORM == 'opal'
           !(defined?($loading_models) && $loading_models) && @tasks
@@ -85,7 +74,7 @@ module Volt
         path_size = path.size
         if save_changes? && path_size > 0 && !@model.nil?
           if path_size > 3 && (parent = @model.parent) && (source = parent.parent)
-            @model.attributes[:"#{path[-4].singularize}_id"] = source._id
+            @model.attributes[:"#{path[-4].singularize}_id"] = source.id
           end
 
           if !collection
@@ -152,7 +141,7 @@ module Volt
 
           if model
             data.each_pair do |key, value|
-              model.send(:"_#{key}=", value) if key != :_id
+              model.set(key, value)# if key != :id
             end
           end
         end
@@ -186,7 +175,7 @@ module Volt
           return errors if errors.present?
 
           # Passed, save it
-          id = values[:_id]
+          id = values[:id]
 
           # Try to create
           update_result = db.update(collection, values)
@@ -194,7 +183,10 @@ module Volt
           # An error hash will be returned if the update doesn't work
           return update_result if update_result
 
-          QueryTasks.live_query_pool.updated_collection(collection.to_s, Thread.current['in_channel'])
+          # If we are running in a task, or the console, push update
+          if (volt_app = Volt.current_app)
+            volt_app.live_query_pool.updated_collection(collection.to_s, Thread.current['in_channel'])
+          end
           {}
         end
       end

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

@@ -0,0 +1,22 @@
+require 'volt/models/persistors/base'
+
+module Volt
+  module Persistors
+    class Page < Base
+      def auto_generate_id
+        true
+      end
+
+      def where(query)
+        @model.select do |model|
+          # Filter through each part of the query and make sure it matches.
+          query.each_pair do |key, value|
+            next false unless model.get(key) == value
+          end
+
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -3,10 +3,6 @@ require 'volt/models/persistors/base'
 module Volt
   module Persistors
     class Params < Base
-      def initialize(model)
-        @model = model
-      end
-
       def changed(attribute_name)
         if RUBY_PLATFORM == 'opal'
           `

data/lib/volt/models/persistors/query/query_listener.rb

@@ -40,8 +40,9 @@ module Volt
         end
       end.fail do |err|
         # TODO: need to make it so we can re-raise out of this promise
-        Volt.logger.error("Error adding listener: #{err.inspect}")
-        Volt.logger.error(err.backtrace) if err.respond_to?(:backtrace)
+        msg = "Error adding listener: #{err.inspect}"
+        msg += "\n#{err.backtrace.join("\n")}" if err.respond_to?(:backtrace)
+        Volt.logger.error(msg)
 
         # If we get back that the user signature is wrong, log the user out.
         if err.to_s.start_with?('user id or hash is incorrectly signed')

data/lib/volt/models/url.rb

@@ -102,7 +102,7 @@ module Volt
     # browser should be updated
     # Called when an attribute changes to update the url
     def update!
-      if Volt.client?
+      if Volt.in_browser?
         new_url = url_for(@params.to_h)
 
         # Push the new url if pushState is supported
@@ -116,7 +116,7 @@ module Volt
     end
 
     def scroll
-      if Volt.client?
+      if Volt.in_browser?
         frag = fragment
         if frag.present?
           # Scroll to anchor via http://www.w3.org/html/wg/drafts/html/master/browsers.html#scroll-to-fragid

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

@@ -8,7 +8,7 @@ module Volt
           query = {}
           # Check to see if any other documents have this value.
           query[field_name.to_s] = value
-          query['_id'] = { '$ne' => model._id }
+          query['id'] = { '$ne' => model.id }
 
           # Check if the value is taken
           # TODO: need a way to handle scope for unique

data/lib/volt/models.rb

@@ -2,6 +2,7 @@ require 'volt/extra_core/extra_core'
 require 'volt/models/model'
 require 'volt/models/cursor'
 require 'volt/models/persistors/store_factory'
+require 'volt/models/persistors/page'
 require 'volt/models/persistors/array_store'
 require 'volt/models/persistors/model_store'
 require 'volt/models/persistors/params'

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

@@ -3,8 +3,8 @@ require 'volt/page/targets/attribute_target'
 
 module Volt
   class AttributeBinding < BaseBinding
-    def initialize(page, target, context, binding_name, attribute_name, getter, setter)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, attribute_name, getter, setter)
+      super(volt_app, target, context, binding_name)
 
       @attribute_name = attribute_name
       @getter         = getter

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

@@ -10,10 +10,10 @@
 #                   binding will be inserted.
 module Volt
   class BaseBinding
-    attr_accessor :target, :context, :binding_name
+    attr_accessor :target, :context, :binding_name, :volt_app
 
-    def initialize(page, target, context, binding_name)
-      @page         = page
+    def initialize(volt_app, target, context, binding_name)
+      @volt_app     = volt_app
       @target       = target
       @context      = context
       @binding_name = binding_name
@@ -21,6 +21,10 @@ module Volt
       @@binding_number ||= 10_000
     end
 
+    def page
+      @volt_app.page
+    end
+
     def dom_section
       @dom_section ||= target.dom_section(@binding_name)
     end