glossyapp 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d580505eb9909f64e97c58e3aa6e822f7eb3f6c
-  data.tar.gz: 0e1c21b09317e7f827806d51c3e2da40cbeffc1e
+  metadata.gz: 783887e5937c63054721cbdb020cfcec02e7d71f
+  data.tar.gz: 1fccc4563c990803cdfe1a2a9773654731bf81a5
 SHA512:
-  metadata.gz: 120cdde4556886fab487f1c15126e6e1e60ad814d885d97cd2a9f438cb10301f3636c5dd68579122c2c8f1e93eee3686536273baa2b1929e5280fd737feff7e2
-  data.tar.gz: 67bae257bda06564c813d92d607e0cd1880b31a3caa51e487e02ad8fd56375b0938481ab40aefd2be08c8dbbcd117bb221cd659d7613ba01484fa27209fa8656
+  metadata.gz: 023f8bc3ab091ae40291a3346262b9cfb0ef887a62f4744b74cf76faf6a93aaa28e828f01ef72177bf1c6b73d0e5eb4beab8eef3b85c633959cd8432c767e77d
+  data.tar.gz: 6d9afc2477c2dce5908add0a2a735f8c2ac1062e569c5ad49e40626b7497d7234eb536d2381d6cef26f9711beb78cdfe419707cfbcef31a2b8721c4058780937

data/lib/glossyapp/session/assets.rb

@@ -3,10 +3,7 @@ module GlossyApp
   class Session
 
     def create_file_asset(file_path, asset_folder_id)
-      # won't work otherwise...
-      setup_session
-
-      response = @glossy_api.post_multipart("/asset_folders/#{asset_folder_id}/asset_files", {}, { 'asset_file[asset_file]' => file_path })
+      response = glossy_post_multipart("/asset_folders/#{asset_folder_id}/asset_files", {}, { 'asset_file[asset_file]' => file_path })
 
       if [200, 201].include?(response.status)
         asset_file = JSON.parse(response.body)
@@ -19,7 +16,7 @@ module GlossyApp
     end
 
     def delete_file_asset(asset_folder_id, asset_file_id)
-      response = @glossy_api.delete("/asset_folders/#{asset_folder_id}/asset_files/#{asset_file_id}")
+      response = glossy_delete("/asset_folders/#{asset_folder_id}/asset_files/#{asset_file_id}")
       if [200, 201].include?(response.status)
         return true
       else
@@ -35,7 +32,7 @@ module GlossyApp
         }
       }
 
-      response = @glossy_api.post('/asset_folders', data.to_json, {"Content-Type" => "application/json"})
+      response = glossy_post('/asset_folders', data.to_json, {"Content-Type" => "application/json"})
       if [200, 201].include?(response.status)
         asset_folder = JSON.parse(response.body)
         return asset_folder['asset_folder']['id']
@@ -45,7 +42,7 @@ module GlossyApp
     end
 
     def delete_assets_folder(assets_folder_id)
-      response = @glossy_api.delete("/asset_folders/#{assets_folder_id}")
+      response = glossy_delete("/asset_folders/#{assets_folder_id}")
       if [200, 201].include?(response.status)
         return true
       else
@@ -54,7 +51,7 @@ module GlossyApp
     end
 
     def asset_folder_with_name_exists?(asset_folder_name, parent_folder_id='root')
-      response = @glossy_api.get "/asset_folders/#{parent_folder_id}"
+      response = glossy_get "/asset_folders/#{parent_folder_id}"
       if [200].include?(response.status)
         root = JSON.parse(response.body)
         root['asset_folder']['children'].each do |folder|

data/lib/glossyapp/session/documents.rb

@@ -3,7 +3,7 @@ module GlossyApp
   class Session
 
     def get_document_with_external_id(external_id)
-      response = @glossy_api.get "/documents"
+      response = glossy_get "/documents"
       if [200].include?(response.status)
         json = JSON.parse(response.body)
 
@@ -27,7 +27,7 @@ module GlossyApp
     end
 
     def get_document(document_id)
-      response = @glossy_api.get "/documents/#{document_id}"
+      response = glossy_get "/documents/#{document_id}"
       if [200].include?(response.status)
         return JSON.parse(response.body)
       else
