hashdown 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ae3203f51852e88568edbd1e2166336e71a4c9
-  data.tar.gz: 73912f3ce1977885a168648f412f67248b3fce19
+  metadata.gz: 295f9605343eb1d2b41d61440ecc6c37bc8de937
+  data.tar.gz: 283e18b01cad8568272ec927408c89115dedcb5e
 SHA512:
-  metadata.gz: ba7a79495e66c86d4d4996f928d6285e3d0f52b26e242d6dcba2a84e45f7a80ca68efa9f027980468be409b71a3054d87e73e9522554d8edbb291c266847cbc3
-  data.tar.gz: 8cfcbbfa8787db3a8bb645c52aef582f46d6170c58b54ea68a5d0950432c3d415e015bedd9cd2d0cfd347229b5dbcfaf25b478449ce68ee55248f27387b83ef7
+  metadata.gz: 39c65a9570f4435c0a39618a774fac0c83b94e5e28da7089f3a298422494f0b2140fbf82fc7faa2e315ad7337e1715364fc2e3955d7bd5fda4ab1e872cd30da5
+  data.tar.gz: b7a31edac85a0f18762e2abb0943172ad73bf83a4343a80dbab1b51e0259e6545ab26770a1b773c6be9bd90a881badc83b2b2363af41283affedf8343c7d5ec9

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor/bundle

data/README.md

@@ -1,5 +1,9 @@
 # Hashdown
 
+[![Gem Version](https://badge.fury.io/rb/hashdown.png)](http://badge.fury.io/rb/hashdown)
+[![Build Status](https://travis-ci.org/rubysolo/hashdown.png?branch=master)](https://travis-ci.org/rubysolo/hashdown)
+[![Code Climate](https://codeclimate.com/github/rubysolo/hashdown.png)](https://codeclimate.com/github/rubysolo/hashdown)
+
 Hashdown is a super lightweight rails plugin that adds hash-style lookups and
 option lists (for generating dropdowns) to ActiveRecord models.  Note: Hashdown
 has been updated to support Rails 3.  If you're looking for the original plugin

data/hashdown.gemspec

@@ -7,8 +7,9 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Hashdown}
   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.license       = 'MIT'
 
-  gem.add_dependency 'activerecord', '>= 3.0'
+  gem.add_dependency 'activerecord', '~> 4.0'
 
   gem.add_development_dependency 'pry-nav'
   gem.add_development_dependency 'rake'

data/lib/hashdown/select_options.rb

@@ -26,7 +26,7 @@ module Hashdown
       def select_options(*args)
         options = generate_options_for_cache_key(args)
 
-        scope = scoped
+        scope = where(nil)
         options[:is_sorted] = scope.arel.orders.any?
         scope = select_options_scope_with_order(scope, options)
 
@@ -34,11 +34,11 @@ module Hashdown
 
         Hashdown.cached(cache_key) do
           if grouping = options[:group]
-            scope.all.group_by {|record| grouping.call(record) }.map do |group, records|
+            scope.to_a.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)
+            map_records_to_select_options(scope.to_a, options)
           end
         end
       end

data/lib/hashdown/version.rb

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

data/spec/lib/hashdown/cache_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Hashdown do
   describe 'cache' do
     describe 'in a Rails project' do
-      before { Object.const_set('Rails', mock(cache: :rails_cache, env: 'development')) }
+      before { Object.const_set('Rails', double(cache: :rails_cache, env: 'development')) }
       after  { Object.send(:remove_const, 'Rails') }
 
       it 'delegates to Rails.cache if available' do

data/spec/lib/hashdown/finder_spec.rb

@@ -34,18 +34,18 @@ describe Hashdown::Finder do
     let(:florida) { State.new(abbreviation: 'FL', name: 'Florida') }
 
     it 'caches found records' do
-      scope = mock(first: florida)
+      scope = double(first: florida)
       State.should_receive(:where).once.and_return(scope)
 
       2.times { State[:FL].name.should eq 'Florida' }
     end
 
     describe 'in test environment' do
-      before { Object.const_set('Rails', mock(env: mock(test?: true), cache: ActiveSupport::Cache::MemoryStore.new)) }
+      before { Object.const_set('Rails', double(env: double(test?: true), cache: ActiveSupport::Cache::MemoryStore.new)) }
       after  { Object.send(:remove_const, 'Rails') }
 
       it 'forces cache miss' do
-        scope = mock(first: florida)
+        scope = double(first: florida)
         State.should_receive(:where).twice.and_return(scope)
 
         2.times { State[:FL].name.should eq 'Florida' }
@@ -53,7 +53,7 @@ describe Hashdown::Finder do
     end
 
     it 'clears the cache on save' do
-      scope = mock(first: florida)
+      scope = double(first: florida)
       State.should_receive(:where).twice.and_return(scope)
 
       State[:FL].save
@@ -61,7 +61,7 @@ describe Hashdown::Finder do
     end
 
     it 'clears the cache on destroy' do
-      scope = mock(first: florida)
+      scope = double(first: florida)
       State.should_receive(:where).twice.and_return(scope)
 
       State[:FL].destroy

data/spec/lib/hashdown/select_options_spec.rb

@@ -47,22 +47,22 @@ describe Hashdown::SelectOptions do
 
   describe 'cache layer' do
     let(:states) { State.all }
-    let(:mock_scope) { mock(arel: mock(orders: %w( name )), to_sql: "SELECT * FROM states") }
+    let(:mock_scope) { double(arel: double(orders: %w( name )), to_sql: "SELECT * FROM states") }
 
     it 'should cache found records' do
-      mock_scope.should_receive(:all).once.and_return(states)
-      State.stub(:scoped).and_return(mock_scope)
+      mock_scope.should_receive(:to_a).once.and_return(states)
+      State.stub(:where).and_return(mock_scope)
 
       2.times { State.select_options.length.should eq states.length }
     end
 
     describe 'in test environment' do
-      before { Object.const_set('Rails', mock(env: mock(test?: true), cache: ActiveSupport::Cache::MemoryStore.new)) }
+      before { Object.const_set('Rails', double(env: double(test?: true), cache: ActiveSupport::Cache::MemoryStore.new)) }
       after  { Object.send(:remove_const, 'Rails') }
 
       it 'forces cache miss' do
-        mock_scope.should_receive(:all).twice.and_return(states)
-        State.stub(:scoped).and_return(mock_scope)
+        mock_scope.should_receive(:to_a).twice.and_return(states)
+        State.stub(:where).and_return(mock_scope)
 
         2.times { State.select_options.length.should eq states.length }
       end
@@ -74,8 +74,8 @@ describe Hashdown::SelectOptions do
     end
 
     it 'clears the cache on save' do
-      mock_scope.should_receive(:all).twice.and_return(states)
-      State.stub(:scoped).and_return(mock_scope)
+      mock_scope.should_receive(:to_a).twice.and_return(states)
+      State.stub(:where).and_return(mock_scope)
 
       State.select_options
       states.first.save
@@ -83,8 +83,8 @@ describe Hashdown::SelectOptions do
     end
 
     it 'clears the cache on destroy' do
-      mock_scope.should_receive(:all).twice.and_return(states)
-      State.stub(:scoped).and_return(mock_scope)
+      mock_scope.should_receive(:to_a).twice.and_return(states)
+      State.stub(:where).and_return(mock_scope)
 
       State.select_options
       states.first.destroy

data/spec/support/models.rb

@@ -1,5 +1,5 @@
 class State < ActiveRecord::Base
-  scope :starting_with_c, where("name like 'C%'")
+  scope :starting_with_c, -> { where("name like 'C%'") }
   finder :abbreviation
   selectable
 
@@ -10,7 +10,7 @@ end
 
 class SortedState < ActiveRecord::Base
   self.table_name = 'states'
-  default_scope order(:abbreviation)
+  default_scope { order(:abbreviation) }
   finder :abbreviation
 end
 
@@ -20,6 +20,6 @@ class StateDefaultNil < ActiveRecord::Base
 end
 
 class Currency < ActiveRecord::Base
-  default_scope order(:code)
+  default_scope { order(:code) }
   selectable
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hashdown
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,8 @@ files:
 - spec/support/schema.rb
 - spec/support/seeds.rb
 homepage: https://github.com/rubysolo/hashdown
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: super lightweight Rails plugin that adds hash-style lookups and option list