pump 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928aa1adcc5c2a7fc5dd530840b2ceb48c60e872
-  data.tar.gz: 7b80bb36b960b06a57ce69f3c4e9aea5cefe8862
+  metadata.gz: c60ca511d26b937009e1b16e1473b4e664509ab9
+  data.tar.gz: 0f6c9cf439f290237b710c56ed25d87b79ccca5b
 SHA512:
-  metadata.gz: cac714cccc025776bcef431bf8d47707f1ca3e588162807171b478d5583092dc19bdae802ee6bcc3906c430c50baa23c1092a193ce4ada0091e64d60723b3850
-  data.tar.gz: c32c95412ebf0b979b212d4596f48b268228f93bf8eb5a45fa0ea8e04a3ddbd26ec876358bb813dbd9d8488ed2166702221362c32f121e66b57e2554ad3adb47
+  metadata.gz: cf21d8aa68ff75a6bb584390bdc16880a48c600057834dcb2aac8457c76268a20e294c8900056854a3019f13065f2eccd8e19ac5e70cac17d4f4b3700914a941
+  data.tar.gz: d1441b8fb1321f5452a25d98568ac35bc9e0a5d0b72866eae2bc795b2bdccb3570def280d700e84c203d5d72f05c081dd28a519014f4475c8d093e2b956b6f84

data/CHANGES.md

@@ -1,6 +1,13 @@
 ### dev
 
-[full changelog](http://github.com/yolk/pump/compare/v0.6.1...master)
+[full changelog](http://github.com/yolk/pump/compare/v0.6.2...master)
+
+### 0.6.2 / 2013-07-26
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.1...v0.6.2)
+
+* Pump::Encoder now forces loading of ActiveRecord::Relation to detect array
+* Format times correctly with OJ options alone (does not rely on activesupports to_json)
 
 ### 0.6.1 / 2013-07-25
 

data/lib/pump/encoder.rb

@@ -52,6 +52,7 @@ module Pump
     #
     # @return [String]
     def encode(object, options={})
+      object = object.to_a if defined?(ActiveRecord::Relation) && object.is_a?(ActiveRecord::Relation)
       object.is_a?(Array) ? encode_array(object, options) : encode_single(object, options)
     end
 

data/lib/pump/json.rb

@@ -1,5 +1,5 @@
 require "pump/encoder"
-require 'active_support/json/encoding'
+
 require "oj"
 
 module Pump
@@ -7,36 +7,47 @@ module Pump
 
     private
 
+    OJ_OPTIONS = {
+      :mode => :compat, 
+      :time_format => :xmlschema, 
+      :second_precision => 0
+    }
+
     def compile_string
+      main = build_main
       <<-EOV
         def encode_single(object, options)
-          json = {}
-          #{build_string(encoder_config)}
+          #{main}
           unless options[:exclude_root_in_json]
             json = { :'#{format_name(root_name)}' => json }
           end
-          Oj.dump(json, :mode => :compat)
+          Oj.dump(json, OJ_OPTIONS)
         end
 
         def encode_array(objects, options)
           Oj.dump(if options[:exclude_root_in_json]
             objects.map do |object|
-              json = {}
-              #{build_string(encoder_config)}
+              #{main}
               json
             end
           else
             objects.map do |object|
-              json = {}
-              #{build_string(encoder_config)}
+              #{main}
               { :'#{format_name(root_name)}' => json }
             end
-          end, :mode => :compat)
+          end, OJ_OPTIONS)
         end
       EOV
     end
 
-    def build_string(config, variable='json')
+    def build_main
+      <<-EOV
+        json = {}
+        #{build_part(encoder_config)}
+      EOV
+    end
+
+    def build_part(config, variable='json')
       config.inject("") do |str, config|
         build_key_value_pair(str, config, variable)
         str
@@ -57,7 +68,7 @@ module Pump
     def build_hash(str, name, method_name, config, variable)
       str << "#{build_condition(config)}\n"
       str << "#{variable}[:'#{format_name(name)}'] = {}\n"
-      str << build_string(method_name, "#{variable}[:'#{format_name(name)}']")
+      str << build_part(method_name, "#{variable}[:'#{format_name(name)}']")
       str << "end\n" if build_condition(config)
     end
 
@@ -67,7 +78,7 @@ module Pump
       unless config.has_key?(:static_value)
         str << "object.#{method_name}.each do |object| "
         str << "#{variable}[:'#{format_name(name)}'] << {}\n"
-        str << build_string(config[:array], "#{variable}[:'#{format_name(name)}'][-1]")
+        str << build_part(config[:array], "#{variable}[:'#{format_name(name)}'][-1]")
         str << "end\n"
       end
       str << "end\n" if build_condition(config)

data/lib/pump/version.rb

@@ -1,3 +1,3 @@
 module Pump
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pump
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sebastian Munz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport