volt 0.9.1.pre4 → 0.9.1.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 112adfde352ea21c2d38e0f6cc3e1f0974f12690
-  data.tar.gz: 0fa53b549be59a3edf910dd28397c07148297a36
+  metadata.gz: 2f83c12e036d4b26d94015e199d1721c7bec82cf
+  data.tar.gz: a6475a6f6e230f0f7d411f17a03a3bc7e15ecc3f
 SHA512:
-  metadata.gz: d50022986eb78ea62fecf9c75465d0839a40c4d5bf2debbda31e469c04d36b14e774813192479482f7bb6cb3ede05ece3fc8b77bd0afc3bf25f4000d582886ee
-  data.tar.gz: 464c2c73e009e3a3edcce0d2ea70c42023a6e832878652263a462b6ddf917ec440bf95441766bcac440d8f81a4539e33277272940aab3b3b34be5450aae6009d
+  metadata.gz: 09519287d313bb3bbcdb4fc5190e67a7ab3f7d2152ddbf4a13ffecaa81fdf63043bbb2ef62d6def2fd5c28e17b048f3008e67629e12ad7b49b63c882d4c45a8d
+  data.tar.gz: bf82e809508689cf4fc749f7dc1c6a23690e4eff81db652d6dc21ced81971195b396bfe75b5d0f6522534a63d4c480359cab8f27f6cb88058ca18b0ced74a749

data/CHANGELOG.md

@@ -10,6 +10,9 @@
 - made it so <:SectionName> can be accessed by <:section_name /> tag
 - fixed issue with if bindings not resolving some promises.
 - fixed issue with require's in controllers.
+- fix class formatting issue with Pry.
+- Bundler.require is now called for the correct env when 'volt/boot' is included.  (We weren't planning to do this, but it does make life so much easier)
+- opal-jquery was removed as a dependency.  If you want to use it again, add ```gem 'opal-jquery'``` to your Gemfile and add ```require 'opal/jquery'` to your MainController.
 
 
 ## 0.9.0

data/CONTRIBUTING.md

@@ -58,7 +58,7 @@ BROWSER=firefox bundle exec rake
 
 #### Write Tests
 
-Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [spec/volt](spec/volt).
+Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [specs](https://github.com/voltrb/volt/tree/master/spec).
 
 We definitely appreciate pull requests that highlight or reproduce a problem, even without a fix.
 

data/README.md

@@ -3,6 +3,7 @@
 [![Code Climate](https://codeclimate.com/github/voltrb/volt/badges/gpa.svg)](https://codeclimate.com/github/voltrb/volt)
 [![Coverage Status](https://coveralls.io/repos/voltrb/volt/badge.svg?branch=master)](https://coveralls.io/r/voltrb/volt?branch=master)[![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg?style=flat)](https://travis-ci.org/voltrb/volt)
 [![Inline docs](http://inch-ci.org/github/voltrb/volt.svg?branch=master)](http://inch-ci.org/github/voltrb/volt)
+[![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT)
 
 For the current status of Volt, read: http://voltframework.com/blog
 

data/app/volt/tasks/query_tasks.rb

@@ -1,18 +1,19 @@
-require_relative 'live_query/data_store'
 require_relative 'live_query/live_query_pool'
 
 class QueryTasks < Volt::Task
-  @@live_query_pool = LiveQueryPool.new(DataStore.new)
   @@channel_live_queries = {}
 
   def self.live_query_pool
-    @@live_query_pool
+    @@live_query_pool ||= LiveQueryPool.new(Volt::DataStore.fetch)
   end
 
   # The dispatcher passes its self in
   def initialize(channel, dispatcher = nil)
     @channel = channel
     @dispatcher = dispatcher
+
+    # Load the query pool if not already setup
+    self.class.live_query_pool
   end
 
   def add_listener(collection, query)

data/app/volt/tasks/store_tasks.rb

@@ -77,7 +77,7 @@ class StoreTasks < Volt::Task
     query.fetch_first do |model|
       if model
         if model.can_delete?
-          db[collection].remove('_id' => id)
+          db.delete('_id' => id)
         else
           raise "Permissions did not allow #{collection} #{id} to be deleted."
         end

data/lib/volt/boot.rb

@@ -1,3 +1,11 @@
+unless RUBY_PLATFORM == 'opal'
+  # An option to skip requiring.
+  unless ENV['SKIP_BUNDLER_REQUIRE']
+    # Require in gems
+    Bundler.require((ENV['VOLT_ENV'] || ENV['RACK_ENV'] || :development).to_sym)
+  end
+end
+
 require 'volt/models'
 require 'volt/server/rack/component_paths'
 
@@ -10,13 +18,6 @@ require 'volt/volt/app'
 
 module Volt
   def self.boot(app_path)
-    # Run the app config to load all users config files
-    unless RUBY_PLATFORM == 'opal'
-      if Volt.server?
-        $page = Page.new
-      end
-    end
-
     # Boot the app
     App.new(app_path)
   end

data/lib/volt/cli/asset_compile.rb

@@ -80,7 +80,7 @@ module Volt
     end
 
     def write_component_js
-      javascript_code = @component_handler.compile_for_component('main')
+      javascript_code = @component_handler.compile_for_component('main', true)
 
       path = File.join(Volt.root, '/public/components/main.js')
       write_file(path, javascript_code)

data/lib/volt/cli/console.rb

@@ -29,6 +29,17 @@ end
 
 module Volt
   class Console
+    module Helpers
+      def store
+        $page.store
+      end
+
+      def page
+        $page.page
+      end
+    end
+
+
     def self.start
       require 'pry'
 
@@ -46,10 +57,10 @@ module Volt
 
       Pry.config.prompt_name = 'volt'
 
-      # start a REPL session
-      # Pry.start
+      Pry.main.send(:include, Volt::Console::Helpers)
 
-      $page.pry
+      # $page.pry
+      Pry.start
     end
   end
 end

data/lib/volt/cli/new_gem.rb

@@ -51,8 +51,8 @@ class NewGem
     copy('newgem/gitignore.tt', '.gitignore')
     copy('newgem/newgem.gemspec.tt', "#{@name}.gemspec")
     copy('newgem/lib/newgem.rb.tt', "lib/#{@namespaced_path}.rb")
-    copy('newgem/VERSION', 'VERSION')
     FileUtils.mkdir_p(File.join(@target, "lib/#{@namespaced_path}"))
+    copy('newgem/lib/newgem/version.rb.tt', "lib/#{@namespaced_path}/version.rb")
   end
 
   def copy_options
@@ -103,8 +103,8 @@ class NewGem
   end
 
   def volt_version_base
-    version_path = File.join(File.dirname(__FILE__), '../../../VERSION')
-    File.read(version_path).split('.').tap { |v| v[v.size - 1] = 0 }.join('.')
+    require 'volt/version'
+    Volt::Version::STRING.split('.').tap { |v| v[v.size - 1] = 0 }.join('.')
   end
 
   def get_constant_name

data/lib/volt/cli.rb

@@ -4,6 +4,7 @@ require 'bundler/setup'
 require 'thor'
 require 'volt/extra_core/extra_core'
 require 'volt/cli/generate'
+require 'volt/version'
 
 module Volt
   class CLI < Thor
@@ -17,8 +18,7 @@ module Volt
       require 'securerandom'
 
       # 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: Volt::Version::STRING, name: name, domain: name.dasherize.downcase, app_name: name.capitalize)
 
       say 'Bundling Gems...'
       `cd #{name} && bundle`
@@ -114,5 +114,5 @@ end
 # Add in more features
 require 'volt/cli/asset_compile'
 
-puts "Volt #{File.read(File.join(File.dirname(__FILE__), '../../VERSION'))}"
+puts "Volt #{Volt::Version::STRING}"
 Volt::CLI.start(ARGV)

data/lib/volt/config.rb

@@ -51,7 +51,13 @@ else
           db_name:   (ENV['DB_NAME'] || (app_name + '_' + Volt.env.to_s)).gsub('.', '_'),
           db_host:   ENV['DB_HOST'] || 'localhost',
           db_port:   (ENV['DB_PORT'] || 27_017).to_i,
-          db_driver: ENV['DB_DRIVER'] || 'mongo'
+          db_driver: ENV['DB_DRIVER'] || 'mongo',
+
+          # a list of components which should be included in all components
+          default_components: ['volt'],
+
+          compress_javascript: Volt.env.production?,
+          compress_css:        Volt.env.production?
         }
       end
 

data/lib/volt/data_stores/base.rb

@@ -0,0 +1,7 @@
+module Volt
+  class DataStore
+    class Base
+
+    end
+  end
+end

data/lib/volt/data_stores/data_store.rb

@@ -3,9 +3,16 @@ require 'volt/data_stores/mongo_driver'
 module Volt
   class DataStore
     def self.fetch
-      if Volt.config.db_driver == 'mongo'
-        MongoDriver.fetch
-      else
+      # Cache the driver
+      return @driver if @driver
+
+      database_name = Volt.config.db_driver
+      driver_name = database_name.camelize + 'Driver'
+
+      begin
+        driver = self.const_get(driver_name)
+        @driver = MongoDriver.new
+      rescue NameError => e
         fail "#{database_name} is not a supported database"
       end
     end

data/lib/volt/data_stores/mongo_driver.rb

@@ -1,17 +1,68 @@
+require 'volt/data_stores/base'
 require 'mongo'
 
 module Volt
   class DataStore
-    class MongoDriver
-      def self.fetch
+    class MongoDriver < Base
+      attr_reader :db, :mongo_db
+
+      def initialize
         if Volt.config.db_uri.present?
-          @@mongo_db ||= Mongo::MongoClient.from_uri(Volt.config.db_uri)
-          @@db ||= @@mongo_db.db(Volt.config.db_uri.split('/').last || Volt.config.db_name)
+          @mongo_db ||= Mongo::MongoClient.from_uri(Volt.config.db_uri)
+          @db ||= @mongo_db.db(Volt.config.db_uri.split('/').last || Volt.config.db_name)
         else
-          @@mongo_db ||= Mongo::MongoClient.new(Volt.config.db_host, Volt.config.db_path)
-          @@db ||= @@mongo_db.db(Volt.config.db_name)
+          @mongo_db ||= Mongo::MongoClient.new(Volt.config.db_host, Volt.config.db_path)
+          @db ||= @mongo_db.db(Volt.config.db_name)
+        end
+      end
+
+      def insert(collection, values)
+        @db[collection].insert(values)
+      end
+
+      def update(collection, values)
+        # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
+        begin
+          @db[collection].insert(values)
+        rescue Mongo::OperationFailure => error
+          # Really mongo client?
+          if error.message[/^11000[:]/]
+            # Update because the id already exists
+            update_values = values.dup
+            id = update_values.delete(:_id)
+            @db[collection].update({ _id: id }, update_values)
+          else
+            return { error: error.message }
+          end
         end
-        @@db
+
+        return nil
+      end
+
+      def query(collection, query)
+        allowed_methods = ['find', 'skip', 'limit']
+
+        cursor = @db[collection]
+
+        query.each do |query_part|
+          method_name, *args = query_part
+
+          unless allowed_methods.include?(method_name.to_s)
+            raise "`#{method_name}` is not part of a valid query"
+          end
+
+          cursor = cursor.send(method_name, *args)
+        end
+
+        cursor.to_a
+      end
+
+      def delete(collection, query)
+        @db[collection].remove(query)
+      end
+
+      def drop_database
+        db.connection.drop_database(Volt.config.db_name)
       end
     end
   end

data/lib/volt/models/associations.rb

@@ -36,7 +36,7 @@ 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.persistor)
 
       # Check if we are on the store collection
       if persistor.is_a?(Volt::Persistors::ModelStore)
@@ -51,4 +51,4 @@ module Volt
       end
     end
   end
-end
+end

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

@@ -18,6 +18,9 @@ module Volt
       end
 
       def initialize(model, tasks = nil)
+        # Keep a hash of all ids in this collection
+        @ids = {}
+
         super
 
         # The listener event counter keeps track of how many things are listening
@@ -226,15 +229,16 @@ module Volt
       # TODO: Deprecate
       alias_method :then, :fetch
 
-      # Called from backend
+      # Called from backend when an item is added
       def add(index, data)
         $loading_models = true
 
         Model.no_validate do
           data_id = data['_id'] || data[:_id]
 
-          # Don't add if the model is already in the ArrayModel
-          unless @model.array.find { |v| v._id == data_id }
+          # Don't add if the model is already in the ArrayModel (from the client already)
+          unless @ids[data_id]
+            @ids[data_id] = true
             # Find the existing model, or create one
             new_model = @@identity_map.find(data_id) do
               new_options = @model.options.merge(path: @model.path + [:[]], parent: @model)
@@ -248,12 +252,14 @@ module Volt
         $loading_models = false
       end
 
+      # Called from the server when it removes an item.
       def remove(ids)
         $loading_models = true
         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
+              @ids.delete(id)
               del = @model.delete_at(index)
               break
             end
@@ -263,23 +269,35 @@ module Volt
         $loading_models = false
       end
 
+      # Called when all models are removed
+      def clear
+        @ids = {}
+      end
+
       def channel_name
         @model.path[-1]
       end
 
-      # When a model is added to this collection, we call its "changed"
-      # method.  This should trigger a save.
+      # Called when the client adds an item.
       def added(model, index)
         if model.persistor
           # Tell the persistor it was added, return the promise
-          model.persistor.add_to_collection
+          promise = model.persistor.add_to_collection
+
+          # Track the the model got added
+          @ids[model._id] = true
+
+          promise
         end
       end
 
+      # Called when the client removes an item
       def removed(model)
         if model.persistor
           # Tell the persistor it was removed
           model.persistor.remove_from_collection
+
+          @ids.delete(model._id)
         end
 
         if defined?($loading_models) && $loading_models

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

@@ -17,6 +17,10 @@ module Volt
         changed(attribute_name)
       end
 
+      # Called when the model is cleared (all child models removed)
+      def clear
+      end
+
       def event_added(event, first, first_for_event)
       end
 

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

@@ -195,21 +195,10 @@ module Volt
           id = values[:_id]
 
           # Try to create
-          # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
-          begin
-            # values['_id'] = BSON::ObjectId('_id') if values['_id']
-            db[collection].insert(values)
-          rescue Mongo::OperationFailure => error
-            # Really mongo client?
-            if error.message[/^11000[:]/]
-              # Update because the id already exists
-              update_values = values.dup
-              update_values.delete(:_id)
-              db[collection].update({ _id: id }, update_values)
-            else
-              return { error: error.message }
-            end
-          end
+          update_result = db.update(collection, values)
+
+          # 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'])
           {}

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

@@ -26,26 +26,28 @@ module Volt
         update(result)
       end
 
-      @is_radio = element.is('[type=radio]')
+      @is_radio = `#{element}.is('[type=radio]')`
       if @is_radio
-        @selected_value = element.attr('value')
+        @selected_value = `#{element}.attr('value') || ''`
       end
 
       # Bind so when this value updates, we update
       case @attribute_name
         when 'value'
-          element.on('input.attrbind') { changed }
+          changed_event = Proc.new { changed }
+          `#{element}.on('input.attrbind', #{changed_event})`
         when 'checked'
-          element.on('change.attrbind') { |event| changed(event) }
+          changed_event = Proc.new { |event| changed(event) }
+          `#{element}.on('change.attrbind', #{changed_event})`
       end
     end
 
     def changed(event = nil)
       case @attribute_name
         when 'value'
-          current_value = element.value
+          current_value = `#{element}.val() || ''`
         else
-          current_value = element.is(':checked')
+          current_value = `#{element}.is(':checked')`
       end
 
       if @is_radio
@@ -59,7 +61,7 @@ module Volt
     end
 
     def element
-      Element.find('#' + binding_name)
+      @element ||= `$('#' + #{binding_name})`
     end
 
     def update(new_value)
@@ -94,20 +96,20 @@ module Volt
         when 'value'
           # TODO: only update if its not the same, this keeps it from moving the
           # cursor in text fields.
-          if val != element.value
-            element.value = val
+          if val != `(#{element}.val() || '')`
+            `#{element}.val(#{val})`
           end
         when 'disabled'
           # Disabled is handled specially, you can either return a boolean:
           # (true being disabled, false not disabled), or you can optionally
           # include the "disabled" string. (or any string)
           if val != false && val.present?
-            element.attr('disabled', 'disabled')
+            `#{element}.attr('disabled', 'disabled')`
           else
-            element.remove_attr('disabled')
+            `#{element}.removeAttr('disabled')`
           end
         else
-          element[@attribute_name] = val
+          `#{element}.attr(#{@attribute_name}, #{val})`
       end
     end
 
@@ -120,7 +122,7 @@ module Volt
         value = (@selected_value == value)
       end
 
-      element.prop('checked', value)
+      `#{element}.prop('checked', #{value})`
     end
 
     def remove
@@ -128,9 +130,9 @@ module Volt
       # aren't responsible for it being there.
       case @attribute_name
         when 'value'
-          element.off('input.attrbind', nil)
+          `#{element}.off('input.attrbind', #{nil})`
         when 'checked'
-          element.off('change.attrbind', nil)
+          `#{element}.off('change.attrbind', #{nil})`
       end
 
       if @computation

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

@@ -31,16 +31,10 @@ module Volt
       Computation.run_without_tracking do
         # Adjust to the new size
         values = current_values(value)
+
         @value = values
 
-        if @added_listener
-          @added_listener.remove
-          @added_listener = nil
-        end
-        if @removed_listener
-          @removed_listener.remove
-          @removed_listener = nil
-        end
+        remove_listeners
 
         if @value.respond_to?(:on)
           @added_listener   = @value.on('added') { |position| item_added(position) }
@@ -141,6 +135,17 @@ module Volt
       values
     end
 
+    def remove_listeners
+      if @added_listener
+        @added_listener.remove
+        @added_listener = nil
+      end
+      if @removed_listener
+        @removed_listener.remove
+        @removed_listener = nil
+      end
+    end
+
     # When this each_binding is removed, cleanup.
     def remove
       @computation.stop
@@ -151,15 +156,7 @@ module Volt
 
       @getter = nil
 
-      if @added_listener
-        @added_listener.remove
-        @added_listener = nil
-      end
-
-      if @removed_listener
-        @removed_listener.remove
-        @removed_listener = nil
-      end
+      remove_listeners
 
       if @templates
         template_count = @templates.size

data/lib/volt/page/bindings/view_binding/controller_handler.rb

@@ -40,5 +40,29 @@ module Volt
       # before_action chain was not stopped
       return false
     end
+
+    # Fetch the controller class
+    def self.get_controller_and_action(controller_path)
+      raise "Invalid controller path: #{controller_path.inspect}" unless controller_path && controller_path.size > 0
+
+      action = controller_path[-1]
+
+      # Get the constant parts
+      parts  = controller_path[0..-2].map { |v| v.tr('-', '_').camelize }
+
+      # Do const lookups starting at object and working our way down.
+      # So Volt::ProgressBar would lookup Volt, then ProgressBar on Volt.
+      obj = Object
+      parts.each do |part|
+        if obj.const_defined?(part)
+          obj = obj.const_get(part)
+        else
+          # return a blank ModelController
+          return [ModelController, nil]
+        end
+      end
+
+      [obj, action]
+    end
   end
 end