rabl-rails 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# CHANGELOG
+
+## 0.1.1
+
+  * Add CHANGELOG
+  * Remove unnused test in loop
+  * Speed up rendering by not double copying variable from context
+  * Rename private variable to avoid name conflict
+  * Remove sqlite3 development dependency

data/Gemfile.lock

@@ -53,7 +53,6 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
     thor (0.15.4)
     tilt (1.3.3)
     yajl-ruby (1.1.0)
@@ -65,5 +64,4 @@ DEPENDENCIES
   actionpack (~> 3.0)
   rabl-rails!
   rspec-mocks
-  sqlite3
   yajl-ruby

data/lib/rabl-rails/renderers/base.rb

@@ -3,11 +3,11 @@ module RablRails
     class PartialError < StandardError; end
 
     class Base
-      attr_accessor :options
+      attr_accessor :_options
 
       def initialize(context) # :nodoc:
         @_context = context
-        @options = {}
+        @_options = {}
         setup_render_context
       end
 
@@ -18,10 +18,10 @@ module RablRails
       # method defined by the renderer.
       #
       def render(template)
-        collection_or_resource = @_context.instance_variable_get(template.data) if template.data
+        collection_or_resource = instance_variable_get(template.data) if template.data
         output_hash = collection_or_resource.respond_to?(:each) ? render_collection(collection_or_resource, template.source) :
           render_resource(collection_or_resource, template.source)
-        options[:root_name] = template.root_name
+        _options[:root_name] = template.root_name
         format_output(output_hash)
       end
 
@@ -54,7 +54,7 @@ module RablRails
           when Hash
             current_value = value.dup
             data_symbol = current_value.delete(:_data)
-            object = data_symbol.nil? ? data : data_symbol.to_s.start_with?('@') ? @_context.instance_variable_get(data_symbol) : data.send(data_symbol)
+            object = data_symbol.nil? ? data : data_symbol.to_s.start_with?('@') ? instance_variable_get(data_symbol) : data.send(data_symbol)
 
             if key.to_s.start_with?('_') # glue
               current_value.each_pair { |k, v|
@@ -108,7 +108,7 @@ module RablRails
       #
       def setup_render_context
         @_context.instance_variable_get(:@_assigns).each_pair { |k, v|
-          instance_variable_set("@#{k}", v) unless k.start_with?('_') || k == @data
+          instance_variable_set("@#{k}", v) unless k.start_with?('_')
         }
       end
     end

data/lib/rabl-rails/renderers/json.rb

@@ -2,7 +2,7 @@ module RablRails
   module Renderers
     class JSON < Base
       def format_output(hash)
-        hash = { options[:root_name] => hash } if options[:root_name] && RablRails.include_json_root
+        hash = { _options[:root_name] => hash } if _options[:root_name] && RablRails.include_json_root
         MultiJson.encode(hash)
       end
     end

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/rabl-rails.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", "~> 3.0"
   s.add_dependency "railties", "~> 3.0"
 
-  s.add_development_dependency "sqlite3"
   s.add_development_dependency "actionpack", "~> 3.0"
 end

data/test/deep_nesting_test.rb

@@ -22,9 +22,8 @@ class DeepNestingTest < ActiveSupport::TestCase
     @user.stub(:respond_to?).with(:each).and_return(false)
 
     @context = Context.new
-    @context.stub(:instance_variable_get).with(:@user).and_return(@user)
-    @context.stub(:instance_variable_get).with(:@virtual_path).and_return('users/show')
-    @context.stub(:instance_variable_get).with(:@_assigns).and_return({})
+    @context.assigns['user'] = @user
+    @context.virtual_path = 'users/show'
     @context.stub(:lookup_context).and_return(mock(:find_template => mock(:source => %{ object :@comment\n attribute :content })))
   end
 

data/test/renderers/json_renderer_test.rb

@@ -7,8 +7,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
     @data.stub(:respond_to?).with(:each).and_return(false)
 
     @context = Context.new
-    @context.stub(:instance_variable_get).with(:@data).and_return(@data)
-    @context.stub(:instance_variable_get).with(:@_assigns).and_return({})
+    @context.assigns['data'] = @data
 
     @template = RablRails::CompiledTemplate.new
     @template.data = :@data
@@ -24,7 +23,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
   end
 
   test "render collection with empty template" do
-    @context.stub(:instance_variable_get).with(:@data).and_return([@data])
+    @context.assigns['data'] = [@data]
     @template.source = {}
     assert_equal %q([{}]), render_json_output
   end
@@ -52,7 +51,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
 
   test "render collection with attributes" do
     @data = [User.new(1, 'foo', 'male'), User.new(2, 'bar', 'female')]
-    @context.stub(:instance_variable_get).with(:@data).and_return(@data)
+    @context.assigns['data'] = @data
     @template.source = { :uid => :id, :name => :name, :gender => :sex }
     assert_equal %q([{"uid":1,"name":"foo","gender":"male"},{"uid":2,"name":"bar","gender":"female"}]), render_json_output
   end
@@ -87,8 +86,8 @@ class TestJsonRenderer < ActiveSupport::TestCase
 
   test "partial should be evaluated at rendering time" do
     # Set assigns
-    @context.stub(:instance_variable_get).with(:@_assigns).and_return({'user' => @data})
     @data.stub(:respond_to?).with(:empty?).and_return(false)
+    @context.assigns['user'] = @data
 
     # Stub Library#get
     t = RablRails::CompiledTemplate.new

data/test/test_helper.rb

@@ -31,10 +31,15 @@ module ActiveSupport
 end
 
 class Context
-  attr_accessor :virtual_path
-
+  attr_writer :virtual_path
+  
   def initialize
     @_assigns = {}
+    @virtual_path = nil
+  end
+  
+  def assigns
+    @_assigns
   end
 
   def params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -126,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Fast Rails 3+ templating system with JSON and XML support