volt 0.8.8 → 0.8.9

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.9

data/app/volt/models/user.rb

@@ -0,0 +1,5 @@
+class User < Model
+  def password=(val)
+    self._password = '--encoded: ' + val
+  end
+end

data/app/volt/tasks/query_tasks.rb

@@ -1,7 +1,7 @@
 require_relative 'live_query/data_store'
 require_relative 'live_query/live_query_pool'
 
-class QueryTasks
+class QueryTasks < TaskHandler
   @@live_query_pool = LiveQueryPool.new(DataStore.new)
   @@channel_live_queries = {}
 
@@ -32,12 +32,12 @@ class QueryTasks
       error = {:error => exception.message}
     end
 
-    return initial_data, error
+    return [initial_data, error]
   end
 
   def initial_data
     data = live_query.initial_data
-    data['_id'] = data['_id'].to_s
+    data[:_id] = data[:_id].to_s
 
     return data
   end

data/app/volt/tasks/store_tasks.rb

@@ -1,7 +1,6 @@
 require 'mongo'
-require 'query_tasks'
 
-class StoreTasks
+class StoreTasks < TaskHandler
   def initialize(channel=nil, dispatcher=nil)
     @channel = channel
     @dispatcher = dispatcher
@@ -11,10 +10,11 @@ class StoreTasks
     @@db ||= Volt::DataStore.fetch
   end
 
-  def model_errors(collection, data)
-    model_name = collection[1..-1].singularize.camelize
+  def model_values_and_errors(collection, data)
+    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
@@ -22,33 +22,35 @@ class StoreTasks
     end
 
     if model_class
-      return model_class.new(data).errors
+      model = model_class.new(data)
+      return model.to_h, model.errors
     end
 
-    return {}
+    return data, {}
   end
 
   def save(collection, data)
+    puts "SAVE: #{data.inspect}"
     data = data.symbolize_keys
-
-    errors = model_errors(collection, data)
+    values, errors = model_values_and_errors(collection, data)
 
     if errors.size == 0
-      # id = BSON::ObjectId(data[:_id])
-      id = data[:_id]
+      # id = BSON::ObjectId(values[:_id])
+      id = values[:_id]
 
       # Try to create
       # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
       begin
-        # data['_id'] = BSON::ObjectId('_id') if data['_id']
-        db[collection].insert(data)
+        # values['_id'] = BSON::ObjectId('_id') if values['_id']
+        puts "VALUES: #{values.inspect}"
+        db[collection].insert(values)
       rescue Mongo::OperationFailure => error
         # Really mongo client?
         if error.message[/^11000[:]/]
           # Update because the id already exists
-          update_data = data.dup
-          update_data.delete(:_id)
-          db[collection].update({:_id => id}, update_data)
+          update_values = values.dup
+          update_values.delete(:_id)
+          db[collection].update({:_id => id}, update_values)
         else
           return {:error => error.message}
         end

data/app/volt/tasks/user_tasks.rb

@@ -0,0 +1,6 @@
+class UserTasks < TaskHandler
+  # Login a user, takes a username and password
+  def create_user(username, password)
+    $page.store._users << {email: username, password: password}
+  end
+end

data/lib/volt/cli.rb

@@ -1,5 +1,6 @@
 require 'bundler/setup'
 require 'thor'
+require 'volt/extra_core/extra_core'
 
 class CLI < Thor
   include Thor::Actions
@@ -77,6 +78,14 @@ class CLI < Thor
     NewGem.new(self, name, options)
   end
 
+  desc "model NAME COMPONENT", "Creates a model named NAME in the component named COMPONENT"
+  method_option :name, :type => :string, :banner => "The name of the model."
+  method_option :component, :type => :string, :default => 'main', :banner => "The component the model should be created in.", :required => false
+  def model(name, component='main')
+    output_file = Dir.pwd + "/app/#{component.underscore}/models/#{name.underscore.singularize}.rb"
+    template("model/model.rb.tt", output_file, {model_name: name.camelize.singularize})
+  end
+
   def self.source_root
     File.expand_path(File.join(File.dirname(__FILE__), '../../templates'))
   end

data/lib/volt/extra_core/string.rb

@@ -3,12 +3,20 @@ require 'volt/extra_core/inflector'
 class String
   # TODO: replace with better implementations
   # NOTE: strings are currently immutable in Opal, so no ! methods
+
+  # Turns a string into the camel case version.  If it is already camel case, it should
+  # return the same string.
   def camelize
-    self.split("_").map {|s| s.capitalize }.join("")
+    new_str = self.gsub(/_[a-z]/) { |a| a[1].upcase }
+    new_str = new_str[0].capitalize + new_str[1..-1]
+
+    return new_str
   end
 
+  # Returns the underscore version of a string.  If it is already underscore, it should
+  # return the same string.
   def underscore
-    self.scan(/[A-Z][a-z]*/).join("_").downcase
+    self.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
   end
 
   def dasherize

data/lib/volt/models/array_model.rb

@@ -10,7 +10,6 @@ class ArrayModel < ReactiveArray
 
   attr_reader :parent, :path, :persistor, :options, :array
 
-
   # For many methods, we want to call load data as soon as the model is interacted
   # with, so we proxy the method, then call super.
   def self.proxy_with_load_data(*method_names)

data/lib/volt/models/model.rb

@@ -26,8 +26,6 @@ class Model
 
     self.send(:attributes=, attributes, true)
 
-    @cache = {}
-
     # Models start in a loaded state since they are normally setup from an
     # ArrayModel, which will have the data when they get added.
     @state = :loaded
@@ -35,6 +33,15 @@ class Model
     @persistor.loaded(initial_state) if @persistor
   end
 
+  # the id is stored in a field named _id, so we setup _id to proxy to this
+  def _id
+    @attributes && @attributes[:_id]
+  end
+
+  def _id=(val)
+    self.__id = val
+  end
+
   # Update the options
   def options=(options)
     @options = options
@@ -46,7 +53,28 @@ class Model
 
   # Assign multiple attributes as a hash, directly.
   def attributes=(attrs, initial_setup=false)
-    @attributes = wrap_values(attrs)
+    @attributes = {}
+
+    attrs = wrap_values(attrs)
+
+    if attrs
+      # Assign id first
+      id = attrs.delete(:_id)
+      self._id = id if id
+
+      # Assign each attribute using setters
+      attrs.each_pair do |key, value|
+        if self.respond_to?(key)
+          # If a method without an underscore is defined, call that.
+          self.send(:"#{key}=", value)
+        else
+          # Otherwise, use the _ version
+          self.send(:"_#{key}=", value)
+        end
+      end
+    else
+      @attributes = attrs
+    end
 
     # Trigger and change all
     @deps.changed_all!
@@ -90,24 +118,21 @@ class Model
         read_attribute(method_name)
       end
     else
-      # Call method directly on attributes.  (since they are
-      # not using _ )
-      attributes.send(method_name, *args, &block)
+      # Call on parent
+      super
     end
   end
 
   # Do the assignment to a model and trigger a changed event
   def assign_attribute(method_name, *args, &block)
-    # Free any cached value
-    free(method_name)
-
     self.expand!
     # Assign, without the =
-    attribute_name = method_name[0..-2].to_sym
+    attribute_name = method_name[1..-2].to_sym
 
     value = args[0]
 
-    attributes[attribute_name] = wrap_value(value, [attribute_name])
+    @attributes[attribute_name] = wrap_value(value, [attribute_name])
+
     @deps.changed!(attribute_name)
 
     # Let the persistor know something changed
@@ -122,29 +147,26 @@ class Model
     # Reading an attribute, we may get back a nil model.
     method_name = method_name.to_sym
 
-    if method_name[0] != '_' && attributes == nil
+    if method_name[0] != '_' && @attributes == nil
       # The method we are calling is on a nil model, return a wrapped
       # exception.
       return return_undefined_method(method_name)
     else
+      attr_name = method_name[1..-1].to_sym
       # See if the value is in attributes
-      value = (attributes && attributes[method_name])
-
-      # Also check @cache
-      value ||= (@cache && @cache[method_name])
+      value = (@attributes && @attributes[attr_name])
 
       # Track dependency
-      @deps.depend(method_name)
+      @deps.depend(attr_name)
 
       if value
         # key was in attributes or cache
         return value
       else
-        # Cache the value, will be removed when expanded or something
-        # is assigned over it.
         # TODO: implement a timed out cache flusing
-        new_model = read_new_model(method_name)
-        @cache[method_name] = new_model
+        new_model = read_new_model(attr_name)
+        @attributes ||= {}
+        @attributes[attr_name] = new_model
 
         return new_model
       end
@@ -204,11 +226,6 @@ class Model
     end
   end
 
-  # Removes an item from the cache
-  def free(name)
-    @cache.delete(name)
-  end
-
   # If this model is nil, it makes it into a hash model, then
   # sets it up to track from the parent.
   def expand!
@@ -217,7 +234,7 @@ class Model
       if @parent
         @parent.expand!
 
-        @parent.send(:"#{@path.last}=", self)
+        @parent.send(:"_#{@path.last}=", self)
       end
     end
   end
@@ -264,7 +281,7 @@ class Model
       if save_to
         if save_to.is_a?(ArrayModel)
           # Add to the collection
-          new_model = save_to.append(self.attributes)
+          new_model = save_to << self.attributes
 
           # Set the buffer's id to track the main model's id
           self.attributes[:_id] = new_model._id

data/lib/volt/models/model_hash_behaviour.rb

@@ -18,6 +18,10 @@ module ModelHashBehaviour
     attributes.nil?
   end
 
+  def empty?
+    !attributes || attributes.size == 0
+  end
+
   def false?
     attributes.false?
   end
@@ -36,15 +40,23 @@ module ModelHashBehaviour
     @persistor.removed(nil) if @persistor
   end
 
+  def each_with_object(*args, &block)
+    return (@attributes || {}).each_with_object(*args, &block)
+  end
+
 
   # Convert the model to a hash all of the way down.
   def to_h
     hash = {}
-    attributes.each_pair do |key, value|
-      hash[key] = deep_unwrap(value)
+    if empty?
+      return nil
+    else
+      attributes.each_pair do |key, value|
+        hash[key] = deep_unwrap(value)
+      end
+
+      return hash
     end
-
-    return hash
   end
 
 end

data/lib/volt/models/model_helpers.rb

@@ -26,11 +26,13 @@ module ModelHelpers
       begin
         # remove the _ and then singularize
         if path.last == :[]
-          klass_name = path[-2][1..-1].singularize.camelize
+          index = -2
         else
-          klass_name = path[-1][1..-1].singularize.camelize
+          index = -1
         end
 
+        klass_name = path[index].singularize.camelize
+
         klass = $page.model_classes[klass_name] || Model
       rescue NameError => e
         # Ignore exception, just means the model isn't defined

data/lib/volt/models/model_wrapper.rb

@@ -17,7 +17,8 @@ module ModelWrapper
       values = values.map {|v| wrap_value(v,lookup + [:[]]) }
     elsif values.is_a?(Hash)
       pairs = values.map do |k,v|
-        path = lookup + [k]
+        # TODO: We should be able to move wrapping into the method_missing on model
+        path = lookup + [k.to_sym]
 
         [k, wrap_value(v,path)]
       end

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

@@ -83,7 +83,6 @@ module Persistors
     def run_query(model, query={})
       @model.clear
 
-      # puts "Run Query: #{query.inspect}"
       collection = model.path.last
       # Scope to the parent
       if model.path.size > 1
@@ -143,12 +142,13 @@ module Persistors
     def add(index, data)
       $loading_models = true
 
-      new_options = @model.options.merge(path: @model.path + [:[]], parent: @model)
-
       # Don't add if the model is already in the ArrayModel
-      if !@model.array.find {|v| v['_id'] == data['_id'] }
+      if !@model.array.find {|v| v._id == data[:_id] }
         # Find the existing model, or create one
-        new_model = @@identity_map.find(data['_id']) { @model.new_model(data.symbolize_keys, new_options, :loaded) }
+        new_model = @@identity_map.find(data[:_id]) do
+          new_options = @model.options.merge(path: @model.path + [:[]], parent: @model)
+          @model.new_model(data, new_options, :loaded)
+        end
 
         @model.insert(index, new_model)
       end
@@ -193,7 +193,7 @@ module Persistors
       if defined?($loading_models) && $loading_models
         return
       else
-        @tasks.call('StoreTasks', 'delete', channel_name, model.attributes[:_id])
+        StoreTasks.delete(channel_name, model.attributes[:_id])
       end
     end
 

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

@@ -41,7 +41,7 @@ module Persistors
 
           @loading_data = true
           root_attributes.each_pair do |key, value|
-            @model.send(:"#{key}=", value)
+            @model.send(:"_#{key}=", value)
           end
           @loading_data = nil
         end

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

@@ -69,9 +69,9 @@ module Persistors
           puts "Attempting to save model directly on store."
           raise "Attempting to save model directly on store."
         else
-          @tasks.call('StoreTasks', 'save', collection, self_attributes) do |errors|
+          StoreTasks.save(collection, self_attributes).then do |errors|
             if errors.size == 0
-              promise.resolve
+              promise.resolve(nil)
             else
               promise.reject(errors)
             end
@@ -95,7 +95,7 @@ module Persistors
 
       if model
         data.each_pair do |key, value|
-          if key != '_id'
+          if key != :_id
             model.send(:"#{key}=", value)
           end
         end