hashdown 0.2.0 → 0.2.1

data/README.md

@@ -32,7 +32,7 @@ You can look up states via their abbreviations like so:
     @colorado = State[:CO]
 
 By default, calling the finder method with a token that does not exist in the
-database will result in an ActiveRecord::RecordNotFount exception being thrown.
+database will result in an ActiveRecord::RecordNotFound exception being thrown.
 This can be overridden by adding a :default option to your finder declaration.
 
     class PurchaseOrder < ActiveRecord::Base
@@ -74,11 +74,11 @@ implementation:
       validates_uniqueness_of :abbreviation
 
       def self.[](state_code)
-        find_by_abbreviation(state_code)
+        where(abbreviation: state_code).first
       end
 
       def self.select_options
-        find(:all).map{|s| [s.name, s.id] }
+        all.map{|s| [s.name, s.id] }
       end
     end
 

data/lib/hashdown/select_options.rb

@@ -16,9 +16,12 @@ module Hashdown
       options[:value] ||= args.shift || :id
 
       scope = scoped
-      scope = scope.order(options[:label]) if scope.arel.orders.empty? && columns.any?{|c| c.name == options[:label].to_s }
+      options[:is_sorted] = scope.arel.orders.any?
+      scope = select_options_scope_with_order(scope, options)
 
-      Hashdown.cache.fetch(Hashdown.cache_key(:select_options, self.to_s, select_options_cache_key(options, scope)), :force => Hashdown.force_cache_miss?) do
+      cache_key = Hashdown.cache_key(:select_options, self.to_s, select_options_cache_key(options, scope))
+
+      Hashdown.cache.fetch(cache_key, :force => Hashdown.force_cache_miss?) do
         if grouping = options[:group]
           scope.all.group_by {|record| grouping.call(record) }.map do |group, records|
             [group, map_records_to_select_options(records, options)]
@@ -39,7 +42,23 @@ module Hashdown
       end
 
       def map_records_to_select_options(records, options)
-        records.map{|record| [ record[options[:label]], record[options[:value]] ] }
+        records = records.map { |record| select_option_for_record(record, options) }
+        options[:is_sorted] ? records : records.sort
+      end
+
+      def select_option_for_record(record, options)
+        [ record.send(options[:label]), record.send(options[:value]) ]
+      end
+
+      def select_options_scope_with_order(scope, options)
+        unless options[:is_sorted]
+          if columns.any? { |c| c.name == options[:label].to_s }
+            options[:is_sorted] = true
+            return scope.order(options[:label])
+          end
+        end
+
+        scope
       end
     end
 

data/lib/hashdown/version.rb

@@ -1,3 +1,3 @@
 module Hashdown
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/lib/hashdown/select_options_spec.rb

@@ -15,6 +15,12 @@ describe Hashdown::SelectOptions do
     State.select_options.map(&:first).should eq state_names
   end
 
+  it 'allows use of methods for labels' do
+    State.select_options(:label => :label).map(&:first).should eq(
+      ['AZ (Arizona)', 'CA (California)', 'CO (Colorado)', 'NY (New York)', 'TX (Texas)']
+    )
+  end
+
   it 'respects order if specified' do
     Currency.select_options.map(&:first).should eq ['Renminbi', 'Euro', 'Pound Sterling', 'US Dollar']
   end

data/spec/support/models.rb

@@ -1,6 +1,10 @@
 class State < ActiveRecord::Base
   scope :starting_with_c, where("name like 'C%'")
   finder :abbreviation
+
+  def label
+    "#{ abbreviation } (#{ name })"
+  end
 end
 
 class SortedState < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashdown
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70301816154100 !ruby/object:Gem::Requirement
+  requirement: &70355080435780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301816154100
+  version_requirements: *70355080435780
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70301816153640 !ruby/object:Gem::Requirement
+  requirement: &70355080435160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301816153640
+  version_requirements: *70355080435160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301816152900 !ruby/object:Gem::Requirement
+  requirement: &70355080434440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301816152900
+  version_requirements: *70355080434440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301815747100 !ruby/object:Gem::Requirement
+  requirement: &70355080433760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301815747100
+  version_requirements: *70355080433760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70301815746680 !ruby/object:Gem::Requirement
+  requirement: &70355080421380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301815746680
+  version_requirements: *70355080421380
 description: Hashdown
 email:
 - rubysolo@gmail.com
@@ -103,18 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1096798538704753083
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1096798538704753083
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11