live_paper 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4dfcf2f3b2dc09dd0e30bf6bebadcf716450fb7
-  data.tar.gz: 7cfdbeb94e1a4a456b05da19bbb2656482f1e1ab
+  metadata.gz: a8e506ee521e614012d2e33d930f8d399623cdb7
+  data.tar.gz: 81a129d47d16a138d10542fe04c7f6ce78773b2a
 SHA512:
-  metadata.gz: 646954d3eafc9b73203023364c8caefa78680630c724b1a9654dd5dc44241fe74890a5a4e931370dc43f4e3d19198234d5087ff500a471b28c18b5977f31420b
-  data.tar.gz: 5dbd3caf1e377d15132edba30c8a8f712e0f6434f78ef87a363dcb297bce8a9b60425a4acf1e2216ca024bde74565cf5fd7feafe892dcadd01aef74053b896b5
+  metadata.gz: edffcf5ba57cd5430bab1bb5c9e1283b9cde187e1f2f2807a0f47526bb4cee99284917a006f819d7763957eac0f4b2fb7b1d3625833d28744f726d88ef175458
+  data.tar.gz: bf363c81984efdc320c8c63633ec660b24fefdfc8aa2dd592da6302c86fe9803cd5c05d2b01a46d9625e66515d7533614ad7ae6d2f5ac7d60c2c73635db85783

data/lib/live_paper/qr_trigger.rb

@@ -4,8 +4,6 @@ module LivePaper
   class QrTrigger < Trigger
     attr_accessor :qrcode_url
 
-    DEFAULT_SUBSCRIPTION = :month
-
     def parse(data)
       data = JSON.parse(data, symbolize_names: true)[:trigger]
       assign_attributes data
@@ -24,9 +22,8 @@ module LivePaper
         trigger: {
           name: @name,
           type: "qrcode",
-          subscription: {
-            package: DEFAULT_SUBSCRIPTION.to_s
-          }
+          startDate: @start_date || default_start_date,
+          endDate: @end_date || default_end_date
         }
       }
     end

data/lib/live_paper/short_trigger.rb

@@ -4,8 +4,6 @@ module LivePaper
   class ShortTrigger < Trigger
     attr_accessor :short_url
 
-    DEFAULT_SUBSCRIPTION = :month
-
     def parse(data)
       data = JSON.parse(data, symbolize_names: true)[:trigger]
       assign_attributes data
@@ -19,9 +17,8 @@ module LivePaper
         trigger: {
           name: @name,
           type: "shorturl",
-          subscription: {
-            package: DEFAULT_SUBSCRIPTION.to_s
-          }
+          startDate: @start_date || default_start_date,
+          endDate: @end_date || default_end_date
         }
       }
     end

data/lib/live_paper/trigger.rb

@@ -1,8 +1,9 @@
 require_relative 'base_object'
+require 'active_support/time'
 
 module LivePaper
   class Trigger < BaseObject
-    attr_accessor :subscription, :state
+    attr_accessor :state, :start_date, :end_date
 
     def self.api_url
       "#{LP_API_HOST}/api/v1/triggers"
@@ -31,6 +32,14 @@ module LivePaper
       trigger_class.new.parse(data_in)
     end
 
+    def default_start_date
+      Time.now.iso8601
+    end
+
+    def default_end_date
+      Time.now.advance(years: 1).iso8601
+    end
+
     private
     def validate_attributes!
       raise ArgumentError, 'Required Attributes needed: name' unless all_present? [@name]
@@ -43,6 +52,7 @@ module LivePaper
         }
       }
     end
+
   end
 
 end

data/lib/live_paper/version.rb

@@ -1,3 +1,3 @@
 module LivePaper
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

data/lib/live_paper/wm_trigger.rb

@@ -5,7 +5,6 @@ module LivePaper
     attr_accessor :wm_url
     WATERMARK_RESOLUTION = 75
     WATERMARK_STRENGTH = 10
-    DEFAULT_SUBSCRIPTION = :month
 
     def parse(data)
       data = JSON.parse(data, symbolize_names: true)[:trigger]
@@ -33,9 +32,8 @@ module LivePaper
         trigger: {
           name: @name,
           type: "watermark",
-          subscription: {
-            package: DEFAULT_SUBSCRIPTION.to_s
-          }
+          startDate: @start_date || default_start_date,
+          endDate: @end_date || default_end_date
         }
       }
     end

data/live_paper.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
   spec.add_runtime_dependency "rest-client"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/spec/live_paper/trigger_spec.rb

@@ -3,34 +3,64 @@ require 'spec_helper'
 DOWNLOAD_URL = "https://watermark.livepaperapi.com/watermark/v1/triggers"
 
 describe LivePaper::WmTrigger do
+  let(:start_date) { "my_start_date" }
+  let(:end_date) { "my_end_date" }
+  let(:data) {
+    {
+      id: 'id',
+      name: 'name',
+      start_date: start_date,
+      end_date: end_date
+    }
+  }
+
   before do
     stub_request(:post, /.*livepaperapi.com\/auth\/token.*/).to_return(:body => lpp_auth_response_json, :status => 200)
     stub_request(:post, LivePaper::WmTrigger.api_url).to_return(:body => lpp_trigger_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::WmTrigger.api_url}/trigger_id").to_return(:body => lpp_trigger_response_json, :status => 200)
     stub_request(:get, "#{LivePaper::WmTrigger.api_url}/trigger_not_existent").to_return(:body => '{}', :status => 404)
+  end
 
-    @data = {
-      id: 'id',
-      name: 'name',
-      subscription: 'subscription'
+  describe '#initialize without specifying start_date end_date' do
+    let(:data){ 
+      {
+        id: 'id',
+        name: 'name'
+      }
     }
+    before do
+      @trigger = LivePaper::WmTrigger.new data
+    end
+
+    it 'should set startDate attribute to nil by default.' do
+      expect(@trigger.start_date).to be_nil
+    end
+
+    it 'should set endDate attribute to nil by default.' do
+      expect(@trigger.end_date).to be_nil
+    end
+
   end
 
-  describe '#initialize' do
+  describe '#initialize with specifying start_date and end_date' do
     before do
-      @trigger = LivePaper::WmTrigger.new @data
+      @trigger = LivePaper::WmTrigger.new data
     end
 
-    it 'should map the subscription attribute.' do
-      expect(@trigger.subscription).to eq @data[:subscription]
+    it 'should set startDate attribute.' do
+      expect(@trigger.start_date).to eq(start_date)
+    end
+
+    it 'should set endDate attribute.' do
+      expect(@trigger.end_date).to eq(end_date)
     end
   end
 
   describe '#save' do
     context 'when all needed attributes are provided,' do
       before do
-        @data.delete :id
-        @trigger = LivePaper::WmTrigger.new @data
+        data.delete :id
+        @trigger = LivePaper::WmTrigger.new data
       end
 
       it 'should make a POST to the trigger URL with body.' do
@@ -39,7 +69,8 @@ describe LivePaper::WmTrigger do
           trigger: {
             name: 'name',
             type: 'watermark',
-            subscription: {package: 'month'}
+            startDate: start_date,
+            endDate: end_date
           }
         }.to_json
       end
@@ -47,14 +78,16 @@ describe LivePaper::WmTrigger do
 
     context 'when we do not have all needed data,' do
       it 'should raise exception if the name is no provided.' do
-        @data.delete :name
-        trigger = LivePaper::WmTrigger.new @data
+        data.delete :name
+        trigger = LivePaper::WmTrigger.new data
         expect { trigger.save }.to raise_error
       end
     end
   end
 
   describe '#parse' do
+    let(:lpp_start_date_response_json) { JSON.parse(lpp_trigger_response_json)['trigger']['startDate'] }
+    let(:lpp_end_date_response_json) { JSON.parse(lpp_trigger_response_json)['trigger']['endDate'] }
     before do
       @trigger = LivePaper::WmTrigger.parse(lpp_trigger_response_json)
     end
@@ -70,13 +103,20 @@ describe LivePaper::WmTrigger do
       expect(@trigger.name).to eq 'name'
     end
 
-    it 'should map the subscription attribute.' do
-      expect(@trigger.subscription).to eq 'subscription'
+    it 'should map the start_date attribute.' do
+      expect(@trigger.start_date).to eq lpp_start_date_response_json
+    end
+
+    it 'should map the end_date attribute.' do
+      expect(@trigger.end_date).to eq lpp_end_date_response_json
     end
   end
 
   describe '.get' do
     context 'the requested trigger exists.' do
+      let(:lpp_start_date_response_json) { JSON.parse(lpp_trigger_response_json)['trigger']['startDate'] }
+      let(:lpp_end_date_response_json) { JSON.parse(lpp_trigger_response_json)['trigger']['endDate'] }
+      
       before do
         @trigger = LivePaper::Trigger.get('trigger_id')
       end
@@ -85,7 +125,8 @@ describe LivePaper::WmTrigger do
         expect(@trigger.id).to eq 'trigger_id'
         expect(@trigger.name).to eq 'name'
         expect(@trigger.class).to eq LivePaper::WmTrigger
-        expect(@trigger.subscription).to eq 'subscription'
+        expect(@trigger.start_date).to eq lpp_start_date_response_json
+        expect(@trigger.end_date).to eq lpp_end_date_response_json
       end
 
       context 'qr trigger' do
@@ -126,7 +167,7 @@ describe LivePaper::WmTrigger do
 
     before do
       stub_request(:get, "https://fileapi/id/image?imageUrl=#{encoded_image_url}&resolution=#{resolution}&strength=#{strength}").to_return(:body => lpp_watermark_response, :status => 200)
-      @trigger = LivePaper::WmTrigger.new @data
+      @trigger = LivePaper::WmTrigger.new data
       @trigger.wm_url='https://fileapi/id/image'
     end
     

data/spec/spec_helpers/lpp_client.rb

@@ -71,7 +71,8 @@ def lpp_trigger_response_json(type='watermark')
     "state": "ACTIVE",
     "type": "#{type}",
     "watermark": "watermark",
-    "subscription": "subscription"
+    "startDate":"2014-10-08T20:40:26.376+0000",
+    "endDate":"2015-10-09T02:29:12.376+0000"
   }
 }
   RESPONSE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_paper
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Mike Whitmarsh
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the Live Paper service by HP.