@@ -47,7 +47,7 @@ module GlossyApp
         }
       }
 
-      response = @glossy_api.post("/documents", post_data.to_json, {"Content-Type" => "application/json"})
+      response = glossy_post("/documents", post_data.to_json, {"Content-Type" => "application/json"})
       if [200, 201].include?(response.status)
         document = JSON.parse(response.body)
 
@@ -60,7 +60,7 @@ module GlossyApp
     end
 
     def delete_document(document_id)
-      response = @glossy_api.delete("/documents/#{document_id}")
+      response = glossy_delete("/documents/#{document_id}")
       if [200, 201].include?(response.status)
         return true
       else
@@ -69,7 +69,7 @@ module GlossyApp
     end
 
     def document_exists?(document_id)
-      response = @glossy_api.get "/documents/#{document_id}"
+      response = glossy_get "/documents/#{document_id}"
       if [200].include?(response.status)
         doc = JSON.parse(response.body)
         return document_id.to_s == doc['id'].to_s
@@ -79,7 +79,7 @@ module GlossyApp
     end
 
     def publish_document(document_id)
-      response = @glossy_api.post("/documents/#{document_id}/publish", {})
+      response = glossy_post("/documents/#{document_id}/publish", {})
       if [200, 201].include?(response.status)
         return true
       else
@@ -88,7 +88,7 @@ module GlossyApp
     end
 
     def unpublish_document(document_id)
-      response = @glossy_api.post("/documents/#{document_id}/unpublish", {})
+      response = glossy_post("/documents/#{document_id}/unpublish", {})
       if [200, 201].include?(response.status)
         return true
       else
@@ -97,7 +97,7 @@ module GlossyApp
     end
 
     def import_asset_file_into_document(document_id, asset_file_id)
-      response = @glossy_api.post("/documents/#{document_id}/import", {:asset_file_id => asset_file_id}.to_json, {"Content-Type" => "application/json"})
+      response = glossy_post("/documents/#{document_id}/import", {:asset_file_id => asset_file_id}.to_json, {"Content-Type" => "application/json"})
       if [200, 201].include?(response.status)
         return true
       else

data/lib/glossyapp/session/page_elements.rb

@@ -15,7 +15,7 @@ module GlossyApp
         }.merge(data)
       }
 
-      response = @glossy_api.post("/documents/#{document_id}/pages/#{page_id}/page_elements", data.to_json, {"Content-Type" => "application/json"})
+      response = glossy_post("/documents/#{document_id}/pages/#{page_id}/page_elements", data.to_json, {"Content-Type" => "application/json"})
       if [200, 201].include?(response.status)
         json = JSON.parse(response.body)
         return json['page_element']['id']
@@ -25,7 +25,7 @@ module GlossyApp
     end
 
     def delete_page_element(document_id, page_id, page_element_id)
-      response = @glossy_api.delete "/documents/#{document_id}/pages/#{page_id}/page_elements/#{page_element_id}"
+      response = glossy_delete "/documents/#{document_id}/pages/#{page_id}/page_elements/#{page_element_id}"
       if [200].include?(response.status)
         return true
       else

data/lib/glossyapp/session/pages.rb

@@ -9,7 +9,7 @@ module GlossyApp
         }
       }
       
-      response = @glossy_api.put("/documents/#{document_id}/pages/#{page_id}", post_data.to_json, {"Content-Type" => "application/json"})
+      response = glossy_put("/documents/#{document_id}/pages/#{page_id}", post_data.to_json, {"Content-Type" => "application/json"})
       if [200, 201].include?(response.status)
         return true
     
@@ -20,7 +20,7 @@ module GlossyApp
     end
     
     def get_pages(document_id)
-      response = @glossy_api.get "/documents/#{document_id}/pages"
+      response = glossy_get "/documents/#{document_id}/pages"
       if [200].include?(response.status)
         return JSON.parse(response.body)
       else
@@ -29,7 +29,7 @@ module GlossyApp
     end
     
     def page_id_for_page_position(document_id, position)
-      response = @glossy_api.get "/documents/#{document_id}/pages?positions=#{position}"
+      response = glossy_get "/documents/#{document_id}/pages?positions=#{position}"
       if [200].include?(response.status)
         json = JSON.parse(response.body)
         if json['pages'].is_a?(Array) and json['pages'].size > 0

