volt 0.9.4 → 0.9.5.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b818f9b2d02006b327aab20af6df7bb258b94ce6
-  data.tar.gz: 186ea61b4516a781fb3bac6b800e7e10a3bf1bef
+  metadata.gz: 6a75b8e5c26d8b7a65f1db6e74aa3a439409b9dd
+  data.tar.gz: d672f1462c31eb1dfc1cc757019445290648ba96
 SHA512:
-  metadata.gz: 0a3898e2d3cab1dfe549cd34538f74df0ba5e9dc0587f94a426480badc4d606a67a51349d9c2f07a2a36881213699ed58d8fe5c04eab9d51a8e95cfecf901e45
-  data.tar.gz: 235f5228b227b80a07179c6f8ac309474e7dbeb209b48318c324c970a5d93810c67c76aa827871138eca29767f96d4bea30413e75081a62f0bb82bd06d53b2e5
+  metadata.gz: e9462ea295ea9bf43b4e5acdebec5fd6962451a68c2cb656316b0cca67f259f85442df3c1d9ecb7175f8ecbbf9a5402032c552479b5e0164f2e15414c75abf07
+  data.tar.gz: 78804d64f6f96755c02cf27b980e4a831a5cd86fb43679d5dacea621381f0c848a3960510fea4e6da39f0392aec60a85b81652feb5781b285fe81fc59e636624

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 
-## 0.9.4.pre1
+## 0.9.5
+### Added
+- You can now disable auto-import of JS/CSS with ```disable_auto_import``` in a dependencies.rb file
+
+## 0.9.4
 ### Lingo Change
 the base collections will now be called "Repositories" or "Repo's" for short.  This will only matter directly for internal volt code, but for the data provider api, this will help.
 

data/Gemfile

@@ -10,8 +10,10 @@ gem 'volt-mongo'
 gem 'rbnacl', require: false
 gem 'rbnacl-libsodium', require: false
 
+# temp until 0.8.0 of opal
+# gem 'opal-rspec', github: 'opal/opal-rspec'
 
-group :development do
+group :development, :test do
   # For testing the kitchen sink app
   # Twitter bootstrap
   gem 'volt-bootstrap'

data/lib/volt/cli/asset_compile.rb

@@ -18,6 +18,7 @@ module Volt
       require 'volt'
       require 'volt/volt/core'
       require 'volt/boot'
+      require 'volt/server'
 
       @root_path ||= Dir.pwd
       Volt.root  = @root_path
@@ -26,7 +27,6 @@ module Volt
 
       require 'volt/server/rack/component_paths'
       require 'volt/server/rack/component_code'
-      require 'volt/server/component_handler'
 
       @app_path = File.expand_path(File.join(@root_path, 'app'))
 
@@ -34,7 +34,6 @@ module Volt
       @app               = Rack::Builder.new
       @opal_files        = OpalFiles.new(@app, @app_path, @component_paths)
       @index_files       = IndexFiles.new(@app, volt_app, @component_paths, @opal_files)
-      @component_handler = ComponentHandler.new(@component_paths)
 
       puts 'Compile Opal for components'
       write_component_js
@@ -49,10 +48,13 @@ module Volt
     end
 
     def logical_paths_and_full_paths
-      @opal_files.environment.each_file do |full_path|
-        logical_path = @opal_files.environment.send(:logical_path_for_filename, full_path, []).to_s
+      env = @opal_files.environment
+      env.each_file do |full_path|
+        # logical_path = env[full_path].logical_path
+        # logical_path = @opal_files.environment.send(:logical_path_for_filename, full_path, []).to_s
+        # puts "FULL PATH: #{full_path.inspect} -- #{logical_path}"
 
-        yield(logical_path, full_path.to_s)
+        # yield(logical_path, full_path.to_s)
       end
 
     end
@@ -94,10 +96,7 @@ module Volt
     end
 
     def write_component_js
-      javascript_code = @component_handler.compile_for_component('main', true)
-
-      path = File.join(Volt.root, '/public/components/main.js')
-      write_file(path, javascript_code)
+      write_sprocket_file('components/main.js')
     end
 
     def write_index

data/lib/volt/extra_core/object.rb

@@ -1,3 +1,5 @@
+require 'volt/utils/ejson'
+
 class Object
   # Setup a default pretty_inspect
   # alias_method :pretty_inspect, :inspect
@@ -13,7 +15,7 @@ class Object
   # TODO: Need a real implementation of this
   def deep_clone
     if RUBY_PLATFORM == 'opal'
