working_hours 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af58b9235b85d46bc35cc76ceb72bf755c074923
-  data.tar.gz: dd5e22bc13e5659507f189ed586327a9ad199f5b
+  metadata.gz: 2195f888fd66910d51526ea5b6a25af72ec6d1a2
+  data.tar.gz: 7177da2b9c2c3601a33246337890a43ce97587fa
 SHA512:
-  metadata.gz: e09fc30b112ad6a69e45b64b6b0559ab82a4b09137c89a5598b86c22e3a2bc4f371790d9a941d0fb5bf993ed18248e8975c4ca01310ff0099bc88c3b734298fe
-  data.tar.gz: e6312bdfccd80b1a19ffe5f8bb48a0c461bc71f0fa821fa1cd9b203780f72ab72c7c023e5bfa7e0b730eca3a1d596ddb312782d3c83a08326f83bd32107af010
+  metadata.gz: 2cb8260c4fec9542faf69153ff77ad91c960dbba662a3ce86d97ca359db66c22b001254f2f17a22ef526f93d990c71f57fe4ef820d8ac2cc3954f20162307197
+  data.tar.gz: bbd6f896e77168371168e96a3f6c298f37011a67e1e348de274fe343c6a480a45a29f81d2170737e7eef05990e4a6b70889e907855b3e4f8a223e1bdb1a092ce

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.2
+  - 2.1.3
   - ruby-head
+  - jruby-head
 gemfile:
   - gemfiles/Gemfile.activesupport-3.2.x
   - gemfiles/Gemfile.activesupport-4.0.x

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Unreleased
 
-[Compare master with v1.0.1](https://github.com/intrepidd/working_hours/compare/v1.0.1...master)
+[Compare master with v1.0.2](https://github.com/intrepidd/working_hours/compare/v1.0.2...master)
+
+# v1.0.2
+
+* Dropped use of `prepend` in favor of `alias_method` for core extensions to increase compability with jruby.
+
+_15/10/2014_
 
 # v1.0.1
 

data/README.md

@@ -135,7 +135,7 @@ end
 
 ## Timezones
 
-This gem uses a simple but efficient approach in dealing with timezones. When you define your working hours **you have to choose** a timezome associated with it (in the config example, the working hours are in Paris time). Then, any time used in calcultation will be converted to this timezone first, so you don't have to worry if your times are local or UTC as long as they are correct :)
+This gem uses a simple but efficient approach in dealing with timezones. When you define your working hours **you have to choose** a timezone associated with it (in the config example, the working hours are in Paris time). Then, any time used in calcultation will be converted to this timezone first, so you don't have to worry if your times are local or UTC as long as they are correct :)
 
 ## Alternatives
 

data/lib/working_hours/core_ext/date_and_time.rb

@@ -5,19 +5,28 @@ module WorkingHours
   module CoreExt
     module DateAndTime
 
-      def +(other)
-        if (other.is_a?(WorkingHours::Duration))
+      def self.included base
+        base.class_eval do
+          alias_method :minus_without_working_hours, :-
+          alias_method :-, :minus_with_working_hours
+          alias_method :plus_without_working_hours, :+
+          alias_method :+, :plus_with_working_hours
+        end
+      end
+
+      def plus_with_working_hours(other)
+        if WorkingHours::Duration === other
           other.since(self)
         else
-          super(other)
+          plus_without_working_hours(other)
         end
       end
 
-      def -(other)
-        if (other.is_a?(WorkingHours::Duration))
+      def minus_with_working_hours(other)
+        if WorkingHours::Duration === other
           other.until(self)
         else
-          super(other)
+          minus_without_working_hours(other)
         end
       end
 
@@ -41,17 +50,17 @@ module WorkingHours
 end
 
 class Date
-  prepend WorkingHours::CoreExt::DateAndTime
+  include WorkingHours::CoreExt::DateAndTime
 end
 
 class DateTime
-  prepend WorkingHours::CoreExt::DateAndTime
+  include WorkingHours::CoreExt::DateAndTime
 end
 
 class Time
-  prepend WorkingHours::CoreExt::DateAndTime
+  include WorkingHours::CoreExt::DateAndTime
 end
 
 class ActiveSupport::TimeWithZone
-  prepend WorkingHours::CoreExt::DateAndTime
+  include WorkingHours::CoreExt::DateAndTime
 end

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport