Commit 4ec100b

committed

Support version checking in rails 3

1 parent df69abb commit 4ec100bCopy full SHA for 4ec100b

File tree

+11

-3

lines changed

elasticsearch-persistence/lib/elasticsearch/persistence/model
- time_with_zone_typecaster.rb

+11

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,25 @@ def call(value)`
`19`	`19`	`precision = @precision_override`
`20`	`20`	`elsif !ActiveSupport::JSON::Encoding.use_standard_json_time_format`
`21`	`21`	`precision = 0`
`22`		`- elsif ActiveSupport.version < Gem::Version.new('4.0')`
	`22`	`+ elsif active_support_version < Gem::Version.new('4.0')`
`23`	`23`	`precision = 0`
`24`		`- elsif ActiveSupport.version >= Gem::Version.new('4.0') &&`
`25`		`- ActiveSupport.version < Gem::Version.new('4.1')`
	`24`	`+ elsif active_support_version >= Gem::Version.new('4.0') &&`
	`25`	`+ active_support_version < Gem::Version.new('4.1')`
`26`	`26`	`precision = 3`
`27`	`27`	`else`
`28`	`28`	`precision = ActiveSupport::JSON::Encoding.time_precision`
`29`	`29`	`end`
`30`	`30`
`31`	`31`	`result.change(usec: (result.usec / (10**(6-precision))))`
`32`	`32`	`end`
	`33`	`+`
	`34`	`+ def active_support_version`
	`35`	`+ if ActiveSupport.respond_to?(:version)`
	`36`	`+ ActiveSupport.version`
	`37`	`+ else`
	`38`	`+ Gem::Version.new(ActiveSupport::VERSION::STRING)`
	`39`	`+ end`
	`40`	`+ end`
`33`	`41`	`end`
`34`	`42`	`end`
`35`	`43`	`end`

Comments

(0)