volt 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5fa5dd92e489dfa4a0257eccd5509aa2324cb25
-  data.tar.gz: 21e58768017cd4b82ec09ee9b9b06a828d3289e8
+  metadata.gz: e0ae38f2f69535b60b4fe850f9c6a9073da98b75
+  data.tar.gz: a2a08253c6f76f71ac495ec91d13efa4a35f0a98
 SHA512:
-  metadata.gz: fd684af9e5c24c317c62e97bff34c8a7f732082074424e225db3712386fb1ded60f30b686a5046961600f0f9a48b12a14da42500434f700f50b681b57125de94
-  data.tar.gz: bc38cdd81e222e1ed407fa44819ee1b0adc6edf1796ec597b7022dfd7f7abb74583fbfcd266409d3299f02afe31cc62daea8f387211c82996e21217cbfab4d45
+  metadata.gz: f39067395499d7b5bd46088b343612d9dc8b79d1fa5b53885777fa9deb5bde1f42215f6ab111264935636e0a7971d8212edd3f235a49df6c2f388aec62a01c44
+  data.tar.gz: a0713dc5334f151bd05bf9b95e879be1b02ae4cd59ae1e9f8bbdbf90e9474f9ff35286f2b998f66d91f1247cc05ddc07c49f3996fbfc9b7ff672bc97619abbf0

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/app/volt/tasks/store_tasks.rb

@@ -16,28 +16,32 @@ class StoreTasks
   
   def save(collection, data)
     puts "Insert: #{data.inspect} on #{collection.inspect}"
+    
+    data = data.symbolize_keys
+    id = data[:_id]
+
     # Try to create
     # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
     begin
       @@db[collection].insert(data)
-      id = {'_id' => data.delete('_id')}
       
       # Message that we inserted a new item
-      ChannelTasks.send_message_to_channel("#{collection}", ['added', nil, collection, data.merge('_id' => id).symbolize_keys], @channel)
+      puts "SENDING DATA: #{data.inspect}"
+      ChannelTasks.send_message_to_channel("#{collection}-added", ['added', nil, collection, data], @channel)
     rescue Mongo::OperationFailure => error
       # Really mongo client?
       if error.message[/^11000[:]/]
         # Update because the id already exists
-        id = {'_id' => data.delete('_id')}
-        @@db[collection].update(id, data)
+        update_data = data.dup
+        update_data.delete(:_id)
+        @@db[collection].update({:_id => id}, update_data)
       else
         raise
       end
     end
     
-    id = id['_id']
 
-    ChannelTasks.send_message_to_channel("#{collection}##{id}", ['changed', nil, id, data.merge('_id' => id).symbolize_keys], @channel)
+    ChannelTasks.send_message_to_channel("#{collection}##{id}", ['changed', nil, id, data], @channel)
   end
   
   def find(collection, scope, query=nil)
@@ -46,4 +50,11 @@ class StoreTasks
     
     return results
   end
+  
+  def delete(collection, id)
+    puts "DELETE: #{collection.inspect} - #{id.inspect}"
+    @@db[collection].remove('_id' => id)
+    
+    ChannelTasks.send_message_to_channel("#{collection}-removed", ['removed', nil, id], @channel)
+  end
 end

data/lib/volt/assets/test.rb

@@ -0,0 +1,6 @@
+require 'sass'
+
+sass_engine = Sass::Engine.new(template, {syntax: :scss, filename: 'cool.css.scss', sourcemap: true}) ; output = 
+sass_engine.render_with_sourcemap('/source_maps/')
+
+puts a[1].to_json(:css_path => '/cool.css', :sourcemap_path => '/source_maps/cool.css.map')

data/lib/volt/models/store.rb

@@ -17,6 +17,10 @@ class Store < Model
     
     value_updated
   end
+  
+  def self.from_id(id)
+    @@identity_map[id]
+  end
 
   def event_added(event, scope_provider, first)
     if first && event == :changed
@@ -36,6 +40,7 @@ class Store < Model
   def change_channel_connection(add_or_remove)
     if attributes && path.size > 1
       channel_name = "#{path[-2]}##{attributes[:_id]}"
+      puts "Event Added: #{channel_name} -- #{attributes.inspect}"
       @tasks.call('ChannelTasks', "#{add_or_remove}_listener", channel_name)
     end    
   end
@@ -121,49 +126,51 @@ class Store < Model
   # On stores, we store the model so we don't have to look it up
   # every time we do a read.
   def read_new_model(method_name)
-    model = new_model(nil, self, path + [method_name])
+    # On stores, plural associations are automatically assumed to be
+    # collections.
+    if method_name.plural?
+      model = new_array_model([], self, path + [method_name])
+    else
+      model = new_model(nil, self, path + [method_name])
+    end
     
     self.attributes ||= {}
     attributes[method_name] = model
     
-    if model.state == :not_loaded
+    if model.is_a?(StoreArray)# && model.state == :not_loaded
       model.load!
     end
     
     return model
   end
+
   
-  def load!
-    if @state == :not_loaded
-      @state = :loading
+  # When called, this model is deleted from its current parent collection
+  # and from the database
+  def delete!
+    if path.size == 0
+      raise "Not in a collection"
+    end
     
-      if @tasks && path.last.plural?
-        # Check to see the parents scope so we can only lookup associated
-        # models.
-        scope = {}
-      
-        # Scope to the parent
-        if path.size > 2 && (attrs = parent.attributes) && attrs[:_id].true?
-          scope[:"#{path[-3].singularize}_id"] = parent._id
-        end
-        
-        load_child_models(scope)
+    # TEMP: Find this model in the parent's collection
+    parent.each_with_index do |child,index|
+      puts "CHECK #{child.inspect} vs #{self.inspect}"
+      if child._id == self._id
+        puts "FOUND AT: #{index}"
+        parent.delete_at(index)
+        break
       end
     end
-    
-    return self
+
+    # Send to the DB that we got deleted
+    unless $loading_models
+      puts "delete #{collection} - #{attributes[:_id]}"
+      @tasks.call('StoreTasks', 'delete', collection, attributes[:_id])
+    end
   end
   
-  def load_child_models(scope)
-    # puts "FIND: #{collection(path).inspect} at #{scope.inspect}"
-    @tasks.call('StoreTasks', 'find', collection(path), scope) do |results|
-      # TODO: Globals evil, replace
-      $loading_models = true
-      results.each do |result|
-        self << Store.new(@tasks, result, self, path + [:[]], @class_paths)
-      end
-      $loading_models = false
-    end
+  def inspect
+    "<#{self.class.to_s}-#{@state} #{attributes.inspect}>"
   end
   
   def new_model(attributes={}, parent=nil, path=nil, class_paths=nil)

data/lib/volt/models/store_array.rb

@@ -1,31 +1,73 @@
 class StoreArray < ArrayModel
+  attr_reader :state
+  
   def initialize(tasks=nil, array=[], parent=nil, path=nil)
     @tasks = tasks
+    @state = :not_loaded
 
     super(array, parent, path)
+    
+    # TEMP: TODO: Setup the listeners right away
+    change_channel_connection('add', 'added')
+    change_channel_connection('add', 'removed')
   end
   
-  def event_added(event, scope_provider, first) 
-    puts "New event: #{event.inspect} - #{first}"   
-    if first && [:added, :removed].include?(event)
-      # Start listening for added items on the collection
+  # def event_added(event, scope_provider, first) 
+  #   puts "New event1: #{event.inspect} - #{first}"   
+  #   if first && [:added, :removed].include?(event)
+  #     # Start listening for added items on the collection
+  #     
+  #     change_channel_connection('add', event)
+  #   end
+  # end
+  # 
+  # def event_removed(event, no_more_events)
+  #   if no_more_events && [:added, :removed].include?(event)
+  #     # Stop listening
+  #     change_channel_connection("remove", event)
+  #   end
+  # end
+  
+  
+  def load!
+    if @state == :not_loaded
+      @state = :loading
+    
+      if @tasks && path.last.plural?
+        # Check to see the parents scope so we can only lookup associated
+        # models.
+        scope = {}
       
-      change_channel_connection('add')
+        # Scope to the parent
+        if path.size > 1 && attributes && attributes[:_id].true?
+          scope[:"#{path[-2].singularize}_id"] = _id
+        end
+        
+        puts "Load At Scope: #{scope.inspect}"
+        
+        load_child_models(scope)
+      end
     end
+    
+    return self
   end
   
-  def event_removed(event, no_more_events)
-    if no_more_events && [:added, :removed].include?(event)
-      # Stop listening
-      change_channel_connection("remove", event)
+  def load_child_models(scope)
+    # puts "FIND: #{collection(path).inspect} at #{scope.inspect}"
+    @tasks.call('StoreTasks', 'find', path.last, scope) do |results|
+      # TODO: Globals evil, replace
+      $loading_models = true
+      results.each do |result|
+        self << Store.new(@tasks, result, self, path + [:[]], @class_paths)
+      end
+      $loading_models = false
     end
   end
   
-  
   def change_channel_connection(add_or_remove, event)
-    if parent.attributes && path.size != 0
+    if @tasks && parent.attributes && path.size != 0
       channel_name = "#{path[-1]}-#{event}"
