easy_filter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ4MDFmOTlmY2I5ODkxMDliNjViOGYyY2ViNDUxMjczOTJjNTg2MA==
+    OTE3NjFkMzY5ZmYwMTIyNmUzMWUyZGYyNjkxZDhmMzE0NTNhMzdkMg==
   data.tar.gz: !binary |-
-    MTU0YTMzMmNiMTg5NTUwODQ0OGU0NmFhODhkNTIzODYxOWU2MzIxOQ==
+    NTlkZjNmNWExMDE5OTVhZTE4YmI4MGIwMzM1MWM0MTFmZWQ3Y2ExMQ==
 SHA512:
   metadata.gz: !binary |-
-    MWY2M2YyZGE0MTFkYmU4ZTk4MDRlZmE0Mjk0NmI4ODMzM2FjMjkwNjYxZTA4
-    YmE3ODA0MDg1MGNmNTAwMTBmYWVkYWFjZTU1YWExMDZkMGYyYWJlMDI1ZmNh
-    YzRjYjU4NGRjYmE1ZmE0ZmZkMjYwMjQ2ZGMzZDMzZjVjNTk4MGU=
+    NmVmZjYxMTg2MGFmYjc3ZTY0NjE4MTRmMzU1N2UxYWZjMzA4MTEzZjRiNDU3
+    NTY3M2FiNTQ2YTJkNGFlMWY1NGU3OGExYmUxNzNiYThkMzQ4Zjg2ZTUxMWU4
+    NDUyOTRkMThhZDFhZDc3ZjkyMjgyMGU4YTJiZDEwYzFhZmI5ZmY=
   data.tar.gz: !binary |-
-    NjQ1OGYxZWZkZmQ5Y2YzZGYwYzMwYWE1N2FhMjYyNWQxNzE2OGFhNzM1YzA2
-    ZjhmNWUxMGE5ODgwNWNkNmQyNDRkY2QzZDE4NzY2ZTdkN2NhZmE4YWI5YzYw
-    OWMwMzIyOGIxMTk5MzEyNTFmMzNjZjhkMGU1MzQ3NmQ3NWNjMTg=
+    OGYxYmNjYmUzYTZkMTg2NTE4MDU4MzNkOGRkMTUwNmJmMDM0MWM5N2ViYTA4
+    ZTExNTMzOWUyZjYwY2ZlYzQ5ODYwZTUxNGMwNDdhN2Y1MmU4Yzk0OGMwOTM1
+    ZjFjOTNhODBiOTA0Mzk4YTEyMDgyNmRjZGZmYzExZTBlMWYwZGI=

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p484
+ruby-1.9.3

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "1.9.3"
+script:
+  - bundle exec rubocop
+  - bundle exec rake

data/README.md

@@ -1,6 +1,8 @@
 # EasyFilter
 
-By [Peter Kepes](https://github.com/kepes).
+By [Peter Kepes](https://github.com/kepes)
+
+[![Build Status](https://travis-ci.org/kepes/easy-filter.svg?branch=master)](https://travis-ci.org/kepes/easy-filter)
 
 Filter and sort `ActiveRecord` model for Rails app with [Bootstrap](http://getbootstrap.com/) view helpers.
 
@@ -18,6 +20,14 @@ Or install it yourself as:
 
     $ gem install easy_filter
 
+In `application.js`:
+
+    //= require easy_filter
+
+In `application.css.scss`:
+
+     *= require easy_filter
+
 ## Usage
 
 Gem provide an AciveRecord model addition and a view helper.

data/easy_filter.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'activerecord', '~> 3.2'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/easy_filter/model_additions.rb

@@ -11,17 +11,10 @@ module EasyFilter
       params.each do |key, value|
         next unless key.start_with?(prefixes[:main]) && !value.blank? && key != "#{prefixes[:main]}button"
 
-        field = key.gsub(prefixes[:main], '').to_s
-        if field.start_with?(prefixes[:from])
-          filter = filter.where("#{field.gsub(prefixes[:from], '')} >= ?", value)
-        elsif field.start_with?(prefixes[:to])
-          filter = filter.where("#{field.gsub(prefixes[:to], '')} <= ?", value)
-        elsif field.start_with?(prefixes[:exact])
-          filter = filter.where("#{field.gsub(prefixes[:exact], '')} = ?", value)
-        else
-          filter = filter.where("#{field} like ?", "%#{value}%")
-        end
+        field = del_prefix(key, prefixes[:main])
+        filter = add_where(filter, field, value, prefixes)
       end
+
       params[prefixes[:sort]] ||= 'id'
       params[prefixes[:direction]] ||= 'desc'
 
@@ -30,5 +23,27 @@ module EasyFilter
 
       filter.order("#{sort_column} #{sort_direction}")
     end
+
+    private
+
+    def add_where(filter, field, value, prefixes)
+      if field.start_with?(prefixes[:from])
+        filter.where("#{del_prefix(field, prefixes[:from])} >= ?", value)
+
+      elsif field.start_with?(prefixes[:to])
+        filter.where("#{del_prefix(field, prefixes[:to])} <= ?", value)
+
+      elsif field.start_with?(prefixes[:exact])
+        filter.where("#{del_prefix(field, prefixes[:exact])} = ?", value)
+
+      else
+        filter.where("#{field} like ?", "%#{value}%")
+      end
+    end
+
+    def del_prefix(name, prefix)
+      return name.gsub(prefix, '').to_s if name.start_with?(prefix)
+      name
+    end
   end
 end

data/lib/easy_filter/version.rb

@@ -1,4 +1,4 @@
 # EasyFilter version number
 module EasyFilter
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Peter Kepes
@@ -70,16 +70,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,7 @@ files:
 - .rubocop.yml
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt