volt 0.8.23 → 0.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81d53a357d5bc17689ca9a67aa8d0bcb9c390df
-  data.tar.gz: 449b98ecf2be170abd4cd584619674e1c96927fb
+  metadata.gz: 4baa719966706c9e9196f42e061abb6e95e7d54c
+  data.tar.gz: 2b9fcde56cc4cd12ac1503dd464f9444a1e9a866
 SHA512:
-  metadata.gz: 7b582e21873ed85930b44e66d327fd036a447a6a3d2b49a8d2f5869d865b3bc1b38d9f7f97265d0cf694af5aa2d76a037aabf4165b0d6d9ec30213a04f138cf3
-  data.tar.gz: c318c757c0ab8de3b72e6e1d6e41b6515c978c8c91c3b3378ed779537d6081563cf1c4f7a55fb97338e25335feea69c651623ce2119302e014c4c27bb19a4fd8
+  metadata.gz: a18bd3212878144d412b33647d98570760c49d2fffcd598083e452dd6c9a3696f8df716e01f4328aff654edb2eef24664c28af7c91151944d37ef64abb146f4c
+  data.tar.gz: 48f4412a6d4064edf20d9006e539ec74230d49d71b27749a42230c13092ffaba650f3625b5078145be5afa6bef13bc0007af620cab7f11cd3e112bcc5348bf4a

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 0.8.34 - 2014-12-01
+- Fix bug with validation inheritance
+
 ## 0.8.33 - 2014-11-30
 ### Added
 - Added url_for and url_with to controllers.  (See docs under Controllers)

data/VERSION

@@ -1 +1 @@
-0.8.23
+0.8.24

data/lib/volt/extra_core/class.rb

@@ -0,0 +1,27 @@
+class Class
+  # Provides a way to make class attributes that inherit.  Pass
+  # in symbols for attribute names
+  def class_attribute(*attrs)
+    attrs.each do |name|
+      define_singleton_method(name) { nil }
+
+      ivar = "@#{name}"
+
+      define_singleton_method("#{name}=") do |val|
+        singleton_class.class_eval do
+          remove_possible_method(name)
+          define_method(name) { val }
+        end
+
+        val
+      end
+    end
+  end
+
+  # Removes a method if it is defined.
+  def remove_possible_method(method)
+    if method_defined?(method) || private_method_defined?(method)
+      undef_method(method)
+    end
+  end
+end

data/lib/volt/extra_core/extra_core.rb

@@ -6,6 +6,7 @@ require 'volt/extra_core/stringify_keys'
 require 'volt/extra_core/string'
 require 'volt/extra_core/numeric'
 require 'volt/extra_core/true_false'
+require 'volt/extra_core/class'
 if RUBY_PLATFORM == 'opal'
   # TODO: != does not work with opal for some reason
 else

data/lib/volt/models/validations.rb

@@ -13,26 +13,18 @@ module Volt
           if field_name || options
             raise "validate should be passed a field name and options or a block, not both."
           end
-          @custom_validations ||= []
-          @custom_validations << block
+          self.custom_validations ||= []
+          custom_validations << block
         else
-          @validations             ||= {}
-          @validations[field_name] = options
+          self.validations             ||= {}
+          validations[field_name] = options
         end
       end
-
-      # TODO: For some reason attr_reader on a class doesn't work in Opal
-      def validations
-        @validations
-      end
-
-      def custom_validations
-        @custom_validations
-      end
     end
 
     def self.included(base)
       base.send :extend, ClassMethods
+      base.class_attribute(:custom_validations, :validations)
     end
 
     # Once a field is ready, we can use include_in_errors! to start

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

@@ -86,12 +86,15 @@ module Volt
         if check_for_template?(path)
           controller = nil
 
-          # Don't return a controller if we are just getting another section
-          # from the same controller
           if path_position >= 1
-            # Lookup the controller
-            controller = [full_path[0], full_path[1] + '_controller', full_path[2]]
+            init_method = full_path[2]
+          else
+            init_method = full_path[3]
           end
+
+          # Lookup the controller
+          controller = [full_path[0], full_path[1] + '_controller', init_method]
+
           return path, controller
         end
       end

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -35,4 +35,10 @@ class MainController < Volt::ModelController
   def main_path
     params._controller.or('main') + '/' + params._action.or('index')
   end
+
+  # Determine if the current nav component is the active one by looking
+  # at the first part of the url against the href attribute.
+  def active_tab?
+    url.path.split('/')[1] == attrs.href.split('/')[1]
+  end
 end

data/spec/apps/kitchen_sink/app/main/views/main/main.html

@@ -27,7 +27,7 @@
   </div>
 
 <:Nav>
-  <li class="{{ if url.path.split('/')[1] == attrs.href.split('/')[1] }}active{{ end }}">
+  <li class="{{ if active_tab? }}active{{ end }}">
     <a href="{{ attrs.href }}">{{ attrs.text }}</a>
   </li>
 

data/spec/extra_core/class_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'volt/extra_core/array'
+
+class TestClassAttributes
+  class_attribute :some_data
+end
+
+class TestSubClassAttributes < TestClassAttributes
+end
+
+class TestSubClassAttributes2 < TestClassAttributes
+end
+
+describe "extra_core class addons" do
+  it 'should provide class_attributes that can be inherited' do
+    expect(TestClassAttributes.some_data).to eq(nil)
+
+    TestClassAttributes.some_data = 5
+    expect(TestClassAttributes.some_data).to eq(5)
+    expect(TestSubClassAttributes.some_data).to eq(5)
+    expect(TestSubClassAttributes2.some_data).to eq(5)
+
+    TestSubClassAttributes.some_data = 10
+    expect(TestClassAttributes.some_data).to eq(5)
+    expect(TestSubClassAttributes.some_data).to eq(10)
+    expect(TestSubClassAttributes2.some_data).to eq(5)
+
+    TestSubClassAttributes2.some_data = 15
+    expect(TestClassAttributes.some_data).to eq(5)
+    expect(TestSubClassAttributes.some_data).to eq(10)
+    expect(TestSubClassAttributes2.some_data).to eq(15)
+  end
+end

data/spec/integration/user_spec.rb

@@ -55,6 +55,26 @@ if ENV['BROWSER']
 
       expect(page).to_not have_content('Test Account 9550')
     end
+
+    it 'should fail to create an account without a valid email and password' do
+      visit '/'
+
+      click_link 'Login'
+      click_link 'Signup here'
+
+      expect(page).to_not have_content('must be at least 8 characters')
+
+      fields = all(:css, 'form .form-control')
+
+      fields[0].set('test')
+      fields[1].set('awe')
+      fields[2].set('Tes')
+
+      # some capybara drivers don't trigger blur correctly
+      page.execute_script("$('.form-control').blur()")
+
+      expect(page).to have_content('must be at least 8 characters')
+    end
   end
 
 end

data/spec/page/bindings/template_binding_spec.rb

@@ -50,7 +50,7 @@ describe Volt::TemplateBinding do
 
     path, result = @template_binding.path_for_template('comments/new/errors')
     expect(path).to eq('main/comments/new/errors')
-    expect(result).to eq(nil)
+    expect(result).to eq(["main", "comments_controller", "errors"])
   end
 
   it 'should handle a tripple lookup to controllers' do

data/spec/spec_helper.rb

@@ -22,6 +22,6 @@ if RUBY_PLATFORM != 'opal'
     # the seed, which is printed after each run.
     #     --seed 1234
     config.order = 'random'
-    # config.seed = '2234'
+    # config.seed = '31241'
   end
 end

data/templates/project/app/main/controllers/main_controller.rb

@@ -16,4 +16,10 @@ class MainController < Volt::ModelController
   def main_path
     params._controller.or('main') + '/' + params._action.or('index')
   end
+
+  # Determine if the current nav component is the active one by looking
+  # at the first part of the url against the href attribute.
+  def active_tab?
+    url.path.split('/')[1] == attrs.href.split('/')[1]
+  end
 end

data/templates/project/app/main/views/main/main.html.tt

@@ -23,7 +23,7 @@
   </div>
 
 <:Nav>
-  <li class="{{ if url.path.split('/')[1] == attrs.href.split('/')[1] }}active{{ end }}">
+  <li class="{{ if active_tab? }}active{{ end }}">
     <a href="{{ attrs.href }}">{{ attrs.text }}</a>
   </li>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.8.23
+  version: 0.8.24
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -473,6 +473,7 @@ files:
 - lib/volt/data_stores/mongo_driver.rb
 - lib/volt/extra_core/array.rb
 - lib/volt/extra_core/blank.rb
+- lib/volt/extra_core/class.rb
 - lib/volt/extra_core/extra_core.rb
 - lib/volt/extra_core/inflections.rb
 - lib/volt/extra_core/inflector.rb
@@ -611,6 +612,7 @@ files:
 - spec/apps/kitchen_sink/config/base/index.html
 - spec/controllers/reactive_accessors_spec.rb
 - spec/extra_core/array_spec.rb
+- spec/extra_core/class_spec.rb
 - spec/extra_core/inflector_spec.rb
 - spec/extra_core/object_spec.rb
 - spec/extra_core/string_transformation_test_cases.rb
@@ -757,6 +759,7 @@ test_files:
 - spec/apps/kitchen_sink/config/base/index.html
 - spec/controllers/reactive_accessors_spec.rb
 - spec/extra_core/array_spec.rb
+- spec/extra_core/class_spec.rb
 - spec/extra_core/inflector_spec.rb
 - spec/extra_core/object_spec.rb
 - spec/extra_core/string_transformation_test_cases.rb