highwinds-api 0.0.5 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 691f0f9c8235c31faa1205e5cea7b53be3636401
+  data.tar.gz: fba8b69d606d486442ba825340718acfab4307e1
+SHA512:
+  metadata.gz: 89c125373d2a361cc8fb439d547c857ca035df4d4587fbd0f53a4e80c57d7e80f25b8a1f2db66e64b6eea491fc361a5b08b895d46a5858c8f4bb4a38d88f68ea
+  data.tar.gz: ca30802de4882d4230de5924899fc9c9c9e553e104cd4aca4b3f3c1969dd4d7f8b636b9e709606a4d4f2b5fa0201816f8355dabf0ef08814aa4fe6a060ba95a5

data/.gitignore

@@ -1,17 +1,4 @@
 *.gem
 *.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
 pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+spec/config.yml

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format nested
+

data/Gemfile

@@ -1,9 +1,6 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in highwinds-api.gemspec
 gemspec
 
-group :test, :development do
-  gem 'rspec', "~>2.0"
-  gem 'rake', '~>0.9.2'
+group :development do
+  gem "rake", "~> 0.9"
 end

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    highwinds-api (0.0.7)
+      httparty (~> 0.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    httparty (0.13.3)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    json (1.8.2)
+    multi_xml (0.5.5)
+    rake (0.9.6)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  highwinds-api!
+  rake (~> 0.9)
+  rspec (~> 2.11)

data/highwinds-api.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency "httparty", "~> 0.10.2"
+  gem.add_dependency "httparty", "~> 0.13"
+  gem.add_development_dependency "rspec", "~> 2.11"
 end

data/lib/highwinds-api/content.rb

@@ -2,33 +2,43 @@ module HighwindsAPI
   require 'httparty'
   class Content
     include HTTParty
-    # debug_output $stdout # adds HTTP debugging 
+    # debug_output $stdout # adds HTTP debugging
 
-    base_uri 'https://striketracker2.highwinds.com/webservices/content/'
+    base_uri 'https://striketracker3.highwinds.com/'
 
     def self.purge_url(url, recursive)
       options = {
-      :headers    =>  { 'Content-Type'  => 'application/xml', 
-                        'Accept'        => 'application/xml' },
-      :basic_auth =>  HighwindsAPI.credentials }
-      self.delete("?recursive=#{recursive}&url=#{url}", options)
+      :headers    =>  { 'Authorization'  => HighwindsAPI.get_token,
+        'Content-Type' => 'application/json'},
+      :body =>  {"list" => [{url: url, recursive: recursive }]}.to_json }
+      self.post("/api/v1/accounts/#{get_account_hash}/purge", options)
     end
 
+    # This method returns the last item post result
     def self.purge_path(host_hash, path)
-      options = {
-      :headers    =>  { 'Content-Type'  => 'application/xml', 
-                        'Accept'        => 'application/xml' },
-      :basic_auth =>  HighwindsAPI.credentials }
-      res = nil
-      path = [*path]
-      path.each do |url|
-        temp_res = self.delete("/#{host_hash}/cds/#{url.chomp('*')}", options)
-        if res.nil? || res.response.code == "200"
-          res = temp_res
-        end
-      end 
+      paths =[*path]
+      paths = paths.map {|single_path| single_path.start_with?('/') ? single_path : '/' << single_path }
+      res=nil
+      paths.each do |path|
+        options = {
+        :headers    =>  { 'Authorization'  => HighwindsAPI.get_token, 
+                          'Content-Type' => 'application/json'},
+        :body =>  {"list" => [{url: "http://cds.#{host_hash}.hwcdn.net#{path}", recursive: true }]}.to_json }
+        res = self.post("/api/v1/accounts/#{get_account_hash}/purge", options)
+      end
       res
     end
-
+    private
+    def self.get_token
+      response = self.post("/auth/token", {body: {grant_type: 'password', username: "#{HighwindsAPI.credentials[:username]}", password: "#{HighwindsAPI.credentials[:password]}"}})
+      "Bearer #{response['access_token']}"      
+    end
+    def self.get_account_hash
+      options = {
+        :headers    =>  { 'Authorization'  => HighwindsAPI.get_token }
+      }
+      me = self.get('/api/v1/users/me', options)
+      me['accountHash'] if me.include?('accountHash')
+    end
   end
 end

data/lib/highwinds-api/version.rb

@@ -1,5 +1,5 @@
 module Highwinds
   module Api
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

data/lib/highwinds-api.rb

@@ -1,10 +1,13 @@
 require "highwinds-api/version"
 
 module HighwindsAPI
-
+  autoload :Content, "highwinds-api/content"
+  ONE_HOUR_IN_SECONDS = 3600
   def self.credentials
-    { :username => @username,
-      :password => @password }
+    {
+      username: @username,
+      password: @password
+    }
   end
 
   def self.set_credentials(username, password)
@@ -12,4 +15,18 @@ module HighwindsAPI
       @password = password
   end
 
+  def self.get_token
+    unless (@token_time and Time.now - @token_time < ONE_HOUR_IN_SECONDS)
+      @token = Content::get_token
+      @token_time = Time.now
+    end
+    @token
+  end
+
+  # should be  used only in testing scenarios
+  def self.clear_token
+    @token = nil
+    @token_time = nil
+  end
+
 end

data/spec/config.example.yml

@@ -0,0 +1,2 @@
+username: <username>
+password: <password>

data/spec/content_spec.rb

@@ -1,45 +1,93 @@
-require 'rspec'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'highwinds-api'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'highwinds-api/content'))
-
-describe 'HighwindsAPI::Content' do
-  username = "<YourUserHere>"
-  password = "<YourPasswordHere>"
-  it "should not purge content, if username and password are not correct." do
-    HighwindsAPI.set_credentials("bad username", "bad password")
-    r = HighwindsAPI::Content.purge_url("http://staging.crossrider.com/kerker/", true).response
-    r.code.should eq("403"), "response was: #{r}"
-  end
+require 'highwinds-api'
 
-  it "should purge content by url" do
-    HighwindsAPI.set_credentials(username, password)
-    r = HighwindsAPI::Content.purge_url("http://staging.crossrider.com/kerker/", true).response
-    r.code.should eq("200"), "response was: #{r}"
-  end
+describe HighwindsAPI::Content do
+  let(:config) { YAML.load_file('spec/config.yml') }
+  let(:client) { HighwindsAPI }
+  let(:content) { client::Content }
 
-  it "should purge folder by path" do
-    HighwindsAPI.set_credentials(username, password)
-    r = HighwindsAPI::Content.purge_path("y2s9x4y9", "kerker/").response
-    r.code.should eq("200"), "response was: #{r}"
-  end
+  context "when credentials are incorrect" do
+    before do
+      client.clear_token
+      client.set_credentials("bad-username", "bad-password")
+    end
 
-  it "should purge file by path" do
-    HighwindsAPI.set_credentials(username, password)
-    r = HighwindsAPI::Content.purge_path("y2s9x4y9", "kerker/akamai").response
-    r.code.should eq("200"), "response was: #{r}"
+    it "does not purge content" do
+      response = content.purge_url("http://staging.crossrider.com/kerker/", true).response
+      expect(response.code).to eq("401")
+    end
   end
 
-  it "should purge folders by array of pathes" do
-    HighwindsAPI.set_credentials(username, password)
-    arr = ["kerker/akamai.txt", "kerker/akamai.htm", "kerker/akamai.gif"]
-    r = HighwindsAPI::Content.purge_path("y2s9x4y9", arr).response
-    r.code.should eq("200"), "response was: #{r}"
+  context "when credentials are correct" do
+    before do
+      client.clear_token
+      client.set_credentials(config["username"], config["password"])
+    end
+
+    it "should purge content by url" do
+      response = content.purge_url("http://staging.crossrider.com/kerker/", true)
+      response.include?("id").should eq(true), "response was: #{response}"
+    end
+
+    it "should purge folder by path" do
+      response = content.purge_path("y2s9x4y9", "/kerker/").response
+      response.code.should eq("200"), "response was: #{response} and response code was #{response.code} and response text #{response.body}"
+    end
+
+    it "should purge file by path" do
+      response = content.purge_path("y2s9x4y9", "kerker/akamai").response
+      response.code.should eq("200"), "response was: #{response}"
+    end
+
+    it "should purge folders by array of pathes" do
+      arr = ["kerker/akamai.txt", "kerker/akamai.htm", "kerker/akamai.gif"]
+      response = content.purge_path("y2s9x4y9", arr).response
+      response.code.should eq("200"), "response was: #{response}"
+    end
+
+    it "should ignore pathes ending with * (purge by path is allways recuresive)" do
+      response = content.purge_path("y2s9x4y9", "kerker/*").response
+      response.code.should eq("200"), "response was: #{response}"
+    end
   end
 
-  it "should ignore pathes ending with * (purge by path is allways recuresive)" do
-    HighwindsAPI.set_credentials(username, password)
-    r = HighwindsAPI::Content.purge_path("y2s9x4y9", "kerker/*").response
-    r.code.should eq("200"), "response was: #{r}"
+  describe "basic functionaility" do
+    let(:host_hash) { "xxxxxxxx" }
+    let(:path) { "baz/*" }
+    let(:url) { "http://foo.bar.com/baz" }
+    let(:recursive) { false }
+    let(:account_hash) {"d3b5s7n9"}
+
+     describe ".purge_url" do
+       it "calls post with given params" do
+        HighwindsAPI.clear_token
+        HighwindsAPI.set_credentials(config["username"], config["password"])      
+        options = {
+          :headers    =>  { 'Authorization'  => HighwindsAPI.get_token,
+                'Content-Type' => 'application/json'},
+          :body =>  {"list" => [{url: url, recursive: recursive }]}.to_json }
+         
+         content.should_receive(:post).\
+           with("/api/v1/accounts/#{account_hash}/purge", options).\
+           and_return("403")
+         content.purge_url(url, recursive)
+       end
+     end
+
+
+     describe ".purge_path" do
+       it "calls post with given params" do
+        HighwindsAPI.clear_token
+        HighwindsAPI.set_credentials(config["username"], config["password"])      
+        options = {
+          :headers    =>  { 'Authorization'  => HighwindsAPI.get_token,
+                'Content-Type' => 'application/json'},
+          :body =>  {"list" => [{url: "http://cds.xxxxxxxx.hwcdn.net/baz/*", recursive: true }]}.to_json }
+         content.should_receive(:post).\
+           with("/api/v1/accounts/#{account_hash}/purge", options).\
+           and_return("403")
+         content.purge_path(host_hash, path)
+       end
+     end
   end
 
 end

data/spec/highwinds-api_spec.rb

@@ -0,0 +1,30 @@
+require 'highwinds-api'
+
+describe HighwindsAPI do
+  let(:config) { YAML.load_file('spec/config.yml') }
+
+  it "set credentials" do
+    username = "user"
+    password = "pass"
+    subject.set_credentials(username, password)
+    subject.credentials.should eq({ username: username, password: password })
+  end
+
+  it "get token" do
+    subject.set_credentials(config["username"], config["password"])
+    expect(subject.get_token.length).to be  >= 20
+  end
+
+  it "get token snd time to be the same as first one" do
+    subject.set_credentials(config["username"], config["password"])
+    old_token = subject.get_token
+    new_token = subject.get_token
+    expect(new_token).to be(old_token)
+  end
+
+
+  it "autoloads ::Content" do
+    # subject.autoload?(:Content).should eq("highwinds-api/content")
+    subject::Content.should eq(HighwindsAPI::Content)
+  end
+end

metadata

@@ -1,32 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: highwinds-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Ofir Kerker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 description: Ruby implementation of Highwinds REST API
 email:
 - ofir@crossrider.com
@@ -35,7 +46,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -43,32 +56,33 @@ files:
 - lib/highwinds-api.rb
 - lib/highwinds-api/content.rb
 - lib/highwinds-api/version.rb
+- spec/config.example.yml
 - spec/content_spec.rb
-- spec/general_spec.rb
+- spec/highwinds-api_spec.rb
 homepage: https://github.com/kerkero/highwinds-api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby implementation of Highwinds REST API
 test_files:
+- spec/config.example.yml
 - spec/content_spec.rb
-- spec/general_spec.rb
+- spec/highwinds-api_spec.rb

data/spec/general_spec.rb

@@ -1,11 +0,0 @@
-require 'rspec'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'highwinds-api'))
-
-describe 'HighwindsAPI' do
-  username = "user"
-  password = "pass"
-  it "set credentials" do
-    HighwindsAPI.set_credentials(username, password)
-    HighwindsAPI.credentials.should eq({:username => username, :password => password})
-  end
-end