tokamak 1.1.2 → 1.1.3

data/lib/tokamak/builder.rb

@@ -12,9 +12,7 @@ module Tokamak
           #{const.name}.build(obj, *args, &block)
         end
 
-        def member(obj, *args, &block)
-          #{const.name}.build(obj, *args, &block)
-        end
+        alias_method :member, :collection
       EOS
       mod
     end

data/lib/tokamak/builder/json.rb

@@ -41,7 +41,10 @@ module Tokamak
       end
 
       def link(relationship, uri, options = {})
-        options["rel"] = relationship.to_s
+        # Start link array
+        @current["link"] = [] unless @current["link"]
+        
+        options["rel"]  = relationship.to_s
         options["href"] = uri
         options["type"] ||= options[:type] || "application/json"
         insert_value("link", nil, options)

data/lib/tokamak/version.rb

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

data/test/rails2_skel/log/development.log

@@ -1183,3 +1183,63 @@ 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]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-06 17:03:09) [GET]
+Rendering test/show
+Completed in 9ms (View: 7 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-01-06 17:03:09) [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 17:03:09) [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 17:04:25) [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 17:04:25) [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 17:04:25) [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-28 15:01:35) [GET]
+Rendering test/show
+Completed in 13ms (View: 10 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-01-28 15:01:35) [GET]
+Rendering test/feed
+Completed in 48ms (View: 47 | 200 OK [http://www.example.com/test/feed]
+
+
+Processing TestController#show (for 127.0.0.1 at 2011-01-28 15:01:35) [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-16 16:46:22) [GET]
+Rendering test/show
+Completed in 8ms (View: 7 | 200 OK [http://www.example.com/test/show]
+
+
+Processing TestController#feed (for 127.0.0.1 at 2011-02-16 16:46:22) [GET]
+Rendering test/feed
+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]

data/test/test_helper.rb

@@ -1,7 +1,10 @@
 require 'test/unit'
 require 'rubygems'
-require 'ruby-debug'
 require "methodize"
 
+begin
+  require 'ruby-debug'
+rescue Exception => e; end
+
 require File.expand_path(File.dirname(__FILE__) + '/../lib/tokamak.rb')
 

data/test/tokamak/builder/json_test.rb

@@ -24,6 +24,7 @@ class Tokamak::Builder::JsonTest < Test::Unit::TestCase
     
     assert_equal "an_id", hash.id
     assert_equal "bar"  , hash.members.first.id
+    assert hash.members.kind_of?(Array)
   end
 
   def test_root_set_on_builder
@@ -69,6 +70,29 @@ class Tokamak::Builder::JsonTest < Test::Unit::TestCase
     assert_equal 4      , hash.members.size
   end
   
+  def test_collection_set_on_members_only_one
+    obj = { :foo => "bar" }
+    a_collection = [1]
+    json = Tokamak::Builder::Json.build(obj) do |collection|
+      collection.values do |values|
+        values.id "an_id"
+      end
+      
+      collection.members(:collection => a_collection) do |member, number|
+        member.values do |values|
+          values.id number
+        end        
+      end
+    end
+    
+    hash = JSON.parse(json).extend(Methodize)
+    
+    assert_equal "an_id", hash.id
+    assert_equal 1      , hash.members.first.id
+    assert_equal 1      , hash.members.size
+    assert hash.members.kind_of?(Array)
+  end
+  
   def test_raise_exception_for_not_passing_a_collection_as_parameter_to_members
     obj = 42
     
@@ -131,6 +155,33 @@ class Tokamak::Builder::JsonTest < Test::Unit::TestCase
     assert_equal 2      , hash.body.legs.count
     assert_equal 4      , hash.body.legs.last.left.fingers_count
   end
+  
+  def test_build_single_link_in_collection_and_member
+    obj = [{ :foo => "bar" }]
+    json = Tokamak::Builder::Json.build(obj) do |collection|
+      collection.values do |values|
+        values.id "an_id"
+      end
+      
+      collection.link 'self', "http://example.com/an_id"
+      
+      collection.members do |member, some_foos|
+        member.values do |values|
+          values.id some_foos[:foo]
+        end
+        
+        member.link 'self', "http://example.com/an_id/#{some_foos[:foo]}"
+      end
+    end
+    
+    hash = JSON.parse(json).extend(Methodize)
+    
+    assert_equal "an_id", hash.id
+    assert_equal "bar"  , hash.members.first.id
+    assert hash.members.kind_of?(Array)
+    assert hash.link.kind_of?(Array)
+    assert hash.members.first.link.kind_of?(Array)
+  end
 
   def test_build_full_collection
     time = Time.now

data/test/tokamak/hook/rails_test.rb

@@ -1,9 +1,12 @@
 require 'test/unit'
 require 'rubygems'
-require 'ruby-debug'
 require "methodize"
 require "rack/conneg"
 
+begin
+  require 'ruby-debug'
+rescue Exception => e; end
+
 require File.expand_path(File.dirname(__FILE__) + '/../../rails2_skel/config/environment.rb')
 
 # put the require below to use tokamak in your rails project

data/test/tokamak/hook/sinatra_test.rb

@@ -1,10 +1,13 @@
 require 'test/unit'
 require 'rubygems'
-require 'ruby-debug'
 require "methodize"
 require "sinatra"
 require "rack/conneg"
 
+begin
+  require 'ruby-debug'
+rescue Exception => e; end
+
 # requiring the hook for sinatra
 require "tokamak/hook/sinatra"
 

data/test/tokamak/hook/tilt_test.rb

@@ -1,9 +1,12 @@
 require 'test/unit'
 require 'rubygems'
-require 'ruby-debug'
 require "methodize"
 require "tilt"
 
+begin
+  require 'ruby-debug'
+rescue Exception => e; end
+
 require "tokamak/hook/tilt"
 
 class Tokamak::Hook::TiltTest < Test::Unit::TestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tokamak
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Luis Cipriani
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -02:00
+date: 2011-02-16 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency