volt 0.9.1.pre3 → 0.9.1.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc7e6af465488d4433ccb709514b3f805ad16cc7
-  data.tar.gz: 25cbe6bf32e904f35db51bd8d2b5b4822a1d81cd
+  metadata.gz: 112adfde352ea21c2d38e0f6cc3e1f0974f12690
+  data.tar.gz: 0fa53b549be59a3edf910dd28397c07148297a36
 SHA512:
-  metadata.gz: f21a61b49bf832d0f234271dcaa247401c80e43d4754fed3fcc49b17cfb61bb68f5aa1283379256449a0f1c881b1f80a59f1709387acecb172443f45b16c9220
-  data.tar.gz: c51891e601da7711ebc8324fcfa5d89f2d5b5524017b09ceeab9fa20a44a7cec36a9b98af3e9d4bad380e6140c8e1b6cbd0bd7588ea91fbc002d84d86bfdab6d
+  metadata.gz: d50022986eb78ea62fecf9c75465d0839a40c4d5bf2debbda31e469c04d36b14e774813192479482f7bb6cb3ede05ece3fc8b77bd0afc3bf25f4000d582886ee
+  data.tar.gz: 464c2c73e009e3a3edcce0d2ea70c42023a6e832878652263a462b6ddf917ec440bf95441766bcac440d8f81a4539e33277272940aab3b3b34be5450aae6009d

data/CHANGELOG.md

@@ -5,11 +5,13 @@
 - All code in ```app``` is now automatically reloaded when any files change.  This is done through a "preforking" server.  Before your apps code is loaded (and after Volt's is), the server forks a child process to handle the request (in dev and test mode).
 - Corrected the name of StringTemplateRender to StringTemplateRenderer
 - Volt now uses faye-websocket for socket connections.  This means we can run on any rack-hijack server supported by faye-websocket.  Currently Volt is tested with thin and puma.  (Note: Thin will probably have better performance since it is evented, which means it doesn't need a thread per connection)  More servers coming soon.
+- originally everything in /config would be run when an app boots (similar to rails initializers folder).  The issue we didn't see is things like capistrano that store other ruby files in config.  To maintain conventions, Volt now loads config/app.rb first, then everything in config/initializers/*.rb
 - fixed issue with the unique validation.
 - 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.
 
+
 ## 0.9.0
 ### Added
 - the permissions api has been added!

data/README.md

@@ -1,7 +1,7 @@
 [![Gratipay](http://img.shields.io/gratipay/voltframework.svg)](https://www.gratipay.com/voltframework/)
 [![Gem Version](https://badge.fury.io/rb/volt.svg)](http://badge.fury.io/rb/volt)
 [![Code Climate](https://codeclimate.com/github/voltrb/volt/badges/gpa.svg)](https://codeclimate.com/github/voltrb/volt)
-[![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg?style=flat)](https://travis-ci.org/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)
 
 For the current status of Volt, read: http://voltframework.com/blog

data/VERSION

@@ -1 +1 @@
-0.9.1.pre3
+0.9.1.pre4

data/app/volt/tasks/store_tasks.rb

@@ -55,6 +55,9 @@ class StoreTasks < Volt::Task
       save_promise = model.save!.then do |result|
 
         next nil
+      end.fail do |err|
+        # An error object, convert to hash
+        Promise.new.reject(err.to_h)
       end
 
       Thread.current['in_channel'] = nil

data/lib/volt/cli.rb

@@ -20,7 +20,7 @@ module Volt
       version = File.read(File.join(File.dirname(__FILE__), '../../VERSION'))
       directory('project', name, version: version, name: name)
 
-      say 'Bundling Gems....'
+      say 'Bundling Gems...'
       `cd #{name} && bundle`
     end
 

data/lib/volt/config.rb

@@ -63,8 +63,11 @@ else
       end
 
       # Load in all .rb files in the config folder
-      def run_files_in_config_folder
-        Dir[Volt.root + '/config/*.rb'].each do |config_file|
+      def run_app_and_initializers
+        files = ["#{Volt.root}/config/app.rb"]
+        files += Dir[Volt.root + '/config/initializers/*.rb']
+
+        files.each do |config_file|
           require(config_file)
         end
       end

data/lib/volt/models/array_model.rb

@@ -40,7 +40,7 @@ module Volt
       end
     end
 
-    proxy_with_root_dep :[], :size, :first, :last, :state_for#, :limit, :find_one, :find
+    proxy_with_root_dep :[], :size, :first, :last, :state_for, :reverse
     proxy_to_persistor :find, :where, :skip, :sort, :limit, :then, :fetch, :fetch_first, :fetch_each
 
     def initialize(array = [], options = {})
@@ -135,6 +135,7 @@ module Volt
       self[0]
     end
 
+
     # returns a promise to fetch the first instance
     def fetch_first(&block)
       persistor = self.persistor
@@ -179,9 +180,10 @@ module Volt
 
     # Convert the model to an array all of the way down
     def to_a
+      @size_dep.depend
       array = []
-      attributes.each do |value|
-        array << deep_unwrap(value)
+      attributes.size.times do |index|
+        array << deep_unwrap(self[index])
       end
       array
     end

data/lib/volt/models/associations.rb

@@ -2,6 +2,7 @@ module Volt
   module Associations
     module ClassMethods
       def belongs_to(method_name, key_name=nil)
+        # getter
         define_method(method_name) do
           association_with_root_model('belongs_to') do |root|
             # Lookup the associated model id

data/lib/volt/models/buffer.rb

@@ -42,6 +42,9 @@ module Volt
             end.fail do |errors|
               if errors.is_a?(Hash)
                 server_errors.replace(errors)
+
+                # Merge the server errors into the main errors
+                self.errors.merge!(server_errors.to_h)
               end
 
               promise_for_errors(errors)

data/lib/volt/models/location.rb

@@ -0,0 +1,9 @@
+class Location
+  def host
+    `document.location.host`
+  end
+
+  def protocol
+    `document.location.protocol`
+  end
+end

data/lib/volt/models/url.rb

@@ -1,5 +1,8 @@
 # The url class handles parsing and updating the url
 require 'volt/reactive/reactive_accessors'
+require 'volt/models/location'
+require 'volt/utils/parsing'
+
 module Volt
   class URL
     include ReactiveAccessors
@@ -11,6 +14,7 @@ module Volt
     def initialize(router = nil)
       @router = router
       @params = Model.new({}, persistor: Persistors::Params)
+      @location = Location.new
     end
 
     # Parse takes in a url and extracts each sections.
@@ -21,8 +25,8 @@ module Volt
         self.fragment = url[1..-1]
         update!
       else
-        host     = `document.location.host`
-        protocol = `document.location.protocol`
+        host = location.host
+        protocol = location.protocol
 
         if url !~ /[:]\/\//
           # Add the host for local urls
@@ -73,13 +77,13 @@ module Volt
         query_parts = []
         nested_params_hash(params).each_pair do |key, value|
           # remove the _ from the front
-          value = `encodeURI(value)`
+          value = Volt::Parsing.encodeURI(value)
           query_parts << "#{key}=#{value}"
         end
 
         if query_parts.size > 0
           query = query_parts.join('&')
-          new_url    += '?' + query
+          new_url += "?#{query}"
         end
       end
 
@@ -135,6 +139,8 @@ module Volt
 
     private
 
+    attr_reader :location
+
     # Assigning the params is tricky since we don't want to trigger changed on
     # any values that have not changed.  So we first loop through all current
     # url params, removing any not present in the params, while also removing
@@ -142,7 +148,7 @@ module Volt
     # remaining new parameters and assign them.
     def assign_query_hash_to_params
       # Get a nested hash representing the current url params.
-      query_hash = self.query_hash
+      query_hash = parse_query
 
       # Get the params that are in the route
       new_params = @router.url_to_params(path)
@@ -197,24 +203,21 @@ module Volt
       end
     end
 
-    def query_hash
+    def parse_query
       query_hash = {}
-      qury       = query
+      qury = query
+
       if qury
         qury.split('&').reject { |v| v == '' }.each do |part|
-          parts    = part.split('=').reject { |v| v == '' }
-
-          # Decode string
-          # parts[0] = `decodeURI(parts[0])`
-          parts[1] = `decodeURI(parts[1])`
+          parts = part.split('=').reject { |v| v == '' }
+          parts[1] = Volt::Parsing.decodeURI(parts[1])
 
           sections = query_key_sections(parts[0])
 
           hash_part = query_hash
           sections.each_with_index do |section, index|
             if index == sections.size - 1
-              # Last part, assign the value
-              hash_part[section] = parts[1]
+              hash_part[section] = parts[1] # Last part, assign the value
             else
               hash_part = (hash_part[section] ||= {})
             end

data/lib/volt/models/validations.rb

@@ -20,7 +20,8 @@ module Volt
           custom_validations << block
         else
           self.validations             ||= {}
-          validations[field_name] = options
+          validations[field_name]      ||= {}
+          validations[field_name].merge!(options)
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Volt
               message = (args.is_a?(Hash) && args[:message]) || 'is already taken'
 
               # return the error
-              next {field_name: [message]}
+              next {field_name => [message]}
             end
           end
         end

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

@@ -63,6 +63,7 @@ module Volt
     def item_removed(position)
       # Remove dependency
       @templates[position].context.locals[:_index_dependency].remove
+      @templates[position].context.locals["_#{@item_name.to_s}_dependency".to_sym].remove
 
       @templates[position].remove_anchors
       @templates[position].remove
@@ -97,6 +98,16 @@ module Volt
         item_context.locals[:_index_value] = val
       end
 
+
+      # Get and set value
+      value_dependency                    = Dependency.new
+      item_context.locals["_#{@item_name.to_s}_dependency".to_sym] = value_dependency
+
+      item_context.locals["#{@item_name.to_s}=".to_sym] = proc do |val|
+        value_dependency.changed!
+        @value[item_context.locals[:_index_value]] = val
+      end
+
       # If the user provides an each_with_index, we can assign the lookup for the index
       # variable here.
       if @index_name

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

@@ -232,7 +232,10 @@ module Volt
         # Only assign sections for action's, so we don't get AttributeSections bound
         # also.
         if @controller.respond_to?(:section=)
-          @controller.section = @current_template.dom_section
+          dom_section = @current_template.dom_section
+
+          # Only assign dom sections that can be manipulated via the dom (so not the title for example)
+          @controller.section = dom_section unless dom_section.is_a?(Volt::AttributeSection)
         end
 
         # Call the ready callback on the controller

data/lib/volt/page/page.rb

@@ -30,6 +30,7 @@ require 'volt/page/url_tracker'
 require 'volt/benchmark/benchmark'
 require 'volt/page/tasks'
 
+
 module Volt
   class Page
     attr_reader :url, :params, :page, :templates, :routes, :events

data/lib/volt/page/sub_context.rb

@@ -9,13 +9,13 @@ module Volt
     attr_reader :locals
 
     def initialize(locals = nil, context = nil, return_nils = false)
-      @locals  = locals.stringify_keys if locals
+      @locals  = locals.symbolize_keys if locals
       @context = context
       @return_nils = return_nils
     end
 
     def respond_to?(method_name)
-      !!((@locals && @locals[method_name.to_s]) || (@context && @context.respond_to?(method_name)))
+      !!((@locals && @locals[method_name.to_sym]) || (@context && @context.respond_to?(method_name.to_sym)))
     end
 
     def inspect
@@ -23,7 +23,7 @@ module Volt
     end
 
     def method_missing(method_name, *args, &block)
-      method_name = method_name.to_s
+      method_name = method_name.to_sym
       if @locals && @locals.key?(method_name)
         obj = @locals[method_name]
 

data/lib/volt/page/tasks.rb

@@ -46,7 +46,7 @@ module Volt
         if error
           # TODO: full error handling
           Volt.logger.error("Task Response:")
-          Volt.logger.error(error)
+          Volt.logger.error(error.inspect)
           promise.reject(error)
         else
           promise.resolve(result)

data/lib/volt/server/html_parser/each_scope.rb

@@ -20,7 +20,7 @@ module Volt
       super
 
       @handler.html << "<!-- $#{binding_number} --><!-- $/#{binding_number} -->"
-      @handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { #{@content} }, #{@variable_name.inspect}, #{@index_name.inspect}, #{@path.inspect}) }")
+      @handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { #{@content} }, #{@variable_name.try(:strip).inspect}, #{@index_name.try(:strip).inspect}, #{@path.inspect}) }")
     end
   end
 end

data/lib/volt/utils/parsing.rb

@@ -0,0 +1,19 @@
+module Volt
+  module Parsing
+    def self.decodeURI(value)
+      if RUBY_PLATFORM == 'opal'
+        `decodeURI(value)`
+      else
+        CGI.unescape(value.to_s)
+      end
+    end
+
+    def self.encodeURI(value)
+      if RUBY_PLATFORM == 'opal'
+        `encodeURI(value)`
+      else
+        CGI.escape(value.to_s)
+      end
+    end
+  end
+end

data/lib/volt/volt/app.rb

@@ -6,9 +6,9 @@ module Volt
       # Setup root path
       Volt.root = app_path
 
-      # Require in config files
+      # Require in app and initializers
       unless RUBY_PLATFORM == 'opal'
-        Volt.run_files_in_config_folder
+        Volt.run_app_and_initializers
       end
 
       # Load component paths

data/spec/models/dirty_spec.rb

@@ -43,8 +43,12 @@ describe "Volt::Dirty" do
     expect(model.changed?(:name)).to eq(true)
 
     model.clear_tracked_changes!
-
     expect(model.changed?(:name)).to eq(false)
+
+    expect(model.changed?).to eq(false)
+    model._some_other_attr = "Wow!"
+    expect(model.changed?).to eq(true)
+
   end
 
   it 'should reset changes' do
@@ -99,4 +103,4 @@ describe "Volt::Dirty" do
     model.revert_changes!
     expect(model.attributes).to eq({first: 'Bob', last: 'Smith'})
   end
-end
+end

data/spec/models/url_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'volt/models/url'
+
+describe Volt::URL do
+  let(:uri) { 'http://voltframework.com:8888/path/1?query=val#fragment' }
+
+  let(:fake_location) do
+    double(
+      'Location',
+      host: 'voltframework.com',
+      protocol: 'http:'
+    )
+  end
+
+  before do
+    allow(Location).to receive(:new).and_return fake_location
+    subject.parse uri
+  end
+
+  subject { described_class.new fake_router }
+
+  describe '#parse' do
+    let(:fake_router) { double('Router', url_to_params: {foo: 'bar'}) }
+    context 'with a valid url' do
+      it 'returns "http" for scheme' do
+        expect(subject.scheme).to eq 'http'
+      end
+
+      it 'returns "voltframework.com" for #host' do
+        expect(subject.host).to eq 'voltframework.com'
+      end
+
+      it 'returns 8888 for #port' do
+        expect(subject.port).to eq 8888
+      end
+
+      it 'returns "/path/1" for #path' do
+        expect(subject.path).to eq '/path/1'
+      end
+
+      it 'returns "query=val" for #query' do
+        expect(subject.query).to eq 'query=val'
+      end
+
+      it 'returns "fragment" for #fragment' do
+        expect(subject.fragment).to eq 'fragment'
+      end
+    end
+  end
+
+  describe '#url_for' do
+    let(:fake_router) do
+      router = Volt::Routes.new
+
+      router.define do
+        client '/path/{{ id }}', view: 'blog/show'
+      end
+    end
+
+    it 'regenerates the URL for the given params' do
+      params = { view: 'blog/show', id: '1', query: 'val' }
+
+      expect(subject.url_for params).to eq uri
+    end
+  end
+end

data/spec/page/sub_context_spec.rb

@@ -7,4 +7,11 @@ describe Volt::SubContext do
     expect(sub_context.respond_to?(:name)).to eq(true)
     expect(sub_context.respond_to?(:missing)).to eq(false)
   end
+
+  it 'should return correctly for missing methods on SubContext' do
+    sub_context = Volt::SubContext.new(name: 'Name')
+
+    expect(sub_context.send(:name)).to eq('Name')
+    expect { sub_context.send(:missing) }.to raise_error(NoMethodError)
+  end
 end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ unless RUBY_PLATFORM == 'opal'
 
   SimpleCov.start do
     add_filter 'spec/'
+    add_filter 'lib/volt/page/bindings' # all Opal / Front end stuff.
   end
 end
 

data/spec/utils/parsing_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Volt::Parsing do
+  subject { Volt::Parsing }
+  context 'surrounding encoding/decoding' do
+    it 'does not mangle characters' do
+      raw = ' !"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~''"'
+      encoded = subject.encodeURI raw
+      decoded = subject.decodeURI encoded
+
+      expect(decoded).to eq raw
+    end
+  end
+end

data/volt.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'uglifier', '>= 2.4.0'
   spec.add_dependency "configurations", "~> 2.0.0.pre"
   spec.add_dependency 'yui-compressor', '~> 0.12.0'
-  spec.add_dependency 'opal', '~> 0.7.1'
+  spec.add_dependency 'opal', '~> 0.7.2'
   spec.add_dependency 'opal-jquery', '~> 0.3.0'
   spec.add_dependency 'bundler', '>= 1.5'
   spec.add_dependency 'faye-websocket', '~> 0.9.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.1.pre3
+  version: 0.9.1.pre4
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
@@ -549,6 +549,7 @@ files:
 - lib/volt/models/errors.rb
 - lib/volt/models/field_helpers.rb
 - lib/volt/models/listener_tracker.rb
+- lib/volt/models/location.rb
 - lib/volt/models/model.rb
 - lib/volt/models/model_hash_behaviour.rb
 - lib/volt/models/model_helpers.rb
@@ -666,6 +667,7 @@ files:
 - lib/volt/utils/logging/task_argument_filterer.rb
 - lib/volt/utils/logging/task_logger.rb
 - lib/volt/utils/modes.rb
+- lib/volt/utils/parsing.rb
 - lib/volt/utils/promise_patch.rb
 - lib/volt/utils/read_write_lock.rb
 - lib/volt/utils/tilt_patch.rb
@@ -745,6 +747,7 @@ files:
 - spec/models/permissions_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
+- spec/models/url_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_validation_spec.rb
 - spec/models/validations_spec.rb
@@ -785,6 +788,7 @@ files:
 - spec/templates/targets/binding_document/component_node_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
+- spec/utils/parsing_spec.rb
 - spec/utils/task_argument_filtererer_spec.rb
 - templates/.gitignore
 - templates/component/assets/css/.empty_directory
@@ -851,6 +855,7 @@ files:
 - templates/project/config.ru
 - templates/project/config/app.rb.tt
 - templates/project/config/base/index.html
+- templates/project/config/initializers/.empty_directory
 - templates/project/lib/.empty_directory
 - templates/project/spec/app/main/controllers/server/sample_http_controller_spec.rb
 - templates/project/spec/app/main/integration/sample_integration_spec.rb
@@ -957,6 +962,7 @@ test_files:
 - spec/models/permissions_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
+- spec/models/url_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_validation_spec.rb
 - spec/models/validations_spec.rb
@@ -997,5 +1003,6 @@ test_files:
 - spec/templates/targets/binding_document/component_node_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
+- spec/utils/parsing_spec.rb
 - spec/utils/task_argument_filtererer_spec.rb
 has_rdoc: