assorted 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1b25bd61cd38f3d4f8bca37962bdcf283c833c
-  data.tar.gz: cc009513f6595ba60033fefda3d7b623186adbfd
+  metadata.gz: e39934bb2ca6d839e3d8b1f07aab05a0eaf75396
+  data.tar.gz: 1fe1404fa394fb310b2e149a15253327d157e5de
 SHA512:
-  metadata.gz: 81f2402794924d399d317d5ad99331e527648c083a64cdc70a13d231e7710f70bc51f6d37feca7aab5acc385621a070a0711511945745918d8a6a0e852cc618d
-  data.tar.gz: 7eda1d0e7e2169655a90d79d173c5f8aa41595653c957a3f2766eb22bdde8b803860b9e40459cf0888e8706c7c190be9c23af820390b0fbe8236105c5edf591b
+  metadata.gz: 766d78c00956d8e60603f83c1260776a582c9edf6769dd0e0966f4ba2f95ea4de120dc4ea7d529660d04440cfae42f59914d47c81fa163bc7fc86294a883d0a0
+  data.tar.gz: bbf7007d6bde7097577c34e297d1357b099de1a5852a8567c2965ebe4a50d18f02aff5225e7161f28b8e8a25e3d09ccc84fdf2328d0a81dd6ff6d2e770d4bd00

data/lib/assorted.rb

@@ -3,6 +3,14 @@ require "active_record"
 require "assorted/version"
 require "assorted/scopes"
 
+module Assorted
+  def self.options
+    @options ||= {
+      default_sort_column: :created_at,
+    }
+  end
+end
+
 ActiveSupport.on_load(:active_record) do
   extend Assorted::Scopes
 end

data/lib/assorted/scopes.rb

@@ -8,8 +8,8 @@ module Assorted
       sanitized_order(column, :desc)
     end
 
-    def set_sorting_column(column)
-      self.sorting_column = column
+    def assorted(options)
+      assorted_options.merge!(options)
     end
 
     private
@@ -23,11 +23,11 @@ module Assorted
     end
 
     def sorting_column
-      @sorting_column ||= :created_at
+      assorted_options[:default_sort_column] || Assorted.options[:default_sort_column]
     end
 
-    def sorting_column=(column)
-      @sorting_column = column
+    def assorted_options
+      @assorted_options ||= {}
     end
 
   end

data/lib/assorted/version.rb

@@ -1,3 +1,3 @@
 module Assorted
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/assorted/scopes_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Assorted::Scopes do
   end
 
   it "prevents SQL injection attacks" do
-    record = ExampleRecord.create
+    ExampleRecord.create
     injection_attempt = "created_at desc; delete * from example_records;"
 
     expect { ExampleRecord.asc(injection_attempt) }.to raise_exception(ActiveRecord::StatementInvalid)
@@ -30,7 +30,7 @@ RSpec.describe Assorted::Scopes do
     less = ExampleRecord.create(example_count: 1)
 
     class ExampleRecord
-      set_sorting_column :example_count
+      assorted default_sort_column: :example_count
     end
 
     expect(ExampleRecord.asc).to eq([less, more])

data/spec/lib/assorted_spec.rb

@@ -4,4 +4,17 @@ RSpec.describe Assorted do
   it "includes itself in ActiveRecord::Base" do
     expect(ActiveRecord::Base.ancestors).to include(Assorted::Scopes)
   end
+
+  describe "#options" do
+    it "defaults to sort with created_at" do
+      expect(Assorted.options[:default_sort_column]).to eq :created_at
+    end
+
+    it "remembers the new options given to it" do
+      Assorted.options[:foo] = :bar
+
+      expect(Assorted.options[:foo]).to eq(:bar)
+    end
+  end
+
 end

data/spec/support/active_record.rb

@@ -13,11 +13,10 @@ RSpec.configure do |config|
         table.timestamps
       end
 
-      original_sorting_column = ExampleRecord.send(:sorting_column)
-
       example.run
 
-      ExampleRecord.send(:sorting_column=, original_sorting_column)
+      ExampleRecord.instance_variable_set(:@assorted_options, nil)
+      Assorted.instance_variable_set(:@options, nil)
 
       raise ActiveRecord::Rollback
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assorted
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Patrick Byrne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord