dm-zone-types 0.1.2 → 0.1.3

data/Gemfile

@@ -3,6 +3,7 @@ source :rubygems
   gem 'dm-core'
   gem 'activesupport', '>=3.0.0.beta3'
   gem 'tzinfo'
+  gem 'ruby-debug'
 
 group :development do
   gem "tumbler", ">= 0"

data/Gemfile.lock

@@ -4,6 +4,10 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
+  ruby-debug: 
+    group: 
+    - :default
+    version: ">= 0"
   dm-validations: 
     group: 
     - :development
@@ -61,6 +65,8 @@ specs:
     version: 0.9.26
 - callsite: 
     version: 0.0.2
+- columnize: 
+    version: 0.3.1
 - data_objects: 
     version: 0.10.2
 - extlib: 
@@ -81,12 +87,18 @@ specs:
     version: 0.4.1
 - json: 
     version: 1.4.3
+- linecache: 
+    version: "0.43"
 - nanotest: 
     version: 0.9.4.1
 - nanotest_extensions: 
     version: 0.6.3
 - rainbow: 
     version: "1.1"
+- ruby-debug-base: 
+    version: 0.10.3
+- ruby-debug: 
+    version: 0.10.3
 - thor: 
     version: 0.13.7
 - versionomy: 
@@ -97,7 +109,7 @@ specs:
     version: 0.3.22
 - watchr: 
     version: "0.6"
-hash: 70f186d5e2b963e6e35c4ade89ccbd628b30ebca
+hash: 0b6c03727c1a61fac9b2854abc49cfc189b6c3bc
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/lib/dm-zone-types/version.rb

@@ -2,7 +2,7 @@
 module DataMapper
   module Zone
     module Types #:nodoc
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

data/lib/dm-zone-types/zoned_time.rb

@@ -6,8 +6,9 @@ module DataMapper
     class ZonedTime < Time
       include DataMapper::Zone::Types
 
-      def valid?(value)
-        value.kind_of?(::Time) || value.nil?
+      def valid?(value, negated = false)
+        response = value.kind_of?(::Time) || value.nil? || value.kind_of?(::Range)
+        negated ? !response : response
       end
 
       def load(value)
@@ -16,23 +17,28 @@ module DataMapper
 
       def dump(value)
         return nil unless value
-        time_with_zone_to_primitive value.in_time_zone(DataMapper::Zone::Types.storage_zone)
+        zone = DataMapper::Zone::Types.storage_zone
+        if value.respond_to?(:in_time_zone)
+          time_with_zone_to_primitive value.in_time_zone(zone)
+        elsif ::Range === value
+          if value.first.respond_to?(:in_time_zone) && value.last.respond_to?(:in_time_zone)
+            ((time_with_zone_to_primitive(value.first.in_time_zone(zone)))..(time_with_zone_to_primitive(value.last.in_time_zone(zone))))
+          else
+            value
+          end
+        else
+          value
+        end
       end
 
       def typecast(value)
         case value
         when ::String
           ::Time.zone.parse(value)
-        when ::DateTime
-          value.in_time_zone
-        when ::Time
-          value.in_time_zone
         when ::Date
           value.to_time.in_time_zone
-        when ActiveSupport::TimeWithZone
-          value.in_time_zone
-        when NilClass
-          nil
+        else
+          value.respond_to?(:in_time_zone) ? value.in_time_zone : value
         end
       end
 

data/test/dm-zone-types/test_zoned_time.rb

@@ -85,11 +85,15 @@ context do
             model.zoned_time.zone.must == t.zone
           end
 
-          # should typecast to a DateTime from a date
+          # should let me search for models within a range
           test do
-            d = Date.today
-            model = SpecModel.new(:zoned_time => d)
-            assert { model.zoned_time.kind_of?(ActiveSupport::TimeWithZone) }
+            t = Time.zone.now
+            [0,1,2,3,4,5].each do |d|
+              SpecModel.create(:zoned_time => (t - d.days))
+            end
+
+            results = SpecModel.all(:zoned_time => ((t - 2.days)..t))
+            results.size.must == 3
           end
         end
       end # tz's

data/test/test_helper.rb

@@ -10,6 +10,7 @@ $:.unshift( File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib"))
 require 'dm-zone-types'
 require 'dm-migrations'
 require 'dm-validations'
+require 'active_support/time'
 
 include Nanotest
 include Nanotest::Contexts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-zone-types
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +10:00
+date: 2010-07-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,9 +74,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  name: tumbler
+  name: ruby-debug
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-  name: nanotest
+  name: tumbler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-  name: nanotest_extensions
+  name: nanotest
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-  name: watchr
+  name: nanotest_extensions
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
-  name: rake
+  name: watchr
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id009
-  name: dm-sqlite-adapter
+  name: rake
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -158,7 +158,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id010
-  name: dm-migrations
+  name: dm-sqlite-adapter
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -172,7 +172,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id011
-  name: i18n
+  name: dm-migrations
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -186,6 +186,20 @@ dependencies:
         - 0
         version: "0"
   requirement: *id012
+  name: i18n
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
   name: dm-validations
   prerelease: false
   type: :development