frill 0.1.11 → 0.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/lib/frill/rspec.rb +3 -3
  3. data/readme.markdown +8 -2
  4. metadata +13 -38
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.11
1
+ 0.1.12
@@ -1,9 +1,9 @@
1
1
  module Frill
2
2
  module RSpec
3
3
  module Helpers
4
- def frill model
4
+ def frill model, options={}
5
5
  view_context = ApplicationController.new.view_context.tap do |context|
6
- context.controller.request ||= ActionController::TestRequest.new
6
+ context.controller.request ||= ActionController::TestRequest.new options
7
7
  context.request ||= context.controller.request
8
8
  context.params ||= {}
9
9
  end
@@ -29,4 +29,4 @@ RSpec.configure do |config|
29
29
  config.include Frill::RSpec::ExampleGroup, :type => :frill, :example_group => {
30
30
  :file_path => /spec[\\\/]frills/
31
31
  }
32
- end
32
+ end
@@ -294,9 +294,15 @@ describe HtmlTimestampFrill do
294
294
  end.new
295
295
  end
296
296
 
297
- subject { frill model }
297
+ context "html request" do
298
+ subject { frill model }
299
+ its(:created_at) { should == "<b>January 01, 2012 00:00<b>" }
300
+ end
298
301
 
299
- its(:created_at) { should == "<b>January 01, 2012 00:00<b>" }
302
+ context "non-html request" do
303
+ subject { frill model, "HTTP_ACCEPT" => "application/json" }
304
+ its(:created_at) { should == "January 01, 2012 00:00" }
305
+ end
300
306
  end
301
307
  ```
302
308
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: frill
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.11
4
+ version: 0.1.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-04 00:00:00.000000000 Z
12
+ date: 2012-09-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: !ruby/object:Gem::Requirement
16
+ requirement: &70283482709540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,15 +21,10 @@ dependencies:
21
21
  version: 3.2.2
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ~>
28
- - !ruby/object:Gem::Version
29
- version: 3.2.2
24
+ version_requirements: *70283482709540
30
25
  - !ruby/object:Gem::Dependency
31
26
  name: rspec
32
- requirement: !ruby/object:Gem::Requirement
27
+ requirement: &70283482708760 !ruby/object:Gem::Requirement
33
28
  none: false
34
29
  requirements:
35
30
  - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
37
32
  version: '0'
38
33
  type: :development
39
34
  prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
45
- version: '0'
35
+ version_requirements: *70283482708760
46
36
  - !ruby/object:Gem::Dependency
47
37
  name: rspec-rails
48
- requirement: !ruby/object:Gem::Requirement
38
+ requirement: &70283482708100 !ruby/object:Gem::Requirement
49
39
  none: false
50
40
  requirements:
51
41
  - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
53
43
  version: '0'
54
44
  type: :development
55
45
  prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
46
+ version_requirements: *70283482708100
62
47
  - !ruby/object:Gem::Dependency
63
48
  name: capybara
64
- requirement: !ruby/object:Gem::Requirement
49
+ requirement: &70283482707520 !ruby/object:Gem::Requirement
65
50
  none: false
66
51
  requirements:
67
52
  - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
69
54
  version: '0'
70
55
  type: :development
71
56
  prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
- requirements:
75
- - - ! '>='
76
- - !ruby/object:Gem::Version
77
- version: '0'
57
+ version_requirements: *70283482707520
78
58
  - !ruby/object:Gem::Dependency
79
59
  name: pry
80
- requirement: !ruby/object:Gem::Requirement
60
+ requirement: &70283482706760 !ruby/object:Gem::Requirement
81
61
  none: false
82
62
  requirements:
83
63
  - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
85
65
  version: '0'
86
66
  type: :development
87
67
  prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
- requirements:
91
- - - ! '>='
92
- - !ruby/object:Gem::Version
93
- version: '0'
68
+ version_requirements: *70283482706760
94
69
  description:
95
70
  email: moonmaster9000@gmail.com
96
71
  executables: []
@@ -132,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
132
107
  version: '0'
133
108
  requirements: []
134
109
  rubyforge_project:
135
- rubygems_version: 1.8.24
110
+ rubygems_version: 1.8.17
136
111
  signing_key:
137
112
  specification_version: 3
138
113
  summary: Decorating objects for presentation. Supports Rails out of the box.