data/lib/glossyapp/session.rb

@@ -1,5 +1,6 @@
 require 'patron'
 require 'json'
+require 'net/http'
 
 require "glossyapp/session/documents"
 require "glossyapp/session/publications"
@@ -23,11 +24,16 @@ module GlossyApp
       @proxy = proxy
       @timeout = timeout
       
-      setup_session
+      @user_agent = "glossyapp-api-ruby/#{GlossyApp::VERSION}"
+      
+      # Handle Proxy
+      if @proxy
+        raise "Setting a proxy is no longer supported"
+      end
     end
     
     def ping
-      response = @glossy_api.get "/ping"
+      response = glossy_get "/ping"
       if [200].include?(response.status)
         return true
       else
@@ -35,14 +41,27 @@ module GlossyApp
       end
     end
     
-    # FIXME: remove before publishing
-    def self.local_dev
-      GlossyApp::Session.new("1rbsyZyuqyYeUxzsAkpJ", "http://localhost:3000/api/v1")#, 'http://localhost:8888')
-    end
     
     protected
     
-    def setup_session
+    def glossy_get(path, headers = {})
+      request = Net::HTTP::Get.new(build_uri(path))
+      return make_request(request, headers)
+    end
+    
+    def glossy_put(path, data, headers = {})
+      request = Net::HTTP::Put.new(build_uri(path))
+      request.body = data
+      return make_request(request, headers)
+    end
+    
+    def glossy_post(path, data, headers = {})
+      request = Net::HTTP::Post.new(build_uri(path))
+      request.body = data
+      return make_request(request, headers)
+    end
+    
+    def glossy_post_multipart(path, data, file, headers = {})
       @glossy_api = Patron::Session.new
       @glossy_api.timeout = @timeout
       
@@ -54,12 +73,53 @@ module GlossyApp
       
       @glossy_api.proxy = @proxy
       
-      @glossy_api.headers['User-Agent'] = "glossyapp-api-ruby/#{GlossyApp::VERSION}"
+      @glossy_api.headers['User-Agent'] = @user_agent
       @glossy_api.headers['Accept'] = 'application/json'
       
-      #@glossy_api.enable_debug STDOUT
+      response = @glossy_api.post_multipart(path, data, file, headers)
+      
+      return GlossyResponse.new(response.status, response.body)
+    end
+    
+    def glossy_delete(path, headers = {})
+      request = Net::HTTP::Delete.new(build_uri(path))
+      return make_request(request, headers)
+    end
+    
+    
+    
+    
+    
+    def build_uri(path)
+      return URI("#{@base_url}#{path}")
+    end
+    
+    def make_request(request, headers)
+      request['Accept'] = 'application/json'
+      request['User-Agent'] = @user_agent
+      
+      headers.each_pair { |key, value| request[key] = value }
+      
+      request.basic_auth @api_key, ''
+      
+      response = Net::HTTP.start(request.uri.hostname, request.uri.port, :use_ssl => request.uri.scheme == 'https', :read_timeout => @timeout) do |http|
+        http.request(request)
+      end
+      
+      return GlossyResponse.new(response.code.to_i, response.body)
     end
     
+    
+  end
+  
+  class GlossyResponse
+    attr_accessor :status
+    attr_accessor :body
+    
+    def initialize(status, body)
+      @status = status
+      @body = body
+    end
   end
   
 end

data/lib/glossyapp/version.rb

@@ -1,3 +1,3 @@
 module GlossyApp
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glossyapp
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Philipp Schmid
@@ -105,7 +105,6 @@ files:
 - lib/glossyapp/session/publications.rb
 - lib/glossyapp/util.rb
 - lib/glossyapp/version.rb
-- old_vanga_main.rb
 homepage: http://www.glossyapp.com
 licenses:
 - MIT

data/old_vanga_main.rb

@@ -1,154 +0,0 @@
-
-def create_article(article, gallery = nil, asset_file_id = nil)
-  post_data = {
-    'article' => {
-      'title' => article[:title],
-      'subtitle' => article[:subtitle],
-      'abstract' => article[:pretext],
-      'content' => article[:textbody]
-    }
-  }
-  
-  if gallery
-    post_data['article']['image_gallery_id'] = gallery[:glossyapp_id]
-  end
-
-  if asset_file_id
-    post_data['article']['header_image_asset_file_id'] = asset_file_id
-  end
-
-  response = @glossy_api.post("/documents/#{@options[:document_id]}/articles", post_data.to_json, {"Content-Type" => "application/json"})
-  if [200, 201].include?(response.status)
-    article = JSON.parse(response.body)
-    
-    article_id = article['id']
-    return article_id
-    
-  else
-    raise "Couldn't create article: #{response.inspect}\n#{response.body}"
-  end
-end
-
-
-def toc_section_id_for_section_with_title(title)
-  response = @glossy_api.get "/documents/#{@options[:document_id]}/toc_sections?title=#{CGI.escape(title)}"
-  if [200].include?(response.status)
-    json = JSON.parse(response.body)
-    if json['toc_sections'].is_a?(Array) and json['toc_sections'].size > 0
-      return json['toc_sections'].first['id']
-    else
-      return nil
-    end
-  else
-    return nil
-  end
-end
-
-def create_toc_section(title, description)
-  post_data = {
-    'toc_section' => {
-      'title' => title,
-      'description' => description
-    }
-  }
-
-  response = @glossy_api.post("/documents/#{@options[:document_id]}/toc_sections", post_data.to_json, {"Content-Type" => "application/json"})
-  if [200, 201].include?(response.status)
-    json = JSON.parse(response.body)
-    return json['id']
-  else
-    raise "Invalid response: #{response.inspect}\n#{response.body}"
-  end
-end
-
-def create_toc_entry(section_id, title, page_index)
-  post_data = {
-    'toc_entry' => {
-      'title' => title,
-      'page_index' => page_index
-    }
-  }
-
-  response = @glossy_api.post("/documents/#{@options[:document_id]}/toc_sections/#{section_id}/toc_entries", post_data.to_json, {"Content-Type" => "application/json"})
-  if [200, 201].include?(response.status)
-    json = JSON.parse(response.body)
-    return json['id']
-  else
-    raise "Invalid response: #{response.inspect}\n#{response.body}"
-  end
-end
-
-
-
-
-
-def old_vanga_main
-  
-  # Check if document exists on GlossyApp
-  if check_if_document_exists
-    @logger.info "Document #{@options[:document_id]} does exist"
-  else
-    raise "Document #{@options[:document_id]} does NOT exist"
-  end
-  
-
-  # create assets_folder_for_this_import
-  asset_folder_id = create_assets_folder("Import of: #{Time.now}")
-    
-  # create articles and ToC
-  articles.each do |article|
-    # create header image for article
-    asset_file_id = nil
-    if article[:url_headerimage_large]
-      begin
-        Tempfile.open('article_header_image') do |f|
-          download_file(article[:url_headerimage_large], f.path)
-
-          asset_file_id = create_file_asset(f.path, asset_folder_id)
-        end
-      rescue Exception => e
-        asset_file_id = nil
-      end
-    end
-    
-    # create gallery for article
-    gallery = gallery_from_article(article)
-    gallery[:glossyapp_id] = create_gallery(gallery) if gallery
-
-    # create article
-    article_id = create_article(article, gallery, asset_file_id)
-    
-    # create ToC entry
-    unless article[:title].nil? or article[:title].size <= 0
-      section_id = toc_section_id_for_section_with_title(article[:title])
-      unless section_id        
-        if article[:title] && article[:subtitle]
-          section_id = create_toc_section(article[:title], article[:subtitle])
-          create_toc_entry(section_id, article[:title], article[:pageStart].to_i - 1)
-        end
-      end
-    end
-    
-    # create ToC section entries & article_links
-    article[:pageStart].to_i.upto(article[:pageEnd].to_i) do |page_position|
-      
-      # create article_link
-      page_id = page_id_for_page_position(page_position)
-      if page_id        
-        create_page_element(page_id,
-          0,
-          0,
-          0,
-          0,
-          'article_link',
-          {'article_id' => article_id },
-          article[:title])
-      else
-        @logger.error "Did not find page for article..."
-      end
-
-    end
-  end
-end
-
-