beerdb 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad253b418044180093357ced2612f6a0423292b0
-  data.tar.gz: 5e3a6c5baba4ab6d14af19bf55dd565eb938b840
+  metadata.gz: 177fe9285da137d665f5d8053008f23cae6cf5ac
+  data.tar.gz: 4029035763dd219cd9d766e4247a7e55857fbdab
 SHA512:
-  metadata.gz: f1da644e8f307b75f64a4ccd20b77b229799ace3d25c0c64a4de477d77a78d9bd453cb72d01a59ca482e2498f30c00fa3d959c9885865f03093b05d9aa988b18
-  data.tar.gz: df049aafb599771214bd66f5307932a0967ca27d884f3050a2fabb9b81beb33bb3cda610ace1745283ff984d51eae1c9df65cfb8c5470f43c03b934ae9af357b
+  metadata.gz: be0866bd97e04d308dc627101be7d7ed61ece520bfe22ab59da4f025ac8e161748045f060566a3fa01efcb313858746ca516098b744de62af51e21266446109b
+  data.tar.gz: 47343c28a37d146ea3660ec64df5e3f851864c3ea93a44daa3b85b470b473d318d26fe77827cf4d9428c03dbadfd74b76267f7031e40d3e85d17b9f5d9a7d01a

data/lib/beerdb.rb

@@ -27,11 +27,48 @@ module BeerDb
 end  # module BeerDb
 
 
+
 ####
 ##  used for server/service command
 ##   "preconfigured" base class for webservice
 class BeerDbService < Webservice::Base
   include BeerDb::Models   # e.g. Beer, Brewery, Brand, etc.
+
+  ## (auto-)add some (built-in) routes
+
+  get '/version(s)?' do
+    {
+      "beerdb":        BeerDbTool::VERSION,
+      "beerdb/models": BeerDb::VERSION,
+      ## todo/fix: add beerdb/note version - if present
+      ## todo/fix: add worlddb/models version
+      ## todo/fix: add some more libs - why? why not??
+      "activerecord":  [ActiveRecord::VERSION::MAJOR,ActiveRecord::VERSION::MINOR,ActiveRecord::VERSION::TINY].join('.'),
+      "webservice":    Webservice::VERSION,
+      "rack":          "#{Rack::RELEASE} (#{Rack::VERSION.join('.')})",     ## note: VERSION is the protocoll version as an array e.g.[1,2]
+      "ruby":          "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]",
+    }
+  end
+
+  get '/(stats|tables)' do
+    {
+      "beers":      BeerDb::Model::Beer.count,
+      "brands":     BeerDb::Model::Brand.count,
+      "breweries":  BeerDb::Model::Brewery.count,
+      "system": {
+        "props":    ConfDb::Models::Prop.count,
+        "logs":     LogDb::Models::Log.count,
+      }
+    }
+  end
+
+  get '/props(.:format)?' do    # note: add format - lets you use props.csv and props.html
+    ConfDb::Models::Prop.all
+  end
+
+  get '/logs(.:format)?' do
+    LogDb::Models::Log.all
+  end
 end
 
 

data/lib/beerdb/cli/main.rb

@@ -284,9 +284,15 @@ command [:serve,:server,:s] do |c|
     ## todo: document optional script arg (defaults to service)
     script = args[0] || 'service'
 
-    script_path = "#{script}.rb"   ## auto-add .rb extension
-    ###############
-    ## todo/fix: add fetch if not found locally!!!
+    script_path = "#{script}.rb"     ## auto-add .rb extension
+
+    unless File.exist?( script_path ) ## if file doesn't exist try to fetch service script
+      script_path = "./#{script}.rb"   ## use / save script in local (current) working dir/folder
+      worker = Fetcher::Worker.new
+      ## note: lets use http:// instead of https:// for now - lets us use person proxy (NOT working w/ https for now)
+      worker.copy( "http://github.com/beerkit/beer.db.service/raw/master/#{script}.rb", script_path )
+    end
+
 
     code = File.read_utf8( script_path )
 

data/lib/beerdb/cli/version.rb

@@ -7,7 +7,7 @@ module BeerDbTool    # todo/check - rename to BeerDbCli or BeerDbCommands or Bee
 
   MAJOR = 1
   MINOR = 2
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beerdb-models