e9_rails 0.0.5 → 0.0.7

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 *.swp
+Gemfile.lock

data/lib/e9_rails/active_record/inheritable_options.rb

@@ -19,11 +19,14 @@ module E9Rails::ActiveRecord
     end
 
     def options=(hash={})
-      write_attribute(:options, hash)
+      write_attribute(:options, hash.stringify_keys)
     end
 
     def options
-      self.class.options_class.new( (read_attribute(:options) || {}).reverse_merge(Hash[options_parameters.zip([nil])]), self)
+      opts = read_attribute(:options) || {}
+      opts.reverse_merge! Hash[options_parameters.map(&:to_s).zip([nil])]
+      
+      options_class.new(opts, self)
     end
 
     class Options < HashWithIndifferentAccess
@@ -39,6 +42,13 @@ module E9Rails::ActiveRecord
         def i18n_scope; :activerecord end
       end
 
+      # This is for active_support, signifying that this class shouldn't be 
+      # extracted from *args as options via extract_options.  If this is NOT set,
+      # we'll get some odd errors when trying to build the form.
+      def extractable_options?
+        false
+      end
+
       def initialize(hash, base)
         merge!(hash)
         @base = base

data/lib/e9_rails/controllers/orderable.rb

@@ -0,0 +1,56 @@
+module E9Rails::Controllers
+  # A hackish has_scope mixin to allow ordering by database column.
+  #
+  # Requires has_scope and inherited_resources.
+  #
+  module Orderable
+    extend ActiveSupport::Concern
+
+    def default_ordered_on; 'created_at' end
+
+    def default_ordered_dir; 'DESC' end
+
+    def ordered_if; params[:action] == 'index' end
+
+    included do
+      has_scope :ordered_on, :if => :ordered_if, :default => lambda {|c| c.send(:default_ordered_on) } do |controller, scope, val|
+        begin
+          # determine the dir from params or controller default
+          dir = case controller.params[:dir]
+                when /^desc$/i then 'DESC'
+                when /^asc$/i  then 'ASC'
+                else controller.send(:default_ordered_dir) rescue ''
+                end
+
+          # split the ordered_param on commas and periods, the idea being that 
+          # it can take multiple columns, and on assocation columns
+          val = val.split(',').map {|v| v.split('.') }
+
+          val = val.map {|v| 
+            # if val split on '.', try to constantize the parsed class
+            if v.length > 1
+              klass = v.first.classify.constantize rescue nil
+              # and if it succeeds
+              if klass
+                # apply the join to the scope.
+                # NOTE there's no checking whatsoever here as to:
+                #      A.) is this class an association?
+                #      B.) does this class have the passed column?
+                scope = scope.joins(v.first.underscore.to_sym)
+                "#{klass.table_name}.#{v.last} #{dir}"
+              end
+            else
+              # else we're assuming the column is on the table
+              "#{resource_class.table_name}.#{v.last} #{dir}"
+            end
+          }.compact.join(', ')
+
+          scope.order(val)
+        rescue => e
+          raise e
+          scope
+        end
+      end
+    end
+  end
+end

data/lib/e9_rails/helpers/resource_error_messages.rb

@@ -23,14 +23,13 @@ module E9Rails::Helpers
           return ''
         end
 
-        messages = object.errors.map {|attribute, msg| content_tag(:li, msg) }.join
-        html     = <<-HTML
+        <<-HTML.html_safe
           <div id="errorExplanation">
-            <ul>#{messages}</ul>
+            <ul>
+              #{ object.errors.map {|attribute, msg| "<li>#{msg}</li>" }.join }
+            </ul>
           </div>
         HTML
-
-        html.html_safe
       rescue => e
         ''
       end

data/lib/e9_rails/version.rb

@@ -1,3 +1,3 @@
 module E9Rails
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/e9_rails.rb

@@ -3,16 +3,20 @@ require 'rails'
 module E9Rails
   autoload :Version, 'e9_rails/version'
 
+  module ActiveRecord
+    autoload :STI,                   'e9_rails/active_record/sti'
+    autoload :AttributeSearchable,   'e9_rails/active_record/attribute_searchable'
+    autoload :InheritableOptions,    'e9_rails/active_record/inheritable_options'
+  end
+
+  module Controllers
+    autoload :Orderable,             'e9_rails/controllers/orderable'
+  end
+
   module Helpers
     autoload :Translation,           'e9_rails/helpers/translation'
     autoload :ResourceErrorMessages, 'e9_rails/helpers/resource_error_messages'
     autoload :Title,                 'e9_rails/helpers/title'
     autoload :Pagination,            'e9_rails/helpers/pagination'
   end
-
-  module ActiveRecord
-    autoload :STI,                   'e9_rails/active_record/sti'
-    autoload :AttributeSearchable,   'e9_rails/active_record/attribute_searchable'
-    autoload :InheritableOptions,    'e9_rails/active_record/inheritable_options'
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Travis Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - lib/e9_rails/active_record/attribute_searchable.rb
 - lib/e9_rails/active_record/inheritable_options.rb
 - lib/e9_rails/active_record/sti.rb
+- lib/e9_rails/controllers/orderable.rb
 - lib/e9_rails/helpers/pagination.rb
 - lib/e9_rails/helpers/resource_error_messages.rb
 - lib/e9_rails/helpers/title.rb