e9_rails 0.0.11 → 0.0.13

data/lib/e9_rails/active_record/attribute_searchable.rb

@@ -11,6 +11,7 @@ module E9Rails::ActiveRecord
       def attr_like_scope_condition(attr_name, string, opts = {})
         matcher = opts.delete(:matcher) || "%%%s%%"
         arel_table[attr_name].matches(matcher % string)
+
       end
 
       def any_attrs_like_scope_conditions(*args)

data/lib/e9_rails/active_record/scopes/times.rb

@@ -0,0 +1,45 @@
+module E9Rails::ActiveRecord
+  module Scopes
+    module Times
+      extend ActiveSupport::Concern
+
+      included do
+        scope :from_time,  lambda {|*args| args.flatten!; for_time_range(args.shift, nil, args.extract_options!) }
+        scope :until_time, lambda {|*args| args.flatten!; for_time_range(nil, args.shift, args.extract_options!) }
+
+        scope :for_time_range, lambda {|*args|
+          opts = args.extract_options!
+
+          args.flatten!
+
+          # try to determine a datetime from each arg, skipping #to_time on passed strings because
+          # it doesn't handle everything DateTime.parse can, e.g. 'yyyy/mm'
+          args.map! do |t| 
+            t.presence and 
+
+              # handle string years 2010, etc.
+              t.is_a?(String) && /^\d{4}$/.match(t) && Date.civil(t.to_i) ||
+
+              # handle Time etc. (String#to_time doesn't handle yyyy/mm properly)
+              !t.is_a?(String) && t.respond_to?(:to_time) && t.to_time || 
+
+              # try to parse it
+              DateTime.parse(t) rescue nil
+          end
+
+          time_column = opts[:column] || :created_at
+
+          if !args.any?
+            where('1=0')
+          elsif args.all?
+            where(time_column => args[0]..args[1])
+          elsif args[0]
+            where(arel_table[time_column].gteq(args[0]))
+          else
+            where(arel_table[time_column].lteq(args[1]))
+          end
+        }
+      end
+    end
+  end
+end

data/lib/e9_rails/controllers/orderable.rb

@@ -12,6 +12,8 @@ module E9Rails::Controllers
       helper_method :default_ordered_dir
 
       has_scope :order, :if => :ordered_if, :default => lambda {|c| c.send(:default_ordered_on) } do |controller, scope, columns|
+        resource_class = controller.send(:resource_class)
+
         begin
           # determine the dir from params or controller default
           dir = case controller.params[:sort]
@@ -26,7 +28,7 @@ module E9Rails::Controllers
 
           columns = columns.map {|v| 
             # if column split on '.', try to constantize the parsed class
-            if v.length > 1
+            if v.length > 1 && v.last =~ /\w+/
               klass = v.first.classify.constantize rescue nil
 
               # and if it succeeds
@@ -38,9 +40,14 @@ module E9Rails::Controllers
                 scope = scope.includes(v.first.underscore.to_sym)
                 "#{klass.table_name}.#{v.last} #{dir}"
               end
-            else
-              # else we're assuming the column is on the table
-              "#{controller.send(:resource_class).table_name}.#{v.last} #{dir}"
+            elsif v.last =~ /\w+/
+              sql = ''
+
+              if resource_class.column_names.member?(v.last)
+                sql << "#{resource_class.table_name}."
+              end
+
+              sql << "#{v.last} #{dir}"
             end
           }.compact.join(', ')
 

data/lib/e9_rails/helpers/resource_links.rb

@@ -18,16 +18,20 @@ module E9Rails::Helpers
 
         path_options = options.slice!(:scope, :action, :method, :remote, :confirm, :class)
 
-        klass   = resource.is_a?(Class) ? resource : resource.class
+        klass  = resource.is_a?(Class) ? resource : resource.class
 
-        action  = options.delete(:action)
-        action  = klass == resource ? :new : (action || :show).to_sym
+        action = (options.delete(:action) || :show).to_sym
+
+        if klass == resource && ![:index, :new].member?(action)
+          action = :index
+        end
 
         scopes  = [*(options[:scope] || @route_scope), parent].compact
         path    = case action
-                  when :new;  new_polymorphic_path(scopes << klass, path_options)
-                  when :edit; edit_polymorphic_path(scopes << resource, path_options)
-                  else        polymorphic_path(scopes << resource, path_options)
+                  when :new;   new_polymorphic_path(scopes << klass, path_options)
+                  when :edit;  edit_polymorphic_path(scopes << resource, path_options)
+                  when :index; polymorphic_path(scopes << klass, path_options)
+                  else         polymorphic_path(scopes << resource, path_options)
                   end
 
         mn = klass.model_name
@@ -79,6 +83,10 @@ module E9Rails::Helpers
       def link_to_destroy_resource(resource, options = {})
         link_to_resource(resource, options.merge(:action => :destroy))
       end
+
+      def link_to_collection(resource, options = {})
+        link_to_resource(resource, options.merge(:action => :index))
+      end
     end
   end
 end

data/lib/e9_rails/locale/en.yml

@@ -0,0 +1,9 @@
+en:
+  activerecord:
+    links:
+      index: "%{models}"
+      new: "New %{model}"
+      edit: "Edit %{model}"
+      destroy: "Delete %{model}"
+      show: "View %{model}"
+      confirm_destroy: Are you sure?  This cannot be undone.

data/lib/e9_rails/version.rb

@@ -1,3 +1,3 @@
 module E9Rails
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

data/lib/e9_rails.rb

@@ -8,6 +8,10 @@ module E9Rails
     autoload :InheritableOptions,    'e9_rails/active_record/inheritable_options'
     autoload :Initialization,        'e9_rails/active_record/initialization'
     autoload :STI,                   'e9_rails/active_record/sti'
+
+    module Scopes
+      autoload :Times,               'e9_rails/active_record/scopes/times'
+    end
   end
 
   module Controllers
@@ -22,4 +26,11 @@ module E9Rails
     autoload :Title,                 'e9_rails/helpers/title'
     autoload :Translation,           'e9_rails/helpers/translation'
   end
+
+  class Railtie < Rails::Railtie
+    initializer 'e9_rails.append_i18n_translations' do
+      require 'active_support/i18n'
+      I18n.load_path << File.join(File.dirname(__FILE__), 'e9_rails/locale/en.yml')
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -04:00
+date: 2011-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/e9_rails/active_record/attribute_searchable.rb
 - lib/e9_rails/active_record/inheritable_options.rb
 - lib/e9_rails/active_record/initialization.rb
+- lib/e9_rails/active_record/scopes/times.rb
 - lib/e9_rails/active_record/sti.rb
 - lib/e9_rails/controllers/orderable.rb
 - lib/e9_rails/controllers/sortable.rb
@@ -62,6 +63,7 @@ files:
 - lib/e9_rails/helpers/resource_links.rb
 - lib/e9_rails/helpers/title.rb
 - lib/e9_rails/helpers/translation.rb
+- lib/e9_rails/locale/en.yml
 - lib/e9_rails/version.rb
 has_rdoc: true
 homepage: http://www.e9digital.com