picky 4.5.12 → 4.6.0

data/lib/picky/category.rb

@@ -126,7 +126,7 @@ module Picky
     # Path and partial filename of the prepared index on this category.
     #
     def prepared_index_path
-      @prepared_index_path ||= "#{index_directory}/prepared_#{name}_index"
+      @prepared_index_path ||= ::File.join(index_directory, name.to_s)
     end
     # Get an opened index file.
     #
@@ -140,7 +140,7 @@ module Picky
     # The index directory for this category.
     #
     def index_directory
-      @index_directory ||= "#{PICKY_ROOT}/index/#{PICKY_ENVIRONMENT}/#{@index.name}"
+      @index_directory ||= ::File.join(PICKY_ROOT, 'index', PICKY_ENVIRONMENT, @index.name.to_s)
     end
 
     # Identifier for technical output.

data/lib/picky/search_facets.rb

@@ -50,7 +50,6 @@ module Picky
         else
           result[key] = total; result
         end
-        result
       end
     end
 

data/spec/lib/category_spec.rb

@@ -23,6 +23,16 @@ describe Picky::Category do
       category.instance_variable_get(:@symbols).should == nil
     end
   end
+  
+  context 'directories' do
+    let(:category) { described_class.new :some_category, index }
+    it 'is correct' do
+      category.prepared_index_path.should == 'spec/test_directory/index/test/some_index/some_category'
+    end
+    it 'is correct' do
+      category.index_directory.should == 'spec/test_directory/index/test/some_index'
+    end
+  end
 
   context 'tokenizer' do
     context 'options hash' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.5.12
+  version: 4.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303139130820 !ruby/object:Gem::Requirement
+  requirement: &70280442447920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303139130820
+  version_requirements: *70280442447920
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70303139130320 !ruby/object:Gem::Requirement
+  requirement: &70280442462400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.12
+        version: 4.6.0
   type: :development
   prerelease: false
-  version_requirements: *70303139130320
+  version_requirements: *70280442462400
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70303139129900 !ruby/object:Gem::Requirement
+  requirement: &70280442460840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303139129900
+  version_requirements: *70280442460840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70303139129440 !ruby/object:Gem::Requirement
+  requirement: &70280442460340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303139129440
+  version_requirements: *70280442460340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70303139128940 !ruby/object:Gem::Requirement
+  requirement: &70280442459300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303139128940
+  version_requirements: *70280442459300
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70303139128440 !ruby/object:Gem::Requirement
+  requirement: &70280442458400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70303139128440
+  version_requirements: *70280442458400
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70303139128060 !ruby/object:Gem::Requirement
+  requirement: &70280442457600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303139128060
+  version_requirements: *70280442457600
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: