beerdb 0.9.2 → 0.9.3

data/Rakefile

@@ -9,25 +9,31 @@ Hoe.spec 'beerdb' do
   self.summary = 'beerdb - beer.db command line tool'
   self.description = summary
 
-  self.urls    = ['https://github.com/geraldb/beer.db.ruby']
-  
+  self.urls    = ['https://github.com/beerkit/beer.db.ruby']
+
   self.author  = 'Gerald Bauer'
   self.email   = 'beerdb@googlegroups.com'
-    
+
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
   self.history_file = 'History.md'
-  
-  self.extra_deps = [
-    ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
-    ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
 
-    ['worlddb', '~> 1.8'],     # NB: worlddb already includes
+  self.extra_deps = [
+    ['props' ],
+    ['logutils'],
+    ['textutils'],
+    ['worlddb', '>= 2.0.2'],  # NB: worlddb already includes
                                #         - logutils
                                #         - textutils
-                               
-     ## 3rd party
-    ['gli', '>= 2.5.6']
+    ['tagutils'],     # tags n tagging tables
+    ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
+    ['fetcher', '>= 0.3'],
+
+    ## 3rd party
+    ['gli', '>= 2.5.6'],
+
+    ['activerecord']  # NB: will include activesupport,etc.
+    ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
   ]
 
   self.licenses = ['Public Domain']
@@ -37,4 +43,3 @@ Hoe.spec 'beerdb' do
   }
 
 end
-

data/lib/beerdb/models/beer.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class Beer < ActiveRecord::Base
 
@@ -17,10 +18,17 @@ class Beer < ActiveRecord::Base
   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, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
-  has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
 
-  validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
+  ## has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
+  ## has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
+
+  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
@@ -191,4 +199,5 @@ class Beer < ActiveRecord::Base
 
 end # class Beer
 
-end # module BeerDb::Model
+  end # module Model
+end # module BeerDb

data/lib/beerdb/models/bookmark.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class Bookmark < ActiveRecord::Base
 
@@ -28,4 +29,5 @@ class Bookmark < ActiveRecord::Base
 
 end # class Bookmark
 
-end # module BeerDb::Model
+  end # module Model
+end # module BeerDb

data/lib/beerdb/models/brand.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class Brand < ActiveRecord::Base
 
@@ -15,7 +16,7 @@ class Brand < ActiveRecord::Base
 
   has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brand_id'
 
-  validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
+  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 = {} )
@@ -57,4 +58,5 @@ class Brand < ActiveRecord::Base
 
 end # class Brand
 
-end # module BeerDb::Model
+  end # module Model
+end # module BeerDb

data/lib/beerdb/models/brewery.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class Brewery < ActiveRecord::Base
 
@@ -20,10 +21,14 @@ class Brewery < ActiveRecord::Base
   has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brewery_id'
   has_many   :brands,  :class_name => 'BeerDb::Model::Brand',    :foreign_key => 'brand_id'
 
-  has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
-  has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
+  ## has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
+  ## has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
 
-  validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
+  has_many :taggings, class_name: 'TagDb::Model::Tagging', :as      => :taggable
+  has_many :tags,     class_name: 'TagDb::Model::Tag',     :through => :taggings
+
+
+  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.rnd  # find random beer  - fix: use "generic" activerecord helper and include/extend class
@@ -229,5 +234,6 @@ class Brewery < ActiveRecord::Base
 
 end # class Brewery
 
+  end # module Model
+end # module BeerDb
 
-end # module BeerDb::Model

data/lib/beerdb/models/city.rb

@@ -1,4 +1,7 @@
-module WorldDb::Model
+# encoding: UTF-8
+
+module WorldDb
+  module Model
 
 class City
     has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'city_id'
@@ -6,6 +9,6 @@ class City
     has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'city_id'
 end # class Country
 
-end # module WorldDb::Model
-
+  end # module Model
+end # module WorldDb
 

data/lib/beerdb/models/country.rb

@@ -1,4 +1,7 @@
-module WorldDb::Model
+# encoding: UTF-8
+
+module WorldDb
+  module Model
 
 class Country
   has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'country_id'
@@ -6,4 +9,6 @@ class Country
   has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'country_id'
 end # class Country
 
-end # module WorldDb::Model
+  end # module Model
+end # module WorldDb
+

data/lib/beerdb/models/drink.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class Drink < ActiveRecord::Base
 
@@ -19,4 +20,6 @@ class Drink < ActiveRecord::Base
 
 end # class Drink
 
-end # module BeerDb::Model
+  end # module Model
+end # module BeerDb
+

data/lib/beerdb/models/forward.rb

@@ -1,8 +1,12 @@
+# encoding: UTF-8
+
+
 ### forward references
 ##   require first to resolve circular references
 
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
   ## todo: why? why not use include WorldDb::Models here???
 
