siphon 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cade992dddbcf4aaed6af0409efc20205c03e48e
-  data.tar.gz: 3ac950dbd0d3ac66a9681193733cc9f363c6da20
+  metadata.gz: 0fda2150f53756f1efb9c4b7799ef8b455058da6
+  data.tar.gz: bf50ec379b961877f30111e9a692f9acb3725fc4
 SHA512:
-  metadata.gz: d6d8a170387014c505b1c1f31dd42d7dc5e4b49455f9d8851c80da5a911e74ac8c0a2aeb4b294dff56c2d7d989fd1efdba8f9b1cc045d3fe00c0ce307776bdba
-  data.tar.gz: ce48cab6fc0e4174fe8f20479daa7f23b118c2574281f3e0881799cbf98b3485f02c6859d98221fdb9f82ded4d6b3e6ba0cd0d19c88303a654dd9c7b03bafb16
+  metadata.gz: cf69ad74e5e7e24674f8c79b085cd8d44099dbf22f4ad6d096f714d6295d7fa49a3b95f277d04c906b6a4bbf5bb7a62d846bae5ccb75b7ebca0c60449b38fcbc
+  data.tar.gz: 67d175542ffade84c13ce2116730d96f7c2fd6841b32e35938d90953ea79069df248e2743268c2815afc859b0929317f4641c191d2072777d6a91c9b2f72cbc5

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  #- jruby-18mode # JRuby in 1.8 mode
+  #- jruby-19mode # JRuby in 1.9 mode
+  #- rbx
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/README.md

@@ -98,6 +98,12 @@ In the case of `unpaid` siphon knows it doesn't take any argument (Siphon::Nil)
 
 That's all!
 
+## Alternate Libs
+
+* [has_scope](https://github.com/plataformatec/has_scope)
+* [periscope](https://github.com/laserlemon/periscope)
+* [scoped_from](https://github.com/alexistoulotte/scoped_from)
+
 ## Contributing
 
 1. Fork it
@@ -108,3 +114,7 @@ That's all!
 
 [1]: https://github.com/solnic/virtus
 [2]: https://coderwall.com/p/4zz6ca
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/charly/siphon/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/generators/siphon_generator.rb

@@ -0,0 +1,7 @@
+class SiphonGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+
+  def create_search_file
+    template "search.rb", File.join('app/siphon', class_path, "#{file_name}_search.rb")
+  end
+end

data/lib/generators/templates/search.rb

@@ -0,0 +1,59 @@
+# uncomment `q` lines for combining ransack with your scope search
+class <%= class_name %>Search
+
+  include ActiveModel::Model
+  include Virtus.model
+
+  TABLE = <%= class_name %>.table_name
+
+  attribute :tree_id,   Integer
+  attribute :is_public, Boolean
+
+
+  attr_reader :q        # the nested ransack object
+  attr_reader :order_by # handles your order clause
+
+  def initialize(params = {})
+    @params = params || {}
+    super(params)
+    self.q= @params[:q]
+    self.order_by= @params[:order_by]
+  end
+
+  # Example of conditionally applying search terms.
+  # def done
+  #   return false unless @params[:q]
+  #   @params[:q][:state_eq].blank? ? @done : ""
+  # end
+
+  def result
+    <%= class_name %>.scoped.order(order_by).merge(q.result).merge(siphoned)
+  end
+
+  # Exmaple of Search Form handling order stuff (might not be the best place)
+  def self.order_by
+    [['newest',"#{TABLE}.created_at DESC"],
+      ["oldest", "#{TABLE}.created_at"],
+      ["category", "#{TABLE}.category_id, #{TABLE}.id"]
+      # ["popularity", "sales_num DESC"]]
+    ]
+  end
+
+  # Example of default ordering
+  def order_by=( val )
+    @order_by = val.blank? ? "#{TABLE}.created_at DESC" : val
+  end
+
+
+  def q=(sub_form_hash = {})
+    @q = <%= class_name %>.search( sub_form_hash )
+  end
+
+private
+
+  def siphoned
+    Siphon::Base.new(<%= class_name %>.scoped).scope( self )
+  end
+
+
+end

data/lib/siphon/base.rb

@@ -20,11 +20,15 @@ module Siphon
       scopes_hash = Siphon::Adapter.new(formobject).call
 
       scopes_hash.each do |meth, arg|
-        self.relation = relation.send(meth, *arg)
+        self.relation = if arg.is_a?(Array)
+          relation.send(meth, *arg)
+        else 
+          relation.send(meth, arg)
+        end
       end
 
       relation
     end
 
   end # Base
-end
+end

data/lib/siphon/version.rb

@@ -1,3 +1,3 @@
 module Siphon
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siphon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Charles Sistovaris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,11 +120,14 @@ files:
 - .pryrc
 - .rspec
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - TODO.md
+- lib/generators/siphon_generator.rb
+- lib/generators/templates/search.rb
 - lib/siphon.rb
 - lib/siphon/adapter.rb
 - lib/siphon/base.rb
@@ -159,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Siphon enables you to easily apply/combine/exclude your ActiveRecord scopes
@@ -173,3 +176,4 @@ test_files:
 - spec/siphon/mapper_spec.rb
 - spec/siphon_spec.rb
 - spec/spec_helper.rb
+has_rdoc: