load_more 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47539dc513cd2fa7d7c0046ea2317aee4eeb5d0e
-  data.tar.gz: 95478dbdf6aadad5dde010f7b06d4249229b4c73
+  metadata.gz: 9c9c52f3aeb1cda9630c813b0e16d1bb36d9b5c3
+  data.tar.gz: 1ebb8b3cb48541a66706c5319569815fde614204
 SHA512:
-  metadata.gz: 165b7854d5fe4d082dd45848b44d249000ad57c0940b2f6d77e23ff04c46b040f869ebb9fc220bff9402cd1897c1504fbd61ce7bd0a1862f8176413f976d0195
-  data.tar.gz: 3601b69f85dcb31fb4bfff22ad7ea9c1ac9861994cfcdb6cf94c1b0c29d63f07f118f35be9ae25b48ba73db5e57b85ef9f95c27b891730215748eb17090dc2ea
+  metadata.gz: 3219e548d7010f937cd5ef3bd1470ecf0692c1e19bc143e17231aba22905ac2e35ba3603c06e9a1caf673491f7adabd0677c3ff0560f8e8e442f8eefe32c8f7e
+  data.tar.gz: c636a66bfa144727169ff987270e81234fc435faf21a623b0753ab9443d719664069ca876501001f0e716ef7305eebf8a77cbccac75c16f89e24b3a026f2bdca

data/README.rdoc

@@ -8,22 +8,30 @@ Then run
   bundle install
 
 == Usage
+
+=== Query
+  Article.load_more(last_load: params[:last_load_id])
+  Article.last_load(params:[last_load_id])
+
+=== Configuring global default value
+In +config/initializers/load_more.rb+:
+  LoadMore.configure do |config|
+    config.load_limit = 10
+    config.sort_column = :id
+    config.sort_method = :desc
+  end
+The above is the default configuration.
+
+=== Configuring default value for each model
 In your model:
   class Article < ActiveRecord::Base
-    acts_as_load_more
-    self.per_load = 15
+    self.load_limit = 15
+    self.sort_column = :unique_id
+    self.sort_method = :desc
   end
-The default 'per_load' value is 10.
-
-Then you can use
-  >> Article.load_more(last_load: params[:last_load_id])
-or
-  >> Article.last_load(params:[last_load_id])
-
-You can also customize the per_load value:
-  >> Article.load_more(per_load: 20, last_load: 99)
 
-By default it use id as the sort column.
+=== Configuring default values for each query
+  Article.load_more(load_limit: 20, sort_column: :sku, sort_method: :asc, last_load: 99)
 
 == License
 This project rocks and uses MIT-LICENSE.

data/lib/load_more/version.rb

@@ -1,3 +1,3 @@
 module LoadMore
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/load_more.rb

@@ -1,42 +1,81 @@
 require 'active_record' unless defined? ActiveRecord
 
 module LoadMore
-  module ActiveRecord
-    @@per_load = 10
-
-    def per_load=(limit)
-      @@per_load = limit
-    end
+  def self.configure(&block)
+    yield @config ||= LoadMore::Configuration.new
+  end
 
-    def per_load
-      @@per_load
-    end
+  def self.config
+    @config
+  end
 
-    def load_more(options = {})
-      per_load = options.delete(:per_load) || self.per_load
-      last_load_id = options.delete(:last_load)
-      rel = order(id: :desc).limit(per_load)
-      rel = rel.where('id < ?', last_load_id) if last_load_id
-      rel
-    end
+  class Configuration
+    include ActiveSupport::Configurable
 
-    def last_load(id = nil)
-      load_more(last_load: id)
-    end
+    config_accessor :load_limit
+    config_accessor :sort_column
+    config_accessor :sort_method
   end
 
-  module ActsAsLoadMore
+  module ActiveRecord
     extend ActiveSupport::Concern
 
     included do
     end
 
     module ClassMethods
-      def acts_as_load_more
-        extend LoadMore::ActiveRecord
+      def load_limit=(limit)
+        @@load_limit = limit
+      end
+
+      def load_limit
+        defined?(@@load_limit) ? @@load_limit : LoadMore.config.load_limit
+      end
+
+      def sort_column=(col)
+        @@sort_column = col
+      end
+
+      def sort_column
+        defined?(@@sort_column) ? @@sort_column : LoadMore.config.sort_column
+      end
+
+      def sort_method=(method)
+        @@sort_method = method
+      end
+
+      def sort_method
+        defined?(@@sort_method) ? @@sort_method : LoadMore.config.sort_method
+      end
+
+      def load_more(options = {})
+        load_limit = options.delete(:load_limit) || self.load_limit
+        sort_column = options.delete(:sort_column) || self.sort_column
+        sort_method = options.delete(:sort_method) || self.sort_method
+        last_load_id = options.delete(:last_load)
+        rel = order(sort_column => sort_method).limit(load_limit)
+        if last_load_id
+          where_query = if sort_method == :desc
+                          "#{self.table_name}.#{sort_column} < ?"
+                        else
+                          "#{self.table_name}.#{sort_column} > ?"
+                        end
+          rel = rel.where(where_query, last_load_id)
+        end
+        rel
+      end
+
+      def last_load(id = nil)
+        load_more(last_load: id)
       end
     end
   end
 end
 
-ActiveRecord::Base.send :include, LoadMore::ActsAsLoadMore
+LoadMore.configure do |config|
+  config.load_limit = 10
+  config.sort_column = :id
+  config.sort_method = :desc
+end
+
+ActiveRecord::Base.send :include, LoadMore::ActiveRecord

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: load_more
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jiajia Wang