-      puts "Listen on #{channel_name}"
+      puts "Listen on #{channel_name} - #{add_or_remove}"
       @tasks.call('ChannelTasks', "#{add_or_remove}_listener", channel_name)
     end    
   end

data/lib/volt/page/channel_stub.rb

@@ -29,7 +29,7 @@ class ChannelStub
     destructive!
   end
   def send_message(message)
-    ChannelHandlerStub.new(self).process_message(message)
+    SocketConnectionHandlerStub.new(self).process_message(message)
   end
   
   def close!

data/lib/volt/page/tasks.rb

@@ -35,6 +35,8 @@ class Tasks
       changed(*args)
     when 'added'
       added(*args)
+    when 'removed'
+      removed(*args)
     when 'reload'
       reload
     end
@@ -62,6 +64,12 @@ class Tasks
     $loading_models = false
   end
   
+  def removed(id)
+    $loading_models = true
+    Store.from_id(id).delete!
+    $loading_models = false
+  end
+  
   def reload
     puts "RELOAD"
     $page.page._reloading = true

data/lib/volt/reactive/events.rb

@@ -100,6 +100,14 @@ end
 module Events
   # Add a listener for an event
   def on(event, scope_provider=nil, &block) 
+
+    
+    # if reactive? && [:added, :removed].include?(event)
+    #   self.object_tracker.queue_update
+    #   ObjectTracker.process_queue
+    # end
+
+
     # puts "Register: #{event} on #{self.inspect}"   
     event = event.to_sym
     

data/lib/volt/reactive/object_tracker.rb

@@ -35,6 +35,7 @@ class ObjectTracker
   end
   
   def queue_update
+    # puts "Queue: #{@main_object.inspect}"
     @@queue[self] = true
   end
   

data/lib/volt/server/component_templates.rb

@@ -15,7 +15,7 @@ class ComponentTemplates
     views_path = "#{@component_path}/views/"
 
     # Load all templates in the folder
-    Dir["#{views_path}*/*.html"].each do |view_path|
+    Dir["#{views_path}*/*.html"].sort.each do |view_path|
       # Get the path for the template, supports templates in folders
       template_path = view_path[views_path.size..((-1 * ('.html'.size + 1)))]
       template_path = "#{@component_name}/#{template_path}"
@@ -45,7 +45,7 @@ class ComponentTemplates
     code = ''
     controllers_path = "#{@component_path}/controllers/"
 
-    Dir["#{controllers_path}*_controller.rb"].each do |controller_path|
+    Dir["#{controllers_path}*_controller.rb"].sort.each do |controller_path|
       code << File.read(controller_path) + "\n\n"
     end
 
@@ -56,7 +56,7 @@ class ComponentTemplates
     code = ''
     models_path = "#{@component_path}/models/"
 
-    Dir["#{models_path}*.rb"].each do |model_path|
+    Dir["#{models_path}*.rb"].sort.each do |model_path|
       code << File.read(model_path) + "\n\n"
       
       model_name = model_path.match(/([^\/]+)[.]rb$/)[1]

data/lib/volt/server/rack/asset_files.rb

@@ -70,7 +70,7 @@ class AssetFiles
     @assets.each do |type, path|
       case type
       when :folder
-        javascript_files += Dir["#{path}/**/*.js"].map {|folder| '/assets' + folder[path.size..-1] }
+        javascript_files += Dir["#{path}/**/*.js"].sort.map {|folder| '/assets' + folder[path.size..-1] }
       when :javascript_file
         javascript_files << path
       end
@@ -94,7 +94,7 @@ class AssetFiles
     @assets.each do |type, path|
       case type
       when :folder
-        css_files += Dir["#{path}/**/*.{css,scss}"].map {|folder| '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '') }
+        css_files += Dir["#{path}/**/*.{css,scss}"].sort.map {|folder| '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '') }
       when :css_file
         css_files << path
       end

data/lib/volt/server/rack/component_paths.rb

@@ -34,7 +34,7 @@ class ComponentPaths
     
     @components = {}
     app_folders do |app_folder|
-      Dir["#{app_folder}/*"].each do |folder|
+      Dir["#{app_folder}/*"].sort.each do |folder|
         if File.directory?(folder)
           folder_name = folder[/[^\/]+$/]
           
@@ -51,7 +51,7 @@ class ComponentPaths
   def setup_components_load_path
     components.each do |name,component_folders|
       component_folders.each do |component_folder|
-        Dir["#{component_folder}/tasks"].each do |tasks_folder|
+        Dir["#{component_folder}/tasks"].sort.each do |tasks_folder|
           $LOAD_PATH.unshift(tasks_folder)
         end
       end
@@ -73,7 +73,7 @@ class ComponentPaths
   def asset_folders
     folders = []
     app_folders do |app_folder|
-      Dir["#{app_folder}/*/assets"].each do |asset_folder|
+      Dir["#{app_folder}/*/assets"].sort.each do |asset_folder|
         folders << yield(asset_folder)
       end
     end

data/lib/volt/server/rack/opal_files.rb

@@ -1,4 +1,8 @@
 require 'volt/server/rack/source_map_server'
+if Volt.env.production?
+  # Compress assets in production
+  require 'uglifier'
+end
 
 # Sets up the maps for the opal assets, and source maps if enabled.
 class OpalFiles
@@ -19,6 +23,12 @@ class OpalFiles
     environment = @environment
     
     environment.cache = Sprockets::Cache::FileStore.new("./tmp")
+    
+    if Volt.env.production?
+      # Compress in production
+      environment.js_compressor = Sprockets::UglifierCompressor
+      environment.css_compressor = Sprockets::YUICompressor
+    end
   
     environment.append_path(app_path)
   

data/spec/models/model_spec.rb

@@ -291,7 +291,7 @@ describe Model do
     # expect(changed_count).to eq(1)
   end
   
-  it "should handle a basic todo list exvoltle with no setup" do
+  it "should handle a basic todo list with no setup" do
     store = ReactiveValue.new(Model.new)
     params = ReactiveValue.new(Params.new)
     
@@ -411,4 +411,31 @@ describe Model do
     expect(count2).to eq(2)
     
   end
+  
+  it "should set its self to be " do
+    
+  end
+  
+  
+  describe "model paths" do
+    before do
+      @model = ReactiveValue.new(Model.new)      
+    end
+    
+    it "should set the model path" do
+      @model._object._name = 'Test'
+      expect(@model._object.path.cur).to eq([:_object])
+    end
+    
+    it "should set the model path for a sub array" do
+      @model._items << {_name: 'Bob'}
+      expect(@model._items.path.cur).to eq([:_items])
+      expect(@model._items[0].path.cur).to eq([:_items, :[]])
+    end
+    
+    it "should set the model path for sub sub arrays" do
+      @model._lists << {_name: 'List 1', _items: []}
+      expect(@model._lists[0]._items.path.cur).to eq([:_lists, :[], :_items])
+    end
+  end
 end

data/spec/models/old_model_spec.rb

@@ -3,48 +3,6 @@
 # 
 # describe Model do
 #   
-#   describe "model paths" do
-#     before do
-#       @model = ReactiveValue.new(Model.new)      
-#     end
-#     
-#     it "should set the model path" do
-#       @model._object._name = 'Test'
-#       @model._object.path.cur.should == ['_object']
-#     end
-#     
-#     it "should set the model path for a sub array" do
-#       @model._items << {_name: 'Bob'}
-#       @model._items.path.cur.should == ['_items']
-#       @model._items[0].path.cur.should == ['_items', '[]']
-#     end
-#     
-#     it "should set the model path for sub sub arrays" do
-#       @model._lists << {_name: 'List 1', _items: []}
-#       @model._lists[0]._items.path.cur.should == ['_lists', '[]', '_items']
-#     end
-#   end
-#   
-#   
-#   describe "paths" do
-#     before do
-#       @model = ReactiveValue.new(Model.new({}, nil, 'model'))
-#     end
-#     
-#     it "should track paths" do
-#       @model._test.path.cur.should == ['model', '_test']
-#     end
-#     
-#     it "should track nested paths" do
-#       @model._test._blue.path.cur.should == ['model', '_test', '_blue']
-#     end
-#     
-#     it "should track paths with array lookup's" do
-#       @model._test._green << {}
-#       @model._test._green.path.cur.should == ['model', '_test', '_green']
-#       @model._test._green[0].path.cur.should == ['model', '_test', '_green', '[]']
-#     end
-#   end
 #   
 #   describe "user models" do
 #     class User < Model

data/volt.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oj", "~> 2.5.0"
   spec.add_dependency "rake", "~> 10.0.4"
   spec.add_dependency "listen", "~> 2.4.0"
+  spec.add_dependency "uglifier", "~> 2.4.0"
+  spec.add_dependency "yui-compressor", "~> 0.12.0"
   # spec.add_dependency "rack-colorized_logger", "~> 1.0.4"
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -206,6 +206,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: yui-compressor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +333,7 @@ files:
 - docs/GETTING_STARTED.md
 - docs/WHY.md
 - lib/volt.rb
+- lib/volt/assets/test.rb
 - lib/volt/benchmark/benchmark.rb
 - lib/volt/cli.rb
 - lib/volt/cli/new_gem.rb