rabl-rails 0.3.3 → 0.3.4

data/.travis.yml

@@ -1,5 +1,11 @@
 language: ruby
+env:
+  - "RAILS_VERSION=3.1.0"
+  - "RAILS_VERSION=3.2.0"
+  - "RAILS_VERSION=4.0.0"
 rvm:
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx
+  - 2.0.0
+  - 2.1.0

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 0.3.4
+  * Add `xml_options` option to root_level (brettallred)
+
+  * Format can be omitted in template filename
+
+      RablRails.allow_empty_format_in_template = true
+      RablRails.render(user, 'show') # => app/view/user.rabl
+
+  * Rails 4 support
+  * Update travis configuration and remove warning in tests (petergoldstein)
+
 ## 0.3.3
   * Add response caching
 

data/Gemfile

@@ -1,7 +1,25 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
+rails_version = ENV['RAILS_VERSION'] || 'default'
+
+rails = case rails_version
+when 'master'
+  {github: 'rails/rails'}
+when "default"
+  '~> 3.2.0'
+else
+  "~> #{rails_version}"
+end
+
+gem 'activesupport', rails
+gem 'railties', rails
+
+group :development, :test do
+  gem 'actionpack', rails
+end
+
 gem 'plist'
 
 platforms :ruby do
@@ -16,6 +34,9 @@ platforms :jruby do
   gem 'nokogiri'
 end
 
-group :test do
-  gem 'rspec-mocks'
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'minitest'
+  gem 'rubysl-test-unit'
 end
+

data/README.md

@@ -93,6 +93,7 @@ RablRails.configure do |config|
   # config.include_json_root = true
   # config.json_engine = :oj
   # config.xml_engine = 'LibXML'
+  # config.xml_options = { :dasherize => true, :skip_types => false }
   # config.use_custom_responder = false
   # config.default_responder_template = 'show'
   # config.enable_jsonp_callbacks = false
@@ -278,7 +279,7 @@ end
 There are cases when you want to render object outside Rails view context. For instance to render objects in the console or to create message queue payloads. For these situations, you can use `RablRails.render` as show below:
 
 ```ruby
-Rabl.render(object, template, :view_path => 'app/views', :format => :json) #=> "{...}"
+RablRails.render(object, template, :view_path => 'app/views', :format => :json) #=> "{...}"
 ```
 
 You can find more informations about how to use this method in the [wiki](http://github.com/ccocchi/rabl-rails/wiki/Render-object-directly)

data/lib/rabl-rails.rb

@@ -42,6 +42,12 @@ module RablRails
   mattr_accessor :enable_jsonp_callbacks
   @@enable_jsonp_callbacks = false
 
+  mattr_accessor :allow_empty_format_in_template
+  @@allow_empty_format_in_template = false
+
+  mattr_accessor :xml_options
+  @@xml_options = { dasherize: true, skip_types: false }
+
   def self.configure
     yield self
 

data/lib/rabl-rails/renderer.rb

@@ -15,7 +15,7 @@ module RablRails
 
       def initialize(view_path, format)
         @view_path = view_path || RablRails::Renderer.view_path
-        @format = format.to_s.downcase
+        @extension = format ? ".#{format.to_s.downcase}.rabl" : ".rabl"
       end
 
       #
@@ -24,7 +24,7 @@ module RablRails
       # path is used
       #
       def find_template(name, opt, partial = false)
-        path = File.join(@view_path, "#{name}.#{@format}.rabl")
+        path = File.join(@view_path, "#{name}#{@extension}")
         File.exists?(path) ? T.new(File.read(path)) : nil
       end
     end
@@ -38,7 +38,7 @@ module RablRails
 
       def initialize(path, options)
         @virtual_path = path
-        @format = options.delete(:format) || 'json'
+        @format = options.delete(:format) || (RablRails.allow_empty_format_in_template ? nil : 'json')
         @_assigns = {}
         @options = options
 

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

@@ -3,10 +3,8 @@ require 'active_support/core_ext/hash/conversions'
 module RablRails
   module Renderers
     class XML < Base
-      DEFAULT_OPTIONS = { dasherize: true, skip_types: false }
-
       def format_output(hash)
-      	xml_options = { root: _options[:root_name] }.merge!(DEFAULT_OPTIONS)
+      	xml_options = { root: _options[:root_name] }.merge!(RablRails.xml_options)
 				hash.to_xml(xml_options)
       end
 

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/rabl-rails.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- test/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "activesupport", "~> 3.0"
-  s.add_dependency "railties", "~> 3.0"
+  s.add_dependency "activesupport", ">= 3.1"
+  s.add_dependency "railties", ">= 3.1"
 
-  s.add_development_dependency "actionpack", "~> 3.0"
+  s.add_development_dependency "actionpack", ">= 3.1"
   s.add_development_dependency "rspec-mocks"
 end

data/test/base_renderer_test.rb

@@ -18,7 +18,7 @@ class TestBaseRenderer < ActiveSupport::TestCase
     @template.source = {}
     @template.data = :@data
 
-    @cache = mock
+    @cache = double
     Rails.stub(:cache).and_return(@cache)
   end
 

data/test/compiler_test.rb

@@ -160,7 +160,7 @@ class CompilerTest < ActiveSupport::TestCase
   end
 
   test "extends use other template source as itself" do
-    template = mock('template', :source => { :id => :id })
+    template = double('template', :source => { :id => :id })
     RablRails::Library.reset_instance
     RablRails::Library.instance.stub(:compile_template_from_path).with('users/base').and_return(template)
     t = @compiler.compile_source(%{ extends 'users/base' })

data/test/deep_nesting_test.rb

@@ -23,7 +23,7 @@ class DeepNestingTest < ActiveSupport::TestCase
     @context = Context.new
     @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 })))
