siphon 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff59f1ee65f4df1a1dcd5a81d58f720516661b04
-  data.tar.gz: b8de584c9cc38381f08ff3728010465aab98ad61
+  metadata.gz: c9b86838aae3f13ab3623d7b189a31f090114cfa
+  data.tar.gz: cdf710190096aa2ffacfbd902da5d315306ab1b0
 SHA512:
-  metadata.gz: 976bb2d950083963335c855b4b7848eb84689094245eafb76c23d0e61fc5ea201ed1ca0b5da71b66f04af1a792ec73938c23ca7c22eef02f707f056a0979338b
-  data.tar.gz: e4b25e4bbe4844db09024f2e61939583f89d6e1daee028162c24740a614972d255703891aacd43a0604f5f5688599362adcaa75e68eb5fe6b4fd93906ccd495d
+  metadata.gz: a6ba1bfa8034b566f0732840e720707d687128ab1b2face86e980616588c26e243ac7d150ad281c8dc60f14c5eaf86ec997d9fe6d9f08f568b603dc2d770e59b
+  data.tar.gz: d60003907e7b8b60377c3c0c8274df899070124e1c87a6101721df4c84b6fd41914bca021e8f6c04147719654a42f591bcad305c1a6cee7ee10e1ace5b641976

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - "1.9.3"
   - "2.0.0"
   - "2.2.3"
   #- jruby-18mode # JRuby in 1.8 mode

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Siphon 0.2.1 (Dec 2015)
+
+* Boilerplate only sets params (relation is left to the user)
+* Search#order_by isn't called in result (left to user as well )
+
 ## Siphon 0.2.0 (Dec 2015)
 
 * The ModelSearch can now respond_to `siphon_attributes`

data/README.md

@@ -1,6 +1,6 @@
 # Siphon
 
-Siphon's a minimalistic gem which enables you to easily and conditionnaly apply your ActiveRecord scopes with parameteres sent through the web.
+Siphon's a minimalistic gem (for ruby >= 2.0) which enables you to easily and conditionnaly apply your ActiveRecord scopes with parameteres sent through the web.
 
 
 ## Installation

data/lib/generators/templates/search.rb

@@ -16,7 +16,10 @@ class <%= class_name %>Search
   # ransack :category_id_eq
   # ransack :title_cont
 
-
+  def initialize(params = {}, relation = nil)
+    super params
+    @relation = relation
+  end
 
   # Exmaple of Search Form handling order stuff (might not be the best place)
   def self.order_by

data/lib/siphon/boilerplate.rb

@@ -21,8 +21,7 @@ module Siphon
     end
 
     module InstanceMethods
-      def initialize( params = {}, relation = nil )
-        @relation||= relation
+      def initialize( params = {})
         @params = params || {}
 
         @params_ransack= @params.slice(*self.class.ransack_set)
@@ -52,7 +51,7 @@ module Siphon
       # memoized or it'll break after attributes reconciled
       def result
         @result ||= begin
-          relation = @relation.order(order_by).
+          relation = @relation.
                       merge(ransack.result).
                       merge(siphoned)
           # reconcile all params for the search form (?)
@@ -68,6 +67,7 @@ module Siphon
         name = model_name || "#{model}Search"
         self.model_name= ActiveModel::Name.new(self, nil, name)
         self.table_name= Asset.table_name
+        @ransack_set ||= []
       end
 
       def ransack_set
@@ -75,7 +75,6 @@ module Siphon
       end
 
       def ransack( attr, type= nil )
-        @ransack_set ||= []
         attribute attr
         @ransack_set << attr
       end

data/lib/siphon/version.rb

@@ -1,3 +1,3 @@
 module Siphon
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siphon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Charles Sistovaris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport