beerdb 0.9.13 → 0.10.0

metadata

@@ -1,159 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.9.13
-  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: props
-  requirement: &82424030 !ruby/object:Gem::Requirement
-    none: false
+  name: beerdb-models
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *82424030
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: &82423660 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *82423660
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: &82746400 !ruby/object:Gem::Requirement
-    none: false
+  name: datafile
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *82746400
-- !ruby/object:Gem::Dependency
-  name: worlddb
-  requirement: &82746080 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *82746080
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: tagutils
-  requirement: &82745850 !ruby/object:Gem::Requirement
-    none: false
+  name: fetcher
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *82745850
-- !ruby/object:Gem::Dependency
-  name: activerecord-utils
-  requirement: &82745500 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *82745500
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: fetcher
-  requirement: &82745060 !ruby/object:Gem::Requirement
-    none: false
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *82745060
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: &82744620 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *82744620
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: &82743920 !ruby/object:Gem::Requirement
-    none: false
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82743920
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &82743610 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *82743610
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82743270 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *82743270
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &82742500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *82742500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
 - beerdb
 extensions: []
 extra_rdoc_files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -161,55 +126,32 @@ files:
 - lib/beerdb.rb
 - lib/beerdb/cli/main.rb
 - lib/beerdb/cli/opts.rb
+- lib/beerdb/cli/version.rb
 - lib/beerdb/console.rb
-- lib/beerdb/deleter.rb
-- lib/beerdb/models/beer.rb
-- lib/beerdb/models/brand.rb
-- lib/beerdb/models/brewery.rb
-- lib/beerdb/models/forward.rb
-- lib/beerdb/models/tag.rb
-- lib/beerdb/models/world/city.rb
-- lib/beerdb/models/world/country.rb
-- lib/beerdb/models/world/region.rb
-- lib/beerdb/reader.rb
-- lib/beerdb/reader_file.rb
-- lib/beerdb/reader_zip.rb
-- lib/beerdb/schema.rb
-- lib/beerdb/serializers/beer.rb
-- lib/beerdb/serializers/brewery.rb
-- lib/beerdb/stats.rb
-- lib/beerdb/version.rb
-- test/helper.rb
-- test/test_fixture_matchers.rb
-- test/test_values.rb
-- .gemtest
 homepage: https://github.com/beerkit/beer.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: beerdb - beer.db command line tool
-test_files:
-- test/test_values.rb
-- test/test_fixture_matchers.rb
+test_files: []

data/History.md

@@ -1,3 +0,0 @@
-### 0.0.1 / 2012-10-17
-
-* Everything is new. First release

data/lib/beerdb/deleter.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-module BeerDb
-
-  class Deleter
-    
-    include Models
-
-    def run
-      # for now delete all tables
-
-      ### fix: use if defined? BeerDbNote or similar or/and check if table exist ??
-      ###      or move to beerdb-note ??
-
-      ## Bookmark.delete_all   # db model extension - move to its own addon?
-      ## Drink.delete_all      # db model extension - move to its own addon?
-      ## Note.delete_all       # db model extension - move to its own addon?
-      ## User.delete_all       # db model extension - move to its own addon?
-
-      Beer.delete_all
-      Brand.delete_all
-      Brewery.delete_all
-    end
-    
-  end # class Deleter
-
-end # module BeerDb

data/lib/beerdb/models/beer.rb

@@ -1,201 +0,0 @@
-# encoding: UTF-8
-
-module BeerDb
-  module Model
-
-class Beer < ActiveRecord::Base
-
-  extend TextUtils::TagHelper  # will add self.find_tags, self.find_tags_in_attribs!, etc.
-
-  # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
-  #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, self.is_address?, is_taglist? etc.
-
-  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
-  belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
-
-  belongs_to :brand,   :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brand_id'
-  belongs_to :brewery, :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brewery_id'
-
-
-  has_many :taggings, class_name: 'TagDb::Model::Tagging', :as      => :taggable
-  has_many :tags,     class_name: 'TagDb::Model::Tag',     :through => :taggings
-
-
-  ## fix/todo: move to regex to patterns; see worlddb
-  validates :key, :format => { :with => /\A[a-z][a-z0-9]+\z/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
-
-
-########################
-# begin extras/extension drink/bookmar/user
-
-  has_many :drinks ## :class_name => 'Drink'
-  has_many :notes  ## :class_name => 'Note'
-  has_many :bookmarks, :as => :bookmarkable
-
-# end extensions
-########
-
-
-  ### support old names (read-only) for now  (remove later)
-
-  def color()  puts "*** depreceated fn api - use srm"; srm;  end
-  def plato()  puts "*** depreceated fn api - use og";  og;   end
-
-  def color=(value)
-    puts "*** depreceated fn api - use srm="
-    self.srm = value
-  end
-
-  def plato=(value)
-    puts "*** depreceated fn api - use og="
-    self.og = value
-  end
-
-
-  def as_json_v2( opts={} )
-    # NB: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2
-    BeerSerializer.new( self ).as_json
-  end
-
-
-  def self.create_or_update_from_values( values, more_attribs={} )
-
-    attribs, more_values = find_key_n_title( values )
-    attribs = attribs.merge( more_attribs )
-      
-    # check for optional values
-    Beer.create_or_update_from_attribs( attribs, more_values )
-  end
-
-
-  def self.create_or_update_from_attribs( attribs, values )
-
-    # fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
-    
-    value_tag_keys    = []
-     
-    ## check for grades (e.g. ***/**/*) in titles (will add attribs[:grade] to hash)
-    ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
-    attribs[ :grade ] ||= 4
-    
-    ### check for "default" tags - that is, if present attribs[:tags] remove from hash
-    value_tag_keys += find_tags_in_attribs!( attribs )
-    
-    ## check for optional values
-    values.each_with_index do |value,index|
-      if match_country(value) do |country|
-           attribs[ :country_id ] = country.id
-         end
-      elsif match_region_for_country(value, attribs[:country_id]) do |region|
-              attribs[ :region_id ] = region.id
-            end
-      elsif match_city(value) do |city|
-              if city.present?
-                attribs[ :city_id ] = city.id
-              else
-                ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
-                logger.warn "city with key #{value[5..-1]} missing for beer #{attribs[:key]}"
-              end
-            end
-      elsif match_brewery(value) do |brewery|
-              attribs[ :brewery_id ] = brewery.id
-
-              # for easy queries cache city and region ids
-          
-              # 1) check if brewery has city - if yes, use it for beer too
-              if brewery.city.present?
-                attribs[ :city_id ] = brewery.city.id
-              end
-
-              # 2) check if brewery has city w/ region if yes, use it for beer to
-              #   if not check for region for brewery
-              if brewery.city.present? && brewery.city.region.present?
-                attribs[ :region_id ] = brewery.city.region.id
-              elsif brewery.region.present?
-                attribs[ :region_id ] = brewery.region.id
-              end
-            end
-      elsif match_year( value ) do |num|  # founded/established year e.g. 1776
-              attribs[ :since ] = num
-            end
-      elsif match_website( value ) do |website|  # check for url/internet address e.g. www.ottakringer.at
-              attribs[ :web ] = website
-            end
-      elsif match_abv( value ) do |num|   # abv (alcohol by volume)
-              # nb: also allows leading < e.g. <0.5%
-              attribs[ :abv ] = num
-            end
-      elsif match_og( value ) do |num|  # plato (stammwuerze/gravity?) e.g. 11.2°
-              # nb: no whitespace allowed between ° and number e.g. 11.2°
-              attribs[ :og ] = num
-            end
-      elsif match_kcal( value ) do |num| # kcal
-              # nb: allow 44.4 kcal/100ml or 44.4 kcal or 44.4kcal
-              attribs[ :kcal ] = num
-            end
-      elsif (values.size==(index+1)) && is_taglist?( value )  # tags must be last entry
-        logger.debug "   found tags: >>#{value}<<"
-        value_tag_keys += find_tags( value )
-      else
-        # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}< - key #{attribs[:key]}"
-      end
-    end # each value
-
-    #  rec = Beer.find_by_key_and_country_id( attribs[ :key ], attribs[ :country_id] )
-    rec = Beer.find_by_key( attribs[ :key ] )
-
-    if rec.present?
-      logger.debug "update Beer #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create Beer:"
-      rec = Beer.new
-    end
-      
-    logger.debug attribs.to_json
-
-    rec.update_attributes!( attribs )
-
-    ##################
-    # add taggings 
-
-##
-##  fix: delete all tags first or only add diff?
-##  fix e.g.
-##
-## [debug] update Beer 1340-opatsvetlevycepni:
-## [debug] {"title":"Opat Světlé Výčepní","key":"opatsvetlevycepni","country_id":130,"txt":"cz-czech-republic!/beers","grade":4,"brewery_id":839,"city_id":1154,"region_id":241,"abv":4.2,"og":11.0}
-## [debug]    adding 1 taggings: >>pale lager<<...
-## rake aborted!
-## ActiveRecord::RecordNotUnique: SQLite3::ConstraintException: columns taggable_id, taggable_type, tag_id are not unique: INSERT INTO "taggings" ("created_at", "tag_id", "taggable_id", "taggable_type", "updated_at") VALUES (?, ?, ?, ?, ?)
-
-=begin
-    if value_tag_keys.size > 0
-        
-        value_tag_keys.uniq!  # remove duplicates
-        logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
-
-        ### fix/todo: check tag_ids and only update diff (add/remove ids)
-
-        value_tag_keys.each do |key|
-          tag = Tag.find_by_key( key )
-          if tag.nil?  # create tag if it doesn't exit
-            logger.debug "   creating tag >#{key}<"
-            tag = Tag.create!( key: key )
-          end
-          rec.tags << tag
-        end
-    end
-=end
-
-    rec # NB: return created or updated obj
-
-  end # method create_or_update_from_values
-
-end # class Beer
-
-  end # module Model
-end # module BeerDb

data/lib/beerdb/models/brand.rb

@@ -1,62 +0,0 @@
-# encoding: UTF-8
-
-module BeerDb
-  module Model
-
-class Brand < ActiveRecord::Base
-
-  # NB: use extend - is_<type>? become class methods e.g. self.is_<type>?
-  extend TextUtils::ValueHelper  # e.g. self.find_key_n_title, self.is_year?, self.is_region?, is_address?, is_taglist? etc.
-
-  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
-  belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
-
-  belongs_to :brewery, :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brewery_id'
-
-  has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brand_id'
-
-  validates :key, :format => { :with => /\A[a-z][a-z0-9]+\z/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
-
-
-  def self.create_or_update_from_values( values, more_attribs = {} )
-    attribs, more_values = find_key_n_title( values )
-    attribs = attribs.merge( more_attribs )
-
-    Brand.create_or_update_from_attribs( attribs, more_values )
-  end
-
-  # convenience helper Brand.create_or_update_from_title
-  def self.create_or_update_from_title( title, more_attribs = {} )
-    values = [title]
-    Brand.create_or_update_from_values( values, more_attribs )
-  end
-
-
-  def self.create_or_update_from_attribs( attribs, values )
-
-    ## fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
-
-    ## check for grades (e.g. ***/**/*) in titles (will add attribs[:grade] to hash)
-    ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
-    attribs[:grade] ||= 4
-
-    rec = Brand.find_by_key( attribs[:key] )
-
-    if rec.present?
-      logger.debug "update Brand #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create Brand:"
-      rec = Brand.new
-    end
-      
-    logger.debug attribs.to_json
-
-    rec.update_attributes!( attribs )
-  end
-
-end # class Brand
-
-  end # module Model
-end # module BeerDb