sorted-activerecord 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad88b26febe4a092e3832ecf4a981590629768e
-  data.tar.gz: 59a3842b4e0a927c118054c0bca71cdb1259bbc5
+  metadata.gz: 9856512bf3a6ea77c80b2e533a1eb9f9733b6581
+  data.tar.gz: 5c64bec217bea4dd89b953e591eb4ff18ea75fd9
 SHA512:
-  metadata.gz: 5384beb8cc7de376e714fc8d5fcb8cc9feb75d354fa820ee2373fccb6d80a879b2418691c5ddc5a36d47969f87f0507ae39c7977e11c99b97a80c3900abf1671
-  data.tar.gz: 922d9586a74b8345f5011fe48c8f5233cd05a78b682faf835e87c6344a9115da962d69360aa0eed9fbfe7abd20a6a5b5444402cfec5e651afcb20b6072b44216
+  metadata.gz: e1fb82ad13affa7e882956be1f74a910bdf9e4b47a22cae92b5cbc0651b4e2af8e4ccc9732c9fa099e14477ab09b5056859a3276a6dfa73009a7e3280bd034aa
+  data.tar.gz: 6d1b300d549bc2dabde078e722ffda9a31ca3ded35abc1244d874b21a91f7a3c503baeb692083a1fb40739a11ae7c5523765b9b368d541d857ab61dbfb3c4f75

data/.rubocop.yml

@@ -1,12 +1,13 @@
-# Offense count: 5
-# Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 174
 
-# Offense count: 5
 Style/Documentation:
   Enabled: false
 
-# Offense count: 2
-Style/RegexpLiteral:
-  MaxSlashes: 0
+SignalException:
+  # prefer raise to fail
+  EnforcedStyle: only_raise
+
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/sorted/active_record.rb'

data/.travis.yml

@@ -1,7 +1,22 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.5
+  - 2.1
+  - 2.2
   - ruby-head
+  - jruby-19mode
+  - jruby-head
+
+before_install:
+  - gem update bundler
 
 script: bundle exec rake spec
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  fast_finish: true
+
+notifications:
+  email: false

data/Guardfile

@@ -1,5 +1,5 @@
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 
   # RSpec files

data/lib/sorted/active_record/builder.rb

@@ -1,4 +1,6 @@
-require 'sorted'
+require 'sorted/set'
+require 'sorted/sql_query'
+require 'sorted/uri_query'
 
 module Sorted
   module ActiveRecord
@@ -42,14 +44,16 @@ module Sorted
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
       def parse(values)
         values.inject(Sorted::Set.new) do |memo, value|
           case value.class.name
           when 'Hash'
-            memo = memo + parse(value.to_a)
+            memo += parse(value.to_a)
           when 'String'
             @return_hash = false
-            memo = memo + ::Sorted::SQLQuery.parse(value)
+            memo += ::Sorted::SQLQuery.parse(value)
           when 'Symbol'
             memo = memo << [value.to_s, 'asc']
           when 'Array'

data/lib/sorted/active_record/helper.rb

@@ -7,7 +7,6 @@ module Sorted
     module Helper
       extend ActiveSupport::Concern
       included do
-
         def self.sorted(sort: [], order: [], whitelist: [])
           builder = ::Sorted::ActiveRecord::Builder.new(sort: sort,
                                                         order: order,

data/lib/sorted/active_record/version.rb

@@ -1,5 +1,5 @@
 module Sorted
   module ActiveRecord
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/sorted/active_record.rb

@@ -1,7 +1,7 @@
 begin
   require 'rails'
 rescue LoadError
-  #do nothing
+  # do nothing
 end
 
 require 'sorted/active_record/version'

data/sorted-activerecord.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'sorted-activerecord'
   spec.version       = Sorted::ActiveRecord::VERSION
   spec.authors       = ['Rufus Post']
-  spec.email         = ['Rufus.Post@team.telstra.com']
+  spec.email         = ['rufuspost@gmail.com']
   spec.summary       = 'Activerecord scoped for sorted.'
   spec.description   = 'Allows the use of the sorted gem with Activerecord.'
   spec.homepage      = ''
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 4.0.0'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'sorted', '~> 2.0.2'
+  spec.add_dependency 'sorted', '~> 2.1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/spec/sorted/active_record_spec.rb

@@ -56,19 +56,19 @@ describe Sorted::ActiveRecord do
   end
 
   it 'should allow hash as order' do
-    expected = subject.order({ created_at: :desc }).to_sql
+    expected = subject.order(created_at: :desc).to_sql
     actual = subject.sorted(order: [{ created_at: :desc }]).to_sql
     expect(actual).to match(expected)
   end
 
   it 'should allow hash as sort' do
-    expected = subject.order({ created_at: :desc }).to_sql
+    expected = subject.order(created_at: :desc).to_sql
     actual = subject.sorted(sort: [{ created_at: :desc }]).to_sql
     expect(actual).to match(expected)
   end
 
   it 'should allow symbols and hash as order' do
-    expected = subject.order(:orders_count, { created_at: :desc }).to_sql
+    expected = subject.order(:orders_count, created_at: :desc).to_sql
     actual = subject.sorted(sort: [:orders_count, { created_at: :desc }]).to_sql
     expect(actual).to match(expected)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorted-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rufus Post
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
         version: 1.3.5
 description: Allows the use of the sorted gem with Activerecord.
 email:
-- Rufus.Post@team.telstra.com
+- rufuspost@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []