fiveapples 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 248cc59ce0fcae37aa84f3b37d1753d2a37220e6a27be1637e1cf90e10cd7890
-  data.tar.gz: 9de4f054e4673e3b60efb5ab0d586b866a8be8d955bbb8cbe10ecaf287ada0c0
+  metadata.gz: 819272c422885597ec73f8dd633cad031e882f03e9c5ee3d009a48792d1ae6eb
+  data.tar.gz: 96e67d9c2cbe9538ca91f30565f8c15553357a7d9c4880c6eccb45454de45917
 SHA512:
-  metadata.gz: f89362536a55e4292a4f4508d0d61b90f59d1434b45446b21067d6340c3de1b209e5f65934105ee8928953fba42cf8a959e0eed2cbd80b760dcced051ab6453f
-  data.tar.gz: 893b60adac0d59cacf29ff37967ec40c1019ae215e94723da80cf00baafd3ebcf4cd0cd8e34148c5ec7cf3a38317c5e495b2133b51432dc40419ade94cde1d75
+  metadata.gz: bf920145c28718564c5c207cb98eb4800d651e691340f1e670b3e8f794ae062c66bba5db6027c28aa09292effbe949b0fcb2db9f0aca1b9b0476b2c4ef13f62d
+  data.tar.gz: b8db84aa3f9f1c83ab63d524be0ee57b10804d39d573a23c59e9efacdfd6e4c6b8444108bb69c056d7399117aa8ea118451331877cb349c1a47175d14f4fa590

data/lib/config5.ru

@@ -33,8 +33,8 @@ end
 
 fiveapples = Rack::OData::Builder.new  do
 
-  use Rack::ODataCommonLogger unless ( FiveA.role == :test )
-
+  use Rack::ODataCommonLogger if FiveA.log
+  
   use Rack::Cors do
     allow do
       origins 'localhost:9494', '127.0.0.1:9494'
@@ -54,9 +54,12 @@ fiveapples = Rack::OData::Builder.new  do
                 '/ui5' => idxh,
                 '/ui5/' => idxh}
   redirects["/#{ui5d}"] = idxh if FiveA.one_way  
-  redirects["/#{ui5d}/"] = idxh if FiveA.one_way  
-  redirects["/ui5/index.html"] = idxh if FiveA.one_way            
-  
+  redirects["/#{ui5d}/"] = idxh if FiveA.one_way
+  if FiveA.one_way     
+    redirects["/ui5/index.html"] = idxh            
+  else
+    redirects["/ui5_1way/index.html"] = idxh 
+  end
   # some user friendly redirects  
   # Note: We need this because serving / with /ui5/index.html content does not work
   # as is produces follow-up javascript resource requests like "/Component.js" 

data/lib/fa_utils.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'socket'
+
+# Ruby 2.5 ships String#delete_prefix but lets try to support 2.4 
+class String
+  def del_prefix(prf)
+    if self[0] == prf
+      self[1..-1]
+    end
+  end
+end
+
+module FiveApples
+  def self.test_host_ip
+    net = Socket.ip_address_list.detect(&:ipv4_private?)
+    net.nil? ? 'localhost' : net.ip_address
+  end
+end

data/lib/fiveapples.rb

@@ -1,28 +1,21 @@
 #!/usr/bin/env ruby
 
 require 'rack'
-
 require 'sequel'
 require 'fileutils'
-require 'socket'
 require 'erb'
 require_relative 'version'
+require_relative 'fa_utils'
+
 require 'safrano.rb'
 
-# Ruby 2.5 ships String#delete_prefix but lets try to support 2.4 
-class String
-  def del_prefix(prf)
-    if self[0] == prf
-      self[1..-1]
-    end
-  end
-end
 
 module FiveApples
   class Server
     CONFIGDIRNAME = 'fiveapples'.freeze
     DBFILENAME = 'fiveapples.db3'.freeze
     CONFIGRU = 'config5.ru'.freeze
+    MEDIADIR = 'media'.freeze
         
     attr_reader :db
     attr_reader :one_way
