fiveapples 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05df5643157a04c97182a2a9eac30c3242ef7f8d6d6c885e03623474f5199c3c
-  data.tar.gz: 5a48a02e003a73be836a4a937596d0f9d11952de9f9e508cb9cbf60c152dd081
+  metadata.gz: 8e515423afa398eb0c84bcde4011e6d8e0c1956abe7e560eae16dbf7227ebb74
+  data.tar.gz: 7785ce629615f46dd99fd292dcecdcd92a26b0ce256f4edb01eae718e6da32d5
 SHA512:
-  metadata.gz: c86fef213d70285c8a9d57353f4139f43cbd11f6deaf1710cf70038e79e37ba22f373cfc7b8a6f08eb31b9b7ee420da90270226161208eac12ab0e713c67f092
-  data.tar.gz: cfcd6121376e7713487e1d01c106db1e011c635ecafe40ebb95d6417ceec6566d87133cf6022d2e3aaaa8458f3a1c928d25b68d7d8c7e0c8f68a1664b05d6fbd
+  metadata.gz: 858a88008a5b520f052cb2083b5bd68ec66b9f2b66f14a937144f96a2f010d4a387503a8f332af9b85d80220f49b0a78b157accb1e9399bdde3e43619f790cd4
+  data.tar.gz: e9814e215c62e5d79237195ecaff7517d9781b2a429231225e7e1e0b5b68c337d13c84ca5802d7c33ce77d3b98df9e5f1e98e328da5468bd8916ee5a1bc3c0ff

data/lib/config5.ru

@@ -6,6 +6,27 @@ require_relative './model.rb'
 
 require 'rack/logger'
 
+# simple redirect middleware for doing / => /ui5/index.html 
+
+module FiveApples
+  class Redirect
+    def initialize(app, options={})
+      @app = app
+      @map = options
+    end
+    def call(env)
+      if @map.has_key?(pi = env['PATH_INFO'])
+        destination  = "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{@map[pi]}"
+        destination << "?#{qs}" unless (qs=env['QUERY_STRING']).empty?
+        [301, {'Location' => destination}, ['See Ya!']] 
+      else
+        @app.call(env)
+      end
+    end
+  end
+end
+
+
 fiveapples = Rack::OData::Builder.new  do
 
   use Rack::Cors do
@@ -20,10 +41,20 @@ fiveapples = Rack::OData::Builder.new  do
   use Rack::CommonLogger
   use Rack::ShowExceptions
 
-# Serve the ui5 app
-  use Rack::Static,  :urls => ["/ui5"]
 
-# Serve the OData
+# Serve the ui5 app
+  
+  # redirect / to /ui5/index.html
+  # 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" 
+  # outside of ui5 directory and it gives NOT FOUND
+  use FiveApples::Redirect, {'/'    => '/ui5/index.html', 
+                             '/ui5' => '/ui5/index.html'}
+  
+  use Rack::Static,  :urls => ['/ui5']
+
+  
+# Serve the OData (prefixed /odata )
   run ODataFiveApples.new
 
 end

data/lib/fiveapples.rb

@@ -3,44 +3,47 @@
 require 'safrano.rb'
 require 'sequel'
 require 'fileutils'
-
-class FiveApples
-  CONFIGDIRNAME = 'fiveapples'.freeze
-  DBFILENAME = 'fiveapples.db3'.freeze
-  CONFIGRU = 'config5.ru'
-
-  attr_reader :db
-
-  def initialize
-    gconfigdir = File.expand_path('.config', Dir.home)
-    @apphome = File.expand_path(CONFIGDIRNAME, gconfigdir)
-    @libdir = __dir__.dup
-    @systemdbname = File.join(@libdir, DBFILENAME)
-    @homedbname = File.expand_path(DBFILENAME, @apphome)
-    @configru = File.expand_path(CONFIGRU, @libdir)
-  end
-
-  def setup_db_in_homedir
-    FileUtils.mkdir_p(@apphome) unless Dir.exist?(@apphome)
-    FileUtils.cp(@systemdbname, @homedbname) unless File.exist?(@homedbname)
-  end
-
-  def startdb
-    setup_db_in_homedir
-
-    @db = Sequel::Model.db = Sequel.sqlite(@homedbname)
-
-    Kernel.at_exit { Sequel::Model.db.disconnect if Sequel::Model.db }
-
-  end
-
-  def serve
-
-    Dir.chdir @libdir
-    exec "rackup -I#{@libdir} #{@configru}"
-
+require_relative 'version'
+
+module FiveApples
+  class Server
+    CONFIGDIRNAME = 'fiveapples'.freeze
+    DBFILENAME = 'fiveapples.db3'.freeze
+    CONFIGRU = 'config5.ru'
+  
+    attr_reader :db
+  
+    def initialize
+      gconfigdir = File.expand_path('.config', Dir.home)
+      @apphome = File.expand_path(CONFIGDIRNAME, gconfigdir)
+      @libdir = __dir__.dup
+      @systemdbname = File.join(@libdir, DBFILENAME)
+      @homedbname = File.expand_path(DBFILENAME, @apphome)
+      @configru = File.expand_path(CONFIGRU, @libdir)
+    end
+  
+    def setup_db_in_homedir
+      FileUtils.mkdir_p(@apphome) unless Dir.exist?(@apphome)
+      FileUtils.cp(@systemdbname, @homedbname) unless File.exist?(@homedbname)
+    end
+  
+    def startdb
+      setup_db_in_homedir
+  
+      @db = Sequel::Model.db = Sequel.sqlite(@homedbname)
+  
+      Kernel.at_exit { Sequel::Model.db.disconnect if Sequel::Model.db }
+  
+    end
+  
+    def serve
+  
+      Dir.chdir @libdir
+      puts "Fiveapples version #{FiveApples::VERSION}"
+      exec "rackup -I#{@libdir} #{@configru}"
+  
+    end
+  
   end
-
 end
-
-FiveA = FiveApples.new
+FiveA = FiveApples::Server.new

data/lib/ui5/controller/Cultivar_Create.controller.js

@@ -31,7 +31,8 @@ sap.ui.define([
                 _that.byId('year').setValue("");
                 _that.byId('breeder_id').setValue("");
                 MessageToast.show("Create success");
-                _that._oRouter.navTo( "cultivar_detail", {id: data.id} );
+                // TODO: isnt this data access OData version dependant?
+                _that._oRouter.navTo( "cultivar_detail", {id: data["results"]["0"].id} );
                 }
             function onErrorHandler(){
                 MessageToast.show("Create failed");          }

data/lib/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module FiveApples
+  VERSION = '0.0.4'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiveapples
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safrano
@@ -118,6 +118,7 @@ files:
 - lib/ui5/view/ParentageList.view.xml
 - lib/ui5/view/Parentage_Create.view.xml
 - lib/ui5/view/Parentage_Detail.view.xml
+- lib/version.rb
 homepage: https://gitlab.com/dm0da/fiveapples
 licenses:
 - MIT