datafile 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 650b215a771b6d6b984f2a65e187a08803c383ad
-  data.tar.gz: 15512a5c171fea567372ed5983599330ad6312cb
+  metadata.gz: 8782dd8b936ebd15c057be430754b81935000a53
+  data.tar.gz: 6761a2f36be11909f9caf6ffbbe4645e2e30f440
 SHA512:
-  metadata.gz: ee1d067e74de8bc1d6ba85cb1cc235b30954d7b0e88254d487ab40a4050143439aa0d994eb34e5801cbb61a1a8c2a28da974878d43a56615118d2bae1a31fd80
-  data.tar.gz: 1c019e305e059a04d3cd7a25909d5616e9d13c5bdbb8a4c360eb042f04484476655e701411c2ecc24e255647c8567171607c58532bb4dd684d90a941cc38c1b1
+  metadata.gz: df27e034db8d08fc858bef78b83c6ae42b702879d1bb86edadd3fc514e43db4b0152b29a8fc48a4e8759fa2fb059189f61500f80edc1722cb1ef29ce3fb97c6e
+  data.tar.gz: 8b59c770f07f82a022c17b9b291ed09321db17a2b0a3f59ecd22683ba16b01adaa406e27d5051c5f7c2e91e0b72da267dc02cb986c3ef5ff12f3d589c2321fe6

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 lib/datafile.rb
 lib/datafile/builder.rb
 lib/datafile/datafile.rb
+lib/datafile/datasets/beer.rb
 lib/datafile/datasets/dataset.rb
 lib/datafile/datasets/football.rb
 lib/datafile/datasets/world.rb

data/lib/datafile.rb

@@ -9,6 +9,7 @@ require 'datafile/version'  # let it always go first
 
 require 'datafile/datasets/dataset'
 require 'datafile/datasets/football'
+require 'datafile/datasets/beer'
 require 'datafile/datasets/world'
 require 'datafile/datafile'
 require 'datafile/builder'

data/lib/datafile/builder.rb

@@ -24,6 +24,11 @@ class Builder
   end
 
 
+  def beer( name, opts={} )
+    logger.info( "[builder] add beer-dataset '#{name}'" )
+    @datafile.datasets << BeerDataset.new( name, opts )
+  end
+
   def football( name, opts={} )
     logger.info( "[builder] add football-dataset '#{name}'" )
     @datafile.datasets << FootballDataset.new( name, opts )

data/lib/datafile/datafile.rb

@@ -8,6 +8,21 @@ class Datafile
 
   attr_reader :datasets
 
+
+  ## convenience method - use like Datafile.load_file()
+  def self.load_file( path='./Datafile' )
+    code = File.read_utf8( path )
+    self.load( code )
+  end
+
+  ## another convenience method - use like Datafile.load()
+  def self.load( code )
+    builder = Builder.new
+    builder.instance_eval( code )
+    builder.datafile   # note: return datafile (of course, NOT the builder)
+  end
+
+
   def initialize()
     @datasets = []
   end

data/lib/datafile/datasets/beer.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Datafile
+
+class BeerDataset < Dataset
+
+  def initialize( name, opts={} )
+    super( name, opts )
+  end
+
+  def read()
+    logger.info( "read beer-dataset '#{@name}', '#{setup}'" )
+
+    BeerDb.read_setup_from_zip( local_zip_name(), setup(), local_zip_root() )
+  end
+end  # class BeerDataset
+
+end # module Datafile

data/lib/datafile/datasets/dataset.rb

@@ -16,7 +16,9 @@ class Dataset
   end
 
   def remote_zip_url()  # remote zip url
-    "https://github.com/#{@name}/archive/master.zip"
+    ###  note: use http:// for now - lets us use (personal proxy NOT working w/ https) for now
+    ## "https://github.com/#{@name}/archive/master.zip"
+    "http://github.com/#{@name}/archive/master.zip"
   end
 
   def local_zip_name()

data/lib/datafile/version.rb

@@ -4,7 +4,7 @@ module Datafile
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 1
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datafile
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -97,6 +97,7 @@ files:
 - lib/datafile.rb
 - lib/datafile/builder.rb
 - lib/datafile/datafile.rb
+- lib/datafile/datasets/beer.rb
 - lib/datafile/datasets/dataset.rb
 - lib/datafile/datasets/football.rb
 - lib/datafile/datasets/world.rb