hashdown 0.2.1 → 0.2.2

data/lib/hashdown/select_options.rb

@@ -1,12 +1,16 @@
 module Hashdown
   module SelectOptions
-    def select_options(*args)
-      unless self.respond_to?(:map_records_to_select_options)
-        self.extend ClassMethods
-        self.send(:include, InstanceMethods)
+    def selectable(*args)
+      unless respond_to?(:select_options)
+        extend ClassMethods
+        include InstanceMethods
 
         after_save    :clear_select_options_cache
         after_destroy :clear_select_options_cache
+
+        class << self
+          attr_accessor :select_options_options
+        end
       end
 
       options = args.pop if args.last.is_a?(Hash)
@@ -15,24 +19,35 @@ module Hashdown
       options[:label] ||= args.shift || :name
       options[:value] ||= args.shift || :id
 
-      scope = scoped
-      options[:is_sorted] = scope.arel.orders.any?
-      scope = select_options_scope_with_order(scope, options)
+      self.select_options_options = options
+    end
+
+    module ClassMethods
+      def select_options(*args)
+        options = args.pop if args.last.is_a?(Hash)
+        options ||= {}
 
-      cache_key = Hashdown.cache_key(:select_options, self.to_s, select_options_cache_key(options, scope))
+        options[:label] ||= args.shift if args.any?
+        options[:value] ||= args.shift if args.any?
+        options.reverse_merge!(select_options_options)
 
-      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)]
+        scope = scoped
+        options[:is_sorted] = scope.arel.orders.any?
+        scope = select_options_scope_with_order(scope, options)
+
+        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)]
+            end
+          else
+            map_records_to_select_options(scope.all, options)
           end
-        else
-          map_records_to_select_options(scope.all, options)
         end
       end
-    end
 
-    module ClassMethods
       private
 
       def select_options_cache_key(options, scope)

data/lib/hashdown/version.rb

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

data/spec/lib/hashdown/select_options_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Hashdown::SelectOptions do
   let(:state_names) { %w(Arizona California Colorado New\ York Texas) }
 
-  it 'adds #select_options to ActiveRecord classes' do
+  it 'adds #select_options to ActiveRecord classes declared selectable' do
     State.should respond_to(:select_options)
   end
 
@@ -16,7 +16,7 @@ describe Hashdown::SelectOptions do
   end
 
   it 'allows use of methods for labels' do
-    State.select_options(:label => :label).map(&:first).should eq(
+    State.select_options(:label).map(&:first).should eq(
       ['AZ (Arizona)', 'CA (California)', 'CO (Colorado)', 'NY (New York)', 'TX (Texas)']
     )
   end

data/spec/support/models.rb

@@ -1,6 +1,7 @@
 class State < ActiveRecord::Base
   scope :starting_with_c, where("name like 'C%'")
   finder :abbreviation
+  selectable
 
   def label
     "#{ abbreviation } (#{ name })"
@@ -20,4 +21,5 @@ end
 
 class Currency < ActiveRecord::Base
   default_scope order(:code)
+  selectable
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashdown
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70355080435780 !ruby/object:Gem::Requirement
+  requirement: &70280660899280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355080435780
+  version_requirements: *70280660899280
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70355080435160 !ruby/object:Gem::Requirement
+  requirement: &70280660898640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355080435160
+  version_requirements: *70280660898640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70355080434440 !ruby/object:Gem::Requirement
+  requirement: &70280660897960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355080434440
+  version_requirements: *70280660897960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355080433760 !ruby/object:Gem::Requirement
+  requirement: &70280660889020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355080433760
+  version_requirements: *70280660889020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70355080421380 !ruby/object:Gem::Requirement
+  requirement: &70280660888540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355080421380
+  version_requirements: *70280660888540
 description: Hashdown
 email:
 - rubysolo@gmail.com