hashdown 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b2ae3203f51852e88568edbd1e2166336e71a4c9
+  data.tar.gz: 73912f3ce1977885a168648f412f67248b3fce19
+SHA512:
+  metadata.gz: ba7a79495e66c86d4d4996f928d6285e3d0f52b26e242d6dcba2a84e45f7a80ca68efa9f027980468be409b71a3054d87e73e9522554d8edbb291c266847cbc3
+  data.tar.gz: 8cfcbbfa8787db3a8bb645c52aef582f46d6170c58b54ea68a5d0950432c3d415e015bedd9cd2d0cfd347229b5dbcfaf25b478449ce68ee55248f27387b83ef7

data/hashdown.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{super lightweight Rails plugin that adds hash-style lookups and option list (for generating dropdowns) to ActiveRecord models}
   gem.homepage      = "https://github.com/rubysolo/hashdown"
 
-  gem.add_dependency 'activerecord', '~> 3.0'
+  gem.add_dependency 'activerecord', '>= 3.0'
 
   gem.add_development_dependency 'pry-nav'
   gem.add_development_dependency 'rake'

data/lib/hashdown/cache.rb

@@ -1,6 +1,6 @@
 module Hashdown
   def self.cache
-    @cache ||= rails_cache || local_cache
+    @cache ||= rails.cache || local_cache
   end
 
   def self.cache=(value)
@@ -8,17 +8,23 @@ module Hashdown
   end
 
   def self.force_cache_miss?
-    Rails.env.test? if defined?(Rails)
+    rails.env.test?
   end
 
   def self.cache_key(source, class_name, token=nil)
-    ['hashdown', class_name, source, token].compact.join('-')
+    ['hashdown', rails.env, class_name, source, token].compact.join('-')
   end
 
   def self.uncache(source, class_name, token)
     cache.delete(cache_key(source, class_name, token))
   end
 
+  def self.cached(cache_key)
+    cache.fetch(cache_key, :force => force_cache_miss?) do
+      yield
+    end
+  end
+
   class Config
     def initialize(hash={})
       @data = hash
@@ -41,8 +47,8 @@ module Hashdown
 
   private
 
-  def self.rails_cache
-    Rails.cache if defined?(Rails)
+  def self.rails
+    @rails ||= defined?(Rails) ? Rails : Config.new(cache: nil, env: Config.new)
   end
 
   def self.local_cache

data/lib/hashdown/finder.rb

@@ -20,14 +20,19 @@ module Hashdown
       end
 
       def [](token)
-        Hashdown.cache.fetch(Hashdown.cache_key(:finder, self.to_s, token), :force => Hashdown.force_cache_miss?) do
-          where({hashdown.finder.key => token.to_s}).first || (
-            hashdown.finder.default? ?
-              hashdown.finder.default :
-              raise(ActiveRecord::RecordNotFound)
-          )
+        cache_key = Hashdown.cache_key(:finder, self.to_s, token)
+
+        Hashdown.cached(cache_key) do
+          where({hashdown.finder.key => token.to_s}).first || hashdown_default_or_raise
         end
       end
+
+      private
+
+      def hashdown_default_or_raise
+        raise ActiveRecord::RecordNotFound unless hashdown.finder.default?
+        hashdown.finder.default
+      end
     end
 
     module InstanceMethods

data/lib/hashdown/select_options.rb

@@ -24,12 +24,7 @@ module Hashdown
 
     module ClassMethods
       def select_options(*args)
-        options = args.pop if args.last.is_a?(Hash)
-        options ||= {}
-
-        options[:label] ||= args.shift if args.any?
-        options[:value] ||= args.shift if args.any?
-        options.reverse_merge!(select_options_options)
+        options = generate_options_for_cache_key(args)
 
         scope = scoped
         options[:is_sorted] = scope.arel.orders.any?
@@ -37,7 +32,7 @@ module Hashdown
 
         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
+        Hashdown.cached(cache_key) 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)]
@@ -50,6 +45,17 @@ module Hashdown
 
       private
 
+      def generate_options_for_cache_key(args)
+        options = args.pop if args.last.is_a?(Hash)
+        options ||= {}
+
+        options[:label] ||= args.shift if args.any?
+        options[:value] ||= args.shift if args.any?
+        options.reverse_merge!(select_options_options)
+
+        options
+      end
+
       def select_options_cache_key(options, scope)
         key = options.sort.each_with_object(""){|ck,(k,v)| ck << "#{ k }:#{ v };" }
         key << scope.to_sql

data/lib/hashdown/version.rb

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

data/spec/lib/hashdown/cache_spec.rb

@@ -3,12 +3,16 @@ require 'spec_helper'
 describe Hashdown do
   describe 'cache' do
     describe 'in a Rails project' do
-      before { Object.const_set('Rails', mock(cache: :rails_cache)) }
+      before { Object.const_set('Rails', mock(cache: :rails_cache, env: 'development')) }
       after  { Object.send(:remove_const, 'Rails') }
 
       it 'delegates to Rails.cache if available' do
         Hashdown.cache.should eq Rails.cache
       end
+
+      it 'incorporates the environment in the cache key' do
+        Hashdown.cache_key(:finder, 'MyModel', 'some-value').should match(/development/)
+      end
     end
 
     it 'creates a new cache store if Rails.cache unavailable' do

data/spec/lib/hashdown/select_options_spec.rb

@@ -32,7 +32,7 @@ describe Hashdown::SelectOptions do
   end
 
   it 'generates grouped options' do
-    grouped_states = State.select_options(group: lambda{|state| state.name.first })
+    grouped_states = State.select_options(group: lambda { |state| state.name[0] })
     grouped_states.map(&:first).should eq %w( A C N T )
     grouped_states.detect{|group, states| group == 'C' }.last.length.should eq 2
   end

data/spec/spec_helper.rb

@@ -10,6 +10,12 @@ require 'hashdown/select_options'
 ActiveRecord::Base.establish_connection(:adapter  => 'sqlite3', :database => ':memory:')
 load 'support/models.rb'
 
+module Hashdown
+  def self.reset
+    @cache = @rails = nil
+  end
+end
+
 RSpec.configure do |config|
   config.mock_with :rspec
 
@@ -18,10 +24,10 @@ RSpec.configure do |config|
     load 'support/schema.rb'
     load 'support/seeds.rb'
 
-    Hashdown.cache = nil
+    Hashdown.reset
   end
 
   config.after(:each) do
-    Hashdown.cache = nil
+    Hashdown.reset
   end
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: hashdown
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70280660899280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280660899280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70280660898640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280660898640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70280660897960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280660897960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280660889020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280660889020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70280660888540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280660888540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hashdown
 email:
 - rubysolo@gmail.com
@@ -93,27 +107,26 @@ files:
 - spec/support/seeds.rb
 homepage: https://github.com/rubysolo/hashdown
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: super lightweight Rails plugin that adds hash-style lookups and option list
   (for generating dropdowns) to ActiveRecord models
 test_files: