hashdown 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 295f9605343eb1d2b41d61440ecc6c37bc8de937
-  data.tar.gz: 283e18b01cad8568272ec927408c89115dedcb5e
+  metadata.gz: 286807c97b93b855bcd7ba06d60dc1a9352e68cd
+  data.tar.gz: 88e736d318f67cdbd6ee00965164fd5914639720
 SHA512:
-  metadata.gz: 39c65a9570f4435c0a39618a774fac0c83b94e5e28da7089f3a298422494f0b2140fbf82fc7faa2e315ad7337e1715364fc2e3955d7bd5fda4ab1e872cd30da5
-  data.tar.gz: b7a31edac85a0f18762e2abb0943172ad73bf83a4343a80dbab1b51e0259e6545ab26770a1b773c6be9bd90a881badc83b2b2363af41283affedf8343c7d5ec9
+  metadata.gz: 5d48a0cd467aced79339703376d64fa1d0649cb785dafcbc8e375cfa0b2121d48aed4abe0dd8b659f3cbd0c34056a32192937ec7fc53b52043ed207fcd4353e3
+  data.tar.gz: 1d6729c89f75f96d67e5ef41a5da3adf4b1566dc10b894e8ed3caa8bf4569b25aea64170cb7e25d8b5cdda825becde32387fda6b25c3110e16aeb0f329cfff00

data/lib/hashdown/select_options.rb

@@ -57,9 +57,10 @@ module Hashdown
       end
 
       def select_options_cache_key(options, scope)
-        key = options.sort.each_with_object(""){|ck,(k,v)| ck << "#{ k }:#{ v };" }
-        key << scope.to_sql
-        key = Digest::MD5.hexdigest(key)
+        Digest::MD5.hexdigest(options.sort.to_json.tap do |key|
+          key << scope.to_sql
+          key << scope.where_values_hash.to_json
+        end)
       end
 
       def map_records_to_select_options(records, options)

data/lib/hashdown/version.rb

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

data/spec/lib/hashdown/select_options_spec.rb

@@ -47,7 +47,7 @@ describe Hashdown::SelectOptions do
 
   describe 'cache layer' do
     let(:states) { State.all }
-    let(:mock_scope) { double(arel: double(orders: %w( name )), to_sql: "SELECT * FROM states") }
+    let(:mock_scope) { double(arel: double(orders: %w( name )), to_sql: "SELECT * FROM states", where_values_hash: {}) }
 
     it 'should cache found records' do
       mock_scope.should_receive(:to_a).once.and_return(states)
@@ -73,6 +73,12 @@ describe Hashdown::SelectOptions do
       State.starting_with_c.select_options.map(&:first).should eq %w( California Colorado )
     end
 
+    it 'respects associations' do
+      City.starting_with_d.select_options.map(&:first).should eq %w( Dallas Denver )
+      State[:TX].cities.starting_with_d.select_options.map(&:first).should eq %w( Dallas )
+      State[:CO].cities.starting_with_d.select_options.map(&:first).should eq %w( Denver )
+    end
+
     it 'clears the cache on save' do
       mock_scope.should_receive(:to_a).twice.and_return(states)
       State.stub(:where).and_return(mock_scope)

data/spec/support/models.rb

@@ -1,6 +1,7 @@
 class State < ActiveRecord::Base
   scope :starting_with_c, -> { where("name like 'C%'") }
   finder :abbreviation
+  has_many :cities
   selectable
 
   def label
@@ -19,6 +20,12 @@ class StateDefaultNil < ActiveRecord::Base
   finder :abbreviation, default: nil
 end
 
+class City < ActiveRecord::Base
+  scope :starting_with_d, -> { where("name like 'D%'") }
+  belongs_to :state
+  selectable
+end
+
 class Currency < ActiveRecord::Base
   default_scope { order(:code) }
   selectable

data/spec/support/schema.rb

@@ -5,6 +5,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :name, :abbreviation
   end
 
+  create_table :cities do |t|
+    t.belongs_to :state
+    t.string :name
+  end
+
   create_table :currencies do |t|
     t.string :name, :code
   end

data/spec/support/seeds.rb

@@ -10,7 +10,11 @@ class ActiveRecord::Base
     data_table.each do |row|
       data = Hash[*headers.zip(row.split(/\s*\|\s*/)[1..-1]).flatten].with_indifferent_access
       if data[primary_key]
-        connection.execute("INSERT INTO #{table_name} SET #{ data.map{|k,v| "#{ connection.quote_column_name(k) } = #{ connection.quote(v) }" }.join(', ') }")
+        columns, values = data.each_with_object([[], []]) do |(c,v), (cols, vals)|
+          cols << connection.quote_column_name(c)
+          vals << connection.quote(v)
+        end
+        connection.execute("INSERT INTO #{table_name} (#{ columns * ', ' }) VALUES (#{ values * ', ' })")
       else
         create(data)
       end
@@ -19,15 +23,24 @@ class ActiveRecord::Base
 end
 
 State.seed %q{
-  +--------------+------------+
-  | abbreviation | name       |
-  +--------------+------------+
-  | AZ           | Arizona    |
-  | NY           | New York   |
-  | CA           | California |
-  | TX           | Texas      |
-  | CO           | Colorado   |
-  +--------------+------------+
+  +----+--------------+------------+
+  | id | abbreviation | name       |
+  +----+--------------+------------+
+  |  1 | AZ           | Arizona    |
+  |  2 | NY           | New York   |
+  |  3 | CA           | California |
+  |  4 | TX           | Texas      |
+  |  5 | CO           | Colorado   |
+  +----+--------------+------------+
+}
+
+City.seed %q{
+  +----------+------------+
+  | state_id | name       |
+  +----------+------------+
+  |        5 | Denver     |
+  |        4 | Dallas     |
+  +----------+------------+
 }
 
 Currency.seed %q{

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: hashdown
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hashdown
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -115,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: super lightweight Rails plugin that adds hash-style lookups and option list