apill 2.5.1 → 2.6.0beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c03153c35e87292c35f133777c0492f2b86ebf9b
-  data.tar.gz: 5bbc4f7f5c3caf1447c234800e43a254d0482d0d
+  metadata.gz: 5b054b264c62b3c4ade3df6880625c877020fe94
+  data.tar.gz: 985023f87cda7520b5e2a7e26df300aafd591435
 SHA512:
-  metadata.gz: e56f619e93a60c29d1d2285d50180467639afcd060a2d6f3c0043dab84f5ef3f67566e2ae3c3a4d9d2b57e75c0734be9afa15bd36e157cf694aec9029ef2dbb6
-  data.tar.gz: edf7e859755576f2dfce4267ab7cf340371e8bcace92e45d2bd8432d48d5ee3e402450ba897ad54cc9f2babcbb8f40836c48e9943823bdf55daa8857db6c42cf
+  metadata.gz: 0298002703ca82908c8d4281e09c257562109163388ff05e274e2f3aa6bb24d188c1548825554fe7ecb6737b6a0c2256b79eae1c781361a0cc356e4fdb03550e
+  data.tar.gz: 2d1d6d6eb61e322298f85e619f5479c2a2dc52525bcbda0bca62be17e1b9509b54c3541f0b304f206851859d53e8a10cd35f54b78a5560449afddc2ffc6caad6

data/lib/apill/mixins/indexable.rb

@@ -0,0 +1,49 @@
+module Apill
+module Mixins
+module Indexable
+  module ClassMethods
+    def index(model)
+      define_method(:indexed_model_name) do
+        model
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  private
+
+  def index_params
+    @index_params ||= params[:index_params] || params || {}
+  end
+
+  def filtered_resource
+    @filtered_resource ||= begin
+      resource = if defined? super
+                   super
+                 else
+                   send(indexed_model_name)
+                 end
+
+      if index_params.key? 'q'
+        resource.search(index_params['q'])
+      else
+        resource
+      end
+    end
+  end
+
+  def filter_data
+    filter_data = defined?(super) ? super : {}
+
+    filter_data.merge(indexing_data)
+  end
+
+  def indexing_data
+    {}
+  end
+end
+end
+end

data/lib/apill/mixins/pageable.rb

@@ -26,9 +26,9 @@ module  Pageable
                    send(paginated_model_name)
                  end
 
-      resource.
-        page(page_number).
-        per(items_per_page)
+      @paginated_resource = resource.
+                              page(page_number).
+                              per(items_per_page)
     end
   end
 
@@ -40,10 +40,10 @@ module  Pageable
 
   def pagination_data
     {
-      total_pages:   filtered_resource.total_pages,
-      current_page:  filtered_resource.current_page,
-      previous_page: filtered_resource.prev_page,
-      next_page:     filtered_resource.next_page,
+      total_pages:   @paginated_resource.total_pages,
+      current_page:  @paginated_resource.current_page,
+      previous_page: @paginated_resource.prev_page,
+      next_page:     @paginated_resource.next_page,
     }
   end
 end

data/lib/apill/mixins/queryable.rb

@@ -38,6 +38,7 @@ module Queryable
     end
   end
 
+  # rubocop:disable Metrics/PerceivedComplexity
   def filtered_resource
     @filtered_resource ||= begin
       resource       = if defined? super
@@ -45,8 +46,13 @@ module Queryable
                        else
                          send(queryed_model_name)
                        end
+      resource       = if resource.respond_to? :records
+                         resource.records
+                       else
+                         resource
+                       end
       resource_class = if resource.respond_to? :klass
-                         resource.klass
+                         resource.klass.name.constantize
                        else
                          resource
                        end
@@ -63,6 +69,7 @@ module Queryable
       end
     end
   end
+  # rubocop:enable Metrics/PerceivedComplexity
 
   def filter_data
     filter_data = defined?(super) ? super : {}

data/lib/apill/mixins/sortable.rb

@@ -26,7 +26,6 @@ module  Sortable
                  else
                    send(sorted_model_name)
                  end
-
       resource.
         order(sorting_arguments)
     end

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '2.5.1'
+  VERSION = '2.6.0beta1'
 end

data/lib/apill.rb

@@ -6,6 +6,7 @@ require 'apill/configuration'
 require 'apill/matchers/accept_header_matcher'
 require 'apill/matchers/subdomain_matcher'
 require 'apill/matchers/version_matcher'
+require 'apill/mixins/indexable'
 require 'apill/mixins/sortable'
 require 'apill/mixins/queryable'
 require 'apill/mixins/pageable'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0beta1
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.0beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.0beta
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - lib/apill/matchers/subdomain_matcher.rb
 - lib/apill/matchers/version_matcher.rb
 - lib/apill/middleware/api_request.rb
+- lib/apill/mixins/indexable.rb
 - lib/apill/mixins/pageable.rb
 - lib/apill/mixins/queryable.rb
 - lib/apill/mixins/sortable.rb
@@ -119,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6