+    @context.stub(:lookup_context).and_return(double(:find_template => double(:source => %{ object :@comment\n attribute :content })))
   end
 
   test "compile and render deep nesting template" do

data/test/render_test.rb

@@ -73,4 +73,20 @@ class RenderTest < ActiveSupport::TestCase
     assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path, format: 'JSON')
   end
 
+  test "format can be omitted if option is set" do
+    begin
+      RablRails.allow_empty_format_in_template = true
+      File.open(@tmp_path + "show.rabl", "w") do |f|
+        f.puts %q{
+          object :@user
+          attributes :id, :name
+        }
+      end
+
+      assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path)
+    ensure
+      RablRails.allow_empty_format_in_template = false
+    end
+  end
+
 end

data/test/renderers/json_renderer_test.rb

@@ -40,7 +40,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
   end
 
   test "render child with object association" do
-    @data.stub(:address).and_return(mock(:city => 'Paris'))
+    @data.stub(:address).and_return(double(:city => 'Paris'))
     @template.source = { :address => { :_data => :address, :city => :city } }
     assert_equal %q({"address":{"city":"Paris"}}), render_json_output
   end
@@ -180,7 +180,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
     @data.stub(:cache_key).and_return('data_cache_key')
     @template.cache_key = nil
 
-    @cache = mock
+    @cache = double
     @cache.should_receive(:fetch).with('data_cache_key.json').and_return(%("some":"json"))
     Rails.stub(:cache).and_return(@cache)
 

data/test/renderers/plist_renderer_test.rb

@@ -48,7 +48,7 @@ class TestPlistRenderer < ActiveSupport::TestCase
   end
 
   test "render child with object association" do
-    @data.stub(:address).and_return(mock(:city => 'Paris'))
+    @data.stub(:address).and_return(double(:city => 'Paris'))
     @template.source = { :address => { :_data => :address, :city => :city } }
     assert_equal %q(<key>address</key><dict><key>city</key><string>Paris</string></dict>), render_plist_output
   end

data/test/renderers/xml_renderer_test.rb

@@ -128,4 +128,10 @@ class TestXmlRenderer < ActiveSupport::TestCase
 
     assert_equal %q(<list><users type="array"/></list>), render_xml_output
   end
+
+  test "render underscorized xml" do
+    RablRails.xml_options = { :dasherize => false, :skip_types => false }
+    @template.source = { :first_name => :name }
+    assert_equal %q(<user><first_name>foobar</first_name></user>), render_xml_output
+  end
 end

metadata

@@ -1,87 +1,83 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rabl-rails
-version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 4
+  version: 0.3.4
 platform: ruby
-authors:
+authors: 
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-04-02 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: railties
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-mocks
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Fast Rails 3+ templating system with JSON, XML and PList support
-email:
+email: 
 - cocchi.c@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -116,31 +112,37 @@ files:
 - test/renderers/plist_renderer_test.rb
 - test/renderers/xml_renderer_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: https://github.com/ccocchi/rabl-rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Fast Rails 3+ templating system with JSON, XML and PList support
-test_files:
+test_files: 
 - test/base_renderer_test.rb
 - test/cache_templates_test.rb
 - test/compiler_test.rb