tokamak 1.1.1 → 1.1.2

data/lib/tokamak/builder.rb

@@ -1,9 +1,9 @@
 module Tokamak
   module Builder
-    autoload :Base  , "tokamak/builder/base"
-    autoload :Values, "tokamak/builder/values"
-    autoload :Json  , "tokamak/builder/json"
-    autoload :Xml   , "tokamak/builder/xml"
+    require "tokamak/builder/base"
+    require "tokamak/builder/values"
+    require "tokamak/builder/json"
+    require "tokamak/builder/xml"
 
     def self.helper_module_for(const)
       mod = Module.new

data/lib/tokamak/builder/json.rb

@@ -1,5 +1,3 @@
-require "json/pure"
-
 module Tokamak
   module Builder
     class Json < Tokamak::Builder::Base
@@ -9,11 +7,17 @@ module Tokamak
       attr_reader :raw
 
       def initialize(obj, options = {})
+        initialize_library
         @raw     = options[:root] ? { options[:root] => {} } : {}
         @current = options[:root] ? @raw[options[:root]]     : @raw
         @obj     = obj
       end
 
+      def initialize_library
+        return if defined?(::JSON)
+        require "json/pure"
+      end
+
       def members(options = {}, &block)
         collection = options[:collection] || @obj
         raise Tokamak::BuilderError.new("Members method require a collection to execute") unless collection.respond_to?(:each)

data/lib/tokamak/builder/xml.rb

@@ -1,5 +1,3 @@
-require "nokogiri"
-
 module Tokamak
   module Builder
     class Xml < Tokamak::Builder::Base
@@ -9,12 +7,18 @@ module Tokamak
       attr_reader :raw
 
       def initialize(obj, options = {})
+        initialize_library
         @raw = Nokogiri::XML::Document.new
         @obj = obj
         @parent = @raw.create_element(options[:root] || "root")
         @parent.parent = @raw
       end
 
+      def initialize_library
+        return if defined?(::Nokogiri)
+        require "nokogiri"
+      end
+
       def members(options = {}, &block)
         collection = options[:collection] || @obj
         raise Tokamak::BuilderError.new("Members method require a collection to execute") unless collection.respond_to?(:each)

data/lib/tokamak/version.rb

@@ -2,7 +2,7 @@ module Tokamak
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rails2_skel/log/development.log

@@ -1138,3 +1138,48 @@ Completed in 11ms (View: 9 | 200 OK [http://www.example.com/test/feed]
 Processing TestController#show (for 127.0.0.1 at 2011-01-06 09:57:09) [GET]
 Rendering test/show
 Completed in 4ms (View: 3 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 16:45:51) [GET]
+Rendering test/show
+Completed in 23ms (View: 22 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-01-06 16:45:51) [GET]
+Rendering test/feed
+Completed in 12ms (View: 11 | 200 OK [http://www.example.com/test/feed]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 16:45:51) [GET]
+Rendering test/show
+Completed in 5ms (View: 3 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 16:55:22) [GET]
+Rendering test/show
+Completed in 156ms (View: 154 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-01-06 16:55:22) [GET]
+Rendering test/feed
+Completed in 10ms (View: 9 | 200 OK [http://www.example.com/test/feed]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 16:55:22) [GET]
+Rendering test/show
+Completed in 4ms (View: 2 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 16:58:12) [GET]
+Rendering test/show
+Completed in 8ms (View: 6 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-01-06 16:58:12) [GET]
+Rendering test/feed
+Completed in 10ms (View: 9 | 200 OK [http://www.example.com/test/feed]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 16:58:12) [GET]
+Rendering test/show
+Completed in 4ms (View: 2 | 200 OK [http://www.example.com/test/show]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tokamak
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Luis Cipriani