prismic.io 1.0.0.preview.2 → 1.0.0.preview.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b17b4fc1bdb46920e3ffb4fd498bfee2b104aa
-  data.tar.gz: 817d91632efa91c0a7473ab3aaf982a0589f0ffc
+  metadata.gz: 7115c0e2648174904a54f5b9eca2dee638c334a6
+  data.tar.gz: a6d17ff3c181ae1a273cbdc8956f114262854354
 SHA512:
-  metadata.gz: aeedce9389e490287de28bae3cd068a864ee6fccc840692581c3939d33c6ec7bf5024bbd7302003146722c977488008a86df61f3a3fad2a7b6b9afc6b0b02513
-  data.tar.gz: cb48dfa12ff2548695f13e1d73d923d6303eda650c430e30b07c7f2ada659a2396bb1b3124f0751ad5a64f09a01d8f45810fe4c67a270fcf93a476f336668787
+  metadata.gz: 5316b6aac4442b9a90f505a7d949ca07f6b0ca970700e081837c618f10a5a41e280ac86aec1a9214a70e04b4631c41fa233063e86cdde89338a2195448259a62
+  data.tar.gz: 98666ce830de416b0327a009cbb182df89acbe533eaf048a8d723b56fcbdd88ec303251c23771d28397295fc77347159bfa2beb1bfc86adc74ab57c646edb205

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prismic.io (1.0.0.preview.2)
+    prismic.io (1.0.0.preview.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/prismic.rb

@@ -32,10 +32,10 @@ module Prismic
   class SearchForm
     attr_accessor :api, :form, :data
 
-    def initialize(api, form, data=form.default_data)
+    def initialize(api, form, data={})
       @api = api
       @form = form
-      @data = data
+      @data = form.default_data.merge(data)
     end
 
     def name
@@ -93,10 +93,9 @@ module Prismic
     end
 
     def query(query)
-      strip_brakets = Proc.new {|str| str.strip[1, str.strip.length - 2]}
-
-      previous_query = (not form.fields['q'].nil?) ? form.fields['q'].default.to_s : ''
-      data['q'] = "[#{strip_brakets.call(previous_query)}#{strip_brakets.call(query)}]"
+      strip_brakets = ->(str) { str =~ /^\[(.*)\]$/ ? $1 : str }
+      previous_query = form.fields['q'] ? form.fields['q'].default.to_s : ''
+      data['q'] = "[%s%s]" % [strip_brakets.(previous_query), strip_brakets.(query)]
       self
     end
 

data/lib/prismic/fragments/select.rb

@@ -8,7 +8,7 @@ module Prismic
       end
 
       def as_html(link_resolver=nil)
-        %(<span class="text">#@value</span>)
+        %(<span class="text">#{CGI::escapeHTML(@value)}</span>)
       end
     end
   end

data/lib/prismic/fragments/structured_text.rb

@@ -106,7 +106,7 @@ module Prismic
               closing = end_spans[i].map {|span|
                 span.end_html(link_resolver)
               }
-              opening + closing + [c]
+              opening + closing + [CGI::escapeHTML(c)]
             }.flatten.join("")
           end
 

data/lib/prismic/fragments/text.rb

@@ -8,7 +8,7 @@ module Prismic
       end
 
       def as_html(link_resolver=nil)
-        %(<span class="text">#@value</span>)
+        %(<span class="text">#{CGI::escapeHTML(@value)}</span>)
       end
     end
   end

data/lib/prismic/version.rb

@@ -1,5 +1,5 @@
 module Prismic
 
-  VERSION = "1.0.0.preview.2"
+  VERSION = "1.0.0.preview.3"
 
 end

data/spec/fragments_spec.rb

@@ -65,6 +65,11 @@ describe 'Text' do
     it "returns a HTML element whose content is the value" do
       Nokogiri::XML(@text.as_html).child.content.should == 'my_value'
     end
+
+    it "espaces HTML content" do
+      @text = Prismic::Fragments::Text.new('&my <value> #abcde')
+      @text.as_html.should =~ /^<[^>]+>&amp;my &lt;value&gt; #abcde<[^>]+>$/
+    end
   end
 end
 
@@ -85,6 +90,11 @@ describe 'Select' do
     it "returns a HTML element whose content is the value" do
       Nokogiri::XML(@select.as_html).child.content.should == 'my_value'
     end
+
+    it "escapes HTML" do
+      @select = Prismic::Fragments::Select.new('&my <value> #abcde')
+      @select.as_html(nil).should =~ %r{^<[^>]+>&amp;my &lt;value&gt; #abcde<[^>]+>$}
+    end
   end
 end
 
@@ -355,6 +365,15 @@ describe 'StructuredText::Paragraph' do
   it 'generates valid html' do
     @block.as_html(nil).should == "<p>This <em>is</em> <b>a</b> simple test.</p>"
   end
+  it "espaces HTML content" do
+    @text = '&my <value> #abcde'
+    @spans = [
+      Prismic::Fragments::StructuredText::Span::Em.new(4, 11),
+      Prismic::Fragments::StructuredText::Span::Strong.new(0, 1),
+    ]
+    @block = Prismic::Fragments::StructuredText::Block::Paragraph.new(@text, @spans)
+    @block.as_html(nil).should =~ %r{^<[^>]+><b>&amp;</b>my <em>&lt;value&gt;</em> #abcde<[^>]+>$}
+  end
 end
 
 describe 'StructuredText::Preformatted' do

data/spec/prismic_spec.rb

@@ -257,5 +257,13 @@ describe 'SearchForm' do
       @form = Prismic::SearchForm.new(@api, Prismic::Form.new('form1', {'q' => @field}, nil, nil, nil, nil), {})
       @form.query('[foo]').should == @form
     end
+
+    it "merge user defined params into default ones" do
+      field = ->(value){ Prismic::Field.new('String', value) }
+      default_params = {'param1' => field.('a'), 'param2' => field.('b')}
+      user_params = {'param1' => 'a2'}
+      @form = Prismic::SearchForm.new(@api, Prismic::Form.new('form1', default_params, nil, nil, nil, nil), user_params)
+      @form.data.should == {'param1' => 'a2', 'param2' => 'b'}
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prismic.io
 version: !ruby/object:Gem::Version
-  version: 1.0.0.preview.2
+  version: 1.0.0.preview.3
 platform: ruby
 authors:
 - Étienne Vallette d'Osia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,3 +141,4 @@ test_files:
 - spec/responses_mocks/structured_text_heading.json
 - spec/responses_mocks/structured_text_paragraph.json
 - spec/spec_helper.rb
+has_rdoc: