ink_file_picker 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a681af38820d24f5944958571caa2ec6e9a2a2
-  data.tar.gz: c689b7e0f95090e1563c3aa10de8bcd85e3e240b
+  metadata.gz: 4719c0f6e4a7133f778fbe0a526bfb789a4c1cde
+  data.tar.gz: b52840576ea9e984cc36b991e1cc91821d05765a
 SHA512:
-  metadata.gz: 006cda13b071eaf270d6c99dde3423e21cc3506f297cdbbc44f66dfdd1478664633f10e6a634b6e15aeee76abea4571cc117bd9365d994864307c6e9ac581a84
-  data.tar.gz: ac22138a939849a2521d635178fdeeeef8b462290db9427bb039bcb1d63ddf8928875b05b9df1b88c96c4bef520b081e3858055a99013434a12fe71dfdf2519f
+  metadata.gz: f586ec60871af2f0d1911680ac2f9435665a46c764dc9dedb36883bdd6d32fbcab8b74c9207a082cd3ef6d513d6963c0e0ad1680173dca16240bb3b769923bd7
+  data.tar.gz: c2341290c994729ceb7f26c9773b3fb88bdaf19b8e8fe3b63499ab8d042f88b186c8b63dfa642869a8e27ba5aaa4a2273707fb6e76a520bca4bd8c52cdeee95e

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/.travis.yml

@@ -1,8 +1,12 @@
+before_install:
+  - gem install bundler
+  - gem update bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.2
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.1
   - ruby-head
   - jruby-19mode
   - jruby

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.4
+* Dropped ActiveSupport as a dependency. Should make life easier for everyone.
+* Expiry on the policy can be given as an object acting as Time, as long as #to_i
+  returns Epoch time.
+
 ## 0.0.3
 * Raise UnexpectedResponseError if we receive a 200 OK, but response body is neither "success", nor valid JSON.
   This may happen if you ask File Picker to download a URL, but the server for the given URL fails to respond
@@ -5,7 +10,6 @@
   the UnexpectedResponseError is raised. Other download errors may also be in the response, for instance
   "Invalid response when trying to read from `http://some.url.com/here.jpg`.
 
-
 ## 0.0.2
 * You can call to_hash on response objects.
 

data/README.md

@@ -1,6 +1,6 @@
 # InkFilePicker
 
-Ruby API client for Ink File Picker (known as filepicker.io).
+Ruby API client for filestack.com. Previously known as Ink File Picker and filepicker.io.
 
 [![Build Status](https://travis-ci.org/Skalar/ink_file_picker.svg?branch=master)](https://travis-ci.org/Skalar/ink_file_picker)
 
@@ -49,12 +49,12 @@ response = client.remove url_or_handle_name
 ### Read operations
 ```ruby
 url = client.convert_url url_or_handle_name, w: 100, h: 100
-url = client.convert_url url_or_handle_name, {w: 100, h: 100}, expiry: 10.minutes.from_now.to_i
+url = client.convert_url url_or_handle_name, {w: 100, h: 100}, expiry: (Time.now + 60 * 10).to_i
 
 # Adds policy and signature, if secret given when client was created.
 get_params = {} # Get params we'll be adding to the request.
 url = client.retrieve_url url_or_handle_name
-url = client.retrieve_url url_or_handle_name, get_params, expiry: 10.minutes.from_now.to_i
+url = client.retrieve_url url_or_handle_name, get_params, expiry: (Time.now + 60 * 10).to_i
 
 
 # Get simple stat on a file, like the Javascript client

data/ink_file_picker.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 3.2.14", "< 5"
   spec.add_dependency "faraday", "~> 0.9.0"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14.1"
+  spec.add_development_dependency "bundler", "~> 1.12.5"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
 end

data/lib/ink_file_picker.rb

@@ -1,19 +1,16 @@
 require "ink_file_picker/version"
 
-require "active_support/all"
 require "ink_file_picker/errors"
+require "ink_file_picker/assignable"
+require "ink_file_picker/configuration"
+require "ink_file_picker/file_handle"
+require "ink_file_picker/url_builder"
+require "ink_file_picker/response"
+require "ink_file_picker/client"
+require "ink_file_picker/policy"
+require "ink_file_picker/utils"
 
 module InkFilePicker
-  extend ActiveSupport::Autoload
-
-  autoload :Assignable
-  autoload :Configuration
-  autoload :FileHandle
-  autoload :UrlBuilder
-  autoload :Response
-  autoload :Client
-  autoload :Policy
-
   # Public: Creates a new Ink File Picker Client.
   #
   # configuration - configuration for the client with an API key

data/lib/ink_file_picker/client.rb

@@ -12,7 +12,7 @@ module InkFilePicker
     # Public: Store a file from given URL.
     #
     # url                 - URL to resource
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {e: (Time.now + 60 * 10)} here
     #
     # Returns a hash representing the response where you can read for instance 'url'
     def store_url(url, policy_attributes = {})
@@ -33,7 +33,7 @@ module InkFilePicker
     # file_or_path        - File or path to file
     # content_type        - The file's content type
     # filename            - The file's name, optional
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # Returns a hash representing the response where you can read for instance 'url'
     def store_file(file_or_path, content_type, filename = nil, policy_attributes = {})
@@ -53,7 +53,7 @@ module InkFilePicker
     # Public: Removes a file from file picker.
     #
     # handle_or_url       - The handle or URL to the file
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # Returns boolean value
     def remove(handle_or_url, policy_attributes = {})
@@ -67,7 +67,7 @@ module InkFilePicker
     #
     # handle_or_url       - The handle or URL to the file
     # params              - Request params, like {width: true, height: true} to get width and height info. May be empty for default response
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # Returns hash of headers returned from file picker or false if request was unsuccessful
     def stat(handle_or_url, params = {}, policy_attributes = {})
@@ -79,7 +79,7 @@ module InkFilePicker
     # Public: Generates a you can use for removing an asset on file picker.
     #
     # handle_or_url       - The handle or URL to the file
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # Returns a URL to the converted image
     def remove_url(handle_or_url, policy_attributes = {})
@@ -90,7 +90,7 @@ module InkFilePicker
     #
     # handle_or_url       - The handle or URL to the file
     # params              - Convert params, like {w: 100, h:100}
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # Returns a URL to the converted image
     def convert_url(handle_or_url, params = {}, policy_attributes = {})
@@ -102,7 +102,7 @@ module InkFilePicker
     #
     # handle_or_url       - The handle or URL to the file
     # params              - Params to be added as get params, like {cache: true}
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # This method is not that usefull unless you have enabled security policy
     #
@@ -115,7 +115,7 @@ module InkFilePicker
     # Public: Generates a stat URL for a given file
     #
     # handle_or_url       - The handle or URL to the file
-    # policy_attributes   - If you use security policies you may send in for instance {expire: 10.minutes.from_now} here
+    # policy_attributes   - If you use security policies you may send in for instance {expire: (Time.now + 60 * 10)} here
     #
     # Returns a URL to the image you can do a HEAD request to in order to get stats
     def stat_url(handle_or_url, params, policy_attributes = {})
@@ -130,10 +130,12 @@ module InkFilePicker
     #
     # Returns Policy object
     def policy(attributes)
-      attributes.reverse_merge!(
+      defaults = {
         secret: configuration.secret,
         expiry: Time.now.to_i + configuration.default_expiry
-      )
+      }.freeze
+
+      attributes = defaults.merge attributes
 
       Policy.new attributes
     end

data/lib/ink_file_picker/configuration.rb

@@ -24,7 +24,7 @@ module InkFilePicker
     private
 
     def verify!
-      if key.blank?
+      if Utils::Blank.blank? key
         fail ArgumentError, "An API key must be provided"
       end
     end

data/lib/ink_file_picker/file_handle.rb

@@ -18,7 +18,7 @@ module InkFilePicker
     private
 
     def build_url_from_handle
-      joins_with = cdn_url.ends_with?('/') ? '' : '/'
+      joins_with = cdn_url.end_with?('/') ? '' : '/'
       [cdn_url, handle].join joins_with
     end
 

data/lib/ink_file_picker/policy.rb

@@ -13,7 +13,9 @@ module InkFilePicker
       assign attributes
     end
 
-
+    def expiry=(epoch_or_time_object)
+      @expiry = epoch_or_time_object.to_i
+    end
 
     def policy
       Base64.urlsafe_encode64 policy_json
@@ -25,7 +27,7 @@ module InkFilePicker
 
 
     def to_hash
-      return {} if secret.blank?
+      return {} if Utils::Blank.blank? secret
 
       {
         policy: policy,
@@ -39,7 +41,7 @@ module InkFilePicker
       out = {}
 
       POLICY_ATTRIBUTES.each do |attr_name|
-        if value = self[attr_name] and value.present?
+        if value = self[attr_name] and !Utils::Blank.blank?(value)
           out[attr_name] = value
         end
       end

data/lib/ink_file_picker/response.rb

@@ -1,9 +1,14 @@
+require 'forwardable'
+require 'json'
+
 module InkFilePicker
   # Public: Simple decorator class for response.
   #
   # Decorates the response with hash like access to the
   # parsed body, which is expected to be JSON.
   class Response
+    extend Forwardable
+
     DELEGATE_TO_RESPONSE = %w[
       success? status headers body finished?
     ]
@@ -14,8 +19,8 @@ module InkFilePicker
 
     attr_reader :http_response
 
-    delegate *DELEGATE_TO_RESPONSE, to: :http_response
-    delegate *DELEGATE_TO_PARSED_BODY, to: :parsed_body
+    def_delegators :http_response,  *DELEGATE_TO_RESPONSE
+    def_delegators :parsed_body,    *DELEGATE_TO_PARSED_BODY
 
 
     def initialize(http_response)

data/lib/ink_file_picker/url_builder.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module InkFilePicker
   # Public: Takes a file url, adds action to the path (if any), and includes params.
   class UrlBuilder
@@ -11,7 +13,7 @@ module InkFilePicker
 
     def url
       url = [file_url, action].compact.join '/'
-      url = [url, params.to_param].join '?' if params.any?
+      url = [url, URI.encode_www_form(params)].join '?' if params.any?
 
       url
     end

data/lib/ink_file_picker/utils.rb

@@ -0,0 +1,22 @@
+module InkFilePicker
+  module Utils
+    module Blank
+      STRING_MATCHER = /\A[[:space:]]*\z/
+
+      def self.blank?(object)
+        case object
+        when String
+          STRING_MATCHER === object
+        when Hash, Array
+          object.empty?
+        when TrueClass, Numeric
+          false
+        when FalseClass, NilClass
+          true
+        else
+          object.respond_to?(:empty?) ? !!object.empty? : !self
+        end
+      end
+    end
+  end
+end

data/lib/ink_file_picker/version.rb

@@ -1,3 +1,3 @@
 module InkFilePicker
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/ink_file_picker/client_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
+require 'uri'
 
 describe InkFilePicker::Client do
+  # Helper method, returns a hash represneting get query param
+  def query_to_hash(uri)
+    uri = URI.parse uri
+    Hash[uri.query.split('&').map { |name_value| name_value.split('=') }]
+  end
+
   let(:attributes) do
     {
       key: 'key',
@@ -27,7 +34,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.store_url url
 
@@ -49,7 +56,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.store_url url, expiry: 1394363896
 
@@ -67,7 +74,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         expect { subject.store_url url, expiry: 1394363896 }.to raise_error InkFilePicker::ClientError
       end
@@ -84,7 +91,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         expect { subject.store_url url, expiry: 1394363896 }.to raise_error InkFilePicker::UnexpectedResponseError
       end
@@ -99,7 +106,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         expect { subject.store_url url, expiry: 1394363896 }.to raise_error InkFilePicker::ServerError
       end
@@ -124,8 +131,8 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
-        Faraday::UploadIO.stub(:new).and_return file_upload # Need same object, so request equals the stub
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
+        allow(Faraday::UploadIO).to receive(:new).and_return file_upload # Need same object, so request equals the stub
 
         response = subject.store_file file, 'image/png'
 
@@ -142,8 +149,8 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
-        Faraday::UploadIO.stub(:new).and_return file_upload # Need same object, so request equals the stub
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
+        allow(Faraday::UploadIO).to receive(:new).and_return file_upload # Need same object, so request equals the stub
 
         response = subject.store_file path, 'image/png'
 
@@ -162,8 +169,8 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
-        Faraday::UploadIO.stub(:new).and_return file_upload # Need same object, so request equals the stub
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
+        allow(Faraday::UploadIO).to receive(:new).and_return file_upload # Need same object, so request equals the stub
 
         response = subject.store_file file, 'image/png', nil, expiry: 1394363896
 
@@ -181,7 +188,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         expect { subject.store_file file, 'image/png', nil, expiry: 1394363896 }.to raise_error InkFilePicker::ClientError
       end
@@ -196,7 +203,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         expect { subject.store_file file, 'image/png', nil, expiry: 1394363896 }.to raise_error InkFilePicker::ServerError
       end
@@ -218,12 +225,12 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.remove file_url
 
         stubs.verify_stubbed_calls
-        expect(response).to be_true
+        expect(response).to be_truthy
       end
 
       it "makes delete request with file handle name" do
@@ -235,12 +242,12 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.remove 'WmFxB2aSe20SGT2kzSsr'
 
         stubs.verify_stubbed_calls
-        expect(response).to be_true
+        expect(response).to be_truthy
       end
 
       it "handles server errors correctly" do
@@ -252,7 +259,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         expect { subject.remove 'WmFxB2aSe20SGT2kzSsr' }.to raise_error InkFilePicker::ServerError
       end
@@ -268,12 +275,12 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.remove file_url, expiry: 1394363896
 
         stubs.verify_stubbed_calls
-        expect(response).to be_true
+        expect(response).to be_truthy
       end
     end
   end
@@ -282,15 +289,15 @@ describe InkFilePicker::Client do
     let(:file_url) { 'https://www.filepicker.io/api/file/WmFxB2aSe20SGT2kzSsr' }
 
     it "handles server errors correctly" do
-      stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get(file_url + '/metadata') { [502, {}, 'Bad Gateway'] }
+      stubs = Faraday::Adapter::Test::Stubs.new do |receive|
+        receive.get(file_url + '/metadata') { [502, {}, 'Bad Gateway'] }
       end
 
       stubbed_connection = Faraday.new do |builder|
         builder.adapter :test, stubs
       end
 
-      subject.stub(:http_connection).and_return stubbed_connection
+      allow(subject).to receive(:http_connection).and_return stubbed_connection
 
       expect { subject.stat 'WmFxB2aSe20SGT2kzSsr' }.to raise_error InkFilePicker::ServerError
     end
@@ -307,7 +314,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.stat file_url, {}, expiry: 1394363896
 
@@ -326,7 +333,7 @@ describe InkFilePicker::Client do
           builder.adapter :test, stubs
         end
 
-        subject.stub(:http_connection).and_return stubbed_connection
+        allow(subject).to receive(:http_connection).and_return stubbed_connection
 
         response = subject.stat file_url, {width: true, heigth: true}, expiry: 1394363896
 
@@ -344,17 +351,37 @@ describe InkFilePicker::Client do
       before { subject.configuration.secret = nil }
 
       it "builds expected convert URL when given a URL" do
-        expect(subject.convert_url url, w: 300, h: 200).to eq 'https://www.filepicker.io/api/file/PHqJHHWpRAGUsIfyx0og/convert?h=200&w=300'
+        converted_url = subject.convert_url url, w: 300, h: 200
+
+        expect(converted_url).to start_with 'https://www.filepicker.io/api/file/PHqJHHWpRAGUsIfyx0og/convert?'
+        expect(query_to_hash converted_url).to include({
+          "h" => "200",
+          "w" => "300"
+        })
       end
 
       it "builds expected convert URL when given a handle" do
-        expect(subject.convert_url handle, w: 300, h: 200).to eq 'https://www.filepicker.io/api/file/PHqJHHWpRAGUsIfyx0og/convert?h=200&w=300'
+        converted_url = subject.convert_url handle, w: 300, h: 200
+
+        expect(converted_url).to start_with 'https://www.filepicker.io/api/file/PHqJHHWpRAGUsIfyx0og/convert?'
+        expect(query_to_hash converted_url).to include({
+          "h" => "200",
+          "w" => "300"
+        })
       end
     end
 
     context "with secret" do
       it "builds expected convert URL when given a URL" do
-        expect(subject.convert_url url, {w: 300, h: 200}, expiry: 1394363896).to eq 'https://www.filepicker.io/api/file/PHqJHHWpRAGUsIfyx0og/convert?h=200&policy=eyJleHBpcnkiOjEzOTQzNjM4OTYsImNhbGwiOiJjb252ZXJ0IiwiaGFuZGxlIjoiUEhxSkhIV3BSQUdVc0lmeXgwb2cifQ%3D%3D&signature=b370d4ae604c7917c169fe5b10a6274683bb82056c7b80993a7601d486b89d22&w=300'
+        converted_url = subject.convert_url url, {w: 300, h: 200}, expiry: 1394363896
+
+        expect(converted_url).to start_with 'https://www.filepicker.io/api/file/PHqJHHWpRAGUsIfyx0og/convert?'
+        expect(query_to_hash converted_url).to include({
+          "h" => "200",
+          "w" => "300",
+          "policy" => "eyJleHBpcnkiOjEzOTQzNjM4OTYsImNhbGwiOiJjb252ZXJ0IiwiaGFuZGxlIjoiUEhxSkhIV3BSQUdVc0lmeXgwb2cifQ%3D%3D",
+          "signature" => "b370d4ae604c7917c169fe5b10a6274683bb82056c7b80993a7601d486b89d22"
+        })
       end
     end
   end
@@ -405,19 +432,20 @@ describe InkFilePicker::Client do
     describe "expiry" do
       context "is given" do
         it "uses given value" do
-          InkFilePicker::Policy.should_receive(:new).with(hash_including(call: 'read', expiry: 60)).and_return policy
+          expect(InkFilePicker::Policy).to receive(:new).with(hash_including(call: 'read', expiry: 60)).and_return policy
 
           expect(subject.policy policy_attributes.merge(expiry: 60)).to eq policy
         end
       end
 
       context "not given" do
-        before { Time.stub_chain(:now, :to_i).and_return 1 }
+        let(:the_time) { double :time, to_i: 1 }
+        before { allow(Time).to receive(:now).and_return the_time }
 
         it "uses default_expiry from config" do
-          subject.configuration.stub(:default_expiry).and_return 600
+          allow(subject.configuration).to receive(:default_expiry).and_return 600
 
-          InkFilePicker::Policy.should_receive(:new).with(hash_including(call: 'read', expiry: 601)).and_return policy
+          expect(InkFilePicker::Policy).to receive(:new).with(hash_including(call: 'read', expiry: 601)).and_return policy
 
           expect(subject.policy policy_attributes).to eq policy
         end

data/spec/ink_file_picker/configuration_spec.rb

@@ -10,10 +10,10 @@ describe InkFilePicker::Configuration do
 
   subject { described_class.new attributes }
 
-  its(:key) { should eq 'key' }
-  its(:secret) { should eq 'secret' }
-  its(:default_expiry) { should eq 600 }
-  its(:cdn_url) { should eq 'https://www.filepicker.io/api/file/' }
+  it { expect(subject.key).to eq 'key' }
+  it { expect(subject.secret).to eq 'secret' }
+  it { expect(subject.default_expiry).to eq 600 }
+  it { expect(subject.cdn_url).to eq 'https://www.filepicker.io/api/file/' }
 
   describe "#initialize" do
     it "fails when no key is given" do

data/spec/ink_file_picker/policy_spec.rb

@@ -11,8 +11,25 @@ describe InkFilePicker::Policy do
     )
   end
 
-  its(:policy) { should eq 'eyJleHBpcnkiOjEzOTQzNjM4OTYsImNhbGwiOiJyZWFkIn0=' }
-  its(:signature) { should eq '4c50ca71d9e123274a01eb00a7facd52069e07c2e9312517f55bf1b94447792e' }
+  it { expect(subject.policy).to eq 'eyJleHBpcnkiOjEzOTQzNjM4OTYsImNhbGwiOiJyZWFkIn0=' }
+  it { expect(subject.signature).to eq '4c50ca71d9e123274a01eb00a7facd52069e07c2e9312517f55bf1b94447792e' }
+
+  describe "the policy" do
+    let(:decoded) do
+      JSON.parse Base64.urlsafe_decode64 subject.policy
+    end
+
+    it { expect(decoded['call']).to eq 'read' }
+    it { expect(decoded['expiry']).to eq 1394363896 }
+
+    it "ensures expiry is a number" do
+      time = Time.parse('2016-01-01 00:00:00 +0100')
+      subject.expiry = time
+
+      decoded = JSON.parse Base64.urlsafe_decode64 subject.policy
+      expect(decoded['expiry']).to eq 1451602800
+    end
+  end
 
   describe "#to_hash" do
     it "contains policy and signature when secret is given" do

data/spec/ink_file_picker_spec.rb

@@ -6,7 +6,7 @@ describe InkFilePicker do
       client = double
       attributes = {some: 'attributes'}
 
-      InkFilePicker::Client.should_receive(:new).with(attributes).and_return client
+      expect(InkFilePicker::Client).to receive(:new).with(attributes).and_return client
 
       expect(described_class.client(attributes)).to eq client
     end

data/spec/spec_helper.rb

@@ -2,5 +2,4 @@ require 'bundler/setup'
 require 'ink_file_picker'
 
 RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ink_file_picker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Thorbjørn Hermansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.14
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.14
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -45,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
 description: 
 email:
 - thhermansen@gmail.com
@@ -94,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -110,6 +91,7 @@ files:
 - lib/ink_file_picker/policy.rb
 - lib/ink_file_picker/response.rb
 - lib/ink_file_picker/url_builder.rb
+- lib/ink_file_picker/utils.rb
 - lib/ink_file_picker/version.rb
 - spec/fixtures/skalar.png
 - spec/ink_file_picker/client_spec.rb