@@ -11,10 +15,10 @@ module BeerDb::Model
   Region    = WorldDb::Model::Region
   City      = WorldDb::Model::City
 
-  Tag       = WorldDb::Model::Tag
-  Tagging   = WorldDb::Model::Tagging
+  Tag       = TagDb::Model::Tag
+  Tagging   = TagDb::Model::Tagging
 
-  Prop      = WorldDb::Model::Prop
+  Prop      = ConfDb::Model::Prop
 
   class Beer < ActiveRecord::Base ; end
   class Brand < ActiveRecord::Base ; end
@@ -25,14 +29,17 @@ module BeerDb::Model
   class Drink < ActiveRecord::Base ; end
   class Note < ActiveRecord::Base ; end
 
-end
+  end # module Model
+end # module BeerDb
 
 
-module WorldDb::Model
+module WorldDb
+  module Model
 
   Beer    = BeerDb::Model::Beer
   Brand   = BeerDb::Model::Brand
   Brewery = BeerDb::Model::Brewery
 
-end
+  end # module Model
+end # module WorldDb
 

data/lib/beerdb/models/note.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class Note < ActiveRecord::Base
 
@@ -9,4 +10,6 @@ class Note < ActiveRecord::Base
 
 end # class Note
 
-end # module BeerDb::Model
+  end # module Model
+end # module BeerDb
+

data/lib/beerdb/models/region.rb

@@ -1,4 +1,7 @@
-module WorldDb::Model
+# encoding: UTF-8
+
+module WorldDb
+  module Model
 
 class Region
     has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'region_id'
@@ -6,5 +9,6 @@ class Region
     has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'region_id'
 end # class Region
 
-end # module WorldDb::Model
+  end # module Model
+end # module WorldDb
 

data/lib/beerdb/models/tag.rb

@@ -1,8 +1,13 @@
-module WorldDb::Model
+# encoding: UTF-8
+
+module TagDb
+  module Model
 
 class Tag
   has_many :beers,     :through => :taggings, :source => :taggable, :source_type => 'BeerDb::Model::Beer',    :class_name => 'BeerDb::Model::Beer'
   has_many :breweries, :through => :taggings, :source => :taggable, :source_type => 'BeerDb::Model::Brewery', :class_name => 'BeerDb::Model::Brewery'
 end # class Country
 
-end # module WorldDb::Model
+  end # module Model
+end # module TagDb
+

data/lib/beerdb/models/user.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-module BeerDb::Model
+module BeerDb
+  module Model
 
 class User < ActiveRecord::Base
 
@@ -23,5 +24,6 @@ class User < ActiveRecord::Base
 
 end # class User
 
-end # module BeerDb::Model
+  end # module Model
+end # module BeerDb
 

data/lib/beerdb/version.rb

@@ -1,6 +1,6 @@
 
 module BeerDb
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end
 
 

data/test/helper.rb

@@ -54,6 +54,8 @@ def setup_in_memory_db
   ## build schema
 
   LogDb.create
+  ConfDb.create
+  TagDb.create
   WorldDb.create
   BeerDb.create
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &20877528 !ruby/object:Gem::Requirement
+  name: props
+  requirement: &85315900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20877528
+  version_requirements: *85315900
+- !ruby/object:Gem::Dependency
+  name: logutils
+  requirement: &85315630 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *85315630
+- !ruby/object:Gem::Dependency
+  name: textutils
+  requirement: &85315370 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *85315370
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &20877180 !ruby/object:Gem::Requirement
+  requirement: &85315060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *85315060
+- !ruby/object:Gem::Dependency
+  name: tagutils
+  requirement: &85314820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20877180
+  version_requirements: *85314820
+- !ruby/object:Gem::Dependency
+  name: activerecord-utils
+  requirement: &85314520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *85314520
+- !ruby/object:Gem::Dependency
+  name: fetcher
+  requirement: &85314220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *85314220
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &20876820 !ruby/object:Gem::Requirement
+  requirement: &85313860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +98,21 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *20876820
+  version_requirements: *85313860
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &85313410 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *85313410
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20876532 !ruby/object:Gem::Requirement
+  requirement: &85313110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +120,18 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20876532
+  version_requirements: *85313110
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20876208 !ruby/object:Gem::Requirement
+  requirement: &85312790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *20876208
+  version_requirements: *85312790
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -115,7 +181,7 @@ files:
 - test/test_fixture_matchers.rb
 - test/test_values.rb
 - .gemtest
-homepage: https://github.com/geraldb/beer.db.ruby
+homepage: https://github.com/beerkit/beer.db.ruby
 licenses:
 - Public Domain
 post_install_message: 
@@ -137,11 +203,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: beerdb
-rubygems_version: 1.8.16
+rubyforge_project: 
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: beerdb - beer.db command line tool
 test_files:
-- test/test_fixture_matchers.rb
 - test/test_values.rb
+- test/test_fixture_matchers.rb