-      JSON.parse(to_json)
+      Volt::EJSON.parse(Volt::EJSON.stringify(self))
     else
       Marshal.load(Marshal.dump(self))
     end

data/lib/volt/models/associations.rb

@@ -1,19 +1,22 @@
 module Volt
   module Associations
     module ClassMethods
-      def belongs_to(method_name, key_name = nil)
-        key_name ||= "#{method_name}_id"
+      def belongs_to(method_name, options = {})
+        collection  ||= options.fetch(:collection, method_name)
+        foreign_key ||= options.fetch(:foreign_key, :id)
+        local_key   ||= options.fetch(:local_key, "#{method_name}_id")
+
         # Add a field for the association_id
-        field(key_name)
+        field(local_key)
 
         # getter
         define_method(method_name) do
           association_with_root_model('belongs_to') do |root|
             # Lookup the associated model id
-            lookup_key = get(key_name)
+            lookup_key = get(local_key)
 
             # Return a promise for the belongs_to
-            root.get(method_name.pluralize).where(id: lookup_key).first
+            root.get(collection.pluralize).where(foreign_key => lookup_key).first
           end
         end
 
@@ -21,7 +24,7 @@ module Volt
           id = obj.is_a?(Fixnum) ? obj : obj.id
 
           # Assign the current model's something_id to the object's id
-          set("#{method_name}_id", id)
+          set(local_key, id)
         end
       end
 

data/lib/volt/models/buffer.rb

@@ -42,6 +42,9 @@ module Volt
               # Copy attributes back from save_to model
               @attributes = new_model.attributes
 
+              # Remove tracked changes
+              clear_tracked_changes!
+
               new_model
             end.fail do |errors|
               if errors.is_a?(Hash)

data/lib/volt/models/field_helpers.rb

@@ -2,16 +2,48 @@
 module FieldHelpers
   class InvalidFieldClass < RuntimeError; end
 
+  NUMERIC_CAST = lambda do |convert_method, val|
+    begin
+      orig = val
+      val = send(convert_method, val)
+
+      if RUBY_PLATFORM == 'opal'
+        # Opal has a bug in 0.7.2 that gives us back NaN without an
+        # error sometimes.
+        val = orig if val.nan?
+      end
+    rescue TypeError, ArgumentError => e
+      # ignore, unmatched types will be caught below.
+      val = orig
+    end
+
+    return val
+  end
+
+  FIELD_CASTS = {
+    String     => :to_s.to_proc,
+    Fixnum     => lambda {|val| NUMERIC_CAST[:Integer, val] },
+    Numeric    => lambda {|val| NUMERIC_CAST[:Float, val] },
+    Float      => lambda {|val| NUMERIC_CAST[:Float, val] },
+    Time       => nil,
+    TrueClass  => nil,
+    FalseClass => nil
+  }
+  VALID_FIELD_CLASSES = FIELD_CASTS.keys
+
+
   module ClassMethods
     # field lets you declare your fields instead of using the underscore syntax.
     # An optional class restriction can be passed in.
-    def field(name, klass = nil)
-      if klass && ![String, Numeric].include?(klass)
-        fail FieldHelpers::InvalidFieldClass, 'valid field types is currently limited to String or Numeric'
+    def field(name, klass = nil, auto_cast = true)
+      if klass && !VALID_FIELD_CLASSES.include?(klass)
+        klass_names = VALID_FIELD_CLASSES.map(&:to_s).join(', ')
+        msg = "valid field types is currently limited to #{klass_names}"
+        fail FieldHelpers::InvalidFieldClass, msg
       end
 
       if klass
-      # Add type validation, execpt for String, since anything can be a string.
+        # Add type validation, execpt for String, since anything can be a string.
         unless klass == String
           validate name, type: klass
         end
@@ -25,23 +57,8 @@ module FieldHelpers
         # Check if the value assigned matches the class restriction
         if klass
           # Cast to the right type
-          if klass == String
-            val = val.to_s
-          elsif klass == Numeric
-            begin
-              orig = val
-              unless val.is_a?(Numeric)
-                val = Float(val)
-              end
-
-              if RUBY_PLATFORM == 'opal'
-                # Opal has a bug in 0.7.2 that gives us back NaN without an
-                # error sometimes.
-                val = orig if val.nan?
-              end
-            rescue TypeError, ArgumentError => e
-              # ignore, unmatched types will be caught below.
-            end
+          if (func = FIELD_CASTS[klass])
+            val = func[val]
           end
         end
 

data/lib/volt/models/model.rb

@@ -119,7 +119,7 @@ module Volt
     end
 
     def _id
-      raise "Accessing  _id has been deprecated in favor of id"
+      get(:id)
     end
 
     # Return true if the model hasn't been saved yet

data/lib/volt/models/permissions.rb

@@ -18,8 +18,8 @@ module Volt
           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?
-              send(:"_#{key}=", user_id)
+            if get(:user_id).nil? && !(user_id = Volt.current_user_id).nil?
+              set(key, user_id)
             end
           end
 

data/lib/volt/models/validations/validations.rb

@@ -127,7 +127,11 @@ module Volt
     def validate!
       errors.clear
 
-      run_validations.then do
+      # Run the before_validate callbacks
+      run_callbacks(:before_validate).then do
+        # Run the actual validations
+        run_validations
+      end.then do
         # See if any server errors are in place and merge them in if they are
         errors.merge!(server_errors.to_h) if Volt.client?
       end.then do

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

@@ -17,8 +17,12 @@ module Volt
       # Convert to float if it is a string for a float
       # The nil check and the nan? check are only require for opal 0.6
       unless @value.nil?
-        @value = Kernel.Float(@value) rescue nil
-        @value = nil if RUBY_PLATFORM == 'opal' && @value.nan?
+        begin
+          @value = Kernel.Float(@value)
+        rescue ArgumentError => e
+          @value = nil
+        end
+        # @value = nil if RUBY_PLATFORM == 'opal' && @value.nan?
       end
 
       check_errors

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

@@ -1,6 +1,8 @@
 require 'volt/page/bindings/base_binding'
 
 module Volt
+  class InvalidObjectForEachBinding < Exception ; end
+
   class EachBinding < BaseBinding
     def initialize(volt_app, target, context, binding_name, getter, variable_name, index_name, template_name)
       super(volt_app, target, context, binding_name)
@@ -57,6 +59,11 @@ module Volt
 
         Volt.run_in_mode(:no_model_promises) do
           templates_size = @templates.size
+
+          unless values.respond_to?(:size)
+            fail InvalidObjectForEachBinding, "Each binding's require an object that responds to size and [] methods.  The binding received: #{values.inspect}"
+          end
+
           values_size    = values.size
         end
 

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

@@ -69,26 +69,25 @@ module Volt
 
         full_path, controller_path = @view_lookup.path_for_template(path, section)
 
-        unless full_path
+        if full_path
+          @starting_controller_handler, generated_new, chain_stopped = create_controller_handler(full_path, controller_path)
+
+          # Check if chain was stopped when the action ran
+          if chain_stopped
+            # An action stopped the chain.  When this happens, we stop running here.
+            remove_starting_controller
+          else
+            # None of the actions stopped the chain
+            # Wait until the controller is loaded before we actually render.
+            @waiting_for_load = -> { @starting_controller_handler.controller.loaded? }.watch_until!(true) do
+              render_next_template(full_path, path)
+            end
+
+            queue_clear_grouped_controller
+          end
+        else
           # if we don't have a full path, then we have a missing template
           render_next_template(full_path, path)
-          return
-        end
-
-        @starting_controller_handler, generated_new, chain_stopped = create_controller_handler(full_path, controller_path)
-
-        # Check if chain was stopped when the action ran
-        if chain_stopped
-          # An action stopped the chain.  When this happens, we stop running here.
-          remove_starting_controller
-        else
-          # None of the actions stopped the chain
-          # Wait until the controller is loaded before we actually render.
-          @waiting_for_load = -> { @starting_controller_handler.controller.loaded? }.watch_until!(true) do
-            render_next_template(full_path, path)
-          end
-
-          queue_clear_grouped_controller
         end
       end
     end
@@ -155,8 +154,11 @@ module Volt
       end
 
       if @grouped_controller && @current_controller_handler
-        # Remove a reference for the controller in the group.
-        @grouped_controller.remove(@current_controller_handler.controller.class)
+        # We remove the controller after all of the current rendering is done.
+        Timers.next_tick do
+          # Remove a reference for the controller in the group.
+          @grouped_controller.remove(@current_controller_handler.controller.class)
+        end
       end
 
       @controller = nil

data/lib/volt/server/component_templates.rb

@@ -138,9 +138,10 @@ module Volt
       explicit_controllers = Dir["#{controllers_path}*_controller.rb"].sort
 
       controllers = (implicit_controllers + explicit_controllers).uniq
+
       controllers.each do |path|
         if File.exists?(path)
-          code << File.read(path) + "\n\n"
+          code << "require '#{localize_path(path)}'\n"
         else
           # parts = path.scan(/([^\/]+)\/controllers\/([^\/]+)_controller[.]rb$/)
           # component, controller = parts[0]
@@ -159,9 +160,12 @@ module Volt
       models_path = "#{@component_path}/models/"
 
       Dir["#{models_path}*.rb"].sort.each do |model_path|
-        code << File.read(model_path) + "\n\n"
+        # code << File.read(model_path) + "\n\n"
 
-        model_name = model_path.match(/([^\/]+)[.]rb$/)[1]
+        # model_name = model_path.match(/([^\/]+)[.]rb$/)[1]
+        if File.exists?(model_path)
+          code << "require '#{localize_path(model_path)}'\n"
+        end
       end
 
       code
@@ -200,16 +204,26 @@ module Volt
     end
 
     def generate_initializers_code
+      # Include the root initializers
+      paths = Dir["#{Volt.root}/config/initializers/*.rb"]
+      paths += Dir["#{Volt.root}/config/initializers/client/*.rb"]
+
       paths = Dir["#{@component_path}/config/initializers/*.rb"]
       paths += Dir["#{@component_path}/config/initializers/client/*.rb"]
 
-      cpath_size = @component_path.size
-      paths.map! {|path| @component_name + path[cpath_size..-1]}
-
-      code = "\n" + paths.map { |path| "require '#{path}'" }.join("\n")
+      code = "\n" + paths.map { |path| "require '#{localize_path(path)}'" }.join("\n")
 
       code
     end
 
+    private
+
+  # Takes a full path and returns the localized version so opal supprots it
+    def localize_path(path)
+      cpath_size = @component_path.size
+      return @component_name + path[cpath_size..-1]
+    end
+
+
   end
 end

data/lib/volt/server/message_bus/message_encoder.rb

@@ -32,6 +32,10 @@ module Volt
             raise e
           end
 
+          if Volt.config.app_secret.blank?
+            raise "No app_secret has been specified in Volt.config"
+          end
+
           # use the first 32 chars of the app secret for the encryption key.
           key = Base64.decode64(Volt.config.app_secret)[0..31]
 

data/lib/volt/server/message_bus/peer_to_peer/peer_connection.rb

@@ -96,7 +96,7 @@ module Volt
         # @worker_thread.kill
 
         # Wait for the worker to publish all messages
-        @worker_thread.join if Thread.current != @worker_thread
+        @worker_thread.join if Thread.current != @worker_thread && @worker_thread
 
         @message_bus.remove_peer_connection(self)
       end

data/lib/volt/server/middleware/default_middleware_stack.rb

@@ -39,13 +39,9 @@ module Volt
     # Setup the middleware that we need to wait for components to boot before we
     # can set them up.
     def self.postboot_setup(volt_app, rack_app)
-      component_paths = volt_app.component_paths
-      rack_app.map '/components' do
-        run ComponentHandler.new(component_paths)
-      end
-
       # Serve the opal files
       opal_files = OpalFiles.new(rack_app, volt_app.app_path, volt_app.component_paths)
+      volt_app.opal_files = opal_files
       volt_app.sprockets = opal_files.environment
 
       # Serve the main html files from public, also figure out

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

@@ -10,7 +10,7 @@ module Volt
       @included_components = {}
       @components          = []
       @disable_auto_import = []
-      
+
       # Include each of the default included components
       Volt.config.default_components.each do |def_comp_name|
         component(def_comp_name)
@@ -22,7 +22,7 @@ module Volt
     def disable_auto_import
       @disable_auto_import.push(*@current_component).uniq
     end
-    
+
     def load_dependencies(path, component_name)
       if path
         dependencies_file = File.join(path, 'config/dependencies.rb')
@@ -80,11 +80,11 @@ module Volt
       end
       locator
     end
-    
+
     def url_or_path?(url)
       (url =~ URI::regexp || url =~ /^\/(\/)?.*/) ? true : false
     end
-    
+
     def component_paths
       @components
     end
@@ -94,31 +94,58 @@ module Volt
       @assets << [:folder, asset_folder] if File.directory?(asset_folder)
     end
 
-    def javascript_files(opal_files)
+    def javascript_files(*args)
+      fail "Deprecation: #javascript_files is deprecated in config/base/index.html, opal 0.8 required a new format.  For an updated config/base/index.html file, see https://gist.github.com/ryanstout/0858cf7dfc32c514f790"
+    end
+
+    def css_files(*args)
+      fail "Deprecation: #css_files is deprecated in config/base/index.html, opal 0.8 required a new format.  For an updated config/base/index.html file, see https://gist.github.com/ryanstout/0858cf7dfc32c514f790"
+    end
+
+    # Returns script tags that should be included
+    def javascript_tags(volt_app)
+      @opal_tag_generator ||= Opal::Server::Index.new(nil, volt_app.opal_files.server)
+
       javascript_files = []
       @assets.each do |type, path|
         case type
           when :folder
+            # for a folder, we search for all .js files and return a tag for them
             javascript_files += Dir["#{path}/**/*.js"].sort.map { |folder| '/assets' + folder[path.size..-1] }
           when :javascript_file
+            # javascript_file is a cdn path to a JS file
             javascript_files << path
         end
       end
 
-      opal_js_files = []
-      if Volt.source_maps?
-        opal_js_files += opal_files.environment['volt/volt/app'].to_a.map { |v| '/assets/' + v.logical_path + '?body=1' }
+      javascript_files = javascript_files.uniq
+
+      scripts = javascript_files.map {|url| "<script src=\"#{url}\"></script>" }
+
+      # Include volt itself.  Unless we are running with MAPS=all, just include
+      # the main file without sourcemaps.
+      volt_path = 'volt/volt/app'
+      if ENV['MAPS'] == 'all'
+        scripts << @opal_tag_generator.javascript_include_tag(volt_path)
       else
-        opal_js_files << '/assets/volt/volt/app.js'
+        scripts << "<script src=\"/assets/#{volt_path}.js\"></script>"
+        scripts << "<script>#{Opal::Processor.load_asset_code(volt_app.sprockets, volt_path)}</script>"
       end
-      opal_js_files << '/components/main.js'
 
-      javascript_files += opal_js_files
+      scripts << @opal_tag_generator.javascript_include_tag('components/main')
+
+      scripts.join("\n")
+    end
 
-      javascript_files.uniq
+    # Returns the link tags for the css
+    def css_tags
+      css.map do |url|
+        "<link href=\"#{url}\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />"
+      end.join("\n")
     end
 
-    def css_files
+    # Returns an array of all css files that should be included.
+    def css
       css_files = []
       @assets.each do |type, path|
         case type
@@ -136,5 +163,24 @@ module Volt
 
       css_files.uniq
     end
+
+    # #javascript is only used on the server
+    unless RUBY_PLATFORM == 'opal'
+      # Parses the javascript tags to reutrn the following:
+      # [[:url, '/somefile.js'], [:body, 'var inlinejs = true;']]
+      def javascript(volt_app)
+        javascript_tags(volt_app)
+        .scan(/[<]script([^>]*)[>](.*?)[<]\/script[^>]*[>]/)
+        .map do |attrs, body|
+          src = attrs.match(/[\s|$]src\s*[=]\s*["']([^"']+?)["']/)
+
+          if src
+            [:src, src[1]]
+          else
+            [:body, body]
+          end
+        end
+      end
+    end
   end
 end

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

@@ -28,13 +28,7 @@ module Volt
 
     def generate_config_code
       # Setup Volt.config on the client
-      code = "\nVolt.setup_client_config(#{Volt.config.public.to_h.inspect})\n"
-
-      # Include the root initializers
-      code << "require_tree '#{Volt.root}/config/initializers'\n"
-      code << "require_tree '#{Volt.root}/config/initializers/client'\n"
-
-      code
+      "\nVolt.setup_client_config(#{Volt.config.public.to_h.inspect})\n"
     end
   end
 end

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

@@ -48,13 +48,21 @@ module Volt
       ERB.new(html, nil, '-').result(binding)
     end
 
-    def javascript_files
+    def javascript_files(*args)
+      fail "Deprecation: #javascript_files is deprecated in config/base/index.html, opal 0.8 required a new format."
+    end
+
+    def css_files(*args)
+      fail "Deprecation: #css_files is deprecated in config/base/index.html, opal 0.8 required a new format."
+    end
+
+    def javascript_tags
       # TODO: Cache somehow, this is being loaded every time
-      AssetFiles.new('main', @component_paths).javascript_files(@opal_files)
+      AssetFiles.new('main', @component_paths).javascript_tags(@volt_app)
     end
 
-    def css_files
-      AssetFiles.new('main', @component_paths).css_files
+    def css_tags
+      AssetFiles.new('main', @component_paths).css_tags
     end
   end
 end