tokamak 1.1.4 → 1.1.5

data/lib/tokamak/builder/json.rb

@@ -43,10 +43,11 @@ module Tokamak
       def link(relationship, uri, options = {})
         # Start link array
         @current["link"] = [] unless @current["link"]
-        
+        stringify_keys(options) 
+
         options["rel"]  = relationship.to_s
         options["href"] = uri
-        options["type"] ||= options[:type] || "application/json"
+        options["type"] ||= "application/json"
         insert_value("link", nil, options)
       end
 
@@ -109,6 +110,11 @@ module Tokamak
         end
       end
 
+      def stringify_keys(hash)
+        hash.keys.each do |key|
+          hash[key.to_s] = hash.delete(key)
+        end
+      end
     end
   end
 end

data/lib/tokamak/builder/values.rb

@@ -8,7 +8,7 @@ module Tokamak
 
       # BlankSlate
       instance_methods.each do |m|
-        undef_method m unless m.to_s =~ /\[\]|method_missing|respond_to\?|^__/
+        undef_method m unless m.to_s =~ /\[\]|method_missing|object_id|respond_to\?|^__/
       end
 
       def initialize(builder)

data/lib/tokamak/hook/rails.rb

@@ -66,13 +66,12 @@ module Tokamak
       if defined? ::ActionView::Template and ::ActionView::Template.respond_to?(:register_template_handler)
         ::ActionView::Template
       else
+        if defined? ::ActionController::Base
+          ::ActionController::Base.exempt_from_layout :tokamak
+        end
         ::ActionView::Base
       end.register_template_handler(:tokamak, Tokamak)
 
-      if defined? ::ActionController::Base
-        ::ActionController::Base.exempt_from_layout :tokamak
-      end
-
     end
   end
 end

data/lib/tokamak/version.rb

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

data/test/rails2_skel/log/development.log

@@ -1243,3 +1243,33 @@ Completed in 55ms (View: 53 | 200 OK [http://www.example.com/test/feed]
 Processing TestController#show (for 127.0.0.1 at 2011-02-16 16:46: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-02-24 08:48:24) [GET]
+Rendering test/show
+Completed in 105ms (View: 102 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-02-24 08:48:24) [GET]
+Rendering test/feed
+Completed in 69ms (View: 68 | 200 OK [http://www.example.com/test/feed]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-02-24 08:48:24) [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-02-24 08:48:44) [GET]
+Rendering test/show
+Completed in 7ms (View: 6 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-02-24 08:48:44) [GET]
+Rendering test/feed
+Completed in 13ms (View: 11 | 200 OK [http://www.example.com/test/feed]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-02-24 08:48:44) [GET]
+Rendering test/show
+Completed in 4ms (View: 2 | 200 OK [http://www.example.com/test/show]

data/test/tokamak/builder/values_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class Tokamak::Builder::ValuesTest < Test::Unit::TestCase
+
+  def test_should_not_remove_important_methods
+    values = Tokamak::Builder::Values.new(nil)
+    assert values.respond_to? :method_missing
+    assert values.respond_to? :object_id
+    assert values.respond_to? :respond_to?
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tokamak
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Luis Cipriani
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -02:00
+date: 2011-02-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -207,6 +207,7 @@ files:
 - test/test_helper.rb
 - test/tokamak/builder/base_test.rb
 - test/tokamak/builder/json_test.rb
+- test/tokamak/builder/values_test.rb
 - test/tokamak/builder/xml_test.rb
 - test/tokamak/helper_test.rb
 - test/tokamak/hook/rails_test.rb