ar_lookups 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b360d35220df4478720deeb64e3461e7b79e0cc3
-  data.tar.gz: e5e20327d8b5edf5a85014d1b8fa20ccd59b755f
+  metadata.gz: 702c058bf42be5107f36fbbc821c47a61cbd9c09
+  data.tar.gz: 50352f03db716f8f5b26a5f5822f3aee08fdcd40
 SHA512:
-  metadata.gz: c48ecd13b18102cafff26e2d4a10cd78ef9b5118987274d0b1b8c3f276cd7f87b9a1c81b463b3815cd92fd19f2d8471bfdfd7b4d5a453df588554a9a59700a07
-  data.tar.gz: 27bb0090eb9baff947db3e6c3a2255037df170326312c42223000ce4eae8886860ca2015f3146c7fac1280bd53a92241e19c43420ddb8866cb3035e4de0d81e6
+  metadata.gz: d22820b18e1a0ce78a426b39483891ea8b89de882413d5230f8f42c0036c5177b361c0cd32ed3a6427d34fb8ea9feba43b101ddeb5df67c728cc1cc6f88e14d5
+  data.tar.gz: 3a574dd90237e9a8d292a52d9d42303993f8779d5ae0f8c06a1998679880f94e509cf1eab48df0fcd166cbd41afe6cc132da8a30ef097d7db53ea8755ac91cf2

data/lib/ar_lookups.rb

@@ -2,7 +2,7 @@ require 'active_record'
 
 require 'ar_lookups/version'
 require 'ar_lookups/lookup_table_definition'
-require 'ar_lookups/base_ext'
+require 'ar_lookups/activerecord_ext'
 require 'ar_lookups/railtie' if defined?(Rails)
 
 module ArLookups

data/lib/ar_lookups/{base_ext.rb → activerecord_ext.rb}

@@ -1,5 +1,5 @@
 module ArLookups
-  module BaseExt
+  module ActiveRecordExt
     def ar_lookups
       @ar_lookups ||= superclass.respond_to?(:ar_lookups) ? superclass.ar_lookups.dup : {}
     end
@@ -24,8 +24,9 @@ module ArLookups
       mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{column}
           keys = read_attribute(:#{column})
-          return {} if keys.blank?
-          Hash[self.class.ar_lookups[:#{column}].where('#{options[:key_column]} IN (?)', keys).pluck(:#{options[:key_column]}, :#{options[:name_column]})]
+          klass = self.class.ar_lookups[:#{column}]
+          return klass.none if keys.blank?
+          self.class.ar_lookups[:#{column}].where('#{options[:key_column]} IN (?)', keys)#.pluck(:#{options[:key_column]}, :#{options[:name_column]})]
         end
 
         def #{column}_ids

data/lib/ar_lookups/railtie.rb

@@ -12,7 +12,7 @@ module ArLookups
 
         # Extend AR base
         ActiveRecord::Base.send :extend,
-          ArLookups::BaseExt
+          ArLookups::ActiveRecordExt
       end
     end
   end

data/lib/ar_lookups/version.rb

@@ -1,3 +1,3 @@
 module ArLookups
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_lookups
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stan Bondi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-nulldb-adapter
+  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: 
 email:
 - stan@fixate.it
@@ -73,22 +87,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- ar_lookups.gemspec
 - lib/ar_lookups.rb
-- lib/ar_lookups/base_ext.rb
+- lib/ar_lookups/activerecord_ext.rb
 - lib/ar_lookups/lookup_table_definition.rb
 - lib/ar_lookups/railtie.rb
 - lib/ar_lookups/version.rb
-- spec/base_ext_spec.rb
-- spec/lookup_table_definition_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/fixate/ar_ar_lookups
 licenses:
 - MIT
@@ -113,7 +121,4 @@ rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Lookup tables using activerecord and array fields
-test_files:
-- spec/base_ext_spec.rb
-- spec/lookup_table_definition_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/ar_lookups.gemspec

@@ -1,25 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ar_lookups/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "ar_lookups"
-  spec.version       = ArLookups::VERSION
-  spec.authors       = ["Stan Bondi"]
-  spec.email         = ["stan@fixate.it"]
-  spec.summary       = %q{Lookup tables using activerecord and array fields}  
-  spec.homepage      = "https://github.com/fixate/ar_ar_lookups"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'rails', '~> 4.0'
-
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
-end

data/spec/base_ext_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-class FooBar; end
-
-describe ArLookups::BaseExt do
-  let(:lookup_relation) { mock_model('Dummy', pluck: []) }
-  let(:lookup) do
-    mock_model('Lookup', where: lookup_relation)
-  end
-
-  let(:client_class) do
-    @class = Class.new
-    @class.class_eval do
-      def write_attribute(column, val)
-        unless respond_to?(column)
-          class_eval <<-RUBY, __FILE__, __LINE__+1
-            attr_accessor :#{column}
-          RUBY
-        end
-
-        instance_variable_set("@#{column}".to_sym, val)
-      end
-
-      def read_attribute(column)
-        instance_variable_get("@#{column}".to_sym)
-      end
-    end
-
-    @class.send(:extend, ArLookups::BaseExt)
-    @class.lookup :foo, lookup
-    @class
-  end
-
-  subject { client_class.new }
-
-  it 'fetches values with keys' do
-    expect(lookup).to receive(:where).with('key IN (?)', [1])
-    expect(lookup_relation).to receive(:pluck).with(:key, :name)
-
-    subject.foo = [1]
-    subject.foo
-  end
-
-  it 'fetches values with different key name' do
-    client_class.lookup :bar, lookup, key_column: :id, name_column: :place
-    expect(lookup).to receive(:where).with('id IN (?)', [1])
-    expect(lookup_relation).to receive(:pluck).with(:id, :place)
-
-    subject.bar = [1]
-    subject.bar
-  end
-
-  it 'returns ids from lookup' do
-    subject.foo = [1,2]
-    expect(subject.foo_ids).to eq([1,2])
-  end
-
-  it 'returns an empty hash if ar_lookups empty' do
-    expect(subject.foo).to eq({})
-  end
-
-  it 'returns a hash' do
-    subject.foo = [1,2]
-    expect(subject.foo).to be_kind_of(Hash)
-  end
-
-  it 'implicitly gets the model name from the column' do
-    client_class.class_eval do
-      lookup :foo_bars
-    end
-
-    expect(client_class.ar_lookups[:foo_bars]).to be(FooBar)
-  end
-end

data/spec/lookup_table_definition_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe ArLookups::LookupTableDefinition do
-  subject do
-    class TableDefinition; include ArLookups::LookupTableDefinition; end.new
-  end
-
-  it 'creates an integer array column with default' do
-    expect(subject).to receive(:integer).with(:foo, {array: true, default: []})
-    subject.lookup :foo
-  end
-
-  it 'merges additional options in preserving array:true' do
-    expect(subject).to receive(:integer).with(:foo, {test: 'foobar', array: true, default: []})
-    subject.lookup :foo, test: 'foobar'
-  end
-
-  it 'uses default if given' do
-    expect(subject).to receive(:integer).with(:foo, {default: [1, 2], array: true, default: []})
-    subject.lookup :foo, default: [1, 2]
-  end
-end

data/spec/spec_helper.rb

@@ -1,27 +0,0 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-
-require 'rails/all'
-require 'rspec'
-require 'rspec/mocks'
-require 'rspec/rails/mocks'
-require 'rspec/autorun'
-
-require 'ar_lookups'
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-end
-