merge_filter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59fa277069936dbd7372984695f1c982c381498c
-  data.tar.gz: c27f63c3fe1716a2220b4bb2c839bf935446d971
+  metadata.gz: 3f6eb03ecd3bab56adb2d65d969a0d966164fa7d
+  data.tar.gz: fe4c30f0c64381fd46077981613175c9ba3ae52d
 SHA512:
-  metadata.gz: bd2ccbba99c502738fde7237929733af57bbd076dfdfd6d89891356e3a437a0a208286c1be10bb9a83898752037b2e022f5fa4288773b257a48fed63634a5809
-  data.tar.gz: 626dec8c043a8a12bd3b8077cd078e33f88713f872dd283524611ed2f71e9b78b00787da0a3aa30da7fca984a19cebe50b0c861c145f9419b8fe91c582cf926e
+  metadata.gz: 6050e4d484b64c25f8464997fb13abda40d5bd0f24e753e2f74d09d83ea2e639432be0ca98702285755fb5c5eff786af54ef1e71a05a06ecb28efcb6115561fe
+  data.tar.gz: 69999a194602fce6dc650407ae01ffabf1f0a1c692d0e9a7b2bfecd8ed79e7c4427af64413f78449dcd2fbb4ff9a6cbfeac6d92abb16ba5b11f6c6933babb87e

data/lib/merge_filter.rb

@@ -1,4 +1,5 @@
 require "merge_filter/version"
+require "merge_filter/undefined_filter"
 
 module MergeFilter
   attr_reader :filter
@@ -21,7 +22,7 @@ module MergeFilter
     def filter_by column, &block
       define_method column do |*args|
         if block_given?
-          yield args, default_scope
+          yield filter.fetch(column), default_scope
         else
           default_scope.where(column => args)
         end
@@ -35,7 +36,11 @@ module MergeFilter
 
   def records
     filter.inject(default_scope) do |scope, (key, value)|
-      scope.merge(__send__(key, value))
+      if respond_to?(key)
+        scope.merge(__send__(key, value))
+      else
+        raise MergeFilter::UndefinedFilter, "There is no filter_by definition for #{key}."
+      end
     end
   end
 end

data/lib/merge_filter/undefined_filter.rb

@@ -0,0 +1,4 @@
+module MergeFilter
+  class UndefinedFilter < StandardError
+  end
+end

data/lib/merge_filter/version.rb

@@ -1,3 +1,3 @@
 module MergeFilter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Thomas Cioppettini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,7 @@ files:
 - README.md
 - Rakefile
 - lib/merge_filter.rb
+- lib/merge_filter/undefined_filter.rb
 - lib/merge_filter/version.rb
 - merge_filter.gemspec
 homepage: ''
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: DSL for filtering ActiveRecord models