forty_facets 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3667e156a13134b58e742270c9a19671cd6e81b0
-  data.tar.gz: 692413b311dc68334826c7fa9460fd9acab6f403
+  metadata.gz: 2ebaa1971ee0830ae8723e8eec222fa2f4ea9227
+  data.tar.gz: c6d056a6e4714b5aa21715fed17587cc467129fb
 SHA512:
-  metadata.gz: 6344847f3c58519bd965b018910c9146851c5276ebf0a678227b3295f35efc37d4abc9459ad09592ee048521941c8f22e08151de01ad8892d18417c4da0656df
-  data.tar.gz: 85db56a26bdc57ba0eded2681c7f9554e397feb175c6250a946a30a7d6b101f25a635f36200cf16371a6550a1e2a989d5821e78367cefaf1c2f5113a628673a6
+  metadata.gz: 1fd1e8a57e598c2c5216a77a81824514c4a56e3bae3b54223b8cab467b60ed3eb63cf9b3e2cf4b979ad2bcff6a800fa5616f6eb78a0e1be7bb8c069325605c5f
+  data.tar.gz: d960db30251ddbd60848c5dbba003631790018b4c3d24eddff4357f8ef32a7da7628550a2327a59ebef9cbe6b3b85bf4010c1ee2a5e4f2a8bbd0321a93276117

data/.gitignore

@@ -16,4 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea
-
+.*.swp

data/.ruby-gemset

@@ -0,0 +1 @@
+forty_facets

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/forty_facets.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "activerecord", ">= 4.0"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "activerecord", "= 4.1.0"
+  # spec.add_development_dependency "byebug" # travis doenst like byebug
 end

data/lib/forty_facets/facet_search.rb

@@ -32,7 +32,7 @@ module FortyFacets
       end
 
       def facet(model_field, opts = {})
-        reflection = self.root_scope.reflect_on_association(model_field)
+        reflection = self.root_class.reflect_on_association(model_field)
         if reflection
           if reflection.macro == :belongs_to
             definitions << BelongsToFilterDefinition.new(self, model_field, opts)
@@ -74,7 +74,7 @@ module FortyFacets
       end
     end
 
-    def initialize(request_params = {})
+    def initialize(request_params = {}, root = nil)
       params = request_to_search_params(request_params)
       @filters = self.class.definitions.inject([]) do |filters, definition|
         filters << definition.build_filter(self, params[definition.request_param])
@@ -84,10 +84,11 @@ module FortyFacets
         orders << definition.build(self, params[:order])
       end
 
+      @root = root
     end
 
-    def self.new_unwrapped(params)
-      self.new(request_param_name => params)
+    def self.new_unwrapped(params, root)
+      self.new({request_param_name => params}, root)
     end
 
     def filter(filter_name)
@@ -101,7 +102,7 @@ module FortyFacets
     end
 
     def result
-      query = @filters.inject(self.class.root_scope) do |previous, filter|
+      query = @filters.inject(root) do |previous, filter|
         filter.build_scope.call(previous)
       end
       query = query.order(order.definition.clause) if order
@@ -129,6 +130,10 @@ module FortyFacets
       @filters.reject(&:empty?).empty?
     end
 
+    def root
+      @root || self.class.root_scope
+    end
+
     private
 
     def request_to_search_params(request_params)

data/lib/forty_facets/filter/attribute_filter_definition.rb

@@ -28,14 +28,14 @@ module FortyFacets
         old_values = new_params[filter_definition.request_param]
         old_values.delete(value.to_s)
         new_params.delete(filter_definition.request_param) if old_values.empty?
-        search_instance.class.new_unwrapped(new_params)
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
 
       def add(value)
         new_params = search_instance.params || {}
         old_values = new_params[filter_definition.request_param] ||= []
         old_values << value.to_s
-        search_instance.class.new_unwrapped(new_params)
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
     end
 

data/lib/forty_facets/filter/belongs_to_filter_definition.rb

@@ -38,14 +38,14 @@ module FortyFacets
         old_values = new_params[filter_definition.request_param]
         old_values.delete(entity.id.to_s)
         new_params.delete(filter_definition.request_param) if old_values.empty?
-        search_instance.class.new_unwrapped(new_params)
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
 
       def add(entity)
         new_params = search_instance.params || {}
         old_values = new_params[filter_definition.request_param] ||= []
         old_values << entity.id.to_s
-        search_instance.class.new_unwrapped(new_params)
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
 
     end

data/lib/forty_facets/filter/has_many_filter_definition.rb

@@ -53,14 +53,14 @@ module FortyFacets
         old_values = new_params[filter_definition.request_param]
         old_values.delete(entity.id.to_s)
         new_params.delete(filter_definition.request_param) if old_values.empty?
-        search_instance.class.new_unwrapped(new_params)
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
 
       def add(entity)
         new_params = search_instance.params || {}
         old_values = new_params[filter_definition.request_param] ||= []
         old_values << entity.id.to_s
-        search_instance.class.new_unwrapped(new_params)
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
 
     end

data/lib/forty_facets/filter.rb

@@ -17,7 +17,7 @@ module FortyFacets
       return search if empty?
       new_params = search_instance.params || {}
       new_params.delete(filter_definition.request_param)
-      search_instance.class.new_unwrapped(new_params)
+      search_instance.class.new_unwrapped(new_params, search_instance.root)
     end
   end
 

data/lib/forty_facets/order.rb

@@ -9,7 +9,7 @@ module FortyFacets
     def by
       new_params = search.params || {}
       new_params[:order] = definition.request_value
-      search.class.new_unwrapped(new_params)
+      search.class.new_unwrapped(new_params, search.root)
     end
   end
 end

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/fixtures.rb

@@ -3,7 +3,8 @@ require 'active_record'
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-ActiveRecord::Base.connection.instance_eval do
+
+ActiveRecord::Schema.define do
 
   create_table :studios do |t|
     t.string :name

data/test/smoke_test.rb

@@ -3,7 +3,7 @@ Coveralls.wear!
 
 require "minitest/autorun"
 require 'logger'
-require 'byebug'
+#require 'byebug'# travis doenst like byebug
 require_relative '../lib/forty_facets'
 
 #silence_warnings do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,30 +84,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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'
+        version: 4.1.0
 description: FortyFacets lets you easily build explorative search interfaces based
   on fields of your active_record models.
 email:
@@ -118,6 +104,8 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -159,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library for building facet searches for active_record models