shibaraku 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723c458eb55e34fe194391b5928d7e5f43c5b1e0
-  data.tar.gz: f56f79deef90c18ecce1436feb637aa3467eb8f5
+  metadata.gz: d09283f74f46480ba067beb6638e15aad884be09
+  data.tar.gz: effe18645523fa64fa9c90d7b50a2f09b5edd716
 SHA512:
-  metadata.gz: d5b2674a7e33a7a5b32d4176139e25b735b04b9eba6d158a2e3e12b03a5f0b853ff6b49635f2157c3ab090ad86aded6329dbc3320b77c6fea63ab09121055f16
-  data.tar.gz: 01c8a21e0e3ea91c22ca208dce953097b6553ca80c5d188617d8a55b6d788275599cd32461ef2d15a45bb919d67cb3801663c615e09004466337a52c92d4b387
+  metadata.gz: 2c5fdb331b576202b1e061c4aac3919751cdf4a36867f81a5a0315d1ebc72525affa4ee2807e91a9d452b0641ba6a573bd1544b3b8c45a6ede1f447757097dc8
+  data.tar.gz: fe777e772eeb8e2eef9513ae971f429d7255386a6c43787e872317e934d52fdfc7f74bf8486d2b642c6cfe39b36ae54cbce7919ea0642c6f4c653f8835017f12

data/.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+cache: bundler
+sudo: false
+services:
+  - mysql
+rvm:
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
+gemfile:
+  - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_5_0.gemfile
+before_install: gem install bundler -v 1.11.2
+before_script:
+  - cp spec/database.yml.travis spec/database.yml
+  - mysql -e 'create database shibaraku_test;'
+script:
+  - bundle exec rspec
+matrix:
+  allow_failures:
+  # NOTE: There are unstable versions
+  - rvm: ruby-head
+  - gemfile: gemfiles/rails_5_0.gemfile

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Shibaraku master (unreleased)
-[full changelog](https://github.com/onk/shibaraku/compare/v1.1.0...master)
+[full changelog](https://github.com/onk/shibaraku/compare/v1.2.0...master)
+
+## Shibaraku v1.2.0 (2016-07-12)
+[full changelog](https://github.com/onk/shibaraku/compare/v1.1.0...v1.2.0)
+
+*   [#3] relax dependency version (@onk)
+*   [#2] support join with shibaraku-ize tables (@onk)
+*   [#1] Support matrix versions test on Travis CI (@sue445)
 
 
 ## Shibaraku v1.1.0 (2015-10-18)

data/gemfiles/rails_4_1.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+
+# NOTE: mysql2 v0.4.x will not work with Rails 4.1
+gem "mysql2", "~> 0.3.20"
+
+gemspec path: '../'

data/gemfiles/rails_4_2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec path: '../'

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0.beta1"
+
+gemspec path: '../'

data/lib/shibaraku/active_record_ext.rb

@@ -50,9 +50,11 @@ module Shibaraku
 
       module ClassMethods
         def in_time(user = nil, now = Time.current)
-          start_at = shibaraku_start_at_column_name(user)
-          end_at   = shibaraku_end_at_column_name(user)
-          where("(#{start_at} IS NULL OR #{start_at} <= :now) AND (#{end_at} IS NULL OR :now < #{end_at})", now: now)
+          start_at = arel_table[shibaraku_start_at_column_name(user)]
+          end_at   = arel_table[shibaraku_end_at_column_name(user)]
+          starting = where(start_at.eq(nil).or(start_at.lteq(now)))
+          ending   = where(end_at.eq(nil).or(end_at.gt(now)))
+          starting.merge(ending)
         end
       end
 

data/lib/shibaraku/version.rb

@@ -1,3 +1,3 @@
 module Shibaraku
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/shibaraku.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rails"
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shibaraku
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Takafumi ONAKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -96,6 +97,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - lib/shibaraku.rb
 - lib/shibaraku/active_record_ext.rb
 - lib/shibaraku/version.rb
@@ -120,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Manage model with a period on ActiveRecord.