roda-component 0.1.11 → 0.1.15

data/lib/roda/component/form/validations.rb

@@ -97,7 +97,7 @@ class Roda
         #                                when the validation fails.
         def assert_format(att, format, error = [att, :format])
           if assert_present(att, error)
-            assert(send(att).to_s.match(format), error)
+            assert(_attributes.send(att).to_s.match(format), error)
           end
         end
 
@@ -107,8 +107,20 @@ class Roda
         # @param [Symbol] att The attribute you wish to verify the presence of.
         # @param [Array<Symbol, Symbol>] error The error that should be returned
         #                                when the validation fails.
-        def assert_present(att, error = [att, :not_present])
-          assert(!send(att).to_s.empty?, error)
+        def assert_present(att, error = [att, :not_present], klass = false)
+          if error.is_a? Class
+            error_new = klass.dup
+            klass = error
+            error = error_new || [att, :not_present]
+
+            options = {}
+            options[:key] = _options[:key] if _options.key? :key
+
+            f = klass.new(_attributes.send(att), options)
+            assert(f.valid?, [att, f.errors])
+          else
+            assert(!_attributes.send(att).to_s.empty?, error)
+          end
         end
 
         # Checks if all the characters of an attribute is a digit.
@@ -139,12 +151,12 @@ class Roda
         end
 
         def assert_member(att, set, err = [att, :not_valid])
-          assert(set.include?(send(att)), err)
+          assert(set.include?(_attributes.send(att)), err)
         end
 
         def assert_length(att, range, error = [att, :not_in_range])
           if assert_present(att, error)
-            val = send(att).to_s
+            val = _attributes.send(att).to_s
             assert range.include?(val.length), error
           end
         end
@@ -173,7 +185,7 @@ class Roda
         # @param [Array<Symbol, Symbol>] error The error that should be returned
         #                                when the validation fails.
         def assert_equal(att, value, error = [att, :not_equal])
-          assert value === send(att), error
+          assert value === _attributes.send(att), error
         end
 
         # The grand daddy of all assertions. If you want to build custom

data/lib/roda/component/titleize.rb

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+# Adds String#titleize for creating properly capitalized titles.
+# It can be called as Titleize.titleize or "a string".titleize.
+#
+# titlecase is included as an alias for titleize.
+#
+# If loaded in a Rails environment, it modifies Inflector.titleize.
+module Titleize
+  SMALL_WORDS = %w{a an and as at but by en for if in of on or the to v v. via vs vs.}
+
+  extend self
+
+  # Capitalizes most words to create a nicer looking title string.
+  #
+  # The list of "small words" which are not capped comes from
+  # the New York Times Manual of Style, plus 'vs' and 'v'.
+  #
+  #   "notes on a scandal" # => "Notes on a Scandal"
+  #   "the good german"    # => "The Good German"
+  def titleize(title)
+    title = title.dup
+    title.downcase! unless title[/[[:lower:]]/]  # assume all-caps need fixing
+
+    phrases(title).map do |phrase|
+      words = phrase.split
+      words.map do |word|
+        def word.capitalize
+          # like String#capitalize, but it starts with the first letter
+          self.sub(/[[:alpha:]].*/) {|subword| subword.capitalize}
+        end
+
+        case word
+        when /[[:alpha:]]\.[[:alpha:]]/  # words with dots in, like "example.com"
+          word
+        when /[-‑]/  # hyphenated word (regular and non-breaking)
+          word.split(/([-‑])/).map do |part|
+            SMALL_WORDS.include?(part) ? part : part.capitalize
+          end.join
+        when /^[[:alpha:]].*[[:upper:]]/ # non-first letter capitalized already
+          word
+        when /^[[:digit:]]/  # first character is a number
+          word
+        when words.first, words.last
+          word.capitalize
+        when *(SMALL_WORDS + SMALL_WORDS.map {|small| small.capitalize })
+          word.downcase
+        else
+          word.capitalize
+        end
+      end.join(" ")
+    end.join(" ")
+  end
+
+  # Splits a title into an array based on punctuation.
+  #
+  #   "simple title"              # => ["simple title"]
+  #   "more complicated: titling" # => ["more complicated:", "titling"]
+  def phrases(title)
+    phrases = title.scan(/.+?(?:[:.;?!] |$)/).map {|phrase| phrase.strip }
+
+    # rejoin phrases that were split on the '.' from a small word
+    if phrases.size > 1
+      phrases[0..-2].each_with_index do |phrase, index|
+        if SMALL_WORDS.include?(phrase.split.last.downcase)
+          phrases[index] << " " + phrases.slice!(index + 1)
+        end
+      end
+    end
+
+    phrases
+  end
+end
+
+class String
+  # Capitalizes most words to create a nicer looking title string.
+  #
+  # The list of "small words" which are not capped comes from
+  # the New York Times Manual of Style, plus 'vs' and 'v'.
+  #
+  # titleize is also aliased as titlecase.
+  #
+  #   "notes on a scandal" # => "Notes on a Scandal"
+  #   "the good german"    # => "The Good German"
+  def titleize(opts={})
+    if defined? ActiveSupport
+      ActiveSupport::Inflector.titleize(self, opts)
+    else
+      Titleize.titleize(self)
+    end
+  end
+  alias_method :titlecase, :titleize
+
+  def titleize!
+    replace(titleize)
+  end
+  alias_method :titlecase!, :titleize!
+end

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.11"
+    VERSION = "0.1.15"
   end
 end

data/test/dummy/.bowerrc

@@ -1,3 +1,3 @@
 {
-  "directory" : "public/chat/bower"
+  "directory" : "public/bower"
 }

data/test/dummy/app.rb

@@ -34,6 +34,8 @@ class TestApp < Roda
     end
   end
 
+  require_relative 'models/user'
+
   # use BetterErrors::Middleware
   use Shield::Middleware, "/login"
   use Rack::Session::Cookie,
@@ -43,21 +45,33 @@ class TestApp < Roda
   plugin :csrf, header: 'X-CSRF-TOKEN', skip: ['POST:/faye']
   plugin :component, { path: 'components', token: '687^*&SAD876asd87as6d*&8asd', debug: true }
   plugin :assets, {
-    path: "#{path}/../public/chat",
+    path: "#{path}/../public",
     css_dir: '',
     js_dir: '',
-    css: [
-      'bower/open-sans-fontface/open-sans.css',
-      'bower/font-awesome/css/font-awesome.css',
-      'bower/jScrollPane/style/jquery.jscrollpane.css',
-      'css/style.css',
-      'css/login.scss'
-    ],
-    js: [
-      'bower/jquery/dist/jquery.js',
-      'bower/jScrollPane/script/jquery.mousewheel.js',
-      'bower/jScrollPane/script/jquery.jscrollpane.js'
-    ]
+    group_subdirs: false,
+    css: {
+      chat: [
+        'bower/open-sans-fontface/open-sans.css',
+        'bower/font-awesome/css/font-awesome.css',
+        'bower/jScrollPane/style/jquery.jscrollpane.css',
+        'chat/css/style.css',
+        'chat/css/login.scss'
+      ],
+      form: [
+        'form/css/style.css'
+      ]
+    },
+    js: {
+      chat: [
+        'bower/jquery/dist/jquery.js',
+        'bower/jScrollPane/script/jquery.mousewheel.js',
+        'chat/bower/jScrollPane/script/jquery.jscrollpane.js'
+      ],
+      form: [
+        'bower/jquery/dist/jquery.js',
+        'form/js/index.js'
+      ]
+    }
   }
 
   def current_user
@@ -80,6 +94,10 @@ class TestApp < Roda
 
     r.root { component(:chat, js: true) }
 
+    r.on('form') do
+      component(:form, js: true)
+    end
+
     r.on('login')  { component(:login, js: true) }
     r.on('logout') { component(:login, call: :logout) }
 

data/test/dummy/bower.json

@@ -10,7 +10,7 @@
     "**/.*",
     "node_modules",
     "bower_components",
-    "public/chat/bower",
+    "public/bower",
     "test",
     "tests"
   ],

data/test/dummy/components/form.rb

@@ -1,3 +1,49 @@
+require_relative 'forms/form'
+
 class Form < Roda::Component
+  comp_name :form
+  comp_html "../public/form/index.html"
+  comp_setup do |dom|
+    # remove hard coded links as we are adding them in using the assets plugin.
+    dom.css('head > link').remove
+    # add require css and javascript
+    dom.at_css('head').add_child assets([:css, :form])
+    dom.at_css('html').add_child assets([:js, :form])
+    dom.at_css('html').add_child <<-EOF
+      <script type="text/javascript" src="/assets/components/roda/component.js"></script>
+      <script type="text/javascript" src="/faye/client.js"></script>
+    EOF
+  end
+
+  def display
+    return unless server?
+
+    dom.at_css('head').add_child csrf_metatag
+
+    data = {
+      name: 'test',
+      address: {
+        zip: 90036
+      }
+    }
+
+    form_dom = dom.find('#form')
+    form     = Forms::Login.new(data, key: :user, dom: form_dom)
+
+    form.render_values
+
+    render_fields data, dom: dom.find('.profile')
+
+    dom
+  end
+
+  on :form, '#form', Forms::Login, key: :user do |form, el, evt|
+    render_fields form, dom: dom.find('.profile')
 
+    if form.valid?
+      puts 'yay, vaild!'
+    else
+      form.display_errors
+    end
+  end
 end

data/test/dummy/components/forms/address.rb

@@ -0,0 +1,11 @@
+module Forms
+  class Address < Roda::Component::Form
+    attr_accessor :line1, :line2, :city, :state, :zip
+
+    def validate
+      assert_present :line1
+      assert_present :city
+      assert_present :zip
+    end
+  end
+end

data/test/dummy/components/forms/form.rb

@@ -0,0 +1,14 @@
+require 'roda/component/form'
+require_relative 'address'
+
+module Forms
+  class Login < Roda::Component::Form
+    attr_accessor :name, :email, :phone, :address
+
+    def validate
+      assert_present :name
+      assert_present :email
+      assert_present :address, Forms::Address
+    end
+  end
+end

data/test/dummy/components/layout.rb

@@ -5,8 +5,8 @@ class LayoutComp < Roda::Component
     # remove hard coded links as we are adding them in using the assets plugin.
     dom.css('head > link').remove
     # add require css and javascript
-    dom.at_css('head').add_child assets(:css)
-    dom.at_css('html').add_child assets(:js)
+    dom.at_css('head').add_child assets([:css, :chat])
+    dom.at_css('html').add_child assets([:js, :chat])
     dom.at_css('html').add_child <<-EOF
       <script type="text/javascript" src="/assets/components/roda/component.js"></script>
       <script type="text/javascript" src="/faye/client.js"></script>

data/test/dummy/components/login.rb

@@ -19,7 +19,7 @@ class LoginComponent < Roda::Component
   end
 
   def logout
-    super(Models::User)
+    super(TestApp::Models::User)
     request.redirect 'login'
   end
 
@@ -30,18 +30,18 @@ class LoginComponent < Roda::Component
 
       if signup
         if form.valid?
-          Models::User.create form.slice(:first_name, :last_name, :email, :password)
-          login(Models::User, form.email, form.password)
+          TestApp::Models::User.create form.slice(:first_name, :last_name, :email, :password)
+          login(TestApp::Models::User, form.email, form.password)
           {success: true}
         else
           {success: false, errors: form.errors}
         end
       else
-        user = Models::User.where(email: form.email).first
+        user = TestApp::Models::User.where(email: form.email).first
 
         return {success: false, reason: 'Account doesn\'t exist.'} unless user
 
-        if login(Models::User, form.email, form.password)
+        if login(TestApp::Models::User, form.email, form.password)
           {success: true}
         else
           {success: false, errors: { email: ['Email and Password combination is incorrect.']}}
@@ -50,7 +50,7 @@ class LoginComponent < Roda::Component
     end
   end
 
-  on :form, 'form.main-form', class: Forms::Login do |form, el, evt|
+  on :form, 'form.main-form', Forms::Login do |form, el, evt|
     if form.valid?
       login_with form.attributes do |res|
         if res['success']

data/test/dummy/config.ru

@@ -1,19 +1,6 @@
 require 'pry'
 require 'awesome_print'
-require 'rack/unreloader'
 require './constants'
 require './app'
 
-Unreloader = Rack::Unreloader.new(:logger=>Logger.new($stdout)){TestApp}
-Unreloader.require './app.rb'
-Unreloader.require './components'
-Unreloader.require './models'
-Unreloader.require '../../lib/roda/component/dom.rb'
-Unreloader.require '../../lib/roda/component/faye.rb'
-Unreloader.require '../../lib/roda/component/form.rb'
-Unreloader.require '../../lib/roda/component/events.rb'
-Unreloader.require '../../lib/roda/component/form/validations.rb'
-Unreloader.require '../../lib/roda/component.rb'
-Unreloader.require '../../lib/roda/plugins/component.rb'
-
-run Unreloader
+run TestApp

data/test/dummy/models/user.rb

@@ -1,18 +1,20 @@
-module Models
-  class User < Sequel::Model
-    include Shield::Model
+class TestApp
+  module Models
+    class User < Sequel::Model
+      include Shield::Model
 
-    def full_name
-      "#{first_name} #{last_name}"
-    end
+      def full_name
+        "#{first_name} #{last_name}"
+      end
 
-    class << self
-      def fetch email
-        # TODO: Case insensitive emails? Force lowercase?
-        if user = Models::User.where(email: email)
-          user.first
-        else
-          false
+      class << self
+        def fetch email
+          # TODO: Case insensitive emails? Force lowercase?
+          if user = Models::User.where(email: email)
+            user.first
+          else
+            false
+          end
         end
       end
     end