From c12e14700fa7655da67415d61b7d36d7113c6065 Mon Sep 17 00:00:00 2001 From: ccocchi Date: Fri, 20 Apr 2012 16:28:34 +0200 Subject: [PATCH] rabl-fast-json => rabl-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- README.md | 2 +- Rakefile | 2 +- lib/rabl-fast-json/renderer.rb | 2 -- lib/{rabl-fast-json.rb => rabl-rails.rb} | 16 ++++++++-------- lib/{rabl-fast-json => rabl-rails}/compiler.rb | 2 +- lib/{rabl-fast-json => rabl-rails}/handler.rb | 4 ++-- lib/{rabl-fast-json => rabl-rails}/library.rb | 4 ++-- lib/{rabl-fast-json => rabl-rails}/railtie.rb | 4 ++-- lib/rabl-rails/renderer.rb | 2 ++ .../renderers/base.rb | 2 +- .../renderers/json.rb | 2 +- lib/{rabl-fast-json => rabl-rails}/template.rb | 2 +- lib/{rabl-fast-json => rabl-rails}/version.rb | 2 +- ...rabl-fast-json_tasks.rake => rabl-rails.rake} | 2 +- rabl-fast-json.gemspec => rabl-rails.gemspec | 10 +++++----- test/cache_templates_test.rb | 6 +++--- test/compiler_test.rb | 14 +++++++------- test/deep_nesting_test.rb | 4 ++-- test/non_restful_response_test.rb | 4 ++-- test/renderers/json_renderer_test.rb | 12 ++++++------ test/test_helper.rb | 2 +- 23 files changed, 53 insertions(+), 53 deletions(-) mode change 100644 => 100755 Rakefile delete mode 100644 lib/rabl-fast-json/renderer.rb rename lib/{rabl-fast-json.rb => rabl-rails.rb} (58%) rename lib/{rabl-fast-json => rabl-rails}/compiler.rb (99%) rename lib/{rabl-fast-json => rabl-rails}/handler.rb (80%) rename lib/{rabl-fast-json => rabl-rails}/library.rb (92%) rename lib/{rabl-fast-json => rabl-rails}/railtie.rb (80%) create mode 100644 lib/rabl-rails/renderer.rb rename lib/{rabl-fast-json => rabl-rails}/renderers/base.rb (99%) rename lib/{rabl-fast-json => rabl-rails}/renderers/json.rb (85%) rename lib/{rabl-fast-json => rabl-rails}/template.rb (88%) rename lib/{rabl-fast-json => rabl-rails}/version.rb (54%) rename lib/tasks/{rabl-fast-json_tasks.rake => rabl-rails.rake} (71%) rename rabl-fast-json.gemspec => rabl-rails.gemspec (73%) diff --git a/Gemfile b/Gemfile index 516b68f..577d5f7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "http://rubygems.org" -# Declare your gem's dependencies in rabl-fast-json.gemspec. +# Declare your gem's dependencies in rabl-rails.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. gemspec diff --git a/Gemfile.lock b/Gemfile.lock index c2c5f09..a07074c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - rabl-fast-json (0.1.0) + rabl-rails (0.1.0) activesupport (~> 3.2.1) GEM @@ -61,7 +61,7 @@ PLATFORMS DEPENDENCIES actionpack (~> 3.2.1) - rabl-fast-json! + rabl-rails! railties (~> 3.2.1) rspec-mocks sqlite3 diff --git a/README.md b/README.md index 24bb8db..7162f32 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -= RablFastJson += RablRails This project rocks and uses MIT-LICENSE. \ No newline at end of file diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 index 065f9e5..e54349b --- a/Rakefile +++ b/Rakefile @@ -14,7 +14,7 @@ # # RDoc::Task.new(:rdoc) do |rdoc| # rdoc.rdoc_dir = 'rdoc' -# rdoc.title = 'RablFastJson' +# rdoc.title = 'RablRails' # rdoc.options << '--line-numbers' # rdoc.rdoc_files.include('README.rdoc') # rdoc.rdoc_files.include('lib/**/*.rb') diff --git a/lib/rabl-fast-json/renderer.rb b/lib/rabl-fast-json/renderer.rb deleted file mode 100644 index 3065875..0000000 --- a/lib/rabl-fast-json/renderer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'rabl-fast-json/renderers/base' -require 'rabl-fast-json/renderers/json' \ No newline at end of file diff --git a/lib/rabl-fast-json.rb b/lib/rabl-rails.rb similarity index 58% rename from lib/rabl-fast-json.rb rename to lib/rabl-rails.rb index 0fcadee..77c6c4c 100644 --- a/lib/rabl-fast-json.rb +++ b/lib/rabl-rails.rb @@ -4,19 +4,19 @@ require 'active_support' require 'active_support/json' require 'active_support/core_ext/class/attribute_accessors' -require 'rabl-fast-json/version' -require 'rabl-fast-json/template' -require 'rabl-fast-json/compiler' +require 'rabl-rails/version' +require 'rabl-rails/template' +require 'rabl-rails/compiler' -require 'rabl-fast-json/renderer' +require 'rabl-rails/renderer' -require 'rabl-fast-json/library' -require 'rabl-fast-json/handler' -require 'rabl-fast-json/railtie' +require 'rabl-rails/library' +require 'rabl-rails/handler' +require 'rabl-rails/railtie' -module RablFastJson +module RablRails extend self mattr_accessor :cache_templates diff --git a/lib/rabl-fast-json/compiler.rb b/lib/rabl-rails/compiler.rb similarity index 99% rename from lib/rabl-fast-json/compiler.rb rename to lib/rabl-rails/compiler.rb index 8619b26..43976b9 100644 --- a/lib/rabl-fast-json/compiler.rb +++ b/lib/rabl-rails/compiler.rb @@ -1,4 +1,4 @@ -module RablFastJson +module RablRails # # Class that will compile RABL source code into a hash # representing data structure diff --git a/lib/rabl-fast-json/handler.rb b/lib/rabl-rails/handler.rb similarity index 80% rename from lib/rabl-fast-json/handler.rb rename to lib/rabl-rails/handler.rb index c86635c..8cc028e 100644 --- a/lib/rabl-fast-json/handler.rb +++ b/lib/rabl-rails/handler.rb @@ -1,4 +1,4 @@ -module RablFastJson +module RablRails module Handlers class Rabl cattr_accessor :default_format @@ -6,7 +6,7 @@ module RablFastJson def self.call(template) %{ - RablFastJson::Library.instance. + RablRails::Library.instance. get_rendered_template(#{template.source.inspect}, self) } end diff --git a/lib/rabl-fast-json/library.rb b/lib/rabl-rails/library.rb similarity index 92% rename from lib/rabl-fast-json/library.rb rename to lib/rabl-rails/library.rb index 62b511e..a727e7f 100644 --- a/lib/rabl-fast-json/library.rb +++ b/lib/rabl-rails/library.rb @@ -1,6 +1,6 @@ require 'singleton' -module RablFastJson +module RablRails class Library include Singleton @@ -19,7 +19,7 @@ module RablFastJson end def get_compiled_template(path, source) - if path && RablFastJson.cache_templates? + if path && RablRails.cache_templates? @cached_templates[path] ||= Compiler.new.compile_source(source) @cached_templates[path].dup else diff --git a/lib/rabl-fast-json/railtie.rb b/lib/rabl-rails/railtie.rb similarity index 80% rename from lib/rabl-fast-json/railtie.rb rename to lib/rabl-rails/railtie.rb index 0bc78c3..207bd61 100644 --- a/lib/rabl-fast-json/railtie.rb +++ b/lib/rabl-rails/railtie.rb @@ -1,8 +1,8 @@ -module RablFastJson +module RablRails class Railtie < Rails::Railtie initializer "rabl.initialize" do |app| ActiveSupport.on_load(:action_view) do - ActionView::Template.register_template_handler :rabl, RablFastJson::Handlers::Rabl + ActionView::Template.register_template_handler :rabl, RablRails::Handlers::Rabl end end end diff --git a/lib/rabl-rails/renderer.rb b/lib/rabl-rails/renderer.rb new file mode 100644 index 0000000..0ee0acf --- /dev/null +++ b/lib/rabl-rails/renderer.rb @@ -0,0 +1,2 @@ +require 'rabl-rails/renderers/base' +require 'rabl-rails/renderers/json' \ No newline at end of file diff --git a/lib/rabl-fast-json/renderers/base.rb b/lib/rabl-rails/renderers/base.rb similarity index 99% rename from lib/rabl-fast-json/renderers/base.rb rename to lib/rabl-rails/renderers/base.rb index bb8bd9e..7f7e087 100644 --- a/lib/rabl-fast-json/renderers/base.rb +++ b/lib/rabl-rails/renderers/base.rb @@ -1,4 +1,4 @@ -module RablFastJson +module RablRails module Renderers class PartialError < StandardError; end diff --git a/lib/rabl-fast-json/renderers/json.rb b/lib/rabl-rails/renderers/json.rb similarity index 85% rename from lib/rabl-fast-json/renderers/json.rb rename to lib/rabl-rails/renderers/json.rb index ed36cef..f903476 100644 --- a/lib/rabl-fast-json/renderers/json.rb +++ b/lib/rabl-rails/renderers/json.rb @@ -1,4 +1,4 @@ -module RablFastJson +module RablRails module Renderers class JSON < Base def format_output(hash) diff --git a/lib/rabl-fast-json/template.rb b/lib/rabl-rails/template.rb similarity index 88% rename from lib/rabl-fast-json/template.rb rename to lib/rabl-rails/template.rb index 8445de1..403b701 100644 --- a/lib/rabl-fast-json/template.rb +++ b/lib/rabl-rails/template.rb @@ -1,4 +1,4 @@ -module RablFastJson +module RablRails class CompiledTemplate attr_accessor :source, :data, :root_name diff --git a/lib/rabl-fast-json/version.rb b/lib/rabl-rails/version.rb similarity index 54% rename from lib/rabl-fast-json/version.rb rename to lib/rabl-rails/version.rb index 37c0dc8..f73f1e5 100644 --- a/lib/rabl-fast-json/version.rb +++ b/lib/rabl-rails/version.rb @@ -1,3 +1,3 @@ -module RablFastJson +module RablRails VERSION = '0.1.0' end diff --git a/lib/tasks/rabl-fast-json_tasks.rake b/lib/tasks/rabl-rails.rake similarity index 71% rename from lib/tasks/rabl-fast-json_tasks.rake rename to lib/tasks/rabl-rails.rake index 8762ae3..0a0b7a3 100644 --- a/lib/tasks/rabl-fast-json_tasks.rake +++ b/lib/tasks/rabl-rails.rake @@ -1,4 +1,4 @@ # desc "Explaining what the task does" -# task :rabl-fast-json do +# task :rabl-rails do # # Task goes here # end diff --git a/rabl-fast-json.gemspec b/rabl-rails.gemspec similarity index 73% rename from rabl-fast-json.gemspec rename to rabl-rails.gemspec index de27583..0748115 100644 --- a/rabl-fast-json.gemspec +++ b/rabl-rails.gemspec @@ -1,17 +1,17 @@ $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's version: -require "rabl-fast-json/version" +require "rabl-rails/version" # Describe your gem and declare its dependencies: Gem::Specification.new do |s| - s.name = "rabl-fast-json" - s.version = RablFastJson::VERSION + s.name = "rabl-rails" + s.version = RablRails::VERSION s.authors = ["TODO: Your name"] s.email = ["TODO: Your email"] s.homepage = "TODO" - s.summary = "TODO: Summary of RablFastJson." - s.description = "TODO: Description of RablFastJson." + s.summary = "TODO: Summary of RablRails." + s.description = "TODO: Description of RablRails." s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"] s.test_files = Dir["test/**/*"] diff --git a/test/cache_templates_test.rb b/test/cache_templates_test.rb index 3d792df..7a7797c 100644 --- a/test/cache_templates_test.rb +++ b/test/cache_templates_test.rb @@ -3,9 +3,9 @@ require 'test_helper' class CacheTemplatesTest < ActiveSupport::TestCase setup do - RablFastJson::Library.reset_instance - @library = RablFastJson::Library.instance - RablFastJson.cache_templates = true + RablRails::Library.reset_instance + @library = RablRails::Library.instance + RablRails.cache_templates = true end test "cache templates if perform_caching is active and cache_templates is enabled" do diff --git a/test/compiler_test.rb b/test/compiler_test.rb index c9b550f..944fc56 100644 --- a/test/compiler_test.rb +++ b/test/compiler_test.rb @@ -4,11 +4,11 @@ class CompilerTest < ActiveSupport::TestCase setup do @user = User.new - @compiler = RablFastJson::Compiler.new + @compiler = RablRails::Compiler.new end test "compiler return a compiled template" do - assert_instance_of RablFastJson::CompiledTemplate, @compiler.compile_source("") + assert_instance_of RablRails::CompiledTemplate, @compiler.compile_source("") end test "object set data for the template" do @@ -91,10 +91,10 @@ class CompilerTest < ActiveSupport::TestCase end test "child with succint partial notation" do - mock_template = RablFastJson::CompiledTemplate.new + mock_template = RablRails::CompiledTemplate.new mock_template.source = { :id => :id } - RablFastJson::Library.reset_instance - RablFastJson::Library.instance.stub(:get).with('users/base').and_return(mock_template) + RablRails::Library.reset_instance + RablRails::Library.instance.stub(:get).with('users/base').and_return(mock_template) t = @compiler.compile_source(%{child(:user, :partial => 'users/base') }) assert_equal( {:user => { :_data => :user, :id => :id } }, t.source) @@ -119,8 +119,8 @@ class CompilerTest < ActiveSupport::TestCase test "extends use other template source as itself" do template = mock('template', :source => { :id => :id }) - RablFastJson::Library.reset_instance - RablFastJson::Library.instance.stub(:get).with('users/base').and_return(template) + RablRails::Library.reset_instance + RablRails::Library.instance.stub(:get).with('users/base').and_return(template) t = @compiler.compile_source(%{ extends 'users/base' }) assert_equal({ :id => :id }, t.source) end diff --git a/test/deep_nesting_test.rb b/test/deep_nesting_test.rb index 2dca67a..7fc8bed 100644 --- a/test/deep_nesting_test.rb +++ b/test/deep_nesting_test.rb @@ -15,7 +15,7 @@ class DeepNestingTest < ActiveSupport::TestCase end setup do - RablFastJson::Library.reset_instance + RablRails::Library.reset_instance @post = Post.new(42, 'I rock !') @user = User.new(1, 'foobar', 'male') @user.stub(:posts).and_return([@post]) @@ -50,7 +50,7 @@ class DeepNestingTest < ActiveSupport::TestCase { :content => 'second' } ] }] - }), RablFastJson::Library.instance.get_rendered_template(source, @context)) + }), RablRails::Library.instance.get_rendered_template(source, @context)) end end diff --git a/test/non_restful_response_test.rb b/test/non_restful_response_test.rb index d0a7e83..44c3109 100644 --- a/test/non_restful_response_test.rb +++ b/test/non_restful_response_test.rb @@ -2,7 +2,7 @@ require 'test_helper' class NonRestfulResponseTest < ActiveSupport::TestCase setup do - RablFastJson::Library.reset_instance + RablRails::Library.reset_instance @user = User.new(1, 'foo', 'male') @user.stub_chain(:posts, :count).and_return(10) @@ -30,6 +30,6 @@ class NonRestfulResponseTest < ActiveSupport::TestCase :id => 1, :name => 'foo' } - }), RablFastJson::Library.instance.get_rendered_template(source, @context)) + }), RablRails::Library.instance.get_rendered_template(source, @context)) end end \ No newline at end of file diff --git a/test/renderers/json_renderer_test.rb b/test/renderers/json_renderer_test.rb index b4fd0ec..a871a81 100644 --- a/test/renderers/json_renderer_test.rb +++ b/test/renderers/json_renderer_test.rb @@ -10,12 +10,12 @@ class TestJsonRenderer < ActiveSupport::TestCase @context.stub(:instance_variable_get).with(:@data).and_return(@data) @context.stub(:instance_variable_get).with(:@_assigns).and_return({}) - @template = RablFastJson::CompiledTemplate.new + @template = RablRails::CompiledTemplate.new @template.data = :@data end def render_json_output - RablFastJson::Renderers::JSON.new(@context).render(@template).to_s + RablRails::Renderers::JSON.new(@context).render(@template).to_s end test "render object wth empty template" do @@ -83,10 +83,10 @@ class TestJsonRenderer < ActiveSupport::TestCase @data.stub(:respond_to?).with(:empty?).and_return(false) # Stub Library#get - t = RablFastJson::CompiledTemplate.new + t = RablRails::CompiledTemplate.new t.source = { :name => :name } - RablFastJson::Library.reset_instance - RablFastJson::Library.instance.should_receive(:get).with('users/base').and_return(t) + RablRails::Library.reset_instance + RablRails::Library.instance.should_receive(:get).with('users/base').and_return(t) @template.data = false @template.source = { :user => ->(s) { partial('users/base', :object => @user) } } @@ -98,7 +98,7 @@ class TestJsonRenderer < ActiveSupport::TestCase @template.data = false @template.source = { :user => ->(s) { partial('users/base') } } - assert_raises(RablFastJson::Renderers::PartialError) { render_json_output } + assert_raises(RablRails::Renderers::PartialError) { render_json_output } end test "partial with empty values should not raise an error" do diff --git a/test/test_helper.rb b/test/test_helper.rb index c9f4c64..1a054dc 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -21,7 +21,7 @@ class <