prismic.io 1.0.0.rc9 → 1.0.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe6723ef7f29deff32c702fed5695aba28e93f6
-  data.tar.gz: a2a470960e7065d31ea4f416d07a738bdf3d467f
+  metadata.gz: 4ea682bc3f2afcc4da972445dda3adb15eff1549
+  data.tar.gz: c47ad3c077959de4f29a90a52249163f69d784ce
 SHA512:
-  metadata.gz: 05c234357c7f80ee100af6471632a5b8defa792ab7dd3def6db15442a0b3a115b0a8c38864f87e37ce755c7516f99e114db0fccb91ed2d1e592b70a7ea8ef655
-  data.tar.gz: 0b4d361e0a79ea6d86795133b16499e6e8c8a844e40be2f681be66269b2ee4c5518971e054bb7c820d029d5bfc0613211ca5db40538f7ebe350ab381398db9a4
+  metadata.gz: 7067ccbd2b56755280c0fdc734adc14dee3c0a1ca9abe6e5462e0eeffef26dfb38f8fe32091a8de5e46b032a2c46d4037d93f48fd76fb82a9c81b942a3a1d7ea
+  data.tar.gz: a7436d00a195ebd14ce978e11b65c52b0bd43b60ab77637d20bd88ccecaa78871faccb49539c4bfb5db0d4b9ee36e898ebf13568121551cb3c2a6c3afadcff55

data/.travis.yml

@@ -1,12 +1,20 @@
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - jruby-19mode
+- 2.1.1
+- 2.1.0
+- 2.0.0
+- 1.9.3
+- 1.9.2
+- jruby-19mode
 script: bundle exec rspec spec
 notifications:
   email:
-    - evo@zenexity.com
+  - evo@zenexity.com
+deploy:
+  provider: rubygems
+  api_key:
+    secure: TBCtAi8FnlHzuiv86Me/YpMdGeAiG9d+J3ZpxWIY32jJv+t8dsW8Fej4jhGSW0aarPT7sarXan6cez0ssSDObUwWMYJfshmMsKykTi6TW4US2ZXtWxtglABYK2DJ/8N1fgkdXKO0NRMF7RVUoJNSw+91GX7ug/obNiCcmG/ms5I=
+  gemspec: prismic.gemspec
+  on:
+    tags: true
+    repo: prismicio/ruby-kit

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "yajl-ruby", require: 'yajl', platforms: [:ruby_19, :ruby_20]
+  gem "yajl-ruby", require: 'yajl', platforms: [:ruby_19, :ruby_20, :ruby_21]
 end

data/Gemfile.lock

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

data/lib/prismic.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
+require 'cgi'
 require 'net/http'
 require 'uri'
 
+require 'json' unless defined?(JSON)
+
 module Prismic
 
   # These exception can contains an error cause and is able to show them
@@ -231,6 +234,23 @@ module Prismic
     # @return [Response] The results (array of Document object + pagination
     #     specifics)
     def submit(ref = nil)
+      Prismic::JsonParser.response_parser(JSON.load(submit_raw(ref)))
+    end
+
+    # Submit the form, returns a raw JSON string
+    # @api
+    #
+    # @note The reference MUST be defined, either by:
+    #
+    #       - setting it at {API#create_search_form creation}
+    #       - using the {#ref} method
+    #       - providing the ref parameter.
+    #
+    # @param ref [Ref, String] The {Ref reference} to use (if not already
+    #     defined)
+    #
+    # @return [string] The JSON string returned by the API
+    def submit_raw(ref = nil)
       self.ref(ref) if ref
       data['ref'] = @ref
       raise NoRefSetException unless @ref
@@ -246,9 +266,9 @@ module Prismic
           response = api.http_client.get(form_action, data, 'Accept' => 'application/json')
 
           if response.code.to_s == "200"
-            Prismic::JsonParser.response_parser(JSON.parse(response.body))
+            response.body
           else
-            body = JSON.parse(response.body) rescue nil
+            body = JSON.load(response.body) rescue nil
             error = body.is_a?(Hash) ? body['error'] : response.body
             raise AuthenticationException, error if response.code.to_s == "401"
             raise AuthorizationException, error if response.code.to_s == "403"

data/lib/prismic/api.rb

@@ -230,7 +230,7 @@ module Prismic
         res = http_client.post(token, params)
         if res.code == '200'
           begin
-            JSON.parse(res.body)['access_token']
+            JSON.load(res.body)['access_token']
           rescue Exception => e
             raise PrismicWSConnectionError.new(res, e)
           end

data/lib/prismic/fragments.rb

@@ -3,6 +3,7 @@ require 'prismic/fragments/fragment'
 require 'prismic/fragments/color'
 require 'prismic/fragments/date'
 require 'prismic/fragments/embed'
+require 'prismic/fragments/geopoint'
 require 'prismic/fragments/group'
 require 'prismic/fragments/image'
 require 'prismic/fragments/link'
@@ -11,3 +12,4 @@ require 'prismic/fragments/number'
 require 'prismic/fragments/select'
 require 'prismic/fragments/structured_text'
 require 'prismic/fragments/text'
+require 'prismic/fragments/timestamp'

data/lib/prismic/fragments/geopoint.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Prismic
+  module Fragments
+    class GeoPoint < Fragment
+      attr_accessor :longitude, :latitude
+
+      def initialize(longitude, latitude)
+        @longitude = longitude
+        @latitude = latitude
+      end
+
+      # Generate an HTML representation of the fragment
+      #
+      # @param link_resolver [LinkResolver] The LinkResolver used to build
+      #     application's specific URL
+      #
+      # @return [String] the HTML representation
+      def as_html(link_resolver=nil)
+        %(<div class="geopoint"><span class="longitude">#@longitude</span><span class="latitude">#@latitude</span></div>)
+      end
+
+    end
+  end
+end

data/lib/prismic/fragments/image.rb

@@ -26,14 +26,15 @@ module Prismic
       class ViewDoesNotExistException < Error ; end
 
       class View < Fragment
-        attr_accessor :url, :width, :height, :alt, :copyright
+        attr_accessor :url, :width, :height, :alt, :copyright, :link_to
 
-        def initialize(url, width, height, alt, copyright)
+        def initialize(url, width, height, alt, copyright, link_to)
           @url = url
           @width = width
           @height = height
           @alt = alt
           @copyright = copyright
+          @link_to = link_to
         end
 
         def ratio
@@ -41,7 +42,11 @@ module Prismic
         end
 
         def as_html(link_resolver=nil)
-          %(<img src="#@url" alt="#@alt" width="#@width" height="#@height" />)
+          html = []
+          html << (link_to.nil? ? '' : link_to.start_html(link_resolver))
+          html << %(<img src="#@url" alt="#@alt" width="#@width" height="#@height" />)
+          html << (link_to.nil? ? '' : link_to.end_html)
+          html.join
         end
 
       end

data/lib/prismic/fragments/structured_text.rb

@@ -113,7 +113,7 @@ module Prismic
             "</strong>"
           end
         end
-        
+
         class Hyperlink < Span
           attr_accessor :link
           def initialize(start, finish, link)
@@ -156,12 +156,20 @@ module Prismic
             # Initializing the browsing of the string
             output = []
             cursor = 0
+            tags = []  # the seen tags
 
             # Taking each text cut and inserting the closing tags and the opening tags if needed
             all_cuts.each do |cut|
               output << CGI::escapeHTML(text[cursor, cut-cursor])
-              output << end_spans[cut].map{|span| span.end_html} # this pushes an array into the array; we'll need to flatten later
-              output << start_spans[cut].map{|span| span.start_html(link_resolver)} # this pushes an array into the array; we'll need to flatten later
+              end_tags = end_spans[cut]
+              # reorder endings tags using creating order
+              split = tags.group_by {|t| end_tags.include?(t) }
+              end_tags, tags = split[true]||[], split[false]||[]
+              output += end_tags.map{|span| span.end_html }
+              # store created tags (in the right order)
+              start_tags = start_spans[cut].sort_by{|s| s.end }.reverse
+              tags += start_tags.reverse
+              output += start_tags.map{|span| span.start_html(link_resolver) }
               cursor = cut # cursor is now where the cut was
             end
 
@@ -169,7 +177,7 @@ module Prismic
             output << text[cursor..-1]
 
             # Making the array into a string
-            output.flatten.join
+            output.join
 
           end
 
@@ -264,6 +272,10 @@ module Prismic
             @view.copyright
           end
 
+          def link_to
+            @view.link_to
+          end
+
           def as_html(link_resolver)
             view.as_html(link_resolver)
           end

data/lib/prismic/fragments/timestamp.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+module Prismic
+  module Fragments
+    class Timestamp < Fragment
+      attr_accessor :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      # Generate an HTML representation of the fragment
+      #
+      # @param link_resolver [LinkResolver] The LinkResolver used to build
+      #     application's specific URL
+      #
+      # @return [String] the HTML representation
+      def as_html(link_resolver=nil)
+        %(<time>#{value.iso8601(3)}</time>)
+      end
+    end
+  end
+end

data/lib/prismic/json_parsers.rb

@@ -8,11 +8,13 @@ module Prismic
           'Link.document'  => method(:document_link_parser),
           'Text'           => method(:text_parser),
           'Link.web'       => method(:web_link_parser),
-          'Link.image'       => method(:image_link_parser),
-          'Link.file'       => method(:file_link_parser),
+          'Link.image'     => method(:image_link_parser),
+          'Link.file'      => method(:file_link_parser),
           'Date'           => method(:date_parser),
+          'Timestamp'      => method(:timestamp_parser),
           'Number'         => method(:number_parser),
           'Embed'          => method(:embed_parser),
+          'GeoPoint'          => method(:geo_point_parser),
           'Image'          => method(:image_parser),
           'Color'          => method(:color_parser),
           'StructuredText' => method(:structured_text_parser),
@@ -56,6 +58,10 @@ module Prismic
         Prismic::Fragments::Date.new(Time.parse(json['value']))
       end
 
+      def timestamp_parser(json)
+        Prismic::Fragments::Timestamp.new(Time.parse(json['value']))
+      end
+
       def number_parser(json)
         Prismic::Fragments::Number.new(json['value'])
       end
@@ -71,13 +77,21 @@ module Prismic
         )
       end
 
+      def geo_point_parser(json)
+        Prismic::Fragments::GeoPoint.new(
+          json['value']['longitude'],
+          json['value']['latitude']
+        )
+      end
+
       def image_parser(json)
         def self.view_parser(json)
           Prismic::Fragments::Image::View.new(json['url'],
                                               json['dimensions']['width'],
                                               json['dimensions']['height'],
                                               json['alt'],
-                                              json['copyright'])
+                                              json['copyright'],
+                                              json['linkTo'] ? link_parser(json['linkTo']) : nil)
         end
 
         main  = view_parser(json['value']['main'])
@@ -143,7 +157,8 @@ module Prismic
               block['dimensions']['width'],
               block['dimensions']['height'],
               block['alt'],
-              block['copyright']
+              block['copyright'],
+              block['linkTo'] ? link_parser(block['linkTo']) : nil
             )
             Prismic::Fragments::StructuredText::Block::Image.new(view)
           when 'embed'

data/lib/prismic/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Prismic
 
-  VERSION = "1.0.0.rc9"
+  VERSION = "1.0.0.rc10"
 
 end

data/prismic.gemspec

@@ -6,7 +6,7 @@ require 'prismic/version'
 Gem::Specification.new do |spec|
   spec.name          = "prismic.io"
   spec.version       = Prismic::VERSION
-  spec.authors       = ["Étienne Vallette d'Osia", "Samy Dindane"]
+  spec.authors       = ["Étienne Vallette d'Osia", "Samy Dindane", "Rudy Rigot"]
   spec.email         = ["evo@zenexity.com"]
   spec.description   = %q{The standard Prismic.io's API library.}
   spec.summary       = %q{Prismic.io development kit}

data/spec/fragments_spec.rb

@@ -1,6 +1,13 @@
 # encoding: utf-8
 require 'spec_helper'
 
+def em(start, stop)
+  Prismic::Fragments::StructuredText::Span::Em.new(start, stop)
+end
+def strong(start, stop)
+  Prismic::Fragments::StructuredText::Span::Strong.new(start, stop)
+end
+
 describe 'WebLink' do
   before do
       @web_link = Prismic::Fragments::WebLink.new('my_url')
@@ -98,7 +105,7 @@ describe 'FileLink' do
   describe 'in structured texts' do
     before do
       @raw_json_structured_text = File.read("#{File.dirname(__FILE__)}/responses_mocks/structured_text_linkfile.json")
-      @json_structured_text = JSON.parse(@raw_json_structured_text)
+      @json_structured_text = JSON.load(@raw_json_structured_text)
       @structured_text = Prismic::JsonParser.structured_text_parser(@json_structured_text)
     end
     it 'serializes well into HTML' do
@@ -111,7 +118,7 @@ describe 'Span' do
   describe 'in structured texts when end is at the end of line' do
     before do
       @raw_json_structured_text = File.read("#{File.dirname(__FILE__)}/responses_mocks/structured_text_with_tricky_spans.json")
-      @json_structured_text = JSON.parse(@raw_json_structured_text)
+      @json_structured_text = JSON.load(@raw_json_structured_text)
       @structured_text = Prismic::JsonParser.structured_text_parser(@json_structured_text)
     end
     it 'serializes well into HTML' do
@@ -121,7 +128,7 @@ describe 'Span' do
   describe 'in structured texts when multiple spans' do
     before do
       @raw_json_structured_text = File.read("#{File.dirname(__FILE__)}/responses_mocks/structured_text_paragraph.json")
-      @json_structured_text = JSON.parse(@raw_json_structured_text)
+      @json_structured_text = JSON.load(@raw_json_structured_text)
       @structured_text = Prismic::JsonParser.structured_text_parser(@json_structured_text)
     end
     it 'serializes well into HTML' do
@@ -394,7 +401,7 @@ describe 'Image::View' do
     @url = 'my_url'
     @width = 10
     @height = 2
-    @view = Prismic::Fragments::Image::View.new(@url, @width, @height, "", "")
+    @view = Prismic::Fragments::Image::View.new(@url, @width, @height, "", "", nil)
   end
 
   describe 'ratio' do
@@ -440,8 +447,8 @@ end
 
 describe 'Image' do
   before do
-    @main_view = Prismic::Fragments::Image::View.new('my_url', 10, 10, "Alternative", "CC-BY")
-    @another_view = Prismic::Fragments::Image::View.new('my_url2', 20, 20, "", "")
+    @main_view = Prismic::Fragments::Image::View.new('my_url', 10, 10, "Alternative", "CC-BY", nil)
+    @another_view = Prismic::Fragments::Image::View.new('my_url2', 20, 20, "", "", nil)
     @image = Prismic::Fragments::Image.new(@main_view, { 'another_view' => @another_view })
   end
 
@@ -501,63 +508,75 @@ end
 describe 'StructuredText::Heading' do
   before do
     @text = "This is a simple test."
-    @spans = [
-      Prismic::Fragments::StructuredText::Span::Em.new(5, 7),
-      Prismic::Fragments::StructuredText::Span::Strong.new(8, 9),
-    ]
+    @spans = [em(5, 7), strong(8, 9)]
   end
+  let :block do Prismic::Fragments::StructuredText::Block::Heading.new(@text, @spans, @heading) end
   it 'generates valid h1 html' do
     @heading = 1
-    @block = Prismic::Fragments::StructuredText::Block::Heading.new(@text, @spans, @heading)
-    @block.as_html(nil).should == "<h1>This <em>is</em> <strong>a</strong> simple test.</h1>"
+    block.as_html(nil).should == "<h1>This <em>is</em> <strong>a</strong> simple test.</h1>"
   end
   it 'generates valid h2 html' do
     @heading = 2
-    @block = Prismic::Fragments::StructuredText::Block::Heading.new(@text, @spans, @heading)
-    @block.as_html(nil).should == "<h2>This <em>is</em> <strong>a</strong> simple test.</h2>"
+    block.as_html(nil).should == "<h2>This <em>is</em> <strong>a</strong> simple test.</h2>"
   end
 end
 
 describe 'StructuredText::Paragraph' do
-  before do
-    @text = "This is a simple test."
-    @spans = [
-      Prismic::Fragments::StructuredText::Span::Em.new(5, 7),
-      Prismic::Fragments::StructuredText::Span::Strong.new(8, 9),
-    ]
-    @block = Prismic::Fragments::StructuredText::Block::Paragraph.new(@text, @spans)
-  end
+  let :block do Prismic::Fragments::StructuredText::Block::Paragraph.new(@text, @spans) end
   it 'generates valid html' do
-    @block.as_html(nil).should == "<p>This <em>is</em> <strong>a</strong> simple test.</p>"
+    @text  = "This is a simple test."
+    @spans = [em(5, 7), strong(8, 9)]
+    block.as_html(nil).should == "<p>This <em>is</em> <strong>a</strong> 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{^<[^>]+><strong>&amp;</strong>my <em>&lt;value&gt;</em> #abcde<[^>]+>$}
+    @text  = '&my <value> #abcde'
+    @spans = [em(4, 11), strong(0, 1)]
+    block.as_html(nil).should =~ %r{^<[^>]+><strong>&amp;</strong>my <em>&lt;value&gt;</em> #abcde<[^>]+>$}
+  end
+  it "espaces HTML content (many spans)" do
+    @text  = 'abcdefghijklmnopqrstuvwxyz'
+    @spans = [em(1, 3), strong(5, 7), em(9, 11), strong(13, 15)]
+    block.as_html(nil).should =~ %r{^<[^>]+>a<em>bc</em>de<strong>fg</strong>hi<em>jk</em>lm<strong>no</strong>pqrstuvwxyz<[^>]+>$}
+  end
+  it "espaces HTML content (empty spans)" do
+    @text  = 'abcdefghijklmnopqrstuvwxyz'
+    @spans = [em(2, 2)]
+    block.as_html(nil).should =~ %r{^<[^>]+>abcdefghijklmnopqrstuvwxyz<[^>]+>$}
+  end
+  it "espaces HTML content (2 spans on the same text)" do
+    @text  = 'abcdefghijklmnopqrstuvwxyz'
+    @spans = [em(2, 4), strong(2, 4)]
+    block.as_html(nil).should =~ %r{^<[^>]+>ab<strong><em>cd</em></strong>efghijklmnopqrstuvwxyz<[^>]+>$}
+  end
+  it "espaces HTML content (2 spans on the same text - one bigger 1)" do
+    @text  = 'abcdefghijklmnopqrstuvwxyz'
+    @spans = [em(2, 6), strong(2, 4)]
+    block.as_html(nil).should =~ %r{^<[^>]+>ab<em><strong>cd</strong>ef</em>ghijklmnopqrstuvwxyz<[^>]+>$}
+  end
+  it "espaces HTML content (2 spans on the same text - one bigger 2)" do
+    @text  = 'abcdefghijklmnopqrstuvwxyz'
+    @spans = [em(2, 4), strong(2, 6)]
+    block.as_html(nil).should =~ %r{^<[^>]+>ab<strong><em>cd</em>ef</strong>ghijklmnopqrstuvwxyz<[^>]+>$}
+  end
+  it "espaces HTML content (span next to span)" do
+    @text  = 'abcdefghijklmnopqrstuvwxyz'
+    @spans = [em(2, 4), strong(4, 6)]
+    block.as_html(nil).should =~ %r{^<[^>]+>ab<em>cd</em><strong>ef</strong>ghijklmnopqrstuvwxyz<[^>]+>$}
   end
 end
 
 describe 'StructuredText::Preformatted' do
-  before do
-    @text = "This is a simple test."
-    @spans = [
-      Prismic::Fragments::StructuredText::Span::Em.new(5, 7),
-      Prismic::Fragments::StructuredText::Span::Strong.new(8, 9),
-    ]
-    @block = Prismic::Fragments::StructuredText::Block::Preformatted.new(@text, @spans)
-  end
+  let :block do Prismic::Fragments::StructuredText::Block::Preformatted.new(@text, @spans) end
   it 'generates valid html' do
-    @block.as_html(nil).should == "<pre>This <em>is</em> <strong>a</strong> simple test.</pre>"
+    @text  = "This is a simple test."
+    @spans = [em(5, 7), strong(8, 9)]
+    block.as_html(nil).should == "<pre>This <em>is</em> <strong>a</strong> simple test.</pre>"
   end
 end
 
 describe 'StructuredText::Image' do
   before do
-    @view = Prismic::Fragments::Image::View.new('my_url', 10, 10, "Aternative", "CC-BY")
+    @view = Prismic::Fragments::Image::View.new('my_url', 10, 10, "Aternative", "CC-BY", nil)
     @image = Prismic::Fragments::StructuredText::Block::Image.new(@view)
   end
 
@@ -599,7 +618,7 @@ describe 'StructuredText::Hyperlink' do
       "product",
       ["Macaron"],
       "dark-chocolate-macaron",
-      false  # broken
+      false  # not broken
     )
     @hyperlink = Prismic::Fragments::StructuredText::Span::Hyperlink.new(0, 0, @link)
     @link_resolver = Prismic.link_resolver("master"){|doc_link| "http://localhost/#{doc_link.id}" }
@@ -671,4 +690,4 @@ describe 'Group' do
     @docchapter['docchapter.docs'][0].size.should == 1
   end
 
-end
+end

data/spec/json_parsers_spec.rb

@@ -17,7 +17,7 @@ describe 'document_link_parser' do
         }
       }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses DocumentLinks" do
@@ -38,7 +38,7 @@ describe 'text_parser' do
       "value": "New York City, NY"
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses Text objects" do
@@ -57,7 +57,7 @@ describe 'web_link_parser' do
       }
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses WebLinks objects" do
@@ -74,7 +74,7 @@ describe 'date_parser' do
       "value": "2013-09-19"
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses Date objects" do
@@ -91,7 +91,7 @@ describe 'number_parser' do
       "value": 3.55
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses Number objects" do
@@ -123,7 +123,7 @@ describe 'embed_parser' do
       }
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses Embed objects" do
@@ -164,7 +164,7 @@ describe 'image_parser' do
       }
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses Image objects" do
@@ -182,6 +182,59 @@ json
   end
 end
 
+describe 'geo_point_parser' do
+  before do
+    raw_json = File.read("#{File.dirname(__FILE__)}/responses_mocks/document.json")
+    json = JSON.load(raw_json)
+    @document = Prismic::JsonParser.document_parser(json)
+  end
+
+  it 'correctly parses GeoPoint objects' do
+    @document['product.location'].latitude.should == 48.877108
+    @document['product.location'].longitude.should == -2.333879
+  end
+
+  it 'correctly serializes GeoPoint objects into HTML' do
+    @document['product.location'].as_html.should == "<div class=\"geopoint\"><span class=\"longitude\">-2.333879</span><span class=\"latitude\">48.877108</span></div>"
+  end
+end
+
+describe 'image_parser in StructuredText' do
+  before do
+    raw_json = File.read("#{File.dirname(__FILE__)}/responses_mocks/document.json")
+    json = JSON.load(raw_json)
+    @document = Prismic::JsonParser.document_parser(json)
+    @image_st = @document['product.linked_images']
+  end
+
+  it 'parses properly with links' do
+    @image_st.blocks[2].link_to.url.should == 'http://google.com/'
+  end
+
+  it 'parses properly without links' do
+    @image_st.blocks[5].link_to.should be_nil
+  end
+
+  it 'serializes properly as HTML' do
+    expected = <<expected
+<p>Here is some introductory text.</p>
+
+<p>The following image is linked.</p>
+
+<a href="http://google.com/"><img src="http://fpoimg.com/129x260" alt="" width="260" height="129" /></a>
+
+<p><strong>More important stuff</strong></p>
+
+<p>One more image, this one is not linked:</p>
+
+<img src="http://fpoimg.com/199x300" alt="" width="300" height="199" />
+expected
+    expected.chomp!
+    link_resolver = Prismic.link_resolver("master"){|doc_link| "http://localhost/#{doc_link.id}" }
+    @image_st.as_html(link_resolver).should == expected
+  end
+end
+
 describe 'color_parser' do
   before do
     raw_json = <<json
@@ -190,7 +243,7 @@ describe 'color_parser' do
       "value": "#ffeacd"
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses Color objects" do
@@ -214,7 +267,7 @@ describe 'file_link_parser' do
       }
     }
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
     @link_file = Prismic::JsonParser.file_link_parser(@json)
   end
 
@@ -230,11 +283,11 @@ end
 describe 'structured_text_parser' do
   before do
     raw_json_paragraph = File.read("#{File.dirname(__FILE__)}/responses_mocks/structured_text_paragraph.json")
-    json_paragraph = JSON.parse(raw_json_paragraph)
+    json_paragraph = JSON.load(raw_json_paragraph)
     @structured_text_paragraph = Prismic::JsonParser.structured_text_parser(json_paragraph)
 
     raw_json_heading = File.read("#{File.dirname(__FILE__)}/responses_mocks/structured_text_heading.json")
-    json_heading = JSON.parse(raw_json_heading)
+    json_heading = JSON.load(raw_json_heading)
     @structured_text_heading = Prismic::JsonParser.structured_text_parser(json_heading)
   end
 
@@ -246,7 +299,7 @@ describe 'structured_text_parser' do
     end
 
     it "correctly parses >h9 heading" do
-      json_heading = JSON.parse(<<-JSON)
+      json_heading = JSON.load(<<-JSON)
         {
           "type": "StructuredText",
           "value": [{
@@ -298,7 +351,7 @@ end
 describe 'document_parser' do
   before do
     raw_json = File.read("#{File.dirname(__FILE__)}/responses_mocks/document.json")
-    json = JSON.parse(raw_json)
+    json = JSON.load(raw_json)
     @document = Prismic::JsonParser.document_parser(json)
   end
 
@@ -311,7 +364,7 @@ describe 'document_parser' do
   end
 
   it "correctly parses the document's fragments" do
-    @document.fragments.size.should == 11
+    @document.fragments.size.should == 14
     @document.fragments['name'].should be_a Prismic::Fragments::StructuredText
   end
 end
@@ -319,7 +372,7 @@ end
 describe 'response_parser' do
 
   it "accepts basic documents response" do
-    @json = JSON.parse('{ "page": 1,
+    @json = JSON.load('{ "page": 1,
       "results_per_page": 20,
       "results_size": 20,
       "total_results_size": 40,
@@ -354,7 +407,7 @@ describe 'multiple_parser' do
         }
       ]
 json
-    @json = JSON.parse(raw_json)
+    @json = JSON.load(raw_json)
   end
 
   it "correctly parses the Multiple object's elements" do
@@ -365,14 +418,32 @@ json
   end
 end
 
+describe 'timestamp_parser' do
+  before do
+    raw_json = File.read("#{File.dirname(__FILE__)}/responses_mocks/document.json")
+    json = JSON.load(raw_json)
+    @document = Prismic::JsonParser.document_parser(json)
+    @timestamp_fragment = @document['product.some_timestamp']
+  end
+
+  it 'correctly parses and stores a Time object' do
+    @timestamp_fragment.value.utc.wednesday?.should == true
+    @timestamp_fragment.value.min.should == 30
+  end
+
+  it 'outputs correctly as HTML' do
+    @timestamp_fragment.as_html.should match /<time>2014-06-1\dT\d{2}:30:00\.000[-+]\d{2}:00<\/time>/
+  end
+end
+
 describe 'unknown_parser' do
   before do
     @raw_json = File.read("#{File.dirname(__FILE__)}/responses_mocks/document_with_unknown_fragment.json")
-    @json = JSON.parse(@raw_json)
+    @json = JSON.load(@raw_json)
   end
 
   it "raises the proper error" do
     Prismic::JsonParser.should_receive(:warn).with("Type blabla is unknown, fragment was skipped; perhaps you should update your prismic.io gem?")
     Prismic::JsonParser.document_parser(@json).fragments.size.should == 2
   end
-end
+end

data/spec/lesbonneschoses_spec.rb

@@ -51,7 +51,7 @@ describe 'LesBonnesChoses' do
       documents.results_size.should == 20
       documents.total_results_size.should == 40
       documents.total_pages.should == 2
-      documents.next_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UkL0hcuvzYUANCrm&page=2&pageSize=20"
+      documents.next_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UlfoxUnM08QWYXdl&page=2&pageSize=20"
       documents.prev_page.should == nil
     end
     it "works on page 2" do
@@ -62,7 +62,7 @@ describe 'LesBonnesChoses' do
       documents.total_results_size.should == 40
       documents.total_pages.should == 2
       documents.next_page.should == nil
-      documents.prev_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UkL0hcuvzYUANCrm&page=1&pageSize=20"
+      documents.prev_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UlfoxUnM08QWYXdl&page=1&pageSize=20"
     end
     it "works on page 2 with a pagination step of 10" do
       documents = @api.form("everything").page("2").page_size("10").submit(@master_ref)
@@ -71,14 +71,14 @@ describe 'LesBonnesChoses' do
       documents.results_size.should == 10
       documents.total_results_size.should == 40
       documents.total_pages.should == 4
-      documents.next_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UkL0hcuvzYUANCrm&page=3&pageSize=10"
-      documents.prev_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UkL0hcuvzYUANCrm&page=1&pageSize=10"
+      documents.next_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UlfoxUnM08QWYXdl&page=3&pageSize=10"
+      documents.prev_page.should == "https://lesbonneschoses.prismic.io/api/documents/search?ref=UlfoxUnM08QWYXdl&page=1&pageSize=10"
     end
   end
 
   describe 'API::Document' do
     before do
-      @document = @api.form('everything').query(%([[:d = at(document.id, "UkL0gMuvzYUANCpf")]])).submit(@master_ref)[0]
+      @document = @api.form('everything').query(%([[:d = at(document.id, "UlfoxUnM0wkXYXbh")]])).submit(@master_ref)[0]
     end
 
     it 'Operator [] works on document' do
@@ -111,10 +111,10 @@ describe 'LesBonnesChoses' do
     it 'has a proper each method' do
       array = []
       @documents.each {|document| array << document.slug }
-      array.join(' ').should == 'pastry-dresser exotic-kiwi-pie apricot-pie sweet-strawberry-pie woodland-cherry-pie cool-coconut-macaron salted-caramel-macaron the-end-of-a-chapter-the-beginning-of-a-new-one get-the-right-approach-to-ganache one-day-in-the-life-of-a-les-bonnes-choses-pastry les-bonnes-chosess-internship-a-testimony our-world-famous-pastry-art-brainstorm-event tips-to-dress-a-pastry triple-chocolate-cupcake dont-be-a-stranger about-us wedding-gift-box art-director store-intern content-director'
+      array.join(' ').should == 'art-director store-intern content-director ganache-specialist community-manager oven-instrumentist paris-saint-lazare tokyo-roppongi-hills london-covent-garden paris-champ-elysees new-york-fifth-avenue pastry-dresser exotic-kiwi-pie apricot-pie sweet-strawberry-pie woodland-cherry-pie cool-coconut-macaron salted-caramel-macaron the-end-of-a-chapter-the-beginning-of-a-new-one get-the-right-approach-to-ganache'
     end
     it 'is a proper Enumerable' do
-      @documents.map {|document| document.slug }.join(' ').should == 'pastry-dresser exotic-kiwi-pie apricot-pie sweet-strawberry-pie woodland-cherry-pie cool-coconut-macaron salted-caramel-macaron the-end-of-a-chapter-the-beginning-of-a-new-one get-the-right-approach-to-ganache one-day-in-the-life-of-a-les-bonnes-choses-pastry les-bonnes-chosess-internship-a-testimony our-world-famous-pastry-art-brainstorm-event tips-to-dress-a-pastry triple-chocolate-cupcake dont-be-a-stranger about-us wedding-gift-box art-director store-intern content-director'
+      @documents.map {|document| document.slug }.join(' ').should == 'art-director store-intern content-director ganache-specialist community-manager oven-instrumentist paris-saint-lazare tokyo-roppongi-hills london-covent-garden paris-champ-elysees new-york-fifth-avenue pastry-dresser exotic-kiwi-pie apricot-pie sweet-strawberry-pie woodland-cherry-pie cool-coconut-macaron salted-caramel-macaron the-end-of-a-chapter-the-beginning-of-a-new-one get-the-right-approach-to-ganache'
     end
   end
 
@@ -125,23 +125,23 @@ describe 'LesBonnesChoses' do
     describe 'API::Fragments::StructuredText' do
       it "returns a correct as_html on a StructuredText with list, span, embed and image" do
         @api.form("everything")
-          .query(%([[:d = at(document.id, "UkL0gMuvzYUANCpr")]]))
+          .query(%([[:d = at(document.id, "UlfoxUnM0wkXYXbX")]]))
           .submit(@master_ref)[0]['blog-post.body'].as_html(@link_resolver).gsub("&#39;", "'").should == "<h1>Get the right approach to ganache</h1>\n\n<p>A lot of people touch base with us to know about one of our key ingredients, and the essential role it plays in our creations: ganache.</p>\n\n<p>Indeed, ganache is the macaron's softener, or else, macarons would be but tough biscuits; it is the cupcake's wrapper, or else, cupcakes would be but plain old cake. We even sometimes use ganache within our cupcakes, to soften the cake itself, or as a support to our pies' content.</p>\n\n<h2>How to approach ganache</h2>\n\n<img src=\"https://prismic-io.s3.amazonaws.com/lesbonneschoses/ee7b984b98db4516aba2eabd54ab498293913c6c.jpg\" alt=\"\" width=\"640\" height=\"425\" />\n\n<p>Apart from the taste balance, which is always a challenge when it comes to pastry, the tough part about ganache is about thickness. It is even harder to predict through all the phases the ganache gets to meet (how long will it get melted? how long will it remain in the fridge?). Things get a hell of a lot easier to get once you consider that there are two main ways to get the perfect ganache:</p>\n\n<ul><li><strong>working from the top down</strong>: start with a thick, almost hard material, and soften it by manipulating it, or by mixing it with a more liquid ingredient (like milk)</li><li><strong>working from the bottom up</strong>: start from a liquid-ish state, and harden it by miwing it with thicker ingredients, or by leaving it in the fridge longer.</li></ul>\n\n<p>We do hope this advice will empower you in your ganache-making skills. Let us know how you did with it!</p>\n\n<h2>Ganache at <em>Les Bonnes Choses</em></h2>\n\n<p>We have a saying at Les Bonnes Choses: \"Once you can make ganache, you can make anything.\"</p>\n\n<p>As you may know, we like to give our workshop artists the ability to master their art to the top; that is why our Preparation Experts always start off as being Ganache Specialists for Les Bonnes Choses. That way, they're given an opportunity to focus on one exercise before moving on. Once they master their ganache, and are able to provide the most optimal delight to our customers, we consider they'll thrive as they work on other kinds of preparations.</p>\n\n<h2>About the chocolate in our ganache</h2>\n\n<p>Now, we've also had a lot of questions about how our chocolate gets made. It's true, as you might know, that we make it ourselves, from Columbian cocoa and French cow milk, with a process that much resembles the one in the following Discovery Channel documentary.</p>\n\n        <div data-oembed=\"http://www.youtube.com/\"\n            data-oembed-type=\"video\"\n            data-oembed-provider=\"youtube\"><iframe width=\"459\" height=\"344\" src=\"http://www.youtube.com/embed/Ye78F3-CuXY?feature=oembed\" frameborder=\"0\" allowfullscreen></iframe></div>\n"
       end
       it "returns a correct as_html on a StructuredText with links" do
         @api.form("everything")
           .query(%([[:d = at(document.id, "#{@api.bookmark('about')}")]]))
-          .submit(@master_ref)[0]['article.content'].as_html(@link_resolver).gsub("&#39;", "'").should == "<h2>A tale of pastry and passion</h2>\n\n<p>As a child, Jean-Michel Pastranova learned the art of fine cuisine from his grand-father, Jacques Pastranova, who was the creator of the \"taste-design\" art current, and still today an unmissable reference of forward-thinking in cuisine. At first an assistant in his grand-father's kitchen, Jean-Michel soon found himself fascinated by sweet flavors and the tougher art of pastry, drawing his own path in the ever-changing cuisine world.</p>\n\n<p>In 1992, the first Les Bonnes Choses store opened on rue Saint-Lazare, in Paris (<a href=\"http://localhost/UkL0gMuvzYUANCpa\">we're still there!</a>), much to everyone's surprise; indeed, back then, it was very surprising for a highly promising young man with a preordained career as a restaurant chef, to open a pastry shop instead. But soon enough, contemporary chefs understood that Jean-Michel had the drive to redefine a new nobility to pastry, the same way many other kinds of cuisine were being qualified as \"fine\".</p>\n\n<p>In 1996, meeting an overwhelming demand, Jean-Michel Pastranova opened <a href=\"http://localhost/UkL0gMuvzYUANCpX\">a second shop on Paris's Champs-Élysées</a>, and <a href=\"http://localhost/UkL0gMuvzYUANCpY\">a third one in London</a>, the same week! Eventually, Les Bonnes Choses gained an international reputation as &quot;a perfection so familiar and new at the same time, that it will feel like a taste travel&quot; (New York Gazette), &quot;the finest balance between surprise and comfort, enveloped in sweetness&quot; (The Tokyo Tribune), &quot;a renewal of the pastry genre (...), the kind that changed the way pastry is approached globally&quot; (The San Francisco Gourmet News). Therefore, it was only a matter of time before Les Bonnes Choses opened shops in <a href=\"http://localhost/UkL0gMuvzYUANCpW\">New York</a> (2000) and <a href=\"http://localhost/UkL0gMuvzYUANCpZ\">Tokyo</a> (2004).</p>\n\n<p>In 2013, Jean-Michel Pastranova stepped down as the CEO and Director of Workshops, remaining a senior advisor to the board and to the workshop artists; he passed the light on to Selena, his daugther, who initially learned the art of pastry from him. Passion for great food runs in the Pastranova family...</p>\n\n<img src=\"https://prismic-io.s3.amazonaws.com/lesbonneschoses/df6c1d87258a5bfadf3479b163fd85c829a5c0b8.jpg\" alt=\"\" width=\"800\" height=\"533\" />\n\n<h2>Our main value: our customers' delight</h2>\n\n<p>Our every action is driven by the firm belief that there is art in pastry, and that this art is one of the dearest pleasures one can experience.</p>\n\n<p>At Les Bonnes Choses, people preparing your macarons are not simply &quot;pastry chefs&quot;: they are &quot;<a href=\"http://localhost/UkL0gMuvzYUANCpe\">ganache specialists</a>&quot;, &quot;<a href=\"http://localhost/UkL0gMuvzYUANCpc\">fruit experts</a>&quot;, or &quot;<a href=\"http://localhost/UkL0gMuvzYUANCpb\">oven instrumentalists</a>\". They are the best people out there to perform the tasks they perform to create your pastry, giving it the greatest value. And they just love to make their specialized pastry skill better and better until perfection.</p>\n\n<p>Of course, there is a workshop in each <em>Les Bonnes Choses</em> store, and every pastry you buy was made today, by the best pastry specialists in your country.</p>\n\n<p>However, the very difficult art of creating new concepts, juggling with tastes and creating brand new, powerful experiences, is performed every few months, during our &quot;<a href=\"http://localhost/UkL0gMuvzYUANCpo\">Pastry Art Brainstorms</a>&quot;. During the event, the best pastry artists in the world (some working for <em>Les Bonnes Choses</em>, some not) gather in Paris, and showcase the experiments they've been working on; then, the other present artists comment on the piece, and iterate on it together, in order to make it the best possible masterchief!</p>\n\n<p>The session is presided by Jean-Michel Pastranova, who then selects the most delightful experiences, to add it to <em>Les Bonnes Choses</em>'s catalogue.</p>"
+          .submit(@master_ref)[0]['article.content'].as_html(@link_resolver).gsub("&#39;", "'").should == "<h2>A tale of pastry and passion</h2>\n\n<p>As a child, Jean-Michel Pastranova learned the art of fine cuisine from his grand-father, Jacques Pastranova, who was the creator of the \"taste-design\" art current, and still today an unmissable reference of forward-thinking in cuisine. At first an assistant in his grand-father's kitchen, Jean-Michel soon found himself fascinated by sweet flavors and the tougher art of pastry, drawing his own path in the ever-changing cuisine world.</p>\n\n<p>In 1992, the first Les Bonnes Choses store opened on rue Saint-Lazare, in Paris (<a href=\"http://localhost/UlfoxUnM0wkXYXbb\">we're still there!</a>), much to everyone's surprise; indeed, back then, it was very surprising for a highly promising young man with a preordained career as a restaurant chef, to open a pastry shop instead. But soon enough, contemporary chefs understood that Jean-Michel had the drive to redefine a new nobility to pastry, the same way many other kinds of cuisine were being qualified as \"fine\".</p>\n\n<p>In 1996, meeting an overwhelming demand, Jean-Michel Pastranova opened <a href=\"http://localhost/UlfoxUnM0wkXYXbP\">a second shop on Paris's Champs-Élysées</a>, and <a href=\"http://localhost/UlfoxUnM0wkXYXbr\">a third one in London</a>, the same week! Eventually, Les Bonnes Choses gained an international reputation as &quot;a perfection so familiar and new at the same time, that it will feel like a taste travel&quot; (New York Gazette), &quot;the finest balance between surprise and comfort, enveloped in sweetness&quot; (The Tokyo Tribune), &quot;a renewal of the pastry genre (...), the kind that changed the way pastry is approached globally&quot; (The San Francisco Gourmet News). Therefore, it was only a matter of time before Les Bonnes Choses opened shops in <a href=\"http://localhost/UlfoxUnM0wkXYXbc\">New York</a> (2000) and <a href=\"http://localhost/UlfoxUnM0wkXYXbU\">Tokyo</a> (2004).</p>\n\n<p>In 2013, Jean-Michel Pastranova stepped down as the CEO and Director of Workshops, remaining a senior advisor to the board and to the workshop artists; he passed the light on to Selena, his daugther, who initially learned the art of pastry from him. Passion for great food runs in the Pastranova family...</p>\n\n<img src=\"https://prismic-io.s3.amazonaws.com/lesbonneschoses/df6c1d87258a5bfadf3479b163fd85c829a5c0b8.jpg\" alt=\"\" width=\"800\" height=\"533\" />\n\n<h2>Our main value: our customers' delight</h2>\n\n<p>Our every action is driven by the firm belief that there is art in pastry, and that this art is one of the dearest pleasures one can experience.</p>\n\n<p>At Les Bonnes Choses, people preparing your macarons are not simply &quot;pastry chefs&quot;: they are &quot;<a href=\"http://localhost/UlfoxUnM0wkXYXba\">ganache specialists</a>&quot;, &quot;<a href=\"http://localhost/UlfoxUnM0wkXYXbQ\">fruit experts</a>&quot;, or &quot;<a href=\"http://localhost/UlfoxUnM0wkXYXbn\">oven instrumentalists</a>\". They are the best people out there to perform the tasks they perform to create your pastry, giving it the greatest value. And they just love to make their specialized pastry skill better and better until perfection.</p>\n\n<p>Of course, there is a workshop in each <em>Les Bonnes Choses</em> store, and every pastry you buy was made today, by the best pastry specialists in your country.</p>\n\n<p>However, the very difficult art of creating new concepts, juggling with tastes and creating brand new, powerful experiences, is performed every few months, during our &quot;<a href=\"http://localhost/UlfoxUnM0wkXYXbl\">Pastry Art Brainstorms</a>&quot;. During the event, the best pastry artists in the world (some working for <em>Les Bonnes Choses</em>, some not) gather in Paris, and showcase the experiments they've been working on; then, the other present artists comment on the piece, and iterate on it together, in order to make it the best possible masterchief!</p>\n\n<p>The session is presided by Jean-Michel Pastranova, who then selects the most delightful experiences, to add it to <em>Les Bonnes Choses</em>'s catalogue.</p>"
       end
       it "returns a correct as_text on a StructuredText" do
         @api.form("everything")
-          .query(%([[:d = at(document.id, "UkL0gMuvzYUANCps")]]))
+          .query(%([[:d = at(document.id, "UlfoxUnM0wkXYXbt")]]))
           .submit(@master_ref)[0]['blog-post.body'].as_text.should == "The end of a chapter the beginning of a new one Jean-Michel Pastranova, the founder of Les Bonnes Choses, and creator of the whole concept of modern fine pastry, has decided to step down as the CEO and the Director of Workshops of Les Bonnes Choses, to focus on other projects, among which his now best-selling pastry cook books, but also to take on a primary role in a culinary television show to be announced later this year. \"I believe I've taken the Les Bonnes Choses concept as far as it can go. Les Bonnes Choses is already an entity that is driven by its people, thanks to a strong internal culture, so I don't feel like they need me as much as they used to. I'm sure they are greater ways to come, to innovate in pastry, and I'm sure Les Bonnes Choses's coming innovation will be even more mind-blowing than if I had stayed longer.\" He will remain as a senior advisor to the board, and to the workshop artists, as his daughter Selena, who has been working with him for several years, will fulfill the CEO role from now on. \"My father was able not only to create a revolutionary concept, but also a company culture that puts everyone in charge of driving the company's innovation and quality. That gives us years, maybe decades of revolutionary ideas to come, and there's still a long, wonderful path to walk in the fine pastry world.\""
       end
 
       it "returns a correct as_text on a StructuredText with a separator" do
         @api.form("everything")
-          .query(%([[:d = at(document.id, "UkL0gMuvzYUANCps")]]))
+          .query(%([[:d = at(document.id, "UlfoxUnM0wkXYXbt")]]))
           .submit(@master_ref)[0]['blog-post.body'].as_text(' #### ').should == "The end of a chapter the beginning of a new one #### Jean-Michel Pastranova, the founder of Les Bonnes Choses, and creator of the whole concept of modern fine pastry, has decided to step down as the CEO and the Director of Workshops of Les Bonnes Choses, to focus on other projects, among which his now best-selling pastry cook books, but also to take on a primary role in a culinary television show to be announced later this year. #### \"I believe I've taken the Les Bonnes Choses concept as far as it can go. Les Bonnes Choses is already an entity that is driven by its people, thanks to a strong internal culture, so I don't feel like they need me as much as they used to. I'm sure they are greater ways to come, to innovate in pastry, and I'm sure Les Bonnes Choses's coming innovation will be even more mind-blowing than if I had stayed longer.\" #### He will remain as a senior advisor to the board, and to the workshop artists, as his daughter Selena, who has been working with him for several years, will fulfill the CEO role from now on. #### \"My father was able not only to create a revolutionary concept, but also a company culture that puts everyone in charge of driving the company's innovation and quality. That gives us years, maybe decades of revolutionary ideas to come, and there's still a long, wonderful path to walk in the fine pastry world.\""
       end
     end

data/spec/prismic_spec.rb

@@ -116,7 +116,7 @@ describe 'Api' do
   describe 'parse_api_response' do
     before do
       @data = File.read("#{File.dirname(__FILE__)}/responses_mocks/api.json")
-      @json = JSON.parse(@data)
+      @json = JSON.load(@data)
       @parsed = Prismic::API.parse_api_response(@json, nil, Prismic::DefaultHTTPClient, false)
     end
 
@@ -225,11 +225,11 @@ describe 'Api' do
     end
 
     it "returns the json representation of the api" do
-      JSON.parse(@json)['foo'].should == 'bar'
+      JSON.load(@json)['foo'].should == 'bar'
     end
 
     it "returns the json representation of the api containing one single element" do
-      JSON.parse(@json).size.should == 1
+      JSON.load(@json).size.should == 1
     end
   end
 
@@ -446,4 +446,82 @@ describe 'SearchForm' do
       expect { @form.submit }.to raise_error Prismic::SearchForm::NoRefSetException
     end
   end
+
+  describe 'submit_raw' do
+    before do
+      @api = Prismic.api("https://lesbonneschoses.prismic.io/api")
+      @master_ref = @api.master_ref
+    end
+    it "returns a proper JSON string if all ok" do
+      data = <<-DATA.gsub(/\n */, '').strip
+        {
+          "page":1,
+          "results_per_page":1,
+          "results_size":1,
+          "total_results_size":40,
+          "total_pages":40,
+          "next_page":"https://lesbonneschoses.prismic.io/api/documents/search?ref=UlfoxUnM08QWYXdl&page=2&pageSize=1",
+          "prev_page":null,
+          "results":[{
+            "id":"UlfoxUnM0wkXYXbV",
+            "type":"job-offer",
+            "href":"https://lesbonneschoses.prismic.io/api/documents/search?ref=UlfoxUnM08QWYXdl&q=%5B%5B%3Ad+%3D+at%28document.id%2C+%22UlfoxUnM0wkXYXbV%22%29+%5D%5D",
+            "tags":[],
+            "slugs":["art-director"],
+            "linked_documents":[{
+              "id":"UlfoxUnM0wkXYXbb",
+              "tags":[],
+              "type":"store",
+              "slug":"paris-saint-lazare"
+            }],
+            "data":{
+              "job-offer":{
+                "name":{
+                  "type":"StructuredText",
+                  "value":[{"type":"heading1","text":"Art Director","spans":[]}]
+                },
+                "location":[{
+                  "type":"Link.document",
+                  "value":{
+                    "document":{
+                      "id":"UlfoxUnM0wkXYXbb",
+                      "type":"store",
+                      "tags":[],
+                      "slug":"paris-saint-lazare"
+                    },
+                    "isBroken":false
+                  }
+                }],
+                "contract_type":{"type":"Select","value":"Permanent"},
+                "service":{"type":"Select","value":"Office"},
+                "profile":{
+                  "type":"StructuredText",
+                  "value":[{
+                    "type":"paragraph",
+                    "text":"Brand visual identity must be vital to you, and you must have a thorough experience with working for/with great visual brands. We will ask you to present your previous work, and explain your choices, so be prepared. Previous work with luxury brands is a plus.",
+                    "spans":[]
+                  }]
+                },
+                "job_description":{
+                  "type":"StructuredText",
+                  "value":[{
+                    "type":"paragraph",
+                    "text":"As our only Art director, you will be the one in charge of every design aspect of Les Bonnes Choses, from the design of our pastry boxes, of our shop fronts, of our website, ... You will lead a team of more specialized people, and you will be expected to be able to travel from time to time.",
+                    "spans":[]
+                  },{
+                    "type":"paragraph",
+                    "text":"You will be the vessel that will bring emotions to our clientbase, before they tasted our pastries. We are aware the responsibility is huge, and we hope that you are too.",
+                    "spans":[]
+                  }]
+                }
+              }
+            }
+          }],
+          "version":"61d96e9",
+          "license":"All Rights Reserved"
+        }
+      DATA
+      @api.form("everything").page_size('1').submit_raw(@master_ref).should == data
+    end
+  end
 end

data/spec/responses_mocks/document.json

@@ -51,6 +51,13 @@
         }
         ]
       },
+      "location" : {
+        "type": "GeoPoint",
+        "value": {
+          "latitude": 48.877108,
+          "longitude": -2.3338790
+        }
+      },
       "image": {
         "type": "Image",
         "value": {
@@ -168,7 +175,68 @@
         }
         ]
       }
-      ]
+      ],
+      "some_timestamp" : {
+        "type" : "Timestamp",
+        "value" : "2014-06-18T15:30:00+0000"
+      },
+      "linked_images": {
+        "type": "StructuredText",
+        "value": [
+          {
+            "spans": [],
+            "text": "Here is some introductory text.",
+            "type": "paragraph"
+          },
+          {
+            "spans": [],
+            "text": "The following image is linked.",
+            "type": "paragraph"
+          },
+          {
+            "alt": "",
+            "copyright": "",
+            "dimensions": {
+              "height": 129,
+              "width": 260
+            },
+            "linkTo": {
+              "type": "Link.web",
+              "value": {
+                "url": "http://google.com/"
+              }
+            },
+            "type": "image",
+            "url": "http://fpoimg.com/129x260"
+          },
+          {
+            "spans": [
+              {
+                "end": 20,
+                "start": 0,
+                "type": "strong"
+              }
+            ],
+            "text": "More important stuff",
+            "type": "paragraph"
+          },
+          {
+            "spans": [],
+            "text": "One more image, this one is not linked:",
+            "type": "paragraph"
+          },
+          {
+            "alt": "",
+            "copyright": "",
+            "dimensions": {
+              "height": 199,
+              "width": 300
+            },
+            "type": "image",
+            "url": "http://fpoimg.com/199x300"
+          }
+        ]
+      }
     }
   }
 }

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 require 'nokogiri'
 begin
-  require 'yajl'
+  require 'yajl/json_gem'
 rescue LoadError
   # ok not a big deal
+  require 'json'
 end
-require 'json'
 require 'simplecov'
 
 SimpleCov.start

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: prismic.io
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc9
+  version: 1.0.0.rc10
 platform: ruby
 authors:
 - "Étienne Vallette d'Osia"
 - Samy Dindane
+- Rudy Rigot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +92,7 @@ files:
 - lib/prismic/fragments/date.rb
 - lib/prismic/fragments/embed.rb
 - lib/prismic/fragments/fragment.rb
+- lib/prismic/fragments/geopoint.rb
 - lib/prismic/fragments/group.rb
 - lib/prismic/fragments/image.rb
 - lib/prismic/fragments/link.rb
@@ -99,6 +101,7 @@ files:
 - lib/prismic/fragments/select.rb
 - lib/prismic/fragments/structured_text.rb
 - lib/prismic/fragments/text.rb
+- lib/prismic/fragments/timestamp.rb
 - lib/prismic/json_parsers.rb
 - lib/prismic/version.rb
 - prismic.gemspec
@@ -138,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Prismic.io development kit