dm_filter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90ab5d9ebe2c67358478767a7c614b37fc20ac75
-  data.tar.gz: 3918583edb244d3c32cbdc6dcd79ac228127f22f
+SHA256:
+  metadata.gz: 835931d9c805e2313b152a9df5e819a10c876138af37842b16d34d83b1eb8c69
+  data.tar.gz: 96399fa5fdb892334422e6a300a976382964db3308ec1ac9b2324e63c7e36005
 SHA512:
-  metadata.gz: dde8ac959f61091d559b28f5427247d965ccc5e24160f0ed9dfa7e704c318e1fb89283059275190314c51bab00882aa3d0545616b96a9eb5e7312c93f626b20d
-  data.tar.gz: 58e51ed17a2e5047d5c69a24438acc8de72fc4c18473565db4c089b5c082b6cdce290b52215012b1e7681a0f4561a73a57649c41dc3376f9ecd89d37b94db7a7
+  metadata.gz: fd4604588da1f6e3dd0584ed5dd95af95273c272e30726ff6b81257432bbe229d016f29dc0facb3ea2a0ae82889654535978738dba8594bf77e3b3882859ec54
+  data.tar.gz: e7fa5b7934270fb4d9f6eccc1d8ff6c97fdc13a5e1d0513419995253852019af580d3de8387b66745cfc689f7159f6bf66907d150e365a19adff455fd684d783

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history
+.rspec_status

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,160 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-07-22 17:04:38 +0800 using RuboCop version 0.58.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    # - 'Gemfile'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    # - 'dm_filter.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    # - 'spec/dm_filter_spec.rb'
+
+# Offense count: 22
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    # - 'lib/dm_filter.rb'
+    # - 'spec/dm_filter_spec.rb'
+
+# Offense count: 27
+# Cop supports --auto-correct.
+# Configuration parameters: IndentationWidth.
+Layout/Tab:
+  Exclude:
+    # - 'lib/dm_filter.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Exclude:
+    # - 'Gemfile'
+    # - 'spec/dm_filter_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    # - 'lib/dm_filter.rb'
+    # - 'spec/dm_filter_spec.rb'
+
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 45
+
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 29
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 11
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 21
+
+# Offense count: 2
+Style/Documentation:
+  Exclude:
+    # - 'spec/**/*'
+    # - 'test/**/*'
+    # - 'lib/dm_filter.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Encoding:
+  Exclude:
+    # - 'dm_filter.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    # - 'dm_filter.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    # - 'Rakefile'
+
+# Offense count: 1
+Style/MixinUsage:
+  Exclude:
+    - 'spec/db/helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    # - 'lib/dm_filter/version.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    # - 'dm_filter.gemspec'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    # - 'lib/dm_filter.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RescueModifier:
+  Exclude:
+    - 'spec/db/helper.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    # - 'Rakefile'
+    # - 'bin/console'
+    # - 'dm_filter.gemspec'
+    # - 'lib/dm_filter/version.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    # - 'dm_filter.gemspec'
+
+# Offense count: 11
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 158

data/.travis.yml

@@ -0,0 +1,23 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.1
+services: mysql
+before_install: gem install bundler -v 1.16.1
+notifications: false
+
+env:
+  global:
+    - CC_TEST_REPORTER_ID=e3a1e96d871b3246e51eeeb6d9d3c901b93a445bd1ab710f30aadbdb4ba9ef0a
+
+before_script:
+  - bundle exec rspec && CODECLIMATE_REPO_TOKEN=e3a1e96d871b3246e51eeeb6d9d3c901b93a445bd1ab710f30aadbdb4ba9ef0a
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+scripts:
+  - bundle exec rspec spec
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dm_filter.gemspec
 gemspec
+
+group :test do
+  gem 'byebug'
+  gem 'rubocop'
+  gem 'simplecov'
+  gem 'simplecov-console'
+end

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/denmarkmeralpis/dm_filter.svg?branch=master)](https://travis-ci.org/denmarkmeralpis/dm_filter) [![Maintainability](https://api.codeclimate.com/v1/badges/ce96a303e9f35ee66e05/maintainability)](https://codeclimate.com/github/denmarkmeralpis/dm_filter/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/ce96a303e9f35ee66e05/test_coverage)](https://codeclimate.com/github/denmarkmeralpis/dm_filter/test_coverage) [![Gem Version](https://badge.fury.io/rb/dm_filter.svg)](https://badge.fury.io/rb/dm_filter)
 # DmFilter
 
 DmFilter is a very light weight Rails plugin that makes it easy to fetch your ActiveRecord lists using date or text as a parameter.
@@ -7,7 +8,7 @@ DmFilter is a very light weight Rails plugin that makes it easy to fetch your Ac
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'dm_filter'
+gem 'dm_filter', '~> 0.0.3'
 ```
 
 And then execute:
@@ -16,16 +17,21 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install dm_filter
+    $ gem install dm_filter -v 0.0.3
 
-include this into your model(example Invoice)
-##### invoice.rb
+include this into your model
 ```ruby
-include DmFilter::Base
+include DmFilter
+```
+example
+```ruby
+class Invoice < ApplicationRecord
+    include DmFilter
+end
 ```
 
 ## Usage
-#### Values for `day`
+#### Values for `duration`
 1. `all` (default)
 2. `today`
 3. `yesterday`
@@ -35,14 +41,20 @@ include DmFilter::Base
 7. `period`
 
 #### Available options
-1. `day`
+1. `duration`(default is `all`)
 2. `from`(if `day` is equal to `period`)
 3. `to`(if `day` is equal to `period`)
-4. `column_name` (default is `created_at`)
+4. `column_date` (default is `created_at`)
 
 #### Example
 ```ruby
-Invoice.dm_filter({ day: 'today', column_name: 'paid_at' })
+# specifying column_date
+Invoice.dm_get(duration: 'today', column_date: 'paid_at')
+```
+or simply
+```ruby
+# default column_date is created_at
+Invoice.dm_get(duration: 'today')
 ```
 
 ## Contributing

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'bundler/gem_tasks'
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "dm_filter"
+require 'bundler/setup'
+require 'dm_filter'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "dm_filter"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/dm_filter.gemspec

@@ -1,32 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dm_filter/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "dm_filter"
+  spec.name          = 'dm_filter'
   spec.version       = DmFilter::VERSION
-  spec.authors       = ["Nujian Den Mark Meralpis"]
-  spec.email         = ["denmarkmeralpis@gmail.com"]
+  spec.authors       = ['Nujian Den Mark Meralpis']
+  spec.email         = ['denmarkmeralpis@gmail.com']
 
-  spec.summary       = %q{Fetch ActiveRecord list using specified period as a parameter}
-  spec.description   = %q{DmFilter is a very light weight Rails plugin that makes it easy to fetch your ActiveRecord lists using date or text as a parameter.}
-  spec.homepage      = "http://www.genmcrg.com/experiment/gems/dm_filter"
-  spec.license       = "MIT"
+  spec.summary       = 'Fetch ActiveRecord list using specified period as a parameter'
+  spec.description   = 'DmFilter is a very light weight Rails plugin that makes it easy to fetch your ActiveRecord lists using date or text as a parameter.'
+  spec.homepage      = 'https://github.com/denmarkmeralpis/dm_filter'
+  spec.license       = 'MIT'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata['allowed_push_host'] = "Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency             'activerecord', '>= 4.2'
+  spec.add_development_dependency 'activesupport', '~> 4.2'
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'mysql2',  '>= 0.3.13', '< 0.4.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/dm_filter.rb

@@ -1,6 +1,36 @@
-require "dm_filter/version"
-require "dm_filter/base"
+require 'active_support/all'
+require 'dm_filter/version'
 
+# DmFilter
 module DmFilter
-  # Your code goes here...
+  extend ActiveSupport::Concern
+  # Class Method
+  module ClassMethods
+    def dm_get(options)
+      options[:column_date] = 'created_at' unless options[:column_date].present?
+
+      from = options[:from].blank? ? Time.current : options[:from].to_datetime
+      to = options[:to].blank? ? Time.current : options[:to].to_datetime
+
+      case options[:duration]
+      when 'all'
+        all
+      when 'today'
+        where(options[:column_date] => from.beginning_of_day..to.end_of_day)
+      when 'yesterday'
+        where(options[:column_date] => from.yesterday.beginning_of_day..to.yesterday.end_of_day)
+      when 'this_week'
+        where(options[:column_date] => from.beginning_of_week..to.end_of_week)
+      when 'this_month'
+        where(options[:column_date] => from.beginning_of_month..to.end_of_month)
+      when 'last_month'
+        where(options[:column_date] => from.last_month.beginning_of_month..to.last_month.end_of_month)
+      when 'period', 'custom'
+        where(options[:column_date] => from.beginning_of_day..to.end_of_day)
+      else
+        all
+      end
+    end
+    extend ClassMethods
+  end
 end

data/lib/dm_filter/version.rb

@@ -1,3 +1,3 @@
 module DmFilter
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: dm_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nujian Den Mark Meralpis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: DmFilter is a very light weight Rails plugin that makes it easy to fetch
   your ActiveRecord lists using date or text as a parameter.
 email:
@@ -47,6 +109,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -56,9 +121,8 @@ files:
 - bin/setup
 - dm_filter.gemspec
 - lib/dm_filter.rb
-- lib/dm_filter/base.rb
 - lib/dm_filter/version.rb
-homepage: http://www.genmcrg.com/experiment/gems/dm_filter
+homepage: https://github.com/denmarkmeralpis/dm_filter
 licenses:
 - MIT
 metadata: {}
@@ -78,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fetch ActiveRecord list using specified period as a parameter

data/lib/dm_filter/base.rb

@@ -1,38 +0,0 @@
-module DmFilter
-   module Base
-      extend ActiveSupport::Concern
-      module ClassMethods
-
-         def dm_get(options)
-            d = options[:from]
-            t = options[:to]
-            column_date = options[:column_date]
-            day = options[:duration]
-
-            column_date = column_date.blank? ? 'created_at' : column_date
-            d = d.blank? ? Time.zone.now : d.to_date
-            t = t.blank? ? Time.zone.now : t.to_date
-
-            case day
-            when "all"
-               self.all
-            when "today"
-               self.where(column_date => d.beginning_of_day..t.end_of_day)
-            when "yesterday"
-               self.where(column_date => d.yesterday.beginning_of_day..t.yesterday.end_of_day)
-            when "this_week"
-               self.where(column_date => d.beginning_of_week..t.end_of_week)
-            when "this_month"
-               self.where(column_date => d.beginning_of_month..t.end_of_month)
-            when "last_month"
-               self.where(column_date => d.last_month.beginning_of_month..t.last_month.end_of_month)
-            when "period"
-               self.where(column_date => d.beginning_of_day..t.end_of_day)
-            else
-               self.all
-            end
-         end
-      end
-      extend ClassMethods
-   end
-end