wheels 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/app/controllers/application_controller.rb

@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  include InheritedResources::DSL
   protect_from_forgery
   def include_jqueryui
     content_for :head do

data/app/controllers/users_controller.rb

@@ -9,8 +9,11 @@ class UsersController < InheritedResources::Base
   end
 
   def update
+    resource
+
+
     update! do |success, failure|
-      failure.html{redirect_to "/change_password"}
+      failure.html{redirect_to my_account_path}
       success.html{flash[:notice] = "Your password has been updated."; redirect_to root_url}
     end
   end

data/app/helpers/application_helper.rb

@@ -9,6 +9,58 @@ module ApplicationHelper
     content_tag(:li, content_tag(:a, content_tag(:span, name, :class=>name.underscore), :href=>url), :class=>_class)
   end
 
+#  def your_basic_form(object, *options)
+#    if object.methods.include? :form_fields then options = object.form_fields.merge(options)
+#    options[:submit] ||= ""
+#    concat(capture do
+#      content_tag('div',
+#        form_for(object, remote=>options[:remote]|| false) {|f|
+#          if object.errors.any?
+#            content_tag('div',
+#              content_tag('h2', "#{pluralize(resource.errors.count, "error")} prohibited this change:") +
+#              content_tag('ul',
+#                resource.errors.full_messages.map{|msg| content_tag('li', msg)}.join('\n')
+#              )
+#            , :id=>'errorExplanation' )
+#          end
+#          options.except(:remote).each do |key, value|
+#            form_field(key, value, f)
+#          end
+#        },
+#      :class=>'form')
+#    end)
+#  end
+
+#  def form_field(key, value, form_helper)
+#    capture do
+#      if value.is_a?(Hash) || (value.is_a? Symbol && value.to_s.ends_with('_attributes')) #  This means it's a field group.
+#        content_tag('div',
+#          content_tag('div', key.to_s, :class=>'fieldGroupTitle') +
+#          value.is_a?(Hash) ?
+#            value.map{|t,u| form_field(t,u)}.join('\n') :
+#            basic_fields_for(key, value, form_helper),
+#        :class=>'fieldGroup')
+#      else
+#        content_tag('div',
+#          content_tag('div',
+#            form_helper.label(key),
+#          :class=>'fieldName') +
+#          content_tag('div',
+#            form_helper.send(value, key),
+#          :class=>'fieldValue'),
+#        :class=>'field')
+#      end
+#    end
+#  end
+
+#  def basic_fields_for(key, value, form_helper)
+#    capture do
+#      form_helper.fields_for value.to_s.gsub(/_attributes/, '').to_sym{|f|
+
+#      }
+#    end
+#  end
+
   def sidebar_content(&block)
     @sidebar = true
     content_for(:sidebar) do

data/app/models/access_control_entry.rb

@@ -89,17 +89,11 @@ class AccessControlEntry < ActiveRecord::Base
   end
 
   def role=(role)
-    unless role.empty?
-      if role.kind_of? Role
-        self.role_id = role.id
-      else
-        role = role.to_s.camelize
-        if role.is_numeric?
-          self.role_id= role
-        else
-          self.role_id= Role.find_by_name(role).id
-        end
-      end
+    if role.kind_of? Role
+      self.role_id = role.id
+    else
+      role = role.to_s.camelize
+      self.role_id = (role.is_numeric? ? role : Role.find_by_name(role).id) unless role.empty?
     end
   end
 

data/app/models/profile.rb

@@ -8,5 +8,6 @@ class Profile < ActiveRecord::Base
       :path => "/:style/:filename",
       :styles => { :medium => "300x300>", :thumb => "100x100>" }
 
+
 end
 

data/app/models/user.rb

@@ -4,12 +4,15 @@ class User < ActiveRecord::Base
   has_one :profile, :dependent => :destroy
   has_many :galleries, :dependent => :destroy
   has_many :access_control_entries, :dependent=>:destroy
+  before_create :create_profile
+
+  form_attributes( {"Edit your profile" => :profile_attributes},
+    {"Change your password" => [:old_password, :new_password, {"Re-type password"=>:password_confirmation}]})
 
   accepts_nested_attributes_for :profile
 
   def initialize(*args)
     super(*args)
-    build_profile unless profile
   end
 
   def self.nobody
@@ -21,8 +24,10 @@ class User < ActiveRecord::Base
   end
 
   def create_profile
-
-    Profile.create(:user=>self) unless self.profile
+    unless self.profile
+      build_profile(:alias=>email)
+      profile.save
+    end
   end
 
   def role?(role)
@@ -63,7 +68,8 @@ class FullyValidatedUser < User
   attr_accessor :old_password
   validates :email, :presence => true, :email => true
   validates :old_password, :presence=>true  , :password=>true
-  validates :password, :presence=>true      , :length=>{:minimum=>6}
+  validates :password, :length=>{:minimum=>6}
   validates :password_confirmation, :equal_to=>{:other=>:password}
+  validates :phone, :phone=>true
 end
 

data/app/views/users/edit.html.haml

@@ -8,15 +8,39 @@
         %ul
           - resource.errors.full_messages.each do |msg|
             %li= msg
+
+    .fieldGroup
+      .fieldGroupTitle Edit your personal info
+      = f.fields_for :profile do |pf|
+        .field
+          .fieldName= pf.label :first_name
+          .fieldValue= pf.text_field :first_name
+        .field
+          .fieldName= pf.label :last_name
+          .fieldValue= pf.text_field :last_name
+        .field
+          .fieldName= f.label :email
+          .fieldValue= f.text_field :email
+        .field
+          .fieldName= pf.label :phone
+          .fieldValue= pf.text_field :phone
+        .field
+          .fieldName= label_tag "Company / Organization"
+          .fieldValue= pf.text_field :company
+        .field
+          .fieldName= pf.label :position
+          .fieldValue= pf.text_field :position
+    .fieldGroup
+      .fieldGroupTitle Change your password
     .field
-      .fieldName Old Password:
-      = f.password_field :old_password, :id=>"old_password"
+      .fieldName= label_tag "Old Password:"
+      .fieldValue= f.password_field :old_password, :id=>"old_password"
     .field
-      .fieldName New Password:
-      = f.password_field :password, :id=>"password"
+      .fieldName= label_tag "New Password:"
+      .fieldValue= f.password_field :password, :id=>"password"
     .field
-      .fieldName Confirm Password:
-      = f.password_field :password_confirmation
+      .fieldName= label_tag "Confirm Password:"
+      .fieldalue= f.password_field :password_confirmation
     .submit= f.submit "Change Password"
 
 :css
@@ -25,19 +49,12 @@
   }
 
 = content_for :head do
-  = javascript_include_tag 'jquery.validate'
+  = javascript_include_tag %w(jquery.validate jquery-validate/extra-methods.js)
 
 
 :javascript
   var checkingPassword = true;
   $(function(){
-  jQuery.validator.addMethod("verify_user", function(value, element, params) {
-  //alert($(element).attr('data-verify-user-path'));
-  return $.ajax({
-  async: false,
-  url: $(element).attr('data-verify-user-path')+ '?password='+value
-  }).responseText == "true";
-  }, "Password is incorrect.");
 
   $('form').validate({onkeyup: function(element) {}});
   $('#old_password').rules("add", {verify_user : true, alphanumeric: true})

data/lib/wheels/active_record_extensions.rb

@@ -1,44 +1,14 @@
 module Wheels
   module ActiveRecordExtensions
-    def commentable_tags
+    def form_attributes(attrib={}, options={})
+      @form_attributes = attrib
       class_eval do
-        after_save.reject! {|callback| callback.method.to_s == 'save_tags' }
-
-        def save_commentable_tags
-          tagging_contexts.each do |context|
-            next unless tag_list_cache_set_on(context)
-
-            tag_list = tag_list_cache_on(context).uniq
-
-            #  Do it normal like, but get the taggings, too.
-
-
-            # Find existing tags or create non-existing tags:
-            tag_list = ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(tag_list)
-
-            current_tags = tags_on(context)
-            old_tags     = current_tags - tag_list
-            new_tags     = tag_list     - current_tags
-
-            # Find taggings to remove:
-            old_taggings = taggings.where(:tagger_type => nil, :tagger_id => nil,
-                                          :context => context.to_s, :tag_id => old_tags).all
-
-            if old_taggings.present?
-              # Destroy old taggings:
-              ActsAsTaggableOn::Tagging.destroy_all :id => old_taggings.map(&:id)
-            end
-
-            # Create new taggings:
-            new_tags.each do |tag|
-              taggings.create!(:tag_id => tag.id, :context => context.to_s, :taggable => self)
-            end
-          end
+        def form_fields
+          self.class.instance_variable_get('@form_attributes')
         end
-        after_save :save_commentable_tags
-
       end
     end
   end
 end
+ActiveRecord::Base.extend Wheels::ActiveRecordExtensions
 

data/lib/wheels/html_writer.rb

@@ -0,0 +1,49 @@
+require 'action_view'
+
+class HtmlWriter
+  include ActionView::Helpers::TagHelper
+
+  def initialize(representation={})
+    @representation = representation
+  end
+
+  #  Wanna be able to do:
+  #    HtmlWriter.new.div.div(:id=>:nice, :cool=>:bar).a('Cool', :href=>'http://...')
+  HtmlWriter.new.div[:fieldName].div.id('nice') {|h|
+    h.div(@page.comments) {|ht, comment|
+      ht.div
+
+    }
+  }
+
+  def method_missing(sym, *args, &block)
+    if args[0].is_a? Array
+      #  Then the first argument is an array of objects.
+    end
+    @representation[sym] = {:args=>args[0]}
+    if block_given?
+      block.call(self)
+    end
+    return HtmlWriter.new(@representation[sym])
+  end
+
+  def val(value)
+    @representation[:value] = value
+    return self
+  end
+
+  def [](html_class)
+    @representation[:args][:class] = html_class.to_s
+    return self
+  end
+
+  def id(_id)
+    @representation[:args][:class] = _id.to_s
+  end
+
+  def html
+    concat
+
+  end
+end
+

data/lib/wheels/routes.rb

@@ -49,7 +49,7 @@ module ActionDispatch::Routing
 
       match '/css' => 'app_configs#css'
       match '/admin' => "sitemaps#index"
-      match "change_password" => "users#edit"
+      match "my_account" => "users#edit"
       match "verify_password" => "users#verify", :format=>:json
     end
   end

data/lib/wheels.rb

@@ -2,6 +2,7 @@ require 'wheels/wheels_engine.rb'
 require 'wheels/routes.rb'
 require 'wheels/action_controller_extensions.rb'
 require 'wheels/action_view_helper_extensions.rb'
+require 'wheels/active_record_extensions.rb'
 require 'wheels/flash_session_cookie_middleware.rb'
 require 'wheels/paperclip_interpolations.rb'
 require 'wheels/password_validators.rb'

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2010-09-16}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -291,6 +291,7 @@ Gem::Specification.new do |s|
      "lib/wheels/active_record_extensions.rb",
      "lib/wheels/active_record_user_extensions.rb",
      "lib/wheels/flash_session_cookie_middleware.rb",
+     "lib/wheels/html_writer.rb",
      "lib/wheels/paperclip_interpolations.rb",
      "lib/wheels/password_validators.rb",
      "lib/wheels/routes.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -07:00
+date: 2010-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -314,6 +314,7 @@ files:
 - lib/wheels/active_record_extensions.rb
 - lib/wheels/active_record_user_extensions.rb
 - lib/wheels/flash_session_cookie_middleware.rb
+- lib/wheels/html_writer.rb
 - lib/wheels/paperclip_interpolations.rb
 - lib/wheels/password_validators.rb
 - lib/wheels/routes.rb