beerdb 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f9cc74689ce9d1208acaab5188304387681738
-  data.tar.gz: 66ca767ba0474ff0f8ba87226f07e5466c005bc2
+  metadata.gz: aa3ae86d75d365735a666895e19a92eeccc6c631
+  data.tar.gz: 4e454b4cd405ef04b411d43cf8a8c7109a51b104
 SHA512:
-  metadata.gz: 85c93d3258a2c2c5ba40e9cf6ea791ff851ed5385f87153d5e5fed5656b3ef22680af9501e1ab951d47af04697bbf16d3fe541209587e1a88864d24ce0d54b38
-  data.tar.gz: b1ad9f90444df6d7070f8191866626780787107d251ec8db1c1102d4aa073e6f50b763cd81a68a5c1d1e787c43e8036adec03bb14c8ba96f0349dd80a33acab6
+  metadata.gz: 40dcaf38f8629df1cf69a08233fef65b627c59bf1201bc328f53f5b996d9bef80090ec780ebaf4019c39363dd94ae3cd930a00ee309760b833636adbf83b4d91
+  data.tar.gz: 97c9a920622ee255d1e22185d1cbf6e70dcf47497ba220bab795c42e9a93ec68733dc6daa4fbf02dfd3fafb01af6720ef7bf7b344eee71562c9ecb69372ea8e7

data/Manifest.txt

@@ -1,10 +1,10 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-bin/beerdb
-lib/beerdb.rb
-lib/beerdb/cli/main.rb
-lib/beerdb/cli/opts.rb
-lib/beerdb/cli/version.rb
-lib/beerdb/console.rb
+HISTORY.md
+Manifest.txt
+README.md
+Rakefile
+bin/beerdb
+lib/beerdb.rb
+lib/beerdb/cli/main.rb
+lib/beerdb/cli/opts.rb
+lib/beerdb/cli/version.rb
+lib/beerdb/console.rb

data/Rakefile

@@ -24,6 +24,7 @@ Hoe.spec 'beerdb' do
 
     ['datafile', '>= 0.2.5'],
     ['fetcher', '>= 0.4.5'],
+    ['webservice', '>= 0.2.1'],
 
     ## 3rd party
     ['gli', '>= 2.12.2'],

data/lib/beerdb.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
+
 require 'beerdb/models'   # Note: pull in all required deps via beerdb-models
+require 'beerdb/note'     # add extension/addon for notes etc.
 
+require 'webservice'
 
 require 'fetcher'
 require 'datafile'
@@ -24,4 +27,13 @@ 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.
+end
+
+
+
 BeerDb.main  if __FILE__ == $0

data/lib/beerdb/cli/main.rb

@@ -275,6 +275,40 @@ end
 
 
 
+desc 'Start web service (HTTP JSON API)'
+arg_name 'NAME'   # optional setup profile name
+command [:serve,:server,:s] do |c|
+
+  c.action do |g,o,args|
+
+    ## 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!!!
+
+    ## fix: use textutils File.read_utf8 !!!!
+    code = File.open( script_path, 'r:bom|utf-8' ).read
+
+    connect_to_db( opts )
+
+    BeerDb.tables   ## print table stats
+
+    BeerDbService.class_eval( code )  ## note: MUST use class_eval (do NOT use instance_eval)  !!!
+
+    puts "dump routes:"
+    pp BeerDbService.routes
+
+    puts "starting server..."
+    BeerDbService.run!
+
+    puts 'Done.'
+  end
+end # command serve
+
+
+
 desc '(Debug) Test command suite'
 command :test do |c|
   c.action do |g,o,args|

data/lib/beerdb/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: webservice
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement