supplejack_client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105c4e653f2e4fb3de6986f14d1d0a36837a387e
-  data.tar.gz: 715c3f1967321da496f7210285eaa1de908421f6
+  metadata.gz: 950c231c1f7bf0f55b66622babdf1524376b02da
+  data.tar.gz: 497695e5a2d9ba4a8bc4fa690a9291eb328d9625
 SHA512:
-  metadata.gz: c63a5a75ce543a758f026e39c653957ff8600e7a6c887f965a9f4553820f9ca82c5315049af8d062829d9ac82b58471960bcb89f4b5fc85bc01a93dbcb68ca95
-  data.tar.gz: 0d53d3c714ba6f46c42ac8d44416a9702546038ba5bc4e362b9826b81ae55d0d0539b55f0278824ed4b2b7c04bf03906434365d041562c6f66e773d0c3bbea1b
+  metadata.gz: 31e663f7fcd4154e2d0bb71cfd4a076dcddc9ed426f61beb68cbf901f6272f3a65c47b06c442ada1805fbf73b5378f8784fcaa87d619484d6bdb622357e2cb70
+  data.tar.gz: fbc71a0fbcbb7c1421c71a19ab0d41a0fb40d73abf476dd288fa659b4026ff29e023fe791d1da6e99cd4ced6775e70120c3d6cbc6111d70b376405b01c3bbcad

data/lib/supplejack/config.rb

@@ -30,9 +30,10 @@ module Supplejack
     PAGINATION_LIMIT          = nil
     TIMEOUT                   = 30
     RECORD_KLASS              = 'Record'
+    CURRENT_USER_METHOD       = :current_user
     SEARCH_KLASS              = nil
     FIELDS                    = [:default]
-    SUPPLEJACK_FIELDS                = []
+    SUPPLEJACK_FIELDS         = []
     ADMIN_FIELDS              = []
     ENABLE_DEBUGGING          = false
     ENABLE_CACHING            = false
@@ -53,6 +54,7 @@ module Supplejack
       :pagination_limit,
       :timeout,
       :record_klass,
+      :current_user_method,
       :search_klass,
       :fields,
       :supplejack_fields,
@@ -101,6 +103,7 @@ module Supplejack
       self.pagination_limit         = PAGINATION_LIMIT
       self.timeout                  = TIMEOUT
       self.record_klass             = RECORD_KLASS
+      self.current_user_method      = CURRENT_USER_METHOD
       self.search_klass             = SEARCH_KLASS
       self.fields                   = FIELDS
       self.supplejack_fields        = SUPPLEJACK_FIELDS

data/lib/supplejack/controllers/helpers.rb

@@ -113,50 +113,6 @@ module Supplejack
         end
       end
 
-      # Displays the next and/or previous links based on the record and current search
-      #
-      # @params [ Dnz::Record ] The record object which has information about the next/previous record and pages.
-      # @params [ Hash ] options Hash of options to customize the output,
-      #   supported options: :prev_class, :next_class, :prev_label, :next_label
-      #
-      # @option options [ String ] :prev_class The CSS class to use on the previous button
-      # @option options [ String ] :next_class The CSS class to use on the next button
-      # @option options [ String ] :wrapper_class The CSS class to use on the wrapping span
-      # @option options [ String ] :prev_label Any HTML to be put inside the previous button
-      # @option options [ String ] :next_label Any HTML to be put inside the next button
-      #
-      def next_previous_links(record, html_options={})
-        html_options.reverse_merge!({prev_class: "prev", next_class: "next", wrapper_class: 'nav', prev_label: nil, next_label: nil})
-
-        return "" unless params[:search]
-        links = "".html_safe
-
-        options = search.options
-
-        previous_label = html_options[:prev_label] ||= t('supplejack_client.previous', default: "Previous")
-        next_label = html_options[:next_label] ||= t('supplejack_client.next', default: "Next")
-        previous_label = previous_label.html_safe
-        next_label = next_label.html_safe
-
-        options[:path] = params[:search][:path].gsub(/(\W|\d)/, '') if params[:search] && params[:search][:path]
-
-        if record.previous_record
-          options[:page] = record.previous_page if record.previous_page.to_i > 1
-          links += link_to(raw(previous_label), record_path(record.previous_record, search: options), class: html_options[:prev_class]).html_safe
-        else
-          links += content_tag(:span, previous_label, class: html_options[:prev_class])
-        end
-
-        if record.next_record
-          options[:page] = record.next_page if record.next_page.to_i > 1
-          links += link_to(raw(next_label), record_path(record.next_record, search: options), class: html_options[:next_class]).html_safe
-        else
-          links += content_tag(:span, next_label, class: html_options[:next_class])
-        end
-
-        content_tag(:span, links, class: html_options[:wrapper_class])
-      end
-
       def attribute_link_replacement(value, link_pattern)
         if link_pattern.is_a?(String)
           link_pattern = URI.decode(link_pattern)

data/lib/supplejack/search.rb

@@ -217,9 +217,9 @@ module Supplejack
     #
     # @return [Hash{String => Integer}] A hash of type names and counts
     #
-    def categories(options={})
-      return @categories if @categories
-      @categories = facet_values('category', options)
+    def types(options={})
+      return @types if @types
+      @types = facet_values('type', options)
     end
 
     # Gets the facet values unrestricted by the current filter

data/lib/supplejack/version.rb

@@ -6,5 +6,5 @@
 # and the Department of Internal Affairs. http://digitalnz.org/supplejack
 
 module Supplejack
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/supplejack/search_spec.rb

@@ -533,7 +533,7 @@ module Supplejack
       end
     end
 
-    describe '#categories' do
+    describe '#types' do
       before(:each) do
         @search = Search.new({:i => {:category => 'Books', :year => 2001}, :text => 'Dogs'})
         @search.stub(:get) { {'search' => {'facets' => {'category' => {'Books' => 123}}, 'result_count' => 123}} }
@@ -541,30 +541,30 @@ module Supplejack
 
       it 'should call the fetch_values method' do
         @search.should_receive(:facet_values).with('category', {})
-        @search.categories
+        @search.types
       end
 
       it 'removes category filter from the search request' do
         @search.should_receive(:get).with('/records', hash_including(:and => {:year => 2001})).and_return({'search' => {'facets' => {'category' => {'Books' => 123}}}})
-        @search.categories
+        @search.types
       end
 
       it 'returns the category facet hash ' do
-        @search.categories.should include('Books' => 123)
+        @search.types.should include('Books' => 123)
       end
 
       it 'asks the API for 0 results' do
         @search.should_receive(:get).with('/records', hash_including({:per_page => 0}))
-        @search.categories
+        @search.types
       end
 
       it 'should return add the All count to the hash' do
-        @search.categories['All'].should eq 123
+        @search.types['All'].should eq 123
       end
 
       it 'orders the category values by :count' do
         @search.should_receive(:facet_values).with('category', {:sort => :count})
-        @search.categories({:sort => :count})
+        @search.types({:sort => :count})
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: supplejack_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Supplejack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails