shibaraku 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 249745c0787cffbfe23b9b9e3ddae9e2c7e43906
-  data.tar.gz: 0b1e63a29e6d513a912a1eaaa96ed6b739a6d7dd
+  metadata.gz: 2fffc67a48192b7316ba31cfdffc0686ca4aa672
+  data.tar.gz: 4391a32d5f93d146a4b674d69845ec1b0d44d028
 SHA512:
-  metadata.gz: 7476a96143771afc55c93fc76ac90d861365caeb62cbeb13d7fa5dfe21706a149292d1883df7d578dd6ac0525194a5875e748c8d0ab356e4484a9e72d7598f45
-  data.tar.gz: e13c0d8509fd31719a63671441bb89d19fb98154a30d4fea2ce8186d455084095fd015508f02482b845c60d8a16f597345eb2337ef5d39f42a5d2043f8e9d897
+  metadata.gz: 92b21a4c02c4921179e6d0a1e1ab3543339863ade1f05bbe9a368ae01f1d7ae11354b510878030d35a4f619a7d5171de3f10deab616fc69e8eed8e294fd154a7
+  data.tar.gz: 4ac54d031eb54400ed3ad74bf4f50b2d539d21037333e1c087d1188f456e78639293005af023bafed54c86ee15a579a3739ab06da7210e3d111b364fc7634ee9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Shibaraku master (unreleased)
-[full changelog](https://github.com/onk/shibaraku/compare/v1.3.0...master)
+[full changelog](https://github.com/onk/shibaraku/compare/v1.4.0...master)
+
+## Shibaraku v1.4.0 (2017-02-15)
+[full changelog](https://github.com/onk/shibaraku/compare/v1.3.0...v1.4.0)
+
+*   [#5] Support ActiveHash (@Narazaka)
+
 
 ## Shibaraku v1.3.0 (2016-11-08)
 [full changelog](https://github.com/onk/shibaraku/compare/v1.2.0...v1.3.0)

data/lib/shibaraku.rb

@@ -1,4 +1,8 @@
 require "active_record"
+begin
+  require "active_hash"
+rescue LoadError
+end
 require "shibaraku/active_record_ext"
 
 module Shibaraku
@@ -7,3 +11,8 @@ end
 ActiveSupport.on_load :active_record do
   ActiveRecord::Base.include(Shibaraku::ActiveRecordExt)
 end
+
+# active_hash do not use ActiveSupport::LazyLoadHooks
+if defined?(ActiveHash)
+  ActiveHash::Base.include(Shibaraku::ActiveRecordExt)
+end

data/lib/shibaraku/active_record_ext.rb

@@ -15,24 +15,6 @@ module Shibaraku
         self.shibaraku_end_at_column   = options[:end_at]   || :end_at
         include Shibaraku::ActiveRecordExt::Core
       end
-
-      def shibaraku_start_at_column_name(user)
-        name = self.shibaraku_start_at_column
-        name = test_column_name(name) if user && user.super_user?
-        name
-      end
-
-      def shibaraku_end_at_column_name(user)
-        name = self.shibaraku_end_at_column
-        name = test_column_name(name) if user && user.super_user?
-        name
-      end
-
-      def test_column_name(name)
-        define_attribute_methods
-        test_name = "test_#{name}"
-        self.method_defined?(test_name) ? test_name : name
-      end
     end
 
     module Core
@@ -49,12 +31,38 @@ module Shibaraku
       end
 
       module ClassMethods
+        def shibaraku_start_at_column_name(user)
+          name = self.shibaraku_start_at_column
+          name = test_column_name(name) if user && user.super_user?
+          name
+        end
+
+        def shibaraku_end_at_column_name(user)
+          name = self.shibaraku_end_at_column
+          name = test_column_name(name) if user && user.super_user?
+          name
+        end
+
+        def test_column_name(name)
+          define_attribute_methods
+          test_name = "test_#{name}"
+          self.method_defined?(test_name) ? test_name : name
+        end
+
         def in_time(user = nil, now = Time.current)
-          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)
+          if ancestors.include?(::ActiveRecord::Base)
+            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)
+          else
+            start_at = shibaraku_start_at_column_name(user)
+            end_at   = shibaraku_end_at_column_name(user)
+            all.select do |record|
+              (record.send(start_at).nil? || record.send(start_at) <= now) && (record.send(end_at).nil? || now < record.send(end_at))
+            end
+          end
         end
       end
 

data/lib/shibaraku/version.rb

@@ -1,3 +1,3 @@
 module Shibaraku
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/shibaraku.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "active_hash"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shibaraku
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Takafumi ONAKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_hash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage model with a period on ActiveRecord.
 email:
 - takafumi.onaka@gmail.com
@@ -124,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Manage model with a period on ActiveRecord.