volt 0.8.15 → 0.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6635ba6a1792a3170956c91f7125be7b5c0cd268
-  data.tar.gz: e63ae431f7bf79aa12be2ed75dc499e580979eb7
+  metadata.gz: e6f2cebeff308d55c2552eba413e158fc6a128a5
+  data.tar.gz: b801ee31880a6926dcb402da887c9aaa957ba578
 SHA512:
-  metadata.gz: 3ccaaf9013222c95f10537b9712e8b8d5a8ecb3d705c20e533c54985c4420ffd09ec71a6cc51bc49e19ce55e525b788745d6be13b2e1cb1ce05a00f87499836f
-  data.tar.gz: 19ecd0ca6771454732889f8336c34cb24803caa5ea8ebc5cdc058557e6ffdaa618cbb4cca56c69069f89b35ce0c7de6468338f0ccc338d69cb75448400a31785
+  metadata.gz: c46369ca33511b29eee4fc83d5790155cfacceab89c16a69dafedc4c3fcd2b048c5ed7c72d704a98d1f5d9d533243920ccebb1807061c1f53512aee8fd3d1ca8
+  data.tar.gz: 17fee69bdedea9ea2f9349c9b13d999e5f07cb9689c4cd8fc6ecacb261bb7a3528236bab9d2a31adf5227f2fe956947e9d0dc0aeac9eca58abf4ef13547bdd44

data/.rubocop.yml

@@ -0,0 +1,11 @@
+UselessAssignment:
+  Enabled: false
+
+UnusedMethodArgument:
+  Enabled: false
+
+UnderscorePrefixedVariableName:
+  Enabled: false
+
+UnusedBlockArgument:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Unreleased
+### Added
+- Change changelog format to match: http://keepachangelog.com/
+- Added rubocop config and ran rubocop on repo, lots of changes.
+- Added .limit and .skip to cursors
+- Changed: ```attrs``` now return nil for attributes that weren't passed in.
+
+# 0.8.15 - Oct 18, 2014
+
+  - MAJOR CHANGE: everything volt related now is under the Volt module.  The only change apps need to think about is inheriting from ```Volt::ModelController``` and ```Volt::Model```  Also, config.ru needs to use ```Volt::Server``` instead of ```Server```.
+
 # 0.8.10 - Oct 12, 2014
   - url.query, url.fragment, url.path all update reactively now.
   - MAJOR CHANGE: Previously all tables and fields were created with _'s as their name prefixes.  The underscores have been removed from everywhere.  The only place you use underscores is when you want to access fields without creating setters and getters.  Now when you do: ```model._name = 'Something'```, your setting the ```name``` attribute on the model.  When you do: ```model._name```, your fetching the ```name``` attribute.  If you insert a hash into a collection, you no longer use underscores:

data/Gemfile

@@ -39,7 +39,7 @@ group :development do
   # Simple theme for bootstrap, remove to theme yourself.
   gem 'volt-bootstrap-jumbotron-theme'
 
-
+  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'

data/Guardfile

@@ -3,7 +3,6 @@
 
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/volt/(.+)\.rb$})     { |m| puts "RUN AGAIN" ; "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^lib/volt/(.+)\.rb$})     { |m| puts 'RUN AGAIN'; "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end
-

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler'
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 Bundler.require(:development)
 
 require 'opal'
@@ -10,7 +10,6 @@ Opal.append_path(File.expand_path('../lib', __FILE__))
 
 require 'opal/rspec/rake_task'
 
-
 task :docs do
   `bundle exec yardoc 'lib/**/*.rb' - Readme.md docs/*`
   # require 'yard'
@@ -22,8 +21,6 @@ task :docs do
   # end
 end
 
-
-
 Opal::RSpec::RakeTask.new
 
 task default: [:test]

data/VERSION

@@ -1 +1 @@
-0.8.15
+0.8.16

data/app/volt/controllers/notices_controller.rb

@@ -3,7 +3,7 @@ module Volt
     model :page
 
     def hey
-      "yep"
+      'yep'
     end
 
     def page

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

@@ -9,13 +9,13 @@ class DataStore
   end
 
   def query(collection, query)
-    query = query.dup
-    query.keys.each do |key|
-      if key =~ /_id$/
-        # query[key] = BSON::ObjectId(query[key])
-      end
-    end
+    # Extract query parts
+    query, skip, limit = query
 
-    db[collection].find(query).to_a
+    cursor = db[collection].find(query)
+    cursor = cursor.skip(skip) if skip
+    cursor = cursor.limit(limit) if limit
+
+    return cursor.to_a
   end
 end

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

@@ -18,39 +18,38 @@ class LiveQuery
     run
   end
 
-  def run(skip_channel=nil)
+  def run(skip_channel = nil)
     @query_tracker.run(skip_channel)
   end
 
   def notify_removed(ids, skip_channel)
     # puts "Removed: #{ids.inspect}"
     notify! do |channel|
-      channel.send_message("removed", nil, @collection, @query, ids)
+      channel.send_message('removed', nil, @collection, @query, ids)
     end
   end
 
   def notify_added(index, data, skip_channel)
     # puts "Added: #{index} - #{data.inspect}"
     notify! do |channel|
-      channel.send_message("added", nil, @collection, @query, index, data)
+      channel.send_message('added', nil, @collection, @query, index, data)
     end
   end
 
   def notify_moved(id, new_position, skip_channel)
     # puts "Moved: #{id}, #{new_position}"
     notify! do |channel|
-      channel.send_message("moved", nil, @collection, @query, id, new_position)
+      channel.send_message('moved', nil, @collection, @query, id, new_position)
     end
   end
 
   def notify_changed(id, data, skip_channel)
     # puts "Changed: #{id}, #{data}"
     notify!(skip_channel) do |channel|
-      channel.send_message("changed", nil, @collection, @query, id, data)
+      channel.send_message('changed', nil, @collection, @query, id, data)
     end
   end
 
-
   # return the query results the first time a channel connects
   def initial_data
     @query_tracker.results.map.with_index do |data, index|
@@ -73,18 +72,17 @@ class LiveQuery
     end
   end
 
-  def notify!(skip_channel=nil, only_channel=nil)
+  def notify!(skip_channel = nil, only_channel = nil)
     if only_channel
       channels = [only_channel]
     else
       channels = @channels
     end
 
-    channels = channels.reject {|c| c == skip_channel }
+    channels = channels.reject { |c| c == skip_channel }
 
     channels.each do |channel|
       yield(channel)
     end
   end
-
 end

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

@@ -10,7 +10,7 @@ class LiveQueryPool < Volt::GenericPool
   def lookup(collection, query)
     query = normalize_query(query)
 
-    return super(collection, query)
+    super(collection, query)
   end
 
   def updated_collection(collection, skip_channel)
@@ -20,16 +20,17 @@ class LiveQueryPool < Volt::GenericPool
   end
 
   private
-    # Creates the live query if it doesn't exist, and stores it so it
-    # can be found later.
-    def create(collection, query={})
-      # If not already setup, create a new one for this collection/query
-      return LiveQuery.new(self, @data_store, collection, query)
-    end
 
-    def normalize_query(query)
-      # TODO: add something to sort query properties so the queries are
-      # always compared the same.
-      return query
-    end
+  # Creates the live query if it doesn't exist, and stores it so it
+  # can be found later.
+  def create(collection, query = {})
+    # If not already setup, create a new one for this collection/query
+    LiveQuery.new(self, @data_store, collection, query)
+  end
+
+  def normalize_query(query)
+    # TODO: add something to sort query properties so the queries are
+    # always compared the same.
+    query
+  end
 end

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

@@ -13,7 +13,7 @@ class QueryTracker
   end
 
   # Runs the query, stores the results and updates the current_ids
-  def run(skip_channel=nil)
+  def run(skip_channel = nil)
     @previous_results = @results
     @previous_results_hash = @results_hash
     @previous_ids = @current_ids
@@ -22,8 +22,8 @@ class QueryTracker
     @results = @data_store.query(@live_query.collection, @live_query.query)
 
     # Update the current_ids
-    @current_ids = @results.map {|r| r['_id'] }
-    @results_hash = Hash[@results.map {|r| [r['_id'], r] }]
+    @current_ids = @results.map { |r| r['_id'] }
+    @results_hash = Hash[@results.map { |r| [r['_id'], r] }]
 
     process_changes(skip_channel)
   end
@@ -55,7 +55,7 @@ class QueryTracker
   # have been added or moved.
   def detect_added_and_moved(skip_channel)
     previous_index = 0
-    @current_ids.each_with_index do |id,index|
+    @current_ids.each_with_index do |id, index|
       if (cur_previous = @previous_ids[previous_index]) && cur_previous == id
         # Same in both previous and new
         previous_index += 1
@@ -91,5 +91,4 @@ class QueryTracker
       end
     end
   end
-
 end

data/app/volt/tasks/query_tasks.rb

@@ -10,7 +10,7 @@ class QueryTasks < Volt::TaskHandler
   end
 
   # The dispatcher passes its self in
-  def initialize(channel, dispatcher=nil)
+  def initialize(channel, dispatcher = nil)
     @channel = channel
     @dispatcher = dispatcher
   end
@@ -29,17 +29,17 @@ class QueryTasks < Volt::TaskHandler
       initial_data = live_query.initial_data
     rescue => exception
       # Capture and pass up any exceptions
-      error = {:error => exception.message}
+      error = { error: exception.message }
     end
 
-    return [initial_data, error]
+    [initial_data, error]
   end
 
   def initial_data
     data = live_query.initial_data
     data[:_id] = data[:_id].to_s
 
-    return data
+    data
   end
 
   # Remove a listening channel, the LiveQuery will automatically remove
@@ -49,7 +49,6 @@ class QueryTasks < Volt::TaskHandler
     live_query.remove_channel(@channel)
   end
 
-
   # Removes a channel from all associated live queries
   def close!
     live_queries = @@channel_live_queries[@channel]
@@ -64,11 +63,10 @@ class QueryTasks < Volt::TaskHandler
   end
 
   private
-    # Tracks that this channel will be notified from the live query.
-    def track_channel_in_live_query(live_query)
-      @@channel_live_queries[@channel] ||= []
-      @@channel_live_queries[@channel] << live_query
-    end
-
 
+  # Tracks that this channel will be notified from the live query.
+  def track_channel_in_live_query(live_query)
+    @@channel_live_queries[@channel] ||= []
+    @@channel_live_queries[@channel] << live_query
+  end
 end

data/app/volt/tasks/store_tasks.rb

@@ -1,7 +1,7 @@
 require 'mongo'
 
 class StoreTasks < Volt::TaskHandler
-  def initialize(channel=nil, dispatcher=nil)
+  def initialize(channel = nil, dispatcher = nil)
     @channel = channel
     @dispatcher = dispatcher
   end
@@ -26,7 +26,7 @@ class StoreTasks < Volt::TaskHandler
       return model.to_h, model.errors
     end
 
-    return data, {}
+    [data, {}]
   end
 
   def save(collection, data)
@@ -48,9 +48,9 @@ class StoreTasks < Volt::TaskHandler
           # Update because the id already exists
           update_values = values.dup
           update_values.delete(:_id)
-          db[collection].update({:_id => id}, update_values)
+          db[collection].update({ _id: id }, update_values)
         else
-          return {:error => error.message}
+          return { error: error.message }
         end
       end
 

data/app/volt/tasks/user_tasks.rb

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

data/bin/volt

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-require 'volt/cli'
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+require 'volt/cli'

data/lib/volt.rb

@@ -21,9 +21,7 @@ module Volt
       @root ||= File.expand_path(Dir.pwd)
     end
 
-    def root=(val)
-      @root = val
-    end
+    attr_writer :root
 
     def server?
       !!ENV['SERVER']
@@ -42,12 +40,10 @@ module Volt
     end
 
     def logger
-      @logger ||= Logger.new
+      @logger ||= Logger.new(STDOUT)
     end
 
-    def logger=(val)
-      @logger = val
-    end
+    attr_writer :logger
 
     def in_browser?
       @in_browser

data/lib/volt/assets/test.rb

@@ -1,5 +1,4 @@
 require 'sass'
 
-sass_engine = Sass::Engine.new(template, {syntax: :scss, filename: 'cool.css.scss', sourcemap: true}) ; output =
+sass_engine = Sass::Engine.new(template, syntax: :scss, filename: 'cool.css.scss', sourcemap: true); output =
 sass_engine.render_with_sourcemap('/source_maps/')
-

data/lib/volt/benchmark/benchmark.rb

@@ -1,7 +1,7 @@
 if RUBY_PLATFORM == 'opal'
   class Benchmark
-    def self.bm(iterations=1)
-      puts "BM"
+    def self.bm(iterations = 1)
+      puts 'BM'
 
       times = []
       total_time = nil
@@ -21,7 +21,7 @@ if RUBY_PLATFORM == 'opal'
         puts "Times: #{times.inspect}"
       end
 
-      return result
+      result
     end
   end
 end

data/lib/volt/boot.rb

@@ -18,6 +18,6 @@ module Volt
     component_paths = ComponentPaths.new(app_path)
     component_paths.require_in_components
 
-    return component_paths
+    component_paths
   end
 end

data/lib/volt/cli.rb

@@ -9,26 +9,26 @@ module Volt
 
     register(Generate, 'generate', 'generate GENERATOR [args]', 'Run a generator.')
 
-    desc "new PROJECT_NAME", "generates a new project."
+    desc 'new PROJECT_NAME', 'generates a new project.'
 
     def new(name)
       # Grab the current volt version
       version = File.read(File.join(File.dirname(__FILE__), '../../VERSION'))
-      directory("project", name, {version: version, name: name})
+      directory('project', name, version: version, name: name)
 
-      say "Bundling Gems...."
+      say 'Bundling Gems....'
       `cd #{name} && bundle`
     end
 
-    desc "console", "run the console on the project in the current directory"
+    desc 'console', 'run the console on the project in the current directory'
 
     def console
       require 'volt/console'
       Console.start
     end
 
-    desc "server", "run the server on the project in the current directory"
-    method_option :port, :type => :string, :aliases => '-p', :banner => 'specify which port the server should run on'
+    desc 'server', 'run the server on the project in the current directory'
+    method_option :port, type: :string, aliases: '-p', banner: 'specify which port the server should run on'
 
     def server
       if RUBY_PLATFORM == 'java'
@@ -42,10 +42,10 @@ module Volt
       # If we're in a Volt project, clear the temp directory
       # TODO: this is a work around for a bug when switching between
       # source maps and non-source maps.
-      if File.exists?("config.ru") && File.exists?("Gemfile")
-        FileUtils.rm_rf("tmp/.")
+      if File.exist?('config.ru') && File.exist?('Gemfile')
+        FileUtils.rm_rf('tmp/.')
       else
-        say("Current folder is not a Volt project", :red)
+        say('Current folder is not a Volt project', :red)
         return
       end
 
@@ -55,7 +55,7 @@ module Volt
         Thread.stop
       else
         ENV['SERVER'] = 'true'
-        args          = ['start', '--threaded', '--max-persistent-conns', '300', "--max-conns", "400"]
+        args          = ['start', '--threaded', '--max-persistent-conns', '300', '--max-conns', '400']
 
         if options[:port]
           args += ['-p', options[:port].to_s]
@@ -65,13 +65,13 @@ module Volt
       end
     end
 
-    desc "gem GEM", "Creates a component gem where you can share a component"
-    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."
-    method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "Generate a test directory for your library: 'rspec' is the default, but 'minitest' is also supported."
-    method_option :edit, :type  => :string, :aliases => "-e",
-                  :lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find { |e| !e.nil? && !e.empty? },
-                  :required     => false, :banner => "/path/to/your/editor",
-                  :desc         => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
+    desc 'gem GEM', 'Creates a component gem where you can share a component'
+    method_option :bin, type: :boolean, default: false, aliases: '-b', banner: 'Generate a binary for your library.'
+    method_option :test, type: :string, lazy_default: 'rspec', aliases: '-t', banner: "Generate a test directory for your library: 'rspec' is the default, but 'minitest' is also supported."
+    method_option :edit, type: :string, aliases: '-e',
+                  lazy_default: [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find { |e| !e.nil? && !e.empty? },
+                  required: false, banner: '/path/to/your/editor',
+                  desc: 'Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)'
 
     def gem(name)
       require 'volt/cli/new_gem'
@@ -88,5 +88,5 @@ end
 # Add in more features
 require 'volt/cli/asset_compile'
 
-puts "Volt #{File.read(File.join(File.dirname(__FILE__), "../../VERSION"))}"
+puts "Volt #{File.read(File.join(File.dirname(__FILE__), '../../VERSION'))}"
 Volt::CLI.start(ARGV)