@@ -31,13 +24,17 @@ module FiveApples
     attr_reader :role
     attr_reader :host
     attr_reader :port
-  
+    attr_reader :media_root
+    attr_accessor :log
+    
     def initialize(options={})
       options ||= {}
       @role = options[:role]
+# from libdir we readonly. --> can be a system (install) dir       
       @libdir = __dir__.dup
       
-      @apphome =  if ( @role == :test )
+# apphome needs to be user-writeable !
+      @apphome = if ( @role == :test )
         File.expand_path('testdb', @libdir)
       else
         gconfigdir = File.expand_path('.config', Dir.home)
@@ -48,18 +45,22 @@ module FiveApples
       
       @systemdbname = File.join(@libdir, DBFILENAME)
       @homedbname = File.expand_path(DBFILENAME, @apphome)
+      @media_root = File.expand_path(MEDIADIR, @apphome)
       @configru = File.expand_path(CONFIGRU, @libdir)
-      
       @one_way = options[:one_way]
       @use_cdn = options[:use_cdn]
-       
+      
+      # in testmode we dont log per default,
+      # in non testmode we log per default,
+      #  but this can be overriden with option
+      @log = ( options[:log] || ( @role != :test ) )
+      
       @resources = @use_cdn ? "https://openui5.hana.ondemand.com/#{OpenUI5::VERSION}/resources/sap-ui-core.js"  : '../resources/sap-ui-core.js'
 
       @ui5d = @one_way ? 'ui5_1way' : 'ui5'
       @port = 9494
       @host = if ( ( @role == :test ) && ENV['selenium_remote_url'] )
-        net = Socket.ip_address_list.detect(&:ipv4_private?)
-        net.nil? ? 'localhost' : net.ip_address
+        FiveApples.test_host_ip()
       else
         'localhost'
       end
@@ -70,16 +71,46 @@ module FiveApples
       if ( @role == :test )
         # in test-mode always start with a fresh DB copy
         FileUtils.cp(@systemdbname, @homedbname)
+        
+        # and reset the media directory 
+        media_photo_dir = File.absolute_path('Photo', @media_root)
+        FileUtils.remove_entry_secure(media_photo_dir) if File.exists?(media_photo_dir)
       else
         FileUtils.cp(@systemdbname, @homedbname) unless File.exist?(@homedbname)
       end
     end
   
+    def db_create_photo_table
+      @db.create_table :photo do
+        primary_key :id
+        column :name, :text
+        Integer :cultivar_id
+        column :content_type, :text
+      end 
+    end
+    
+    def db_breeder_table_photo_id
+      return if @db.schema(:breeder).find{|col| col[0] == :photo_id }
+      
+      @db.alter_table :breeder do
+        add_column :photo_id, Integer
+        add_foreign_key [:photo_id], :photo, key: :id, 
+                        name: :breeder_photo_id_fkey
+      end
+      
+    end
+    
     def startdb
       setup_db_in_homedir
   
       @db = Sequel::Model.db = Sequel.sqlite(@homedbname)
-  
+# data model for media entities table and relations      
+      unless @db.table_exists? :photo
+        db_create_photo_table
+      end
+      
+      db_breeder_table_photo_id
+      
       Kernel.at_exit { Sequel::Model.db.disconnect if Sequel::Model.db }
   
     end
@@ -92,8 +123,11 @@ module FiveApples
     def serve
   
       puts "Fiveapples version #{FiveApples::VERSION} on #{@host} config #{@configru}"
-# this requires safrano ~> 0.3.5
-#      puts "Safrano version #{Safrano::VERSION}"
+      begin
+  # this requires safrano ~> 0.3.5
+        puts "Safrano version #{Safrano::VERSION}"
+      rescue
+      end
       
       Dir.chdir @libdir do
        

data/lib/model.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
+
 class Cultivar < Sequel::Model(:cultivar)
 
     # Navigation attributes
     one_to_many :parent, :class => :Parentage, :key => :cultivar_id
     one_to_many :child, :class => :Parentage, :key => :parent_id
-
+    one_to_many :photo, :class => :Photo, :key => :cultivar_id
     many_to_one :breeder, :key => :breeder_id
 
 end
@@ -15,6 +16,7 @@ end
 
 class Breeder < Sequel::Model(:breeder)
   one_to_many :cultivar, :key => :breeder_id
+  many_to_one :avatar, :class => :Photo, :key => :photo_id
 end
 
 class Parentage < Sequel::Model(:parentage)
@@ -27,6 +29,9 @@ class Parentage < Sequel::Model(:parentage)
 
 end
 
+class Photo < Sequel::Model(:photo)
+end
+
 ### SERVER Part #############################
 
 class ODataFiveApples < OData::ServerApp
@@ -37,12 +42,21 @@ class ODataFiveApples < OData::ServerApp
     namespace  'ODataFiveApples'
     path_prefix '/odata'
     enable_batch 
+    publish_media_model Photo do 
+      slug :name 
+      use OData::Media::Static, :root => FiveA.media_root
+    end
+
     publish_model Cultivar, :cultivar do
       add_nav_prop_single :breeder
       add_nav_prop_collection :parent
       add_nav_prop_collection :child
+      add_nav_prop_collection :photo
+    end
+    publish_model Breeder, :breeder do 
+      add_nav_prop_collection :cultivar 
+      add_nav_prop_single :avatar
     end
-    publish_model Breeder, :breeder do add_nav_prop_collection :cultivar end
     publish_model ParentageType, :par_type
     publish_model Parentage, :parentage do
       add_nav_prop_single :parent
@@ -50,5 +64,6 @@ class ODataFiveApples < OData::ServerApp
       add_nav_prop_single :par_type
     end
   end
+  
 end
 

data/lib/options.rb

@@ -4,7 +4,8 @@ OPTS = GetoptLong.new(
         [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
         [ '--one_way', '-o', GetoptLong::NO_ARGUMENT ],
         [ '--use_cdn', '-c', GetoptLong::NO_ARGUMENT ],
-        [ '--libdir', '-I', GetoptLong::REQUIRED_ARGUMENT ]
+        [ '--libdir', '-I', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--test', '-t', GetoptLong::NO_ARGUMENT ]
         )
 
    def read_opts
@@ -12,7 +13,7 @@ OPTS = GetoptLong.new(
       options[:one_way] = false
       options[:libdir_add] = nil
       options[:use_cdn] = false
-
+      
         OPTS.each do |opt, arg|
           case opt
             when '--help'
@@ -29,6 +30,8 @@ Usage: fiveapples [OPTIONS]
             options[:one_way] = true
           when '--use_cdn'
             options[:use_cdn] = true
+          when '--test'
+            options[:role] = :test 
           when '--libdir'
             options[:libdir_add] = arg
             if arg

data/lib/ui5/Component.js.erb

@@ -2,9 +2,10 @@ sap.ui.define(
   [
     "sap/ui/core/UIComponent",
     "sap/ui/model/odata/ODataModel",
-    "sap/ui/model/resource/ResourceModel"
+    "sap/ui/model/resource/ResourceModel",
+    "sap/m/MessageToast"
   ],
-  function(UIComponent, ODataModel, ResourceModel) {
+  function(UIComponent, ODataModel, ResourceModel, MessageToast) {
     "use strict";
     return UIComponent.extend("fivea.Component", {
       metadata: { manifest: "json" },
@@ -27,7 +28,7 @@ sap.ui.define(
         mParameters.serviceUrl = "http://<%= @host %>:9494/odata";
         var oModel = new sap.ui.model.odata.v2.ODataModel(mParameters);
         oModel.setTokenHandlingEnabled(true);
-
+        
         this.setModel(oModel);
 
         // set i18n model

data/lib/ui5/controller/Base64.js

@@ -0,0 +1,87 @@
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*  https://stackoverflow.com/questions/246801/how-can-you-encode-a-string-to-base64-in-javascript
+**/
+
+
+/**  
+* https://stackoverflow.com/questions/37376838/how-to-call-utility-functions-in-sapui5-controller 
+* 
+* **/
+
+sap.ui.define([], function() {
+   
+   "use strict";
+   
+    var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+    var _utf8_encode = function (string) {
+
+        var utftext = "", c, n;
+
+        string = string.replace(/\r\n/g,"\n");
+
+        for (n = 0; n < string.length; n++) {
+
+            c = string.charCodeAt(n);
+
+            if (c < 128) {
+
+                utftext += String.fromCharCode(c);
+
+            } else if((c > 127) && (c < 2048)) {
+
+                utftext += String.fromCharCode((c >> 6) | 192);
+                utftext += String.fromCharCode((c & 63) | 128);
+
+            } else {
+
+                utftext += String.fromCharCode((c >> 12) | 224);
+                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                utftext += String.fromCharCode((c & 63) | 128);
+
+            }
+
+        }
+
+        return utftext;
+    };
+
+    return {
+      encode: function (input) {
+       var output = "", chr1, chr2, chr3, enc1, enc2, enc3, enc4, i = 0;
+
+        input = _utf8_encode(input);
+
+        while (i < input.length) {
+
+            chr1 = input.charCodeAt(i++);
+            chr2 = input.charCodeAt(i++);
+            chr3 = input.charCodeAt(i++);
+
+            enc1 = chr1 >> 2;
+            enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+            enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+            enc4 = chr3 & 63;
+
+            if (isNaN(chr2)) {
+                enc3 = enc4 = 64;
+            } else if (isNaN(chr3)) {
+                enc4 = 64;
+            }
+
+            output += _keyStr.charAt(enc1);
+            output += _keyStr.charAt(enc2);
+            output += _keyStr.charAt(enc3);
+            output += _keyStr.charAt(enc4);
+
+        }
+
+        return output;
+    }
+   
+   };
+  }
+);

data/lib/ui5/controller/Breeder.js

@@ -0,0 +1,74 @@
+
+/**  
+* Common helper/callbacks for Breeder related functions, eg 
+* reusable search helps
+* 
+* **/
+
+sap.ui.define(["sap/m/MessageToast",
+               "sap/ui/commons/Dialog",
+               "sap/ui/core/routing/History"], 
+function(MessageToast, Dialog, History) {
+   
+   "use strict";
+
+    return {
+      
+            
+      onIdValueHelp: function(that, oEvent) {
+        
+        that.inputId = oEvent.getSource().getId();
+        that.inputDescrId = that.inputId + "_descr";
+
+        // create value help dialog
+        if (!that._valueHelpDialog) {
+          that._valueHelpDialog = sap.ui.xmlfragment(
+            "fivea.view.BreederOptio", that );
+          that.getView().addDependent(that._valueHelpDialog);
+        }
+
+        that._valueHelpDialog.open("");
+      },    
+      _handleValueHelpSearch: function(evt) {
+        var sValue = evt.getParameter("value");
+        var oFilter = new Filter(
+          "name",
+          sap.ui.model.FilterOperator.Contains,
+          sValue
+        );
+        evt.getSource()
+          .getBinding("items")
+          .filter([oFilter]);
+      },
+
+      _handleValueHelpClose: function(that, evt) {
+        var oSelectedItem = evt.getParameter("selectedItem");
+        if (oSelectedItem) {
+//           oSelectedItem.getBindingContextPath();
+     // "/breeder(8)"
+          var oModel = oSelectedItem.getModel();
+          var oPath = oSelectedItem.getBindingContextPath();
+          
+          
+          function _loadavsuccs(oData, response){
+            that.loadavsuccs(oData, response);
+          };
+          function _loadaverr(oErr){};
+          oModel.read(oPath, 
+                    { urlParameters:{$expand: "avatar"}, 
+                      success: _loadavsuccs, 
+                      error: _loadaverr } );
+          
+          var IDInput = that.getView().byId(that.inputId);
+          IDInput.setValue(oSelectedItem.getDescription());
+
+          var oText = that.getView().byId(that.inputDescrId);
+          oText.setText(oSelectedItem.getTitle());
+        }
+        evt.getSource()
+          .getBinding("items")
+          .filter([]);
+      }      
+   };
+  }
+);