frill 0.1.11 → 0.1.12

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/frill/rspec.rb

@@ -1,9 +1,9 @@
 module Frill
   module RSpec
     module Helpers
-      def frill model
+      def frill model, options={}
         view_context = ApplicationController.new.view_context.tap do |context|
-          context.controller.request ||= ActionController::TestRequest.new
+          context.controller.request ||= ActionController::TestRequest.new options
           context.request            ||= context.controller.request
           context.params             ||= {}
         end
@@ -29,4 +29,4 @@ RSpec.configure do |config|
   config.include Frill::RSpec::ExampleGroup, :type => :frill, :example_group => {
     :file_path => /spec[\\\/]frills/
   }
-end
+end

data/readme.markdown

@@ -294,9 +294,15 @@ describe HtmlTimestampFrill do
     end.new
   end
 
-  subject { frill model }
+  context "html request" do
+    subject { frill model }
+    its(:created_at) { should == "<b>January 01, 2012 00:00<b>" }
+  end
 
-  its(:created_at) { should == "<b>January 01, 2012 00:00<b>" }
+  context "non-html request" do
+    subject { frill model, "HTTP_ACCEPT" => "application/json" }
+    its(:created_at) { should == "January 01, 2012 00:00" }
+  end
 end
 ```
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frill
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70283482709540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.2
+  version_requirements: *70283482709540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70283482708760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70283482708760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70283482708100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70283482708100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70283482707520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70283482707520
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70283482706760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70283482706760
 description: 
 email: moonmaster9000@gmail.com
 executables: []
@@ -132,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Decorating objects for presentation. Supports Rails out of the box.