bcl 0.3.4 → 0.3.5

data/lib/bcl/component_methods.rb

@@ -42,6 +42,7 @@ module BCL
     def initialize()
       @config = nil
       @session = nil
+      @access_token = nil
       @http = nil
       @api_version = 2.0
       config_path = File.expand_path('~') + '/.bcl'
@@ -94,10 +95,10 @@ module BCL
       data = %Q({"username":"#{username}","password":"#{password}"})
       #data = {"username" => username, "password" => password}
       
-      path = "/api/user/login.json?"
+      login_path = "/api/user/login.json?"
       headers = {'Content-Type' => 'application/json'}
 
-      res, data = @http.post(path, data, headers)
+      res, data = @http.post(login_path, data, headers)
       
       #restClient wasn't working
       #res = RestClient.post "#{@config[:server][:url]}/api/user/login", data.to_json, :content_type => :json, :accept => :json
@@ -134,7 +135,7 @@ module BCL
 			@session = {session_name => sessid,bnes_name => bnesid,bni_name => bni_id}
 		
 =end
-		
+    
         bnes = ""
         bni = ""
         junkout = res["set-cookie"].split(";")
@@ -162,9 +163,24 @@ module BCL
           end
         end
 
-        @session = session_name + '=' + sessid + ';' + bni + ";" + bnes
-          
-        #puts "SESSION COOKIE: #{@session}"
+        @session = session_name + '=' + sessid + ';' + bni + ";" + bnes 
+         
+        #get access token
+        token_path = "/services/session/token"
+        token_headers = {'Content-Type' => 'application/json', 'Cookie' => @session}
+        #puts "token_headers = #{token_headers.inspect}"
+        access_token_res, access_token = @http.post(token_path,"",token_headers)
+        if access_token_res.code == '200'
+          @access_token = access_token
+        else
+          puts "Unable to get access token; uploads will not work"
+          puts "error code: #{access_token_res.code}"
+          puts "error info: #{access_token_res.body}"
+        end
+		
+        #puts "access_token = *#{@access_token}*" 
+        #puts "cookie = #{@session}"
+        
         res
       else
       
@@ -179,6 +195,7 @@ module BCL
     # username and password set in ~/.bcl/config.yml file
     def push_content(filename_and_path, write_receipt_file, content_type, bcl_group_id)
       raise "Please login before pushing components" if @session.nil?
+      raise "Do not have a valid access token; try again" if @access_token.nil?
       valid = false
       res_j = nil
       filename = File.basename(filename_and_path)
@@ -197,6 +214,10 @@ module BCL
                 "node" =>
                {
                 "type" => "#{content_type}",
+                "field_component_tags" =>  #TODO remove this field_component_tags once BCL is fixed
+                  {
+                    "und" => "1289"
+                  },  
                 "og_group_ref" =>
                   {
                     "und" =>
@@ -209,8 +230,8 @@ module BCL
       #res = RestClient.post "#{@config[:server][:url]}/api/content.json", @data.to_json, :content_type => :json, :cookies => @session
 	   
       path = "/api/content.json"	 
-      headers = {'Content-Type' => 'application/json', 'Cookie' => @session}
-
+      headers = {'Content-Type' => 'application/json','X-CSRF-Token' => @access_token, 'Cookie' => @session}
+      #puts headers.inspect
       res, data = @http.post(path, @data.to_json, headers)		
 		 
       res_j = "could not get json from http post response"
@@ -288,6 +309,10 @@ module BCL
                "node" =>
                {
                 "uuid" => "#{uuid}",
+                "field_component_tags" =>  #TODO remove this field_component_tags once BCL is fixed
+                  {
+                    "und" => "1289"
+                  },                  
                 "og_group_ref" =>
                   {
                     "und" =>
@@ -301,7 +326,7 @@ module BCL
 		#res = RestClient.post "#{@config[:server][:url]}/api/content", @data.to_json, :content_type => :json, :cookies => @session, :accept => :json   
 
 		path = "/api/content.json"	 
-		headers = {'Content-Type' => 'application/json', 'Cookie' => @session}
+		headers = {'Content-Type' => 'application/json', 'Cookie' => @session, 'X-CSRF-Token' => @access_token}
 
 		res, data = @http.post(path, @data.to_json, headers)
 				

data/lib/bcl/component_spreadsheet.rb

@@ -23,6 +23,7 @@
 require 'rubygems'
 require 'pathname'
 require 'fileutils'
+require 'date'
 
 # required gems
 require 'uuid' # gem install uuid
@@ -55,7 +56,7 @@ class ComponentSpreadsheet
 if $have_win32ole
 
   #initialize with Excel spreadsheet to read
-  def initialize(xlsx_path,worksheet_names = "all")
+  def initialize(xlsx_path,worksheet_names =["all"])
     
     @xlsx_path = Pathname.new(xlsx_path).realpath.to_s
     @worksheets = []
@@ -67,7 +68,7 @@ if $have_win32ole
       xlsx = excel.Workbooks.Open(@xlsx_path)
       
       #by default, operate on all worksheets
-      if worksheet_names == "all"
+      if worksheet_names == ["all"]
         xlsx.Worksheets.each do |xlsx_worksheet|
           parse_xlsx_worksheet(xlsx_worksheet)
         end
@@ -144,6 +145,13 @@ end # if $have_win32ole
           
             author = values.delete_at(0)
             datetime = values.delete_at(0)
+            if datetime.nil?
+              puts "[ComponentSpreadsheet] WARNING missing the date in the datetime column in the spreadsheet - assuming today"
+              datetime = DateTime.new
+            else
+              datetime = DateTime.parse(datetime)
+            end
+            
             comment = values.delete_at(0)
             component_xml.add_provenance(author.to_s, datetime.to_s, comment.to_s)
             
@@ -270,6 +278,8 @@ end # if $have_win32ole
       headers[0].name = "description"
     end
     
+    puts "  Found #{num_rows - 2} components"
+    
     components = []
     for i in 3..num_rows do
       component = ComponentStruct.new

data/lib/bcl/component_xml.rb

@@ -289,6 +289,8 @@ module BCL
         comp_xml.description @description if @description != ""
         comp_xml.comment @comment if @comment != ""
 
+        comp_xml.fidelity_level @fidelity_level if @fidelity_level != ""
+        
         comp_xml.provenances {
           @provenances.each do |prov|
             comp_